consolidate table data, fix combobox table item

enderslash1010 · Jan 3, 2025 · 3e83279 · 3e83279
1 parent 6d6b4d3
commit 3e83279
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -263,35 +263,36 @@ void MainWindow::connect(SaveFieldID sfID, QExtendedSlider* slider, int start, i
     slider->setScaling(start, spacing, count);
 }
 
-// TODO: consolidate these into struct?
-const int MINE_ARRAY_ROW_COUNT = 150;
-const Mapping MINEArrayMapping =
-{
-    {MINE_MapID, MINE_MineID, MINE_NumHarvests, MINE_Cooldown},
-    {"Map ID", "Mine ID", "Number of Harvests", "Cooldown"}
+const TableDefinition MINEArrayDefinition
+{
+    150, // row count
+    { // array mapping
+        {MINE_MapID, MINE_MineID, MINE_NumHarvests, MINE_Cooldown},
+        {"Map ID", "Mine ID", "Number of Harvests", "Cooldown"}
+    },
+    {QExtendedComboBox_T, QExtendedLineEdit_T, QExtendedLineEdit_T, QExtendedLineEdit_T},
+    {&MapMapping, nullptr, nullptr, nullptr}
 };
-QList<ExtendedWidgetType> MINEArrayWidgetTypes = {QExtendedComboBox_T, QExtendedLineEdit_T, QExtendedLineEdit_T, QExtendedLineEdit_T};
-QList<const Mapping*> MINEArrayColumnMapping = {&MapMapping, nullptr, nullptr, nullptr};
 
 // QTableWidget
-void MainWindow::connect(SaveFieldID sfID, QExtendedTableWidget* table, const int rowCount, const Mapping* mapping, QList<ExtendedWidgetType> columnTypes)
+void MainWindow::connect(SaveFieldID sfID, QExtendedTableWidget* table, const TableDefinition* def)
 {
-    table->setRowCount(rowCount);
-    table->setColumnCount(std::size(mapping->keys));
-    table->setRows(rowCount);
-    table->setCols(std::size(mapping->keys));
+    table->setRowCount(def->row_count);
+    table->setColumnCount(std::size(def->array_mapping.keys));
+    table->setRows(def->row_count);
+    table->setCols(std::size(def->array_mapping.keys));
 
     QHeaderView* header = table->horizontalHeader();
     header->setSectionResizeMode(QHeaderView::Stretch);
 
-    table->setHorizontalHeaderLabels(mapping->values);
+    table->setHorizontalHeaderLabels(def->array_mapping.values);
 
     table->setProperty(SAVE_FIELD_PROPERTY, sfID);
     table->setSaveFieldID(sfID);
 
     saveFieldMap.insert({sfID, {table, Type::ARRAY_T}});
 
-    table->setup(rowCount, MINEArrayWidgetTypes, MINEArrayColumnMapping, &MINEArrayMapping);
+    table->setup(&MINEArrayDefinition);
 
     QObject::connect(table, &QExtendedTableWidget::tableCellChanged, this, &MainWindow::updateTable);
 }
@@ -389,7 +390,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(WTHRUnk2, ui->WTHRUnk2, Type::UINT_T);
 
     // MINE
-    connect(MINEArray, ui->MINEArray, MINE_ARRAY_ROW_COUNT, &MINEArrayMapping, MINEArrayWidgetTypes);
+    connect(MINEArray, ui->MINEArray, &MINEArrayDefinition);
 
     // TBOX
 

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -32,7 +32,7 @@ class MainWindow : public QMainWindow
     void connect(SaveFieldID sfID, QExtendedComboBox* thisComboBox, QExtendedComboBox* sourceComboBox, std::vector<const Mapping*>& dynamicMapping);
     void connect(SaveFieldID sfID, QExtendedRadioButtons* radioButtonFrame, std::unordered_map<QString, QRadioButton*>& rbs);
     void connect(SaveFieldID sfID, QExtendedSlider* slider, int start, int spacing, int count);
-    void connect(SaveFieldID sfID, QExtendedTableWidget* table, const int rowCount, const Mapping* mapping, QList<ExtendedWidgetType> columnTypes);
+    void connect(SaveFieldID sfID, QExtendedTableWidget* table, const TableDefinition* def);
 
     void setField(SaveFieldID sfID);
     QString getField(SaveFieldID sfID, int row = 0, int col = 0);

diff --git a/include/QExtendedWidget.h b/include/QExtendedWidget.h
@@ -228,6 +228,14 @@ class QExtendedSlider : public QSlider, public QExtendedWidget
     }
 };
 
+struct TableDefinition
+{
+    int row_count;
+    Mapping array_mapping;
+    QList<ExtendedWidgetType> widget_types;
+    QList<const Mapping*> column_mapping;
+};
+
 class QExtendedTableWidget : public QTableWidget, public QExtendedWidget
 {
     Q_OBJECT
@@ -247,15 +255,15 @@ private slots:
 public:
 
     QExtendedTableWidget(QWidget* parent = nullptr) : QTableWidget(parent) { }
-    void setup(int rows, QList<ExtendedWidgetType> types, QList<const Mapping*> columnMapping, const Mapping* tableMapping)
+    void setup(const TableDefinition* def)
     {
-        this->tableMapping = tableMapping;
-        for (int row = 0; row < rows; row++)
+        this->tableMapping = &def->array_mapping;
+        for (int row = 0; row < def->row_count; row++)
         {
             std::vector<QExtendedWidget*> newRow;
-            for (int col = 0; col < types.size(); col++)
+            for (int col = 0; col < def->widget_types.size(); col++)
             {
-                switch (types.at(col))
+                switch (def->widget_types.at(col))
                 {
                 case QExtendedLineEdit_T:
                 {
@@ -276,10 +284,8 @@ private slots:
                     cb->setEditable(true);
                     newRow.push_back(cb);
                     this->setCellWidget(row, col, cb);
-                    if (columnMapping.at(col) != nullptr) cb->setMapping(columnMapping.at(col));
-
-                    if (cb->lineEdit() != nullptr) QObject::connect(cb->lineEdit(), &QLineEdit::editingFinished, this, &QExtendedTableWidget::cellEdited);
-                    else QObject::connect(cb, &QComboBox::currentTextChanged, this, &QExtendedTableWidget::cellEdited);
+                    if (def->column_mapping.at(col) != nullptr) cb->setMapping(def->column_mapping.at(col));
+                    QObject::connect(cb, &QComboBox::currentTextChanged, this, &QExtendedTableWidget::cellEdited);
 
                     cb->setProperty("row", row);
                     cb->setProperty("column", col);