优化配置界面

data_config.h

@@ -2,7 +2,9 @@
 #define DATA_CONFIG_H
 #include <QString>
 #include <QPushButton>
+#include <QList>
 
+#define CHANNLE_COUNT 4
 typedef struct {
     int slot;
     int slot_type;
@@ -20,4 +22,19 @@ enum SlotType{
     VIBRATE = 40,
     RPM = 50
 };
+
+typedef struct{
+    int id;
+    QString channle_name;
+    bool standby;
+    bool active;
+    QString rack_type;
+    QString tmr_group;
+    QString channel_type;
+    QString transducer_name;
+    QString scale_factor;
+    QString sample_rate;
+    float normal_voltage_low;
+    float normal_voltage_high;
+}SeismicMonitor;
 #endif // DATA_CONFIG_H

doc/seismic_monitor.jsonc

@@ -12,7 +12,7 @@
 			"tmr_group":"1-3",
 			"channel_type":"acceleration",
 			"transducer_name":"3300-8mm Proximitor",
-			"scale_factor":"10 mv/ m/s^2",
+			"scale_factor":"10",
 			"sample_rate":32000,
 			"normal_voltage_range": [-21.3, 21.0]
 		},{
@@ -24,7 +24,7 @@
 			"tmr_group":"1-3",
 			"channel_type":"acceleration",
 			"transducer_name":"3300-8mm Proximitor",
-			"scale_factor":"10 mv/ m/s^2",
+			"scale_factor":"10",
 			"sample_rate":32000,
 			"normal_voltage_range": [-21.3, 21.0]
 		},{
@@ -36,7 +36,7 @@
 			"tmr_group":"3-5",
 			"channel_type":"acceleration",
 			"transducer_name":"3300-8mm Proximitor",
-			"scale_factor":"10 mv/ m/s^2",
+			"scale_factor":"10",
 			"sample_rate":32000,
 			"normal_voltage_range": [-21.3, 21.0]
 		},{
@@ -48,7 +48,7 @@
 			"tmr_group":"3-5",
 			"channel_type":"acceleration",
 			"transducer_name":"3300-8mm Proximitor",
-			"scale_factor":"10 mv/ m/s^2",
+			"scale_factor":"10",
 			"sample_rate":32000,
 			"normal_voltage_range": [-21.3, 21.0]
 		}

keyphase.cpp

@@ -12,3 +12,9 @@ KeyPhase::~KeyPhase()
 {
     delete ui;
 }
+
+void KeyPhase::on_pushButton_confirm_clicked()
+{
+
+}
+

keyphase.h

@@ -15,6 +15,9 @@ public:
     explicit KeyPhase(QWidget *parent = nullptr);
     ~KeyPhase();
 
+private slots:
+    void on_pushButton_confirm_clicked();
+
 private:
     Ui::KeyPhase *ui;
 };

keyphase.ui

@@ -1557,7 +1557,7 @@
     <string>打 印...</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="pushButton_10">
+  <widget class="QPushButton" name="pushButton_confirm">
    <property name="geometry">
     <rect>
      <x>130</x>

mainwindow.cpp

@@ -347,7 +347,7 @@ void MainWindow::OnButtonGroup(QAbstractButton * slot_btn)
             single_relay->setWindowModality(Qt::ApplicationModal);
             single_relay->show();
         }else if (slot_config.slot_type == VIBRATE){
-            Seismic_monitor *seismic_monitor = new Seismic_monitor();
+            Seismic_monitor *seismic_monitor = new Seismic_monitor(button_id);
             seismic_monitor->setWindowModality(Qt::ApplicationModal);
             seismic_monitor->show();
         }else if (slot_config.slot_type == RPM){
@@ -428,3 +428,9 @@ void MainWindow::on_pushButton_save_clicked()
     file.close();
 }
 
+
+void MainWindow::on_pushButton_open_clicked()
+{
+
+}
+

mainwindow.h

@@ -51,5 +51,6 @@ private slots:
     void on_pushButton_alarm_clicked();
     void on_pushButton_point_name_clicked();
     void on_pushButton_save_clicked();
+    void on_pushButton_open_clicked();
 };
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -57,7 +57,7 @@
            <string>保存</string>
           </property>
          </widget>
-         <widget class="QPushButton" name="pushButton_21">
+         <widget class="QPushButton" name="pushButton_open">
           <property name="geometry">
            <rect>
             <x>80</x>

seismic_monitor.cpp

@@ -1,14 +0,0 @@
-#include "Seismic_monitor.h"
-#include "ui_Seismic_monitor.h"
-
-Seismic_monitor::Seismic_monitor(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::Seismic_monitor)
-{
-    ui->setupUi(this);
-}
-
-Seismic_monitor::~Seismic_monitor()
-{
-    delete ui;
-}

seismic_monitor.h

@@ -1,22 +0,0 @@
-#ifndef seismic_monitor_H
-#define seismic_monitor_H
-
-#include <QWidget>
-
-namespace Ui {
-class Seismic_monitor;
-}
-
-class Seismic_monitor : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit Seismic_monitor(QWidget *parent = nullptr);
-    ~Seismic_monitor();
-
-private:
-    Ui::Seismic_monitor *ui;
-};
-
-#endif // seismic_monitor_H