diff --git a/experiment_data/analysis_state/~$ana-5-new.xlsx b/experiment_data/analysis_state/~$ana-5-new.xlsx deleted file mode 100644 index d4a5841..0000000 Binary files a/experiment_data/analysis_state/~$ana-5-new.xlsx and /dev/null differ diff --git a/experiment_data/analysis_state/~$ana-6-new.xlsx b/experiment_data/analysis_state/~$ana-6-new.xlsx deleted file mode 100644 index d4a5841..0000000 Binary files a/experiment_data/analysis_state/~$ana-6-new.xlsx and /dev/null differ diff --git a/experiment_data/sample_data/20升温.xlsx b/experiment_data/sample_data/20升温.xlsx new file mode 100644 index 0000000..ca8d096 Binary files /dev/null and b/experiment_data/sample_data/20升温.xlsx differ diff --git a/experiment_data/sample_data/27-.xlsx b/experiment_data/sample_data/27-.xlsx new file mode 100644 index 0000000..ca44dde Binary files /dev/null and b/experiment_data/sample_data/27-.xlsx differ diff --git a/experiment_data/sample_data/27-new.xlsx b/experiment_data/sample_data/27-new.xlsx new file mode 100644 index 0000000..aab700a Binary files /dev/null and b/experiment_data/sample_data/27-new.xlsx differ diff --git a/experiment_data/sample_data/28-11.xlsx b/experiment_data/sample_data/28-11.xlsx new file mode 100644 index 0000000..3352a55 Binary files /dev/null and b/experiment_data/sample_data/28-11.xlsx differ diff --git a/experiment_data/sample_data/28-1111.xlsx b/experiment_data/sample_data/28-1111.xlsx new file mode 100644 index 0000000..a1aee81 Binary files /dev/null and b/experiment_data/sample_data/28-1111.xlsx differ diff --git a/experiment_data/sample_data/28-2.xlsx b/experiment_data/sample_data/28-2.xlsx new file mode 100644 index 0000000..37413f6 Binary files /dev/null and b/experiment_data/sample_data/28-2.xlsx differ diff --git a/experiment_data/sample_data/28-22.xlsx b/experiment_data/sample_data/28-22.xlsx new file mode 100644 index 0000000..5f682fc Binary files /dev/null and b/experiment_data/sample_data/28-22.xlsx differ diff --git a/src/AnalysisTool.pro b/src/AnalysisTool.pro index 581857e..1f18c0a 100644 --- a/src/AnalysisTool.pro +++ b/src/AnalysisTool.pro @@ -9,9 +9,9 @@ CONFIG+=precompile_header PRECOMPILED_HEADER=stable.h # -VERSION = 1.0.0 +VERSION = 1.0.1 # 设置目标文件名,包含版本号 -TARGET = AnalysisTool_$${VERSION} +TARGET = DSCAnalysisTool_$${VERSION} # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings diff --git a/src/FvbVvC.json b/src/FvbVvC.json deleted file mode 100644 index a31cc40..0000000 --- a/src/FvbVvC.json +++ /dev/null @@ -1 +0,0 @@ -[{"excluded":[],"includePaths":["D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx","D:/gitfile/analysis_tool/src/serialport","D:/gitfile/analysis_tool/src/ui","D:/gitfile/analysis_tool/src/logger","D:/gitfile/analysis_tool/src/thirdparty/easylogging","D:/gitfile/analysis_tool/src/thirdparty/qcustomplot","D:/gitfile/analysis_tool/src/data","D:/gitfile/analysis_tool/src","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtPrintSupport","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/5.14.2","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/5.14.2/QtGui","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtANGLE","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtSerialPort","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/5.14.2","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/5.14.2/QtCore","D:/qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore","D:/gitfile/analysis_tool/src","D:/gitfile/analysis_tool/src"],"projectFile":"D:/gitfile/analysis_tool/src/AnalysisTool.pro","sources":["D:/gitfile/analysis_tool/src/data/confighandler.cpp","D:/gitfile/analysis_tool/src/data/confighandler.h","D:/gitfile/analysis_tool/src/data/filemanager.cpp","D:/gitfile/analysis_tool/src/data/filemanager.h","D:/gitfile/analysis_tool/src/data/pointcalculate.cpp","D:/gitfile/analysis_tool/src/data/pointcalculate.h","D:/gitfile/analysis_tool/src/data/txthandler.cpp","D:/gitfile/analysis_tool/src/data/txthandler.h","D:/gitfile/analysis_tool/src/data/xlsxhandler.cpp","D:/gitfile/analysis_tool/src/data/xlsxhandler.h","D:/gitfile/analysis_tool/src/defines.h","D:/gitfile/analysis_tool/src/global.cpp","D:/gitfile/analysis_tool/src/global.h","D:/gitfile/analysis_tool/src/logger/logger.cpp","D:/gitfile/analysis_tool/src/logger/logger.h","D:/gitfile/analysis_tool/src/main.cpp","D:/gitfile/analysis_tool/src/mainwindow.cpp","D:/gitfile/analysis_tool/src/mainwindow.h","D:/gitfile/analysis_tool/src/mainwindow.ui","D:/gitfile/analysis_tool/src/serialport/dataparser.cpp","D:/gitfile/analysis_tool/src/serialport/dataparser.h","D:/gitfile/analysis_tool/src/serialport/protocol.h","D:/gitfile/analysis_tool/src/serialport/serialport.cpp","D:/gitfile/analysis_tool/src/serialport/serialport.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractooxmlfile.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractooxmlfile.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractooxmlfile_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractsheet.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractsheet.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxabstractsheet_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcell.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcell.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcell_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellformula.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellformula.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellformula_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellrange.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellrange.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellreference.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcellreference.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchart.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchart.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchart_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchartsheet.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchartsheet.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxchartsheet_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcolor.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcolor_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxconditionalformatting.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxconditionalformatting.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxconditionalformatting_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcontenttypes.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxcontenttypes_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdatavalidation.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdatavalidation.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdatavalidation_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocpropsapp.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocpropsapp_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocpropscore.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocpropscore_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocument.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocument.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdocument_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdrawing.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdrawing_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdrawinganchor.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxdrawinganchor_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxformat.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxformat.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxformat_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxglobal.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxmediafile.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxmediafile_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxnumformatparser.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxnumformatparser_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxrelationships.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxrelationships_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxrichstring.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxrichstring.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxrichstring_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxsharedstrings.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxsharedstrings_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxsimpleooxmlfile.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxsimpleooxmlfile_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxstyles.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxstyles_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxtheme.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxtheme_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxutility.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxutility_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworkbook.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworkbook.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworkbook_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworksheet.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworksheet.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxworksheet_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxzipreader.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxzipreader_p.h","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxzipwriter.cpp","D:/gitfile/analysis_tool/src/thirdparty/QtXlsxWriter-0.3.0/src/xlsx/xlsxzipwriter_p.h","D:/gitfile/analysis_tool/src/thirdparty/easylogging/easylogging++.cc","D:/gitfile/analysis_tool/src/thirdparty/easylogging/easylogging++.h","D:/gitfile/analysis_tool/src/thirdparty/qcustomplot/qcustomplot.cpp","D:/gitfile/analysis_tool/src/thirdparty/qcustomplot/qcustomplot.h","D:/gitfile/analysis_tool/src/ui/aboutform.cpp","D:/gitfile/analysis_tool/src/ui/aboutform.h","D:/gitfile/analysis_tool/src/ui/aboutform.ui","D:/gitfile/analysis_tool/src/ui/analysisoperationrecorder.cpp","D:/gitfile/analysis_tool/src/ui/analysisoperationrecorder.h","D:/gitfile/analysis_tool/src/ui/analysissettingform.cpp","D:/gitfile/analysis_tool/src/ui/analysissettingform.h","D:/gitfile/analysis_tool/src/ui/axissettingform.cpp","D:/gitfile/analysis_tool/src/ui/axissettingform.h","D:/gitfile/analysis_tool/src/ui/axissettingform.ui","D:/gitfile/analysis_tool/src/ui/centralwidget.cpp","D:/gitfile/analysis_tool/src/ui/centralwidget.h","D:/gitfile/analysis_tool/src/ui/coefficientselectionform.cpp","D:/gitfile/analysis_tool/src/ui/coefficientselectionform.h","D:/gitfile/analysis_tool/src/ui/coefficientselectionform.ui","D:/gitfile/analysis_tool/src/ui/degreeofcrystallinityform.cpp","D:/gitfile/analysis_tool/src/ui/degreeofcrystallinityform.h","D:/gitfile/analysis_tool/src/ui/degreeofcrystallinityform.ui","D:/gitfile/analysis_tool/src/ui/degreeofcureform.cpp","D:/gitfile/analysis_tool/src/ui/degreeofcureform.h","D:/gitfile/analysis_tool/src/ui/degreeofcureform.ui","D:/gitfile/analysis_tool/src/ui/enthalpydatacorrectionform.cpp","D:/gitfile/analysis_tool/src/ui/enthalpydatacorrectionform.h","D:/gitfile/analysis_tool/src/ui/enthalpydatacorrectionform.ui","D:/gitfile/analysis_tool/src/ui/eventhandler.cpp","D:/gitfile/analysis_tool/src/ui/eventhandler.h","D:/gitfile/analysis_tool/src/ui/experimentsettingform.cpp","D:/gitfile/analysis_tool/src/ui/experimentsettingform.h","D:/gitfile/analysis_tool/src/ui/experimentsettingform.ui","D:/gitfile/analysis_tool/src/ui/instrumentcoefficientform.cpp","D:/gitfile/analysis_tool/src/ui/instrumentcoefficientform.h","D:/gitfile/analysis_tool/src/ui/instrumentcoefficientform.ui","D:/gitfile/analysis_tool/src/ui/itemmanager.cpp","D:/gitfile/analysis_tool/src/ui/itemmanager.h","D:/gitfile/analysis_tool/src/ui/leftwidget.cpp","D:/gitfile/analysis_tool/src/ui/leftwidget.h","D:/gitfile/analysis_tool/src/ui/localcustomplot.cpp","D:/gitfile/analysis_tool/src/ui/localcustomplot.h","D:/gitfile/analysis_tool/src/ui/oitautoanalysisparamform.cpp","D:/gitfile/analysis_tool/src/ui/oitautoanalysisparamform.h","D:/gitfile/analysis_tool/src/ui/oitautoanalysisparamform.ui","D:/gitfile/analysis_tool/src/ui/printereditform.cpp","D:/gitfile/analysis_tool/src/ui/printereditform.h","D:/gitfile/analysis_tool/src/ui/printereditform.ui","D:/gitfile/analysis_tool/src/ui/printpreviewform.cpp","D:/gitfile/analysis_tool/src/ui/printpreviewform.h","D:/gitfile/analysis_tool/src/ui/printpreviewform.ui","D:/gitfile/analysis_tool/src/ui/realtimedataform.cpp","D:/gitfile/analysis_tool/src/ui/realtimedataform.h","D:/gitfile/analysis_tool/src/ui/realtimedataform.ui","D:/gitfile/analysis_tool/src/ui/rightwidget.cpp","D:/gitfile/analysis_tool/src/ui/rightwidget.h","D:/gitfile/analysis_tool/src/ui/specificheatcomparisonmethodform.cpp","D:/gitfile/analysis_tool/src/ui/specificheatcomparisonmethodform.h","D:/gitfile/analysis_tool/src/ui/specificheatcomparisonmethodform.ui"],"translations":["D:/gitfile/analysis_tool/src/Language/linguist_cn.ts","D:/gitfile/analysis_tool/src/Language/linguist_en.ts"]}] diff --git a/src/global.h b/src/global.h index 9da02d6..c80a8d3 100644 --- a/src/global.h +++ b/src/global.h @@ -31,6 +31,9 @@ const QString RateStr("rate"); // const double DefaultParamter = 8.177; const double OnsetAndEndSetRate = 0.01; + +//curve object name +const QString objectNameExperiemnt("experiment"); // enum LanguageType{ Chinese, diff --git a/src/images.qrc b/src/images.qrc index 801bea4..d287da3 100644 --- a/src/images.qrc +++ b/src/images.qrc @@ -10,5 +10,6 @@ images/axis.png images/clear_data.png images/real_time.png + images/disconnect.png diff --git a/src/images/disconnect.png b/src/images/disconnect.png new file mode 100644 index 0000000..9b495ae Binary files /dev/null and b/src/images/disconnect.png differ diff --git a/src/main.cpp b/src/main.cpp index b36579b..31598c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,8 +15,7 @@ int main(int argc, char *argv[]) { - - system("chcp 65001"); + system("chcp 65001"); QTextCodec *codec = QTextCodec::codecForName("UTF-8"); QTextCodec::setCodecForLocale(codec); @@ -41,6 +40,7 @@ int main(int argc, char *argv[]) logde<<"config,instrument coefficient:" <isOpen()){ + SerialPort::instance()->closeSp(); - if (SerialPort::instance()->openSp()) - { - setActionEnable(true); - // Global::instance()->setMode(Global::Mode::ConnectedToDev); - Global::_mode = Global::Mode::ConnectedToDev; + ui->actionConnectToDev->setIcon(QIcon(":/images/connect.png")); + ui->actionConnectToDev->setText("连接设备"); - QByteArray ba = DataParser::inquirePhaseInfo(); - SerialPort::instance()->sendData(ba); - } - else - { - QMessageBox::warning(this, "warnning", "Serial Port open failed."); + logde<<"close serial port."; + }else{ + if (SerialPort::instance()->openSp()) + { + setActionEnable(true); + // Global::instance()->setMode(Global::Mode::ConnectedToDev); + Global::_mode = Global::Mode::ConnectedToDev; + + QByteArray ba = DataParser::inquirePhaseInfo(); + SerialPort::instance()->sendData(ba); + + ui->actionConnectToDev->setIcon(QIcon(":/images/disconnect.png")); + ui->actionConnectToDev->setText("断开连接"); + + logde<<"open serial port."; + } + else + { + QMessageBox::warning(this, "warnning", "Serial Port open failed."); + } } } diff --git a/src/mainwindow.h b/src/mainwindow.h index 16fa453..6e3f591 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -126,4 +126,5 @@ private: PrintPreviewForm *_printPreviewForm; AxisSettingForm * _axisSettingForm; }; + #endif // MAINWINDOW_H diff --git a/src/serialport/serialport.cpp b/src/serialport/serialport.cpp index 314869d..5752101 100644 --- a/src/serialport/serialport.cpp +++ b/src/serialport/serialport.cpp @@ -19,7 +19,8 @@ const u16 conVid = 1155; // 0x0483 const u16 conPid = 22336; // 0x5740 SerialPort::SerialPort(QObject *parent) - : QObject(parent), _sp(nullptr) + : QObject(parent) + ,_sp(new QSerialPort(this)) { // displayPortInfo(); @@ -333,7 +334,7 @@ bool SerialPort::openSp() if ((pid == conPid) && (vid == conVid)) { - _sp = new QSerialPort(info); + _sp->setPort(info); break; } } @@ -371,6 +372,15 @@ bool SerialPort::openSp() return true; } +bool SerialPort::closeSp() +{ + if (_sp && _sp->isOpen()) + { + _sp->clear(); + _sp->close(); + } +} + void SerialPort::sendCmd(const SerialPort::E_CMD_TYPE e) { #if 1 diff --git a/src/serialport/serialport.h b/src/serialport/serialport.h index aba26ef..45612e6 100644 --- a/src/serialport/serialport.h +++ b/src/serialport/serialport.h @@ -27,7 +27,8 @@ public: void sendCmd(const E_CMD_TYPE e); static void parserTest(); bool openSp(); - + bool isOpen(){return _sp->isOpen();} + bool closeSp(); protected: void timerEvent(QTimerEvent *event); signals: diff --git a/src/ui/centralwidget.cpp b/src/ui/centralwidget.cpp index 201dcf0..acd0845 100644 --- a/src/ui/centralwidget.cpp +++ b/src/ui/centralwidget.cpp @@ -178,17 +178,15 @@ void CentralWidget::slotRecvCommonData(const CommonData &cd) if(!_currentCurve){ logde<<"_currentCurve is nullptr"; _currentCurve = new QCPCurve(_customPlot->xAxis, _customPlot->yAxis); + _currentCurve->setObjectName(Global::objectNameExperiemnt); } // logde<<"temp:"<addData(index++,cd.sample_temp, cd.dsc); // _customPlot->rescaleAxes(); _customPlot->replot(); - // return; - // Record data. if(!Global::_currentCurveExperimentDataPtr){ loger<<"_currentCurveExperimentDataPtr is nullptr."; @@ -245,8 +243,10 @@ void CentralWidget::slotAnalysisSettingApply() if(Global::_curveFileDataVtr.empty()){ // Load experiment data. + logde<<"experiment vtr size:"<(plottable)) { - qDebug() << "Selected Curve:" << curve->objectName(); - logde<objectName().toStdString(); + logde << "Selected Curve:" << curve->objectName().toStdString(); _currentCurve = curve; // 更新当前选中的曲线 } } +#if 0 // 如果没有选中的曲线 if (selectedPlottables.isEmpty()) { - qDebug() << "No curve selected"; + logde<< "No curve selected"; _currentCurve = nullptr; // 清空当前选中的曲线 } +#endif } void CentralWidget::uiLoadXlsxFileData() @@ -719,8 +720,6 @@ void CentralWidget::glassTransitionHandle(const double x1,const double x2,const } drawText(averagePoint,str); - - } // 使用最小二乘法计算线性回归 PointCalculate::Line CentralWidget::calculateLinearRegression(const QVector& x, const QVector& y) { @@ -1250,6 +1249,7 @@ void CentralWidget::loadAnalysisData( peakPointTime, startPointTime, endPointTime); + drawText(peakPoint,str,objectName); }else{ diff --git a/src/ui/experimentsettingform.cpp b/src/ui/experimentsettingform.cpp index f827c8a..a2e0ba9 100644 --- a/src/ui/experimentsettingform.cpp +++ b/src/ui/experimentsettingform.cpp @@ -391,6 +391,7 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() return; } } + { Phase phase; phase.onoff = ui->checkBox_phase_2->checkState()?1:0; @@ -402,15 +403,18 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() phaseVtr.push_back(phase); // - phase2CutoffTemp = phase.cutoff_temp; - if(phase2CutoffTemp < phase1CutoffTemp){ - phaseCufoffTempErrorMesgBox(2); - return; - } + if(phase.onoff){ + logde<<"phase 2 enable."; + phase2CutoffTemp = phase.cutoff_temp; + if(phase2CutoffTemp < phase1CutoffTemp){ + phaseCufoffTempErrorMesgBox(2); + return; + } - if(phase.temp_flow <= 0){ - phaseScanRateErrorMesgBox(2); - return; + if(phase.temp_flow <= 0){ + phaseScanRateErrorMesgBox(2); + return; + } } } @@ -424,15 +428,18 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() phaseVtr.push_back(phase); // - phase3CutoffTemp = phase.cutoff_temp; - if(phase3CutoffTemp < phase2CutoffTemp){ - phaseCufoffTempErrorMesgBox(3); - return; - } + if(phase.onoff){ + logde<<"phase 3 enable."; + phase3CutoffTemp = phase.cutoff_temp; + if(phase3CutoffTemp < phase2CutoffTemp){ + phaseCufoffTempErrorMesgBox(3); + return; + } - if(phase.temp_flow <= 0){ - phaseScanRateErrorMesgBox(3); - return; + if(phase.temp_flow <= 0){ + phaseScanRateErrorMesgBox(3); + return; + } } } @@ -446,15 +453,18 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() phase.gas = GasType::N2; phaseVtr.push_back(phase); // - phase4CutoffTemp = phase.cutoff_temp; - if(phase4CutoffTemp < phase3CutoffTemp){ - phaseCufoffTempErrorMesgBox(4); - return; - } + if(phase.onoff){ + logde<<"phase 4 enable."; + phase4CutoffTemp = phase.cutoff_temp; + if(phase4CutoffTemp < phase3CutoffTemp){ + phaseCufoffTempErrorMesgBox(4); + return; + } - if(phase.temp_flow <= 0){ - phaseScanRateErrorMesgBox(4); - return; + if(phase.temp_flow <= 0){ + phaseScanRateErrorMesgBox(4); + return; + } } } @@ -469,15 +479,18 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() phaseVtr.push_back(phase); // - phase5CutoffTemp = phase.cutoff_temp; - if(phase5CutoffTemp < phase4CutoffTemp){ - phaseCufoffTempErrorMesgBox(5); - return; - } + if(phase.onoff){ + logde<<"phase 5 enable."; + phase5CutoffTemp = phase.cutoff_temp; + if(phase5CutoffTemp < phase4CutoffTemp){ + phaseCufoffTempErrorMesgBox(5); + return; + } - if(phase.temp_flow <= 0){ - phaseScanRateErrorMesgBox(5); - return; + if(phase.temp_flow <= 0){ + phaseScanRateErrorMesgBox(5); + return; + } } } @@ -492,15 +505,18 @@ void ExperimentSettingForm::on_pushButton_deliverData_clicked() phaseVtr.push_back(phase); // - phase6CutoffTemp = phase.cutoff_temp; - if(phase6CutoffTemp < phase5CutoffTemp){ - phaseCufoffTempErrorMesgBox(6); - return; - } + if(phase.onoff){ + logde<<"phase 6 enable."; + phase6CutoffTemp = phase.cutoff_temp; + if(phase6CutoffTemp < phase5CutoffTemp){ + phaseCufoffTempErrorMesgBox(6); + return; + } - if(phase.temp_flow <= 0){ - phaseScanRateErrorMesgBox(6); - return; + if(phase.temp_flow <= 0){ + phaseScanRateErrorMesgBox(6); + return; + } } } //