|
@@ -452,12 +452,14 @@ namespace OTSMeasureApp
|
|
|
|
|
|
//测量终止方式
|
|
|
tB_StopMode.Text = m_cotsimgscanprm.GetStopMode().ToString();
|
|
|
- ////终止时间
|
|
|
- //IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
|
|
|
- ////终止帧图数
|
|
|
- //IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
|
|
|
- ////终止夹杂物数
|
|
|
- //IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
|
|
|
+ //终止时间
|
|
|
+ IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
|
|
|
+ //终止帧图数
|
|
|
+ IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
|
|
|
+ //终止夹杂物数
|
|
|
+ IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
|
|
|
+ //终止面积
|
|
|
+ IDC_EDIT_STOP_INCA_AREA.Text = m_cotsimgscanprm.GetStopParamArea().ToString();
|
|
|
//取图方式
|
|
|
foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
|
|
|
{
|
|
@@ -1322,33 +1324,6 @@ namespace OTSMeasureApp
|
|
|
MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
return false;
|
|
|
}
|
|
|
- //终止时间
|
|
|
- if (false == rg.Match(IDC_EDIT_STOP_TIME.Text.Trim()).Success)
|
|
|
- {
|
|
|
- IDC_EDIT_STOP_TIME.Focus();
|
|
|
- IDC_EDIT_STOP_TIME.SelectAll();
|
|
|
- string message = table["message28"].ToString();
|
|
|
- MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
- return false;
|
|
|
- }
|
|
|
- //终止帧图数
|
|
|
- if (false == rg.Match(IDC_EDIT_STOP_FIELD_NUM.Text.Trim()).Success)
|
|
|
- {
|
|
|
- IDC_EDIT_STOP_FIELD_NUM.Focus();
|
|
|
- IDC_EDIT_STOP_FIELD_NUM.SelectAll();
|
|
|
- string message = table["message29"].ToString();
|
|
|
- MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
- return false;
|
|
|
- }
|
|
|
- //终止夹杂物数
|
|
|
- if (false == rg.Match(IDC_EDIT_STOP_INCA_NUM.Text.Trim()).Success)
|
|
|
- {
|
|
|
- IDC_EDIT_STOP_INCA_NUM.Focus();
|
|
|
- IDC_EDIT_STOP_INCA_NUM.SelectAll();
|
|
|
- string message = table["message30"].ToString();
|
|
|
- MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
- return false;
|
|
|
- }
|
|
|
//颗粒面积范围 最小
|
|
|
if (false == rgPositiveDecimals.Match(IDC_EDIT_PARTAREAMIN.Text.Trim()).Success)
|
|
|
{
|