2025-09-28T17:19:30

src/data/xlsxhandler.cpp

@@ -147,7 +147,7 @@ void XlsxHandler::readPhaseData(QXlsx::Worksheet *workSheet, int &startLineIndex
 }
 
 void XlsxHandler::writeExperimentFile(const QString filePath) {
-    logde << "write file...";
+    logde << "writeExperimentFile...";
 
 #if 0
     if(Global::_curveExperimentDataVtr.empty()){
@@ -293,9 +293,12 @@ void XlsxHandler::writeExperimentFile(const QString filePath) {
         //        logde<<"edVtr size:"<<edVtr.size();
 
         for (int index = 0; index < edVtr.size(); index++) {
-            //            logde<<"index :"<<index;
             const Global::ExperimentData &ed = edVtr.at(index);
-
+            // 跳过运行时间为0 的数据
+            if(ed.runTime == 0){
+                continue;
+            }
+            //
             xlsx.write(row, 1, index);
             xlsx.write(row, 2, ed.runTime);
             xlsx.write(row, 3, ed.sampleTemp);
@@ -667,6 +670,8 @@ void XlsxHandler::writeSmoothnessFile(const QString filePath) {
 }
 
 void XlsxHandler::writeXlsxFile(const QString filePath) {
+    logde<<"write xlsx file...";
+
     if (Global::_curveFileDataVtr.empty()) {
         logde << "curve file data vtr empty...";
         return;

src/mainwindow.cpp

@@ -418,11 +418,13 @@ void MainWindow::startExperiment() {
     _centralWidget->startExperiment();
 }
 
-void MainWindow::startExperimentByDeviceInfo()
+void MainWindow::startExperimentByDeviceInfo() {
-{
     Global::_mode                  = Global::Mode::Experiment;
     _manuallyStopTheExperimentFlag = false;
     _centralWidget->startExperiment();
+    
+    // 实验开始，清除上一个实验所有数据。
+    Global::clearExperimentData();
 }
 
 void MainWindow::on_actionStop_triggered() {
@@ -468,7 +470,7 @@ void MainWindow::on_actionNew_triggered() {
 
 void MainWindow::on_actionStart_triggered() {
     logde << "start experiment,set soft into experiment mode.";
-    logde<<"```````````````````````````````";
+    logde << "```````````````````````````````";
 
     if (!SerialPort::instance()->isOpen()) {
         showMesgBox("设备未连接，请先连接设备。");
@@ -500,7 +502,10 @@ void MainWindow::slotSaveExperimentalDataMsgBox() {
     // auto save file.
     logde << "slotSaveExperimentalDataMsgBox saveFile ...";
     QString finalFileName;
-    if (saveFile(Global::_experimentInfo.sampleName, Global::Mode::Experiment, finalFileName, true)) {
+    if (saveFile(Global::_experimentInfo.sampleName,
+                 Global::Mode::Experiment,
+                 finalFileName,
+                 true)) {
         _leftWidget->reloadFileName();
 
         QString str = QString("%1 文件保存成功。").arg(finalFileName);
@@ -526,6 +531,8 @@ void MainWindow::on_actionConnectToDev_triggered() {
     logde << "connect to device...";
 
     if (SerialPort::instance()->isOpen()) {
+        logde << "close device.";
+
         SerialPort::instance()->closeSp();
 
         ui->actionConnectToDev->setIcon(QIcon(":/images/connect.png"));
@@ -537,29 +544,25 @@ void MainWindow::on_actionConnectToDev_triggered() {
         slotUpdateStatusbarMsg(str);
         showMesgBox(str);
     } else {
+        logde << "open device.";
+
         if (SerialPort::instance()->openSp()) {
-
-            logde << "open serial port success. 1";
-
             setActionEnable(true);
             //        Global::instance()->setMode(Global::Mode::ConnectedToDev);
             Global::_mode = Global::Mode::ConnectedToDev;
 
-            logde << "open serial port success. 2";
-
             QByteArray ba = DataParser::inquirePhaseInfo();
             SerialPort::instance()->sendData(ba);
 
             ui->actionConnectToDev->setIcon(QIcon(":/images/disconnect.png"));
             ui->actionConnectToDev->setText("断开连接");
 
-            logde << "open serial port.";
             //
-            logde << "open serial port success. 3";
-
             QString str("设备已连接。");
             slotUpdateStatusbarMsg(str);
             showMesgBox(str);
+
+            logde << "open serial port success. ";
         } else {
             //            QMessageBox::warning(this, "warnning", "Serial Port open failed.");
             showMesgBox("设备打开失败。");
@@ -568,7 +571,7 @@ void MainWindow::on_actionConnectToDev_triggered() {
 }
 
 void MainWindow::on_actionStartPoint_triggered() {
-    logde<<"start experiment...";
+    logde << "start experiment...";
 
     _rightWidget->show();
     _centralWidget->setAnalysisMode(CentralWidget::AnalysisMode::StartPoint);
@@ -590,6 +593,11 @@ void MainWindow::on_actionPeakSynthesisAnalysis_triggered() {
 }
 
 void MainWindow::on_actionClearAllData_triggered() {
+    // 实验过程中，不允许清除数据。
+    if(Global::_mode == Global::Mode::Experiment) {
+        return;
+    }
+
     slotUpdateStatusbarMsg("");
 
     _rightWidget->hide();

src/serialport/serialport.cpp

@@ -77,33 +77,28 @@ SerialPort *SerialPort::instance() {
 }
 
 SerialPort::~SerialPort() {
-    logde<<"serialport destructor.";
+    logde << "serialport destructor.";
+
+    closeSp();
 
-    if (_sp && _sp->isOpen()) {
-        _sp->clear();
-        _sp->close();
-    }
     delete _sp;
     _sp = nullptr;
 }
 
-void SerialPort::timerEvent(QTimerEvent *event) {
-}
-
 void SerialPort::slotReadData() {
     QByteArray ba = _sp->readAll();
     if (ba.size() == 0) {
         return;
     }
 
-#if 0
+#if 1
     QString hexData = ba.toHex(' ');    // ' ' 作为分隔符，可选参数
     logde << "receive info (hex):" << hexData.toStdString();
 #endif
 
     SerialPortProtocol *spp = (SerialPortProtocol *)ba.data();
     if (FRANE_HEAD != spp->head) {
-        qDebug() << "Data header error.";
+        logde << "Data header error.";
         return;
     }
 
@@ -162,6 +157,26 @@ void SerialPort::updateStatus(const CommonData &cd) {
             break;
     }
 
+    // 判断是否根据下位机数据，切换软件实验模式。
+    static Global::Mode preMode            = Global::Mode::Analysis;
+    bool                sendSaveSignalFlag = false;
+    if (Global::_mode != preMode) {
+        if (preMode == Global::Mode::Experiment
+            && Global::_mode == Global::Mode::Analysis) {
+            sendSaveSignalFlag = true;
+        } else if (preMode == Global::Mode::Analysis
+                   && Global::_mode == Global::Mode::Experiment) {
+
+            // 根据下位机数据，软件进入实验模式，开始实验。
+            logde << "start experiment, accord to device data...";
+            logde << "---------------------";
+
+            emit sigStartExperiment();
+        }
+
+        preMode = Global::_mode;
+    }
+
     // If phase update, add new phase data to the global param.
     if (Global::_mode == Global::Mode::Experiment) {
         if (Global::_currentPhase != (int)cd.current_phase) {
@@ -174,6 +189,7 @@ void SerialPort::updateStatus(const CommonData &cd) {
             ced.phaseIndex = cd.current_phase;
 
             Global::_curveExperimentDataVtr.push_back(ced);
+
             Global::_currentCurveExperimentDataPtr =
                 &Global::_curveExperimentDataVtr.last();
 
@@ -219,7 +235,7 @@ void SerialPort::updateStatus(const CommonData &cd) {
 
     emit sigUpdateStatusbarMsg(msg);
 
-#if 1
+#if 0
     // If save experiment data.
     static Global::Mode preMode            = Global::Mode::Analysis;
     bool                sendSaveSignalFlag = false;
@@ -229,18 +245,22 @@ void SerialPort::updateStatus(const CommonData &cd) {
             sendSaveSignalFlag = true;
         } else if (preMode == Global::Mode::Analysis
                    && Global::_mode == Global::Mode::Experiment) {
-            logde<<"update status accord to device data...";
+                    
-            logde<<"--------------------------------------";
+            // 根据下位机数据，软件进入实验模式，开始实验。
+            logde << "start experiment, accord to device data...";
+            logde << "---------------------";
+
             emit sigStartExperiment();
         }
 
         preMode = Global::_mode;
     }
+#endif
 
+    // 弹出保存数据对话框。
     if (sendSaveSignalFlag && !Global::_OITAutoAnalysisModeFlag) {
         emit sigSaveExperimentalDataMsgBox();
     }
-#endif
 }
 
 void SerialPort::commonDataParser(const int dataLength, const u16 addr,
@@ -338,9 +358,15 @@ void SerialPort::commonDataParser(const int dataLength, const u16 addr,
 
 bool SerialPort::openSp() {
     logde << "openSp 1";
+    closeSp();
+    QThread::msleep(100);
+
+#if 0
     if (_sp != nullptr && _sp->isOpen()) {
         return true;
     }
+#endif
+
     logde << "openSp 2";
     foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
         u16 pid = info.productIdentifier();
@@ -376,7 +402,7 @@ bool SerialPort::openSp() {
         return false;
     } else {
         //        qDebug() << "open succ.";
-        logde<<"openSp 5.";
+        logde << "openSp 5.";
         // 设置 DTR 信号为就绪状态（true 表示低电平）
         _sp->setDataTerminalReady(true);
     }

src/serialport/serialport.h

@@ -28,8 +28,6 @@ public:
     bool openSp();
     bool isOpen(){return _sp->isOpen();}
     bool closeSp();
-protected:
-    void timerEvent(QTimerEvent *event);
 signals:
     void sigSendCommonData(const CommonData &);
     void sigSendCommonDataToRealDataForm(const CommonData &);

src/ui/experimentsettingform.cpp

@@ -661,9 +661,9 @@ void ExperimentSettingForm::slotPhaseCheck() {
 }
 
 void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba) {
-    logde << "----------------------- recv";
+    logde << "recv phase info  ----------------------- ";
 
-#if 0
+#if 1
     QString hexData = ba.toHex(' ');    // ' ' 作为分隔符，可选参数
     qDebug() << "slotRecvPhaseInfo hex:" << hexData;
 #endif