2025-04-28T14:16:25

src/mainwindow.cpp

@@ -147,6 +147,8 @@ void MainWindow::connections()
 
     connect(_degreeOfCrystallinityForm,&DegreeOfCrystallinityForm::sigDrawCustomText,
             _centralWidget,&CentralWidget::slotDrawCustomText);
+    connect(_specificHeatComparisonMethodForm,&SpecificHeatComparisonMethodForm::sigDrawCustomText,
+            _centralWidget,&CentralWidget::slotDrawCustomText);
 
     //SpecificHeatComparisonMethodForm
     connect(_eventHandler,&EventHandler::sigSetCurve,
@@ -325,13 +327,6 @@ void MainWindow::on_actionInstrumentParameter_triggered()
     _instrumentCoefficientForm->show();
 }
 
-void MainWindow::on_actionInitialMeltingPoint_triggered()
-{
-}
-
-void MainWindow::on_actionFinalMeltingPoint_triggered()
-{
-}
 
 void MainWindow::on_actionOITAutoAnalysisParam_triggered()
 {
@@ -382,3 +377,15 @@ void MainWindow::on_actionPrintPreview_triggered()
     _printPreviewForm->setPixmap(_centralWidget->getPixMap());
     _printPreviewForm->show();
 }
+
+void MainWindow::on_actionOnsetTemperaturePoint_triggered()
+{
+    _rightWidget->show();
+    _centralWidget->setAnalysisMode(CentralWidget::AnalysisMode::OnsetTemperaturePoint);
+}
+
+void MainWindow::on_actionEndsetTemperaturePoint_triggered()
+{
+    _rightWidget->show();
+    _centralWidget->setAnalysisMode(CentralWidget::AnalysisMode::EndsetTemperaturePoint);
+}

src/mainwindow.h

@@ -65,10 +65,6 @@ private slots:
 
     void on_actionInstrumentParameter_triggered();
 
-    void on_actionInitialMeltingPoint_triggered();
-
-    void on_actionFinalMeltingPoint_triggered();
-
     void on_actionOITAutoAnalysisParam_triggered();
 
     void on_actionOITAutoAnalysisMode_triggered();
@@ -87,6 +83,10 @@ private slots:
 
     void on_actionPrintPreview_triggered();
 
+    void on_actionOnsetTemperaturePoint_triggered();
+
+    void on_actionEndsetTemperaturePoint_triggered();
+
 private:
     void connections();
     void setActionEnable(const bool);

src/mainwindow.ui

@@ -58,8 +58,8 @@
     <addaction name="actionDegreeOfCrystallinity"/>
     <addaction name="separator"/>
     <addaction name="actionInstrumentParameter"/>
-    <addaction name="actionInitialMeltingPoint"/>
-    <addaction name="actionFinalMeltingPoint"/>
+    <addaction name="actionOnsetTemperaturePoint"/>
+    <addaction name="actionEndsetTemperaturePoint"/>
     <addaction name="actionOITAutoAnalysisParam"/>
     <addaction name="actionOITAutoAnalysisMode"/>
     <addaction name="actionTimeAxisAnalysisPCTMode"/>
@@ -222,14 +222,20 @@
     <string>仪器系数</string>
    </property>
   </action>
-  <action name="actionInitialMeltingPoint">
+  <action name="actionOnsetTemperaturePoint">
    <property name="text">
-    <string>初融点</string>
+    <string>初熔点</string>
+   </property>
+   <property name="toolTip">
+    <string>初熔点</string>
    </property>
   </action>
-  <action name="actionFinalMeltingPoint">
+  <action name="actionEndsetTemperaturePoint">
    <property name="text">
-    <string>终融点</string>
+    <string>终熔点</string>
+   </property>
+   <property name="toolTip">
+    <string>终熔点</string>
    </property>
   </action>
   <action name="actionOITAutoAnalysisParam">

src/ui/centralwidget.cpp

@@ -83,7 +83,7 @@ CentralWidget::CentralWidget(QWidget *parent)
     _customPlot->xAxis->setRange(0,100);
     _customPlot->yAxis->setRange(0,20);
 
-    //        startTimer(300);
+    // startTimer(300);
 }
 
 CentralWidget::~CentralWidget()

src/ui/centralwidget.h

@@ -22,7 +22,9 @@ public:
         StartPoint,
         StopPoint,
         PeakSynthesisAnalysis,
-        GlassTransition
+        GlassTransition,
+        OnsetTemperaturePoint,
+        EndsetTemperaturePoint
     };
     CentralWidget(QWidget *parent = nullptr);
     ~CentralWidget();
@@ -69,7 +71,6 @@ private:
     void drawText(const QPointF,const QString);
     void fillGraph(const double x1,const double x2);
 
-
     enum ClearDataMode{
         All,
         Undo

src/ui/degreeofcureform.h

@@ -15,7 +15,6 @@ public:
     explicit DegreeOfCureForm(QWidget *parent = nullptr);
     ~DegreeOfCureForm();
 
-
 private slots:
     void on_pushButtonCalculate_clicked();
 

src/ui/specificheatcomparisonmethodform.cpp

@@ -157,7 +157,7 @@ void SpecificHeatComparisonMethodForm::on_pushButtonCalculate_clicked()
     logde<<"standardSamplePoint:"<<standardSamplePoint.x()<<","<<standardSamplePoint.y();
     logde<<"samplePoint:"<<samplePoint.x()<<","<<samplePoint.y();
 
-    double cp = calculateHeatCapacity(100);
+    double cp = calculateHeatCapacity(targetTemperature);
     logde<<"cp:"<<cp;
 
     float standardSampleWeight = ui->LineEditStandardSampleWeight->text().toFloat();
@@ -171,6 +171,12 @@ void SpecificHeatComparisonMethodForm::on_pushButtonCalculate_clicked()
 
     ui->LineEditStandardSampleSpecificHeat->setText(QString::number(cp,'f',3));
     ui->LineEditSampleSpecificHeat->setText(QString::number(cpTarget,'f',3));
+
+//    100℃比热容=x J/(g*℃)
+    QString str = QString("%1℃比热容= %2J/(g*℃)")
+            .arg(QString::number(targetTemperature,'f',3))
+            .arg(QString::number(cpTarget,'f',3));
+    emit sigDrawCustomText(str);
 }
 
 void SpecificHeatComparisonMethodForm::on_pushButtonQuit_clicked()

src/ui/specificheatcomparisonmethodform.h

@@ -25,6 +25,8 @@ public:
         StandardSample,
         Sample
     };
+signals:
+    void sigDrawCustomText(const QString);
 public slots:
     void slotSetCurve(const int ,QCPCurve*);
 protected: