From 5989b9686ac39a9c6a3282ba8710316925b9560d Mon Sep 17 00:00:00 2001 From: yuntang <123@qq.com> Date: Mon, 20 Oct 2025 16:16:12 +0800 Subject: [PATCH] 2025-10-20T16:16:11 --- DSCAnalysisTool-release/bin/log/20251020.log | 6 ++++++ README.md | 5 +++++ src/DSCAnalysisTool.pro | 2 +- src/global.cpp | 2 ++ src/mainwindow.cpp | 4 ++++ src/ui/eventhandler.cpp | 1 + src/ui/leftwidget.cpp | 13 +++++++++++-- 7 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 README.md diff --git a/DSCAnalysisTool-release/bin/log/20251020.log b/DSCAnalysisTool-release/bin/log/20251020.log index d67dd70..087a2cf 100644 --- a/DSCAnalysisTool-release/bin/log/20251020.log +++ b/DSCAnalysisTool-release/bin/log/20251020.log @@ -3,3 +3,9 @@ [2025-10-20 10:09:12,036] version:1.3.5.1 [2025-10-20 10:09:12,045] setEventHandlerEnable...0 [2025-10-20 10:14:59,230] serialport destructor. +[2025-10-20 15:56:10,580] main... +[2025-10-20 15:56:10,580] config file existed. +[2025-10-20 15:56:10,598] version:1.3.5.1 +[2025-10-20 15:56:10,607] setEventHandlerEnable...0 +[2025-10-20 15:56:17,121] slotRecvAnalysisFileName, filePath:D:/gitfile/analysis_tool/DSCAnalysisTool-release/bin/../experiment_data/base_line/base_line.txt +[2025-10-20 16:14:37,091] serialport destructor. diff --git a/README.md b/README.md new file mode 100644 index 0000000..9a3400e --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +V1.3.6.0 + +1、隐藏了左侧【基线】文件夹。 + +2、隐藏【分析】选项中【仪器系数】设置窗口。 \ No newline at end of file diff --git a/src/DSCAnalysisTool.pro b/src/DSCAnalysisTool.pro index bd82139..a08fbe8 100644 --- a/src/DSCAnalysisTool.pro +++ b/src/DSCAnalysisTool.pro @@ -9,7 +9,7 @@ CONFIG+=precompile_header PRECOMPILED_HEADER=stable.h # -VERSION = 1.3.5.1 +VERSION = 1.3.6 # 设置目标文件名,包含版本号 TARGET = DSCAnalysisTool_$${VERSION} diff --git a/src/global.cpp b/src/global.cpp index e5aa544..7ab757a 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -182,8 +182,10 @@ void updateFileList() QDir dir(SampleDataFloder); _fileList.append(dir.entryList(QDir::Files)); +#if 0 dir.setPath(BaseLineFolder); _fileList.append(dir.entryList(QDir::Files)); +#endif dir.setPath(AnalysisStateFolder); _fileList.append(dir.entryList(QDir::Files)); } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 18bc6bb..8b515f6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -36,6 +36,8 @@ MainWindow::MainWindow(QWidget *parent) this->setToolTip("....."); ui->actionSaveas->setVisible(false); + // 隐藏仪器系数设置窗口。 + ui->actionInstrumentParameter->setVisible(false); setCentralWidget(_centralWidget); addDockWidget(Qt::LeftDockWidgetArea, _leftWidget); @@ -43,6 +45,8 @@ MainWindow::MainWindow(QWidget *parent) _rightWidget->setWidget(_analysisSettingWidget); _rightWidget->hide(); + + // ui->statusbar->showMessage("showMessage show temp message!"); diff --git a/src/ui/eventhandler.cpp b/src/ui/eventhandler.cpp index b777910..d159029 100644 --- a/src/ui/eventhandler.cpp +++ b/src/ui/eventhandler.cpp @@ -180,6 +180,7 @@ void EventHandler::initMenu() connect(_delCurveAction,&QAction::triggered, this,&EventHandler::slotDelCurve); + } bool EventHandler::isNearLine(QCPItemStraightLine *line, const QPoint &pos) diff --git a/src/ui/leftwidget.cpp b/src/ui/leftwidget.cpp index 4bbe996..b5a1ab0 100644 --- a/src/ui/leftwidget.cpp +++ b/src/ui/leftwidget.cpp @@ -16,30 +16,35 @@ LeftWidget::LeftWidget(QWidget *parent ): _sampleDataItem = new QTreeWidgetItem(_treeWidget); _sampleDataItem->setText(0,"样品数据"); +#if 0 _baseLineItem = new QTreeWidgetItem(_treeWidget); _baseLineItem->setText(0,"基线"); +#endif _analysisStateItem = new QTreeWidgetItem(_treeWidget); _analysisStateItem->setText(0,"分析状态"); _treeWidget->setSortingEnabled(false); _treeWidget->insertTopLevelItem(0, _sampleDataItem); - _treeWidget->insertTopLevelItem(1, _baseLineItem); +// _treeWidget->insertTopLevelItem(1, _baseLineItem); _treeWidget->insertTopLevelItem(2, _analysisStateItem); setWidget(_treeWidget); //init file name. initFileName(_sampleDataItem,Global::SampleDataFloder); +#if 0 initFileName(_baseLineItem,Global::BaseLineFolder); +#endif initFileName(_analysisStateItem,Global::AnalysisStateFolder); expandAll(_sampleDataItem); - expandAll(_baseLineItem); +// expandAll(_baseLineItem); expandAll(_analysisStateItem); Global::updateFileList(); + //connections connect(_treeWidget,&QTreeWidget::itemDoubleClicked, this,&LeftWidget::slotTreeWidgetItemClicked); @@ -52,7 +57,9 @@ void LeftWidget::reloadFileName() clearAllChildItems(_analysisStateItem); initFileName(_sampleDataItem,Global::SampleDataFloder); +#if 0 initFileName(_baseLineItem,Global::BaseLineFolder); +#endif initFileName(_analysisStateItem,Global::AnalysisStateFolder); // 更新文件列表 Global::updateFileList(); @@ -125,8 +132,10 @@ void LeftWidget::slotTreeWidgetItemClicked(QTreeWidgetItem *item, int column){ qDebug() << "parent item text:" << parentItem->text(0); if(parentItem == _sampleDataItem){ fileName =Global::SampleDataFloder + "/" + item->text(0); +#if 0 }else if(parentItem == _baseLineItem){ fileName =Global::BaseLineFolder + "/" +item->text(0); +#endif }else if(parentItem == _analysisStateItem){ fileName =Global::AnalysisStateFolder + "/" +item->text(0); }