From 4eb50d95a4ce2aea529632517587f1504dfb3912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B5=B7?= Date: Mon, 1 Jun 2026 18:44:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E5=92=8C=E5=81=9C=E6=AD=A2=E6=B5=8B=E9=87=8F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MainWindow.ui | 67 ++++++++++++++++--- .../DeviceParamsManagerDlg.cpp | 7 ++ 2 files changed, 63 insertions(+), 11 deletions(-) diff --git a/src/MainWindow.ui b/src/MainWindow.ui index 6ac767b..4c6a27e 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -6,8 +6,8 @@ 0 0 - 892 - 688 + 1079 + 499 @@ -19,8 +19,8 @@ 0 0 - 892 - 21 + 1079 + 22 @@ -52,7 +52,7 @@ - 测量参数管理 + 配置管理 @@ -65,9 +65,16 @@ 视图 + + + 核素库 + + + + @@ -102,10 +109,23 @@ - + + + + toolBar + + + TopToolBarArea + + + false + + + + 使用说明 @@ -123,20 +143,26 @@ - 新建 + 新建测量分析 - 新建 + 新建测量分析 - 关闭 + 关闭测量分析 + + + 关闭测量分析 - 保存 + 保存测量分析 + + + 保存测量分析 @@ -146,7 +172,10 @@ - 打开 + 打开测量分析 + + + 打开测量分析 @@ -185,6 +214,22 @@ 核素库 + + + 开始测量 + + + QAction::TextHeuristicRole + + + + + 停止测量 + + + QAction::TextHeuristicRole + + diff --git a/src/MeasureDeviceParamsConfigView/DeviceParamsManagerDlg.cpp b/src/MeasureDeviceParamsConfigView/DeviceParamsManagerDlg.cpp index 4240277..1ae96b2 100644 --- a/src/MeasureDeviceParamsConfigView/DeviceParamsManagerDlg.cpp +++ b/src/MeasureDeviceParamsConfigView/DeviceParamsManagerDlg.cpp @@ -87,12 +87,19 @@ void DeviceParamsManagerDlg::onBtnDelete() if (!ms_cfg_file.remove()) { LOG_WARN(QStringLiteral(u"删除设备测量参数配置[%1]失败: %2").arg(current->text()).arg(ms_cfg_file.errorString())); } else { + int row = ui->listw_cfg_list->row(current); ui->listw_cfg_list->takeItem(ui->listw_cfg_list->currentRow()); delete current; current = nullptr; ui->linedit_cfg_name->clear(); ui->pte_description->clear(); ui->params_table_form->ClearParamsTable(); + + row = (row > 1) ? (row - 1) : 0; + QListWidgetItem *item = ui->listw_cfg_list->item(row); + if (item) { + this->onCfgListCurrentItemChanged(item); + } } } }