2025-03-19T11:19:52

src/data/filemanager.cpp

@@ -34,7 +34,6 @@ void createExperimentFile()
 
     fileName.append("_");
     if(_expeInfo.date.isEmpty()){
-//        fileName.append(QDateTime::currentDateTime().toUTC().toString("yyyyMMdd_HHmmss"));
         fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss"));
     }else{
         fileName.append(_expeInfo.date);

src/mainwindow.cpp

@@ -121,6 +121,7 @@ void MainWindow::on_actionConnectToDev_triggered()
     {
         setActionEnable(true);
         Global::instance()->setMode(Global::Mode::ConnectedToDev);
+
         QByteArray ba = DataParser::inquirePhaseInfo();
         SerialPort::instance()->sendData(ba);
     }

src/serialport/protocol.h

@@ -13,6 +13,14 @@
 #pragma pack(push)
 #pragma pack(1)
 
+enum DeviceRunStatus{
+    Idle,
+    Heat,
+    ConstantTemp,
+    Cooling,
+    HeatingReteSelfTunning
+};
+
 enum DeviceStartMode{
     Stop,
     Start,

src/serialport/serialport.cpp

@@ -101,6 +101,7 @@ void SerialPort::slotReadData()
 #if 1
     QString hexData = ba.toHex(' '); // ' ' 作为分隔符，可选参数
     qDebug() << "receive info (hex):" << hexData;
+    return;
 #endif
     SerialPortProtocol *spp = (SerialPortProtocol *)ba.data();
     if (FRANE_HEAD != spp->head)
@@ -123,10 +124,12 @@ void SerialPort::slotReadData()
 
     if (WRITE_CMD == spp->cmd)
     {
-        writeCmdHandle(dataLength, spp->addr, cd);
+        commonDataParser(dataLength, spp->addr, cd);
     }
     else if (READ_CMD == spp->cmd)
     {
+        // judge the device status.
+        commonDataParser(dataLength, spp->addr, cd);
         // read data
         if (spp->addr == 0)
         {
@@ -140,7 +143,7 @@ void SerialPort::slotReadData()
 #endif
 }
 
-void SerialPort::writeCmdHandle(const int dataLength, const u16 addr,
+void SerialPort::commonDataParser(const int dataLength, const u16 addr,
                                   const CommonData &cd)
 {
     int localLength = dataLength;
@@ -165,6 +168,20 @@ void SerialPort::writeCmdHandle(const int dataLength, const u16 addr,
     {
         switch (localAddr)
         {
+        case offsetof(CommonData, run_type): // 运行状态
+        {
+            switch(cd.run_type){
+            case DeviceRunStatus::Cooling:
+                Global::instance()->setMode(Global::Mode::Analysis);
+                break;
+            default:break;
+            }
+
+            localAddr += 1;
+            localLength -= 1;
+
+            break;
+        }
         case offsetof(CommonData, current_gas): // 当前气氛
             //            gas_type_set(dev->temp, msg_data.current_gas);
             localAddr += 1;
@@ -414,6 +431,7 @@ void SerialPort::parserTest()
 
 void SerialPort::slotDeliverData(const QByteArray &ba)
 {
+    qDebug()<<"slotDeliverData...";
     openSp();
 
     slotSendData(ba);
@@ -421,13 +439,6 @@ void SerialPort::slotDeliverData(const QByteArray &ba)
 
 void SerialPort::slotSendData(const QByteArray &ba)
 {
-#if 0
-    if (WRITE_CMD == ba.at(3))
-    {
-        _lastWriteBa = ba;
-    }
-#endif
-
 #if 1
     qDebug() << "slotSendData:" << ba.size();
     QString hexData = ba.toHex(' '); // ' ' 作为分隔符，可选参数

src/serialport/serialport.h

@@ -23,7 +23,7 @@ public:
     ~SerialPort();
 
     void sendData(const QByteArray &data)
-    {slotSendData(data);    }
+    {   slotSendData(data);    }
     void sendCmd(const E_CMD_TYPE e);
     static void parserTest();
     bool openSp();
@@ -43,7 +43,7 @@ private slots:
     void slotReadData();
 
 private:
-    void writeCmdHandle(const int dataLength, const u16 addr, const CommonData &cd);
+    void commonDataParser(const int dataLength, const u16 addr, const CommonData &cd);
     void to_hex(char *in_char, int char_length, char *out_char);
     void displayPortInfo();
 

src/ui/centralwidget.cpp

@@ -35,6 +35,11 @@ CentralWidget::CentralWidget(QWidget *parent)
     //    startTimer(1000);
 }
 
+CentralWidget::~CentralWidget()
+{
+    FileManager::fileClose();
+}
+
 void CentralWidget::slotModeModify(const Global::Mode mode)
 {
     if (Global::Mode::ExperimentStart == mode)
@@ -51,6 +56,8 @@ void CentralWidget::slotModeModify(const Global::Mode mode)
     }
     else if (Global::Mode::Analysis == mode)
     {
+        qDebug()<<"file close...";
+        FileManager::fileClose();
     }
 }
 

src/ui/centralwidget.h

@@ -12,6 +12,7 @@ class CentralWidget:public QWidget
     Q_OBJECT
 public:
     CentralWidget(QWidget *parent = nullptr);
+    ~CentralWidget();
 public slots:
     void slotModeModify(const Global::Mode);
     void slotRevCommonData(const CommonData&);

src/ui/experimentsettingform.cpp

@@ -354,6 +354,54 @@ void ExperimentSettingForm::slotConnectToDevice()
         phaseVtr.push_back(phase);
     }
 
+    if (ui->checkBox_phase_3->checkState())
+    {
+        Phase phase;
+        phase.onoff = 1;
+        phase.cutoff_temp = ui->phase_3_cutoff_temp->text().toFloat();
+        phase.temp_flow = ui->phase_3_scan_rate->text().toFloat();
+        phase.constant_temp_time_min = (uint16_t)ui->phase_3_constant_temp->text().toInt();
+        phase.gas = GasType::N2;
+
+        phaseVtr.push_back(phase);
+    }
+    if (ui->checkBox_phase_4->checkState())
+    {
+        Phase phase;
+        phase.onoff = 1;
+        phase.cutoff_temp = ui->phase_4_cutoff_temp->text().toFloat();
+        phase.temp_flow = ui->phase_4_scan_rate->text().toFloat();
+        phase.constant_temp_time_min = (uint16_t)ui->phase_4_constant_temp->text().toInt();
+        //        phase.gas = ui->comboBox_phase_1_atmosphere->currentIndex();
+        phase.gas = GasType::N2;
+
+        phaseVtr.push_back(phase);
+    }
+    if (ui->checkBox_phase_5->checkState())
+    {
+        Phase phase;
+        phase.onoff = 1;
+        phase.cutoff_temp = ui->phase_5_cutoff_temp->text().toFloat();
+        phase.temp_flow = ui->phase_5_scan_rate->text().toFloat();
+        phase.constant_temp_time_min = (uint16_t)ui->phase_5_constant_temp->text().toInt();
+        //        phase.gas = ui->comboBox_phase_1_atmosphere->currentIndex();
+        phase.gas = GasType::N2;
+
+        phaseVtr.push_back(phase);
+    }
+    if (ui->checkBox_phase_6->checkState())
+    {
+        Phase phase;
+        phase.onoff = 1;
+        phase.cutoff_temp = ui->phase_6_cutoff_temp->text().toFloat();
+        phase.temp_flow = ui->phase_6_scan_rate->text().toFloat();
+        phase.constant_temp_time_min = (uint16_t)ui->phase_6_constant_temp->text().toInt();
+        //        phase.gas = ui->comboBox_phase_1_atmosphere->currentIndex();
+        phase.gas = GasType::N2;
+
+        phaseVtr.push_back(phase);
+    }
+
     QByteArray ba = DataParser::connectToDevice(phaseVtr);
     qDebug() << "ba size:" << ba.size();
     emit sigDeliverData(ba);
@@ -464,7 +512,7 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba)
         QString checkBoxName = QString("checkBox_phase_%1").arg(i);
         QCheckBox *checkBox_phase = qobject_cast<QCheckBox*>(this->findChild<QObject*>(checkBoxName));
         if (checkBox_phase) {
-            checkBox_phase->setTristate(true);
+            checkBox_phase->setChecked(true);
             qDebug()<<"found...";
         }else{
             qDebug()<<"not found...";