2025-05-12T17:29:58

src/data/xlsxhandler.cpp

@@ -1,5 +1,6 @@
 #include "xlsxhandler.h"
 #include "logger.h"
+#include "analysisoperationrecorder.h"
 
 void XlsxHandler::test()
 {
@@ -245,3 +246,8 @@ void XlsxHandler::writeFile(const QString filePath)
     
 }
 
+
+void XlsxHandler::writeAnalysisOperation(QXlsx::Document xlsx)
+{
+
+}

src/data/xlsxhandler.h

@@ -22,6 +22,7 @@ namespace XlsxHandler {
     void readPhaseData(QXlsx::Worksheet*,int& startLineIndex,Global::PhaseTotalInfo&);
 
     void writeFile(const QString filePath);
+    void writeAnalysisOperation(QXlsx::Document&);
 
     const QString ConUnitMg = "mg";
     const QString ConUnitDegreeCentigrade = "℃";

src/ui/analysisoperationrecorder.cpp

@@ -12,4 +12,7 @@ void removeTheLastAnalysisOperation()
         _ananlysisOperationVtr.removeLast();
     }
 }
+
+QVector<AnalysisOperation> _ananlysisOperationVtr;
+
 }

src/ui/analysisoperationrecorder.h

@@ -14,11 +14,10 @@ enum AnalysisMode{
 };
 struct AnalysisOperation{
     AnalysisMode mode;
-    QPointF point;
+    double x1,x2;
-    QString str;
 };
 
-QVector<AnalysisOperation> _ananlysisOperationVtr;
+extern QVector<AnalysisOperation> _ananlysisOperationVtr;
 void addAnalysisOperation(const AnalysisOperation);
 void removeTheLastAnalysisOperation();
 

src/ui/centralwidget.cpp

@@ -13,6 +13,8 @@
 #include "xlsxhandler.h"
 #include "itemmanager.h"
 
+namespace AnaOpRecorder = AnalysisOperationRecorder;
+
 CentralWidget::CentralWidget(QWidget *parent)
     : QWidget(parent)
     ,_customPlot(new LocalCustomPlot(this))
@@ -321,16 +323,24 @@ void CentralWidget::slotAnalysisSettingApply()
     {
         QPointF selectPoint = PointCalculate::getClosestPointByX(x1);
 
-//        logde<<"lin1 x:"<<x1;
+        //        logde<<"lin1 x:"<<x1;
 
         if(selectPoint.isNull()){
             QMessageBox::warning((QWidget*)this->parent(), "warnning", "曲线选择错误.");
             return;
         }
 
-        drawText(selectPoint,
+        QString str = PointCalculate::textFormatNumbericalLabel(selectPoint);
-                 PointCalculate::textFormatNumbericalLabel(selectPoint));
 
+        drawText(selectPoint,str);
+
+        //
+        AnaOpRecorder::AnalysisOperation ao;
+        ao.mode = AnaOpRecorder::NumericalLabel;
+        ao.x1 = x1;
+
+        AnaOpRecorder::addAnalysisOperation(ao);
+        //
         break;
     }
     case AnalysisMode::StartPoint:
@@ -339,15 +349,28 @@ void CentralWidget::slotAnalysisSettingApply()
 
         QPair<QPointF, QPointF> startEndPointPair =
                 PointCalculate::calculateStartAndEndPoint();
+        //
+        QPointF point;
+        QString str;
+        AnaOpRecorder::AnalysisOperation ao;
 
         if(_analysisMode == AnalysisMode::StartPoint){
-            drawText(startEndPointPair.first,
+            point = startEndPointPair.first;
-                     PointCalculate::textFormatStartPoint(startEndPointPair.first));
+            str = PointCalculate::textFormatStartPoint(point);
+            ao.mode = AnaOpRecorder::StartPoint;
         }else{
-            drawText(startEndPointPair.second,
+            point = startEndPointPair.second;
-                     PointCalculate::textFormatEndPoint(startEndPointPair.second));
+            str = PointCalculate::textFormatEndPoint(point);
+            ao.mode = AnaOpRecorder::StopPoint;
         }
 
+        drawText(point,str);
+        //
+        ao.x1 = x1;
+        ao.x2 = x2;
+
+        AnaOpRecorder::addAnalysisOperation(ao);
+        //
         break;
     }
     case AnalysisMode::PeakSynthesisAnalysis:
@@ -379,25 +402,34 @@ void CentralWidget::slotAnalysisSettingApply()
         logde<<"start,end:"<<startEndPointPair.first.x()<<","
             <<startEndPointPair.second.x();
 
+        QString str;
         if(Global::_displayTimeValue){
             double peakPointTime = PointCalculate::obtainTimeValueBasedOnTemperatureValue(peakPoint.x());
             double startPointTime = PointCalculate::obtainTimeValueBasedOnTemperatureValue(startEndPointPair.first.x());
             double endPointTime = PointCalculate::obtainTimeValueBasedOnTemperatureValue(startEndPointPair.second.x());
 
-            drawText(peakPoint,
+            str =    PointCalculate::textFormatPeakPointWithTime(
-                     PointCalculate::textFormatPeakPointWithTime(
+                        enthalpyValue,
-                         enthalpyValue,
+                        peakPointTime,
-                         peakPointTime,
+                        startPointTime,
-                         startPointTime,
+                        endPointTime);
-                         endPointTime));
+            drawText(peakPoint,str);
+
         }else{
-            drawText(peakPoint,
+            str =    PointCalculate::textFormatPeakPoint(enthalpyValue,
-                     PointCalculate::textFormatPeakPoint(enthalpyValue,
                                                          peakPoint.x(),
                                                          startEndPointPair.first.x(),
-                                                         startEndPointPair.second.x()));
+                                                         startEndPointPair.second.x());
+            drawText(peakPoint,str);
         }
         //
+        AnaOpRecorder::AnalysisOperation ao;
+        ao.mode = AnaOpRecorder::PeakSynthesisAnalysis;
+        ao.x1 = x1;
+        ao.x2 = x2;
+
+        AnaOpRecorder::addAnalysisOperation(ao);
+        //
         break;
     }
     case AnalysisMode::GlassTransition:
@@ -419,6 +451,15 @@ void CentralWidget::slotAnalysisSettingApply()
         QString str = QString::number(point.x(),'f',3);
         drawText(point,str);
 
+        //
+        AnaOpRecorder::AnalysisOperation ao;
+        ao.mode = AnaOpRecorder::OnsetTemperaturePoint;
+        ao.x1 = x1;
+        ao.x2 = x2;
+
+        AnaOpRecorder::addAnalysisOperation(ao);
+        //
+
         break;
     }
     case AnalysisMode::EndsetTemperaturePoint:{
@@ -731,6 +772,14 @@ void CentralWidget::glassTransitionHandle(const double x1,const double x2)
 
     drawText(averagePoint,str);
 
+    //
+    AnaOpRecorder::AnalysisOperation ao;
+    ao.mode = AnaOpRecorder::GlassTransition;
+    ao.point = averagePoint;
+    ao.str = str;
+
+    AnaOpRecorder::addAnalysisOperation(ao);
+    //
 }
 // 使用最小二乘法计算线性回归
 PointCalculate::Line CentralWidget::calculateLinearRegression(const QVector<double>& x, const QVector<double>& y) {