数据采集页面增加集结按钮

QFD/widgets/DataCollectionWidget.cpp

@@ -24,12 +24,14 @@
 #include <CNode.h>
 
 #include <Widgets/Button.h>
+#include <Widgets/ComboBox.h>
 
 #include <QTabWidget>
 #include <QBoxLayout>
 #include <QMap>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QComboBox>
 
 #include <QDebug>
 
@@ -49,8 +51,14 @@ DataCollectionWidget::DataCollectionWidget(ProjectInfo *proj, QWidget *parent) :
     m_configMeasure->setHidden(true);
     m_configScheme->setHidden(true);
 
+    m_comboBox = new QComboBox(this);
+    m_comboBox->addItems({ "结果集结", "矩阵集结" });
+    m_comboBox->resize(50, 35);
     m_calcBtn = new PushButton("更新数据");
+
     m_topLayout->addStretch();
+    m_topLayout->addWidget(m_comboBox);
+    m_topLayout->addSpacing(10);
     m_topLayout->addWidget(m_calcBtn);
     connect(m_calcBtn, &PushButton::clicked, this, &DataCollectionWidget::slotCalc);
 

QFD/widgets/DataCollectionWidget.h

@@ -14,6 +14,7 @@ class PushButton;
 
 class QTabWidget;
 class QHBoxLayout;
+class QComboBox;
 
 /**
  * @brief The DataCollectionWidget class
@@ -45,6 +46,7 @@ private:
     ConfigMeasureDataWidget *m_configMeasure = nullptr;
     ConfigSchemeDataWidget *m_configScheme   = nullptr;
 
+    QComboBox *m_comboBox = nullptr;
     PushButton *m_calcBtn = nullptr;
 };
 

QFD/widgets/DataTableWidget.cpp

@@ -146,8 +146,6 @@ void DataTableWidget::setupModels()
         }
         m_models[i] = modelList;
     }
-
-    setCurrentPage(1);
 }
 
 void DataTableWidget::setupTabWidget()