1、添加开始和停止测量按钮
2、修改已知BUG
This commit is contained in:
parent
a72dbeebbe
commit
4eb50d95a4
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>892</width>
|
||||
<height>688</height>
|
||||
<width>1079</width>
|
||||
<height>499</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>892</width>
|
||||
<height>21</height>
|
||||
<width>1079</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menu_measurement_analysis">
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</widget>
|
||||
<widget class="QMenu" name="menu_manage_measurement_params">
|
||||
<property name="title">
|
||||
<string>测量参数管理</string>
|
||||
<string>配置管理</string>
|
||||
</property>
|
||||
<addaction name="action_device_connect_cfg"/>
|
||||
<addaction name="action_device_config_mrg"/>
|
||||
|
|
@ -65,9 +65,16 @@
|
|||
<string>视图</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menu">
|
||||
<property name="title">
|
||||
<string>核素库</string>
|
||||
</property>
|
||||
<addaction name="action_nuclideLib"/>
|
||||
</widget>
|
||||
<addaction name="menu_measurement_analysis"/>
|
||||
<addaction name="menu_manage_measurement_params"/>
|
||||
<addaction name="menu_view"/>
|
||||
<addaction name="menu"/>
|
||||
<addaction name="menu_help"/>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
|
|
@ -102,10 +109,23 @@
|
|||
</attribute>
|
||||
<addaction name="action_device_config_mrg"/>
|
||||
<addaction name="action_energy_scale_mrg"/>
|
||||
<addaction name="action_efficiency_scale_mrg"/>
|
||||
<addaction name="action_roi"/>
|
||||
<addaction name="action_efficiency_scale_mrg"/>
|
||||
<addaction name="action_nuclideLib"/>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBar">
|
||||
<property name="windowTitle">
|
||||
<string>toolBar</string>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="action_start_measure"/>
|
||||
<addaction name="action_stop_measure"/>
|
||||
</widget>
|
||||
<action name="action_help_manual">
|
||||
<property name="text">
|
||||
<string>使用说明</string>
|
||||
|
|
@ -123,20 +143,26 @@
|
|||
</action>
|
||||
<action name="action_new_measurement_analysis">
|
||||
<property name="text">
|
||||
<string>新建</string>
|
||||
<string>新建测量分析</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>新建</string>
|
||||
<string>新建测量分析</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_close_measurement_analysis">
|
||||
<property name="text">
|
||||
<string>关闭</string>
|
||||
<string>关闭测量分析</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>关闭测量分析</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_save_measurement_analysis">
|
||||
<property name="text">
|
||||
<string>保存</string>
|
||||
<string>保存测量分析</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>保存测量分析</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_output_measurement_analysis">
|
||||
|
|
@ -146,7 +172,10 @@
|
|||
</action>
|
||||
<action name="action_open_measurement_analysis">
|
||||
<property name="text">
|
||||
<string>打开</string>
|
||||
<string>打开测量分析</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>打开测量分析</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_manage_measurement_analysis">
|
||||
|
|
@ -185,6 +214,22 @@
|
|||
<string>核素库</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_start_measure">
|
||||
<property name="text">
|
||||
<string>开始测量</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::TextHeuristicRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_stop_measure">
|
||||
<property name="text">
|
||||
<string>停止测量</string>
|
||||
</property>
|
||||
<property name="menuRole">
|
||||
<enum>QAction::TextHeuristicRole</enum>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user