2025-05-16T17:28:44

src/AnalysisTool.pro

@@ -120,7 +120,8 @@ ui \
 logger \
 thirdparty/easylogging \
 thirdparty/qcustomplot \
-data
+data \
+.
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

src/data/pointcalculate.h

@@ -4,6 +4,7 @@
 #include <QPointF>
 
 #include "filemanager.h"
+#include "global.h"
 
 namespace PointCalculate{
 void setExperimentData(const QVector<Global::ExperimentData>&);

src/data/xlsxhandler.cpp

@@ -6,7 +6,7 @@
 namespace AnaOpRecorder = AnalysisOperationRecorder;
 using AnaOpRecorderOperation = AnalysisOperationRecorder::AnalysisOperation;
 
-using AnalysisMode = Global::AnalysisMode;
+using AnalysisMode = AnalysisOperationRecorder::AnalysisMode;
 
 
 QString XlsxHandler::_currentFilePath;
@@ -44,7 +44,7 @@ int XlsxHandler::readFile(const QString filePath, Global::CurveFileData &cfd)
 
     _currentFilePath = filePath;
 
-    cfd.filePath = filePath;
+    cfd.fileName = fileInfo.fileName();
 
     QXlsx::Document xlsx(filePath);
 
@@ -296,7 +296,7 @@ void XlsxHandler::writeAnalysisOperation(const QString filePath)
     int row = index + 1;
 
     QVector<AnalysisOperationRecorder::AnalysisOperation>& aoVtr =
-            AnalysisOperationRecorder::_ananlysisOperationVtr;
+            AnalysisOperationRecorder::_analysisOperationVtr;
 
     xlsx->write(row , 1, ConAnalysisOperationCount);
     xlsx->write(row , 2, aoVtr.size());
@@ -311,32 +311,32 @@ void XlsxHandler::writeAnalysisOperation(const QString filePath)
             analysisOpName = AnalysisOperationRecorder::NumericalLabelStr;
             break;
         }
-        case Global::StartPoint:
+        case AnalysisMode::StartPoint:
         {
             analysisOpName = AnalysisOperationRecorder::StartPointStr;
             break;
         }
-        case Global::StopPoint:
+        case AnalysisMode::StopPoint:
         {
             analysisOpName = AnalysisOperationRecorder::StopPointStr;
             break;
         }
-        case Global::PeakSynthesisAnalysis:
+        case AnalysisMode::PeakSynthesisAnalysis:
         {
             analysisOpName = AnalysisOperationRecorder::PeakSynthesisAnalysisStr;
             break;
         }
-        case Global::GlassTransition:
+        case AnalysisMode::GlassTransition:
         {
             analysisOpName = AnalysisOperationRecorder::GlassTransitionStr;
             break;
         }
-        case Global::OnsetTemperaturePoint:
+        case AnalysisMode::OnsetTemperaturePoint:
         {
             analysisOpName = AnalysisOperationRecorder::OnsetTemperaturePointStr;
             break;
         }
-        case Global::EndsetTemperaturePoint:
+        case AnalysisMode::EndsetTemperaturePoint:
         {
             analysisOpName = AnalysisOperationRecorder::EndsetTemperaturePointStr;
             break;
@@ -414,19 +414,19 @@ void XlsxHandler::readAnalysisOperation(
         QString modeStr = sheet->cellAt(startLineIndex, 1)->value().toString();
 
         if(modeStr == AnaOpRecorder::NumericalLabelStr){
-            ao.mode = Global::AnalysisMode::NumericalLabel;
+            ao.mode = AnalysisMode::NumericalLabel;
         }else if(modeStr == AnaOpRecorder::StartPointStr){
-            ao.mode = Global::AnalysisMode::StartPoint;
+            ao.mode = AnalysisMode::StartPoint;
         }else if(modeStr == AnaOpRecorder::StopPointStr){
-            ao.mode = Global::AnalysisMode::StopPoint;
+            ao.mode = AnalysisMode::StopPoint;
         }else if(modeStr == AnaOpRecorder::PeakSynthesisAnalysisStr){
-            ao.mode = Global::AnalysisMode::PeakSynthesisAnalysis;
+            ao.mode = AnalysisMode::PeakSynthesisAnalysis;
         }else if(modeStr == AnaOpRecorder::GlassTransitionStr){
-            ao.mode = Global::AnalysisMode::GlassTransition;
+            ao.mode = AnalysisMode::GlassTransition;
         }else if(modeStr == AnaOpRecorder::OnsetTemperaturePointStr){
-            ao.mode = Global::AnalysisMode::OnsetTemperaturePoint;
+            ao.mode = AnalysisMode::OnsetTemperaturePoint;
         }else if(modeStr == AnaOpRecorder::EndsetTemperaturePointStr){
-            ao.mode = Global::AnalysisMode::EndsetTemperaturePoint;
+            ao.mode = AnalysisMode::EndsetTemperaturePoint;
         }
 
         ao.x1 = sheet->cellAt(startLineIndex, 2)->value().toDouble();

src/global.h

@@ -8,19 +8,6 @@
 #include "protocol.h"
 #include "analysisoperationrecorder.h"
 
-#if 0
-enum AnalysisMode{
-    Null,
-    NumericalLabel,
-    StartPoint,
-    StopPoint,
-    PeakSynthesisAnalysis,
-    GlassTransition,
-    OnsetTemperaturePoint,
-    EndsetTemperaturePoint
-};
-#endif
-
 namespace Global {
 const QString ExperimentDirPath  = QDir::currentPath()+"/../experiment_data";
 
@@ -45,6 +32,7 @@ const QString RateStr("rate");
 const double DefaultParamter = 1.0;
 
 //
+#if 0
 enum AnalysisMode{
     Null,
     NumericalLabel,
@@ -55,6 +43,7 @@ enum AnalysisMode{
     OnsetTemperaturePoint,
     EndsetTemperaturePoint
 };
+#endif
 enum Mode{
     Analysis,
     ConnectedToDev,
@@ -100,12 +89,11 @@ struct PhaseTotalInfo{
     QCPCurve * curve;
 };
 
-using namespace AnalysisOperationRecorder;
 struct CurveFileData{
-    QString filePath;
+    QString fileName;
     Global::ExperimentInfo ei;
     QVector<Global::PhaseTotalInfo> phaseTotalVtr;
-    QVector<AnalysisOperation> analysisOperationVtr;
+    QVector<AnalysisOperationRecorder::AnalysisOperation> analysisOperationVtr;
 };
 
 struct CurveExperimentData{

src/ui/analysisoperationrecorder.cpp

@@ -1,18 +1,21 @@
 #include "analysisoperationrecorder.h"
 
 namespace AnalysisOperationRecorder {
+#if 0
 void addAnalysisOperation(const AnalysisOperation ao)
 {
     _ananlysisOperationVtr.push_back(ao);
 }
+#endif
+
+QVector<AnalysisOperation> _ananlysisOperationVtr;
 
 void removeTheLastAnalysisOperation()
 {
-    if (!_ananlysisOperationVtr.isEmpty()) {
+    if (!_analysisOperationVtr.isEmpty()) {
-        _ananlysisOperationVtr.removeLast();
+        _analysisOperationVtr.removeLast();
     }
 }
 
-QVector<AnalysisOperation> _ananlysisOperationVtr;
 //QVector<AnalysisOperation> _fileAnanlysisOperationVtr;
 }

src/ui/analysisoperationrecorder.h

@@ -1,12 +1,7 @@
 #ifndef ANALYSISOPERATIONRECORDER_H
 #define ANALYSISOPERATIONRECORDER_H
 
-#include "centralwidget.h"
-#include "global.h"
-
 namespace AnalysisOperationRecorder {
-using AnalysisMode = Global::AnalysisMode;
-
 const QString NumericalLabelStr("NumericalLabel");
 const QString StartPointStr("StartPoint");
 const QString StopPointStr("StopPoint");
@@ -15,7 +10,7 @@ const QString GlassTransitionStr("GlassTransition");
 const QString OnsetTemperaturePointStr("OnsetTemperaturePoint");
 const QString EndsetTemperaturePointStr("EndsetTemperaturePoint");
 
-#if 0
+#if 1
 enum AnalysisMode{
     Null,
     NumericalLabel,

src/ui/centralwidget.cpp

@@ -310,7 +310,7 @@ void CentralWidget::slotRecvAnalysisFileName(const QString &filePath)
     // Add analysis operation data.
     if(cfd.analysisOperationVtr.size() > 0){
         for(AnaOpRecorder::AnalysisOperation& ao
-            :AnalysisOperationRecorder::_ananlysisOperationVtr){
+            :AnalysisOperationRecorder::_analysisOperationVtr){
             loadAnalysisData(ao.mode,ao.x1,ao.x2);
         }
     }

src/ui/centralwidget.h

@@ -14,7 +14,6 @@
 #include "analysisoperationrecorder.h"
 #include "global.h"
 
-
 class CentralWidget:public QWidget
 {
     Q_OBJECT
@@ -33,12 +32,13 @@ public:
 #endif
 
 //    using AnalysisMode = Global::AnalysisMode;
-//    using AnalysisOperation = AnalysisOperationRecorder::AnalysisOperation;
+    using AnalysisOperation = AnalysisOperationRecorder::AnalysisOperation;
+    using AnalysisMode = AnalysisOperationRecorder::AnalysisMode;
 
     CentralWidget(QWidget *parent = nullptr);
     ~CentralWidget();
 
-    void setAnalysisMode(const Global::AnalysisMode);
+    void setAnalysisMode(const AnalysisMode);
     void clearAllData();
 
     EventHandler* getEvnetHandler(){return _eventHandler;}