From dc255f7fc1d2b590763439321bc156d6bb542620 Mon Sep 17 00:00:00 2001
From: yuntang <123@qq.com>
Date: Thu, 15 May 2025 09:10:10 +0800
Subject: [PATCH] 2025-05-15T09:10:09
---
experiment_data/analysis_state/~$ana-2new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$ana-3-new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$ana-4-new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$ana-5-new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$ana-6-new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$ana-new.xlsx | Bin 165 -> 0 bytes
experiment_data/analysis_state/~$anapeak.xlsx | Bin 165 -> 0 bytes
experiment_data/sample_data/~$1.xlsx | Bin 165 -> 0 bytes
experiment_data/sample_data/~$锡.xlsx | Bin 165 -> 0 bytes
src/AnalysisTool.pro | 5 +++++
src/global.h | 2 --
src/main.cpp | 2 ++
src/mainwindow.cpp | 2 +-
src/ui/aboutform.cpp | 2 +-
14 files changed, 9 insertions(+), 4 deletions(-)
delete mode 100644 experiment_data/analysis_state/~$ana-2new.xlsx
delete mode 100644 experiment_data/analysis_state/~$ana-3-new.xlsx
delete mode 100644 experiment_data/analysis_state/~$ana-4-new.xlsx
delete mode 100644 experiment_data/analysis_state/~$ana-5-new.xlsx
delete mode 100644 experiment_data/analysis_state/~$ana-6-new.xlsx
delete mode 100644 experiment_data/analysis_state/~$ana-new.xlsx
delete mode 100644 experiment_data/analysis_state/~$anapeak.xlsx
delete mode 100644 experiment_data/sample_data/~$1.xlsx
delete mode 100644 experiment_data/sample_data/~$锡.xlsx
diff --git a/experiment_data/analysis_state/~$ana-2new.xlsx b/experiment_data/analysis_state/~$ana-2new.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/analysis_state/~$ana-3-new.xlsx b/experiment_data/analysis_state/~$ana-3-new.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/analysis_state/~$ana-4-new.xlsx b/experiment_data/analysis_state/~$ana-4-new.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
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 d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
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 d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/analysis_state/~$ana-new.xlsx b/experiment_data/analysis_state/~$ana-new.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/analysis_state/~$anapeak.xlsx b/experiment_data/analysis_state/~$anapeak.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/sample_data/~$1.xlsx b/experiment_data/sample_data/~$1.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/experiment_data/sample_data/~$锡.xlsx b/experiment_data/sample_data/~$锡.xlsx
deleted file mode 100644
index d4a5841882f71e1e9259c5c320e2b84832515279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 165
ZcmZQhOiETD9WXN_G9)o1Gbqpn0s!Zc4-)_Y
diff --git a/src/AnalysisTool.pro b/src/AnalysisTool.pro
index 226cfa3..007e5c8 100644
--- a/src/AnalysisTool.pro
+++ b/src/AnalysisTool.pro
@@ -7,6 +7,11 @@ CONFIG += c++11
CONFIG+=precompile_header
PRECOMPILED_HEADER=stable.h
+#
+VERSION = 0.9.7.3
+# 设置目标文件名，包含版本号
+TARGET = AnalysisTool_$${VERSION}
+
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
diff --git a/src/global.h b/src/global.h
index 4e8f634..e30a9b3 100644
--- a/src/global.h
+++ b/src/global.h
@@ -21,8 +21,6 @@ enum AnalysisMode{
#endif
namespace Global {
-const QString ConSoftVersion = "0.9.7.1";
-
const QString ExperimentDirPath = QDir::currentPath()+"/../experiment_data";
const QString SampleDataFloder = ExperimentDirPath + "/sample_data";
diff --git a/src/main.cpp b/src/main.cpp
index 9ddeee0..0b852a7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,6 +59,8 @@ int main(int argc, char *argv[])
w.show();
#endif
+ qDebug() << "Application version:" << qApp->applicationVersion();
+
// EnthalpyDataCorrectionForm edf;
// edf.show();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 70c0af9..179ca0d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -43,7 +43,7 @@ MainWindow::MainWindow(QWidget *parent)
ui->statusbar->showMessage("showMessage show temp message!");
// permenent show
QLabel *permenentLabel = new QLabel(this);
- permenentLabel->setText("Software Ver:" + Global::ConSoftVersion);
+ permenentLabel->setText("Software Ver:" + qApp->applicationVersion());
ui->statusbar->addPermanentWidget(permenentLabel);
ui->actionTimeAxisAnalysisPCTMode->setCheckable(true);
diff --git a/src/ui/aboutform.cpp b/src/ui/aboutform.cpp
index b6d32ea..c1de608 100644
--- a/src/ui/aboutform.cpp
+++ b/src/ui/aboutform.cpp
@@ -29,7 +29,7 @@ AboutForm::AboutForm(QWidget *parent) :
"本软件基于 Qt 框架开发，Qt 遵循 "
"LGPL 协议。
"
"Qt 官网：www.qt.io
")
- .arg(Global::ConSoftVersion);
+ .arg(qApp->applicationVersion());
ui->labelContent->setAlignment(Qt::AlignTop | Qt::AlignLeft);
ui->labelContent->setTextFormat(Qt::RichText);