Configuration dialog for SPI chips

Author: bbogush

qt/main_window.cpp

@@ -6,9 +6,11 @@
 #include "main_window.h"
 #include "ui_main_window.h"
 #include "settings_programmer_dialog.h"
-#include "chip_db_dialog.h"
+#include "parallel_chip_db_dialog.h"
+#include "spi_chip_db_dialog.h"
 #include "firmware_update_dialog.h"
 #include "parallel_chip_db.h"
+#include "spi_chip_db.h"
 #include "logger.h"
 #include "about_dialog.h"
 #include "settings.h"
@@ -85,8 +87,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
         SLOT(slotProgReadBadBlocks()));
     connect(ui->actionProgrammer, SIGNAL(triggered()), this,
         SLOT(slotSettingsProgrammer()));
-    connect(ui->actionChipDb, SIGNAL(triggered()), this,
-        SLOT(slotSettingsChipDb()));
+    connect(ui->actionParallelChipDb, SIGNAL(triggered()), this,
+        SLOT(slotSettingsParallelChipDb()));
+    connect(ui->actionSpiChipDb, SIGNAL(triggered()), this,
+        SLOT(slotSettingsSpiChipDb()));
     connect(ui->actionAbout, SIGNAL(triggered()), this,
         SLOT(slotAboutDialog()));
     connect(ui->detectPushButton, SIGNAL(clicked()), this,
@@ -635,9 +639,17 @@ void MainWindow::updateProgSettings()
     }
 }
 
-void MainWindow::slotSettingsChipDb()
+void MainWindow::slotSettingsParallelChipDb()
 {
-    ChipDbDialog chipDbDialog(&parallelChipDb, this);
+    ParallelChipDbDialog chipDbDialog(&parallelChipDb, this);
+
+    if (chipDbDialog.exec() == QDialog::Accepted)
+        updateChipList();
+}
+
+void MainWindow::slotSettingsSpiChipDb()
+{
+    SpiChipDbDialog chipDbDialog(&spiChipDb, this);
 
     if (chipDbDialog.exec() == QDialog::Accepted)
         updateChipList();

qt/main_window.h

@@ -72,7 +72,8 @@ public slots:
     void slotSelectChip(int selectedChipNum);
     void slotDetectChip();
     void slotSettingsProgrammer();
-    void slotSettingsChipDb();
+    void slotSettingsParallelChipDb();
+    void slotSettingsSpiChipDb();
     void slotAboutDialog();
     void slotFirmwareUpdateDialog();
 };

qt/main_window.ui

@@ -283,7 +283,8 @@
      <string>Settings</string>
     </property>
     <addaction name="actionProgrammer"/>
-    <addaction name="actionChipDb"/>
+    <addaction name="actionParallelChipDb"/>
+    <addaction name="actionSpiChipDb"/>
     <addaction name="separator"/>
     <addaction name="actionFirmwareUpdate"/>
    </widget>
@@ -379,9 +380,9 @@
     <string>Read bad blocks</string>
    </property>
   </action>
-  <action name="actionChipDb">
+  <action name="actionParallelChipDb">
    <property name="text">
-    <string>Chip database</string>
+    <string>Parallel chip database</string>
    </property>
   </action>
   <action name="actionAbout">
@@ -397,6 +398,11 @@
     <string>Firmware update</string>
    </property>
   </action>
+  <action name="actionSpiChipDb">
+   <property name="text">
+    <string>SPI chip database</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

qt/parallel_chip_db_dialog.cpp

@@ -0,0 +1,73 @@
+/*  Copyright (C) 2020 NANDO authors
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#include "parallel_chip_db_dialog.h"
+#include "ui_parallel_chip_db_dialog.h"
+
+#define HEADER_LONG_WIDTH 120
+#define HEADER_MED_WIDTH 100
+#define HEADER_SHORT_WIDTH 50
+
+ParallelChipDbDialog::ParallelChipDbDialog(ParallelChipDb *chipDb,
+    QWidget *parent) : QDialog(parent), ui(new Ui::ParallelChipDbDialog),
+    chipDbTableModel(chipDb, parent)
+{
+    ui->setupUi(this);
+    chipDbProxyModel.setSourceModel(&chipDbTableModel);
+    ui->chipDbTableView->setModel(&chipDbProxyModel);
+    ui->chipDbTableView->setColumnWidth(CHIP_PARAM_NAME, HEADER_LONG_WIDTH);
+    ui->chipDbTableView->setColumnWidth(CHIP_PARAM_PAGE_SIZE,
+        HEADER_MED_WIDTH);
+    ui->chipDbTableView->setColumnWidth(CHIP_PARAM_BLOCK_SIZE,
+        HEADER_MED_WIDTH);
+    ui->chipDbTableView->setColumnWidth(CHIP_PARAM_TOTAL_SIZE,
+        HEADER_MED_WIDTH);
+    ui->chipDbTableView->setColumnWidth(CHIP_PARAM_SPARE_SIZE,
+        HEADER_MED_WIDTH);
+    for (int i = CHIP_PARAM_T_CS; i <= CHIP_PARAM_T_REA; i++)
+        ui->chipDbTableView->setColumnWidth(i, HEADER_SHORT_WIDTH);
+    for (int i = CHIP_PARAM_ROW_CYCLES; i <= CHIP_PARAM_BB_MARK_OFF; i++)
+        ui->chipDbTableView->setColumnWidth(i, HEADER_MED_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()));
+}
+
+ParallelChipDbDialog::~ParallelChipDbDialog()
+{
+    delete ui;
+}
+
+void ParallelChipDbDialog::slotAddChipDbButtonClicked()
+{
+    chipDbTableModel.addRow();
+}
+
+void ParallelChipDbDialog::slotDelChipDbButtonClicked()
+{
+    QModelIndexList selection = ui->chipDbTableView->selectionModel()->
+        selectedRows();
+
+    if (!selection.count())
+        return;
+
+    chipDbTableModel.delRow(selection.at(0).row());
+}
+
+void ParallelChipDbDialog::slotOkButtonClicked()
+{
+    chipDbTableModel.commit();
+}
+
+void ParallelChipDbDialog::slotCancelButtonClicked()
+{
+    chipDbTableModel.reset();
+}

qt/parallel_chip_db_dialog.h

@@ -0,0 +1,37 @@
+/*  Copyright (C) 2020 NANDO authors
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ */
+
+#ifndef PARALLEL_CHIP_DB_DALOG_H
+#define PARALLEL_CHIP_DB_DALOG_H
+
+#include "parallel_chip_db_table_model.h"
+#include <QDialog>
+#include <QSortFilterProxyModel>
+
+namespace Ui {
+class ParallelChipDbDialog;
+}
+
+class ParallelChipDbDialog : public QDialog
+{
+    Q_OBJECT
+
+    Ui::ParallelChipDbDialog *ui;
+    ParallelChipDbTableModel chipDbTableModel;
+    QSortFilterProxyModel chipDbProxyModel;
+
+public:
+    explicit ParallelChipDbDialog(ParallelChipDb *chipDb,
+        QWidget *parent = nullptr);
+    ~ParallelChipDbDialog();
+
+private slots:
+    void slotAddChipDbButtonClicked();
+    void slotDelChipDbButtonClicked();
+    void slotOkButtonClicked();
+    void slotCancelButtonClicked();
+};
+
+#endif // PARALLEL_CHIP_DB_DALOG_H