2025-10-20T16:16:11

This commit is contained in:
yuntang 2025-10-20 16:16:12 +08:00
parent 1cd078ed79
commit 5989b9686a
7 changed files with 30 additions and 3 deletions

View File

@ -3,3 +3,9 @@
[2025-10-20 10:09:12,036] version:1.3.5.1 [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:09:12,045] setEventHandlerEnable...0
[2025-10-20 10:14:59,230] serialport destructor. [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.

5
README.md Normal file
View File

@ -0,0 +1,5 @@
V1.3.6.0
1、隐藏了左侧【基线】文件夹。
2、隐藏【分析】选项中【仪器系数】设置窗口。

View File

@ -9,7 +9,7 @@ CONFIG+=precompile_header
PRECOMPILED_HEADER=stable.h PRECOMPILED_HEADER=stable.h
# #
VERSION = 1.3.5.1 VERSION = 1.3.6
# 设置目标文件名,包含版本号 # 设置目标文件名,包含版本号
TARGET = DSCAnalysisTool_$${VERSION} TARGET = DSCAnalysisTool_$${VERSION}

View File

@ -182,8 +182,10 @@ void updateFileList()
QDir dir(SampleDataFloder); QDir dir(SampleDataFloder);
_fileList.append(dir.entryList(QDir::Files)); _fileList.append(dir.entryList(QDir::Files));
#if 0
dir.setPath(BaseLineFolder); dir.setPath(BaseLineFolder);
_fileList.append(dir.entryList(QDir::Files)); _fileList.append(dir.entryList(QDir::Files));
#endif
dir.setPath(AnalysisStateFolder); dir.setPath(AnalysisStateFolder);
_fileList.append(dir.entryList(QDir::Files)); _fileList.append(dir.entryList(QDir::Files));
} }

View File

@ -36,6 +36,8 @@ MainWindow::MainWindow(QWidget *parent)
this->setToolTip("....."); this->setToolTip(".....");
ui->actionSaveas->setVisible(false); ui->actionSaveas->setVisible(false);
// 隐藏仪器系数设置窗口。
ui->actionInstrumentParameter->setVisible(false);
setCentralWidget(_centralWidget); setCentralWidget(_centralWidget);
addDockWidget(Qt::LeftDockWidgetArea, _leftWidget); addDockWidget(Qt::LeftDockWidgetArea, _leftWidget);
@ -43,6 +45,8 @@ MainWindow::MainWindow(QWidget *parent)
_rightWidget->setWidget(_analysisSettingWidget); _rightWidget->setWidget(_analysisSettingWidget);
_rightWidget->hide(); _rightWidget->hide();
// //
ui->statusbar->showMessage("showMessage show temp message!"); ui->statusbar->showMessage("showMessage show temp message!");

View File

@ -180,6 +180,7 @@ void EventHandler::initMenu()
connect(_delCurveAction,&QAction::triggered, connect(_delCurveAction,&QAction::triggered,
this,&EventHandler::slotDelCurve); this,&EventHandler::slotDelCurve);
} }
bool EventHandler::isNearLine(QCPItemStraightLine *line, const QPoint &pos) bool EventHandler::isNearLine(QCPItemStraightLine *line, const QPoint &pos)

View File

@ -16,30 +16,35 @@ LeftWidget::LeftWidget(QWidget *parent ):
_sampleDataItem = new QTreeWidgetItem(_treeWidget); _sampleDataItem = new QTreeWidgetItem(_treeWidget);
_sampleDataItem->setText(0,"样品数据"); _sampleDataItem->setText(0,"样品数据");
#if 0
_baseLineItem = new QTreeWidgetItem(_treeWidget); _baseLineItem = new QTreeWidgetItem(_treeWidget);
_baseLineItem->setText(0,"基线"); _baseLineItem->setText(0,"基线");
#endif
_analysisStateItem = new QTreeWidgetItem(_treeWidget); _analysisStateItem = new QTreeWidgetItem(_treeWidget);
_analysisStateItem->setText(0,"分析状态"); _analysisStateItem->setText(0,"分析状态");
_treeWidget->setSortingEnabled(false); _treeWidget->setSortingEnabled(false);
_treeWidget->insertTopLevelItem(0, _sampleDataItem); _treeWidget->insertTopLevelItem(0, _sampleDataItem);
_treeWidget->insertTopLevelItem(1, _baseLineItem); // _treeWidget->insertTopLevelItem(1, _baseLineItem);
_treeWidget->insertTopLevelItem(2, _analysisStateItem); _treeWidget->insertTopLevelItem(2, _analysisStateItem);
setWidget(_treeWidget); setWidget(_treeWidget);
//init file name. //init file name.
initFileName(_sampleDataItem,Global::SampleDataFloder); initFileName(_sampleDataItem,Global::SampleDataFloder);
#if 0
initFileName(_baseLineItem,Global::BaseLineFolder); initFileName(_baseLineItem,Global::BaseLineFolder);
#endif
initFileName(_analysisStateItem,Global::AnalysisStateFolder); initFileName(_analysisStateItem,Global::AnalysisStateFolder);
expandAll(_sampleDataItem); expandAll(_sampleDataItem);
expandAll(_baseLineItem); // expandAll(_baseLineItem);
expandAll(_analysisStateItem); expandAll(_analysisStateItem);
Global::updateFileList(); Global::updateFileList();
//connections //connections
connect(_treeWidget,&QTreeWidget::itemDoubleClicked, connect(_treeWidget,&QTreeWidget::itemDoubleClicked,
this,&LeftWidget::slotTreeWidgetItemClicked); this,&LeftWidget::slotTreeWidgetItemClicked);
@ -52,7 +57,9 @@ void LeftWidget::reloadFileName()
clearAllChildItems(_analysisStateItem); clearAllChildItems(_analysisStateItem);
initFileName(_sampleDataItem,Global::SampleDataFloder); initFileName(_sampleDataItem,Global::SampleDataFloder);
#if 0
initFileName(_baseLineItem,Global::BaseLineFolder); initFileName(_baseLineItem,Global::BaseLineFolder);
#endif
initFileName(_analysisStateItem,Global::AnalysisStateFolder); initFileName(_analysisStateItem,Global::AnalysisStateFolder);
// 更新文件列表 // 更新文件列表
Global::updateFileList(); Global::updateFileList();
@ -125,8 +132,10 @@ void LeftWidget::slotTreeWidgetItemClicked(QTreeWidgetItem *item, int column){
qDebug() << "parent item text:" << parentItem->text(0); qDebug() << "parent item text:" << parentItem->text(0);
if(parentItem == _sampleDataItem){ if(parentItem == _sampleDataItem){
fileName =Global::SampleDataFloder + "/" + item->text(0); fileName =Global::SampleDataFloder + "/" + item->text(0);
#if 0
}else if(parentItem == _baseLineItem){ }else if(parentItem == _baseLineItem){
fileName =Global::BaseLineFolder + "/" +item->text(0); fileName =Global::BaseLineFolder + "/" +item->text(0);
#endif
}else if(parentItem == _analysisStateItem){ }else if(parentItem == _analysisStateItem){
fileName =Global::AnalysisStateFolder + "/" +item->text(0); fileName =Global::AnalysisStateFolder + "/" +item->text(0);
} }