Implemented add/delete of chips from UI

Author: bbogush

qt/chip_db.cpp

@@ -5,7 +5,6 @@
 
 #include "chip_db.h"
 #include <cstring>
-#include <QFile>
 #include <QDebug>
 #include <QStandardPaths>
 #include <QDir>
@@ -31,8 +30,7 @@ QString ChipDb::findFile()
     return fileName;
 }
 
-int ChipDb::stringToChipInfo(const QString &file, const QString &s,
-    ChipInfo &ci)
+int ChipDb::stringToChipInfo(const QString &s, ChipInfo &ci)
 {
     int paramNum;
     QStringList paramsList;
@@ -42,8 +40,8 @@ int ChipDb::stringToChipInfo(const QString &file, const QString &s,
     if (paramNum != CHIP_PARAM_NUM)
     {
         QMessageBox::critical(nullptr, tr("Error"),
-            tr("Failed to read chip DB entry from %1. Expected %2 parameters, "
-            "but read %3").arg(file).arg(CHIP_PARAM_NUM).arg(paramNum));
+            tr("Failed to read chip DB entry. Expected %2 parameters, "
+            "but read %3").arg(CHIP_PARAM_NUM).arg(paramNum));
         return -1;
     }
 
@@ -56,14 +54,27 @@ int ChipDb::stringToChipInfo(const QString &file, const QString &s,
         if (!ok)
         {
             QMessageBox::critical(nullptr, tr("Error"), tr("Failed to parse"
-                " parameter %1 in %2").arg(paramsList[i]).arg(file));
+                " parameter %1").arg(paramsList[i]));
             return -1;
         }
     }
 
     return 0;
 }
 
+int ChipDb::chipInfoToString(const ChipInfo &ci, QString &s)
+{
+    QStringList paramsList;
+
+    paramsList.append(ci.name);
+    for (int i = CHIP_PARAM_NAME + 1; i < CHIP_PARAM_NUM; i++)
+        paramsList.append(QString("%1").arg(ci.params[i]));
+
+    s = paramsList.join(',');
+
+    return 0;
+}
+
 void ChipDb::readFromCvs(void)
 {
     ChipInfo chipInfo;
@@ -89,46 +100,124 @@ void ChipDb::readFromCvs(void)
             continue;
         if (*line.data() == '#')
             continue;
-        if (stringToChipInfo(fileName, line, chipInfo))
-            return;
+        if (stringToChipInfo(line, chipInfo))
+            break;
         chipInfoVector.append(chipInfo);
     }
+    dbFile.close();
+}
+
+int ChipDb::readCommentsFromCsv(QFile &dbFile, QString &comments)
+{
+    if (!dbFile.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        QMessageBox::critical(nullptr, tr("Error"), tr("Failed to open chip DB "
+            "file: %1, error: %2").arg(dbFile.fileName()).
+            arg(dbFile.errorString()));
+        return -1;
+    }
+
+    QTextStream in(&dbFile);
+    while (!in.atEnd())
+    {
+        QString l = in.readLine();
+        if (l.isEmpty())
+            continue;
+        if (*l.data() == '#')
+        {
+            comments.append(l);
+            comments.append('\n');
+        }
+    }
+    dbFile.close();
+
+    return 0;
+}
+
+void ChipDb::writeToCvs(void)
+{
+    QString line;
+    QFile dbFile;
+    QString fileName = findFile();
+
+    if (fileName.isNull())
+        return;
+
+    dbFile.setFileName(fileName);
+
+    if (readCommentsFromCsv(dbFile, line))
+        return;
+
+    if (!dbFile.open(QIODevice::WriteOnly | QIODevice::Truncate |
+        QIODevice::Text))
+    {
+        QMessageBox::critical(nullptr, tr("Error"), tr("Failed to open chip DB "
+            "file: %1, error: %2").arg(fileName).arg(dbFile.errorString()));
+        return;
+    }
+
+    QTextStream out(&dbFile);
+    out << line;
+    for (int i = 0; i < chipInfoVector.size(); i++)
+    {
+        chipInfoToString(chipInfoVector[i], line);
+        out << line << '\n';
+    }
+    dbFile.close();
 }
 
 ChipDb::ChipDb(QObject *parent) : QObject(parent)
 {
     readFromCvs();
 }
 
-QStringList *ChipDb::getNames()
+QStringList ChipDb::getNames()
 {
-    QStringList *namesList = new QStringList;
+    QStringList namesList;
 
     for (int i = 0; i < chipInfoVector.size(); i++)
-        namesList->append(chipInfoVector[i].name);
+        namesList.append(chipInfoVector[i].name);
 
     return namesList;
 }
 
-ChipInfo *ChipDb::chipInfoGetByName(const QString &name)
+ChipInfo *ChipDb::chipInfoGetById(int id)
 {
-    for (int i = 0; i < chipInfoVector.size(); i++)
-    {
-        if (!chipInfoVector[i].name.compare(name))
-            return &chipInfoVector[i];
-    }
+    if (id >= chipInfoVector.size() || id < 0)
+        return nullptr;
 
-    return nullptr;
+    return &chipInfoVector[id];
 }
 
-uint32_t ChipDb::pageSizeGetByName(const QString &name)
+uint32_t ChipDb::pageSizeGetById(int id)
 {
-    ChipInfo *info = chipInfoGetByName(name);
+    ChipInfo *info = chipInfoGetById(id);
 
     return info ? info->params[CHIP_PARAM_PAGE_SIZE] : 0;
 }
 
+void ChipDb::addChip(ChipInfo &chipInfo)
+{
+    chipInfoVector.append(chipInfo);
+}
+
+void ChipDb::delChip(int index)
+{
+    chipInfoVector.remove(index);
+}
+
 int ChipDb::size()
 {
     return chipInfoVector.size();
 }
+
+void ChipDb::commit()
+{
+    writeToCvs();
+}
+
+void ChipDb::reset()
+{
+    chipInfoVector.clear();
+    readFromCvs();
+}

qt/chip_db.h

@@ -10,6 +10,7 @@
 #include <QString>
 #include <QObject>
 #include <QVector>
+#include <QFile>
 
 enum
 {
@@ -55,15 +56,22 @@ class ChipDb : public QObject
     QVector<ChipInfo> chipInfoVector;
 
     QString findFile();
-    int stringToChipInfo(const QString &file, const QString &s, ChipInfo &ci);
-    void readFromCvs(void);
+    int stringToChipInfo(const QString &s, ChipInfo &ci);
+    int chipInfoToString(const ChipInfo &ci, QString &s);
+    void readFromCvs();
+    int readCommentsFromCsv(QFile &dbFile, QString &comments);
+    void writeToCvs();
 
 public:
     explicit ChipDb(QObject *parent = 0);
-    QStringList *getNames();
-    ChipInfo *chipInfoGetByName(const QString &name);
-    uint32_t pageSizeGetByName(const QString &name);
+    QStringList getNames();
+    ChipInfo *chipInfoGetById(int id);
+    uint32_t pageSizeGetById(int id);
+    void addChip(ChipInfo &chipInfo);
+    void delChip(int index);
     int size();
+    void commit();
+    void reset();
 
     ChipInfo *operator[](int index) { return &chipInfoVector[index]; }
 };

qt/chip_db_dialog.cpp

@@ -18,9 +18,44 @@ ChipDbDialog::ChipDbDialog(ChipDb *chipDb, QWidget *parent) : QDialog(parent),
     ui->chipDbTableView->setColumnWidth(CHIP_PARAM_SIZE, HEADER_LONG_WIDTH);
     for (int i = CHIP_PARAM_SIZE + 1; i < CHIP_PARAM_NUM; i++)
         ui->chipDbTableView->setColumnWidth(i, HEADER_SHORT_WIDTH);
+
+    connect(ui->addChipDbButton, SIGNAL(clicked()), this,
+        SLOT(slotAddChipDbButtonClicked()));
+    connect(ui->delChipDbButton, SIGNAL(clicked()), this,
+        SLOT(slotDelChipDbButtonClicked()));
+    connect(ui->okCancelButtonBox->button(QDialogButtonBox::Ok),
+        SIGNAL(clicked()), this, SLOT(slotOkButtonClicked()));
+    connect(ui->okCancelButtonBox->button(QDialogButtonBox::Cancel),
+        SIGNAL(clicked()), this, SLOT(slotCancelButtonClicked()));
 }
 
 ChipDbDialog::~ChipDbDialog()
 {
     delete ui;
 }
+
+void ChipDbDialog::slotAddChipDbButtonClicked()
+{
+    chipDbTableModel.addRow();
+}
+
+void ChipDbDialog::slotDelChipDbButtonClicked()
+{
+    QModelIndexList selection = ui->chipDbTableView->selectionModel()->
+        selectedRows();
+
+    if (!selection.count())
+        return;
+
+    chipDbTableModel.delRow(selection.at(0).row());
+}
+
+void ChipDbDialog::slotOkButtonClicked()
+{
+    chipDbTableModel.commit();
+}
+
+void ChipDbDialog::slotCancelButtonClicked()
+{
+    chipDbTableModel.reset();
+}

qt/chip_db_dialog.h

@@ -20,6 +20,12 @@ class ChipDbDialog : public QDialog
 public:
     explicit ChipDbDialog(ChipDb *chipDb, QWidget *parent = nullptr);
     ~ChipDbDialog();    
+
+private slots:
+    void slotAddChipDbButtonClicked();
+    void slotDelChipDbButtonClicked();
+    void slotOkButtonClicked();
+    void slotCancelButtonClicked();
 };
 
 #endif // CHIP_DB_DALOG_H