Browse Source

修改程序管理失效的bug

cxs 2 years ago
parent
commit
d018617022

+ 1 - 1
OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -340,7 +340,7 @@ namespace OTSMeasureApp
             pSample.SetName(strNewSampleName);
             pSample.SetName(strNewSampleName);
             pSample.SetSampleHoleName(pHole.GetName());
             pSample.SetSampleHoleName(pHole.GetName());
             pSample.SetSwitch(m_pParam.GetMeasurementSwitch());
             pSample.SetSwitch(m_pParam.GetMeasurementSwitch());
-            pSample.GetMsrParams().SetSysSTDSwitch(m_pParam.GetSysSTD());
+            poMsrParams.SetSysSTDSwitch(m_pParam.GetSysSTD());
             pSample.SetMsrDomain(pMsrArea);
             pSample.SetMsrDomain(pMsrArea);
             pSample.SetMembraneType(a_nVal);
             pSample.SetMembraneType(a_nVal);
             pSample.SetMsrParams(poMsrParams);
             pSample.SetMsrParams(poMsrParams);

+ 9 - 8
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -457,14 +457,15 @@ namespace OTSMeasureApp
 
 
             //测量终止方式
             //测量终止方式
             tB_StopMode.Text = m_cotsimgscanprm.GetStopMode().ToString();
             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_INCA_AREA.Text = m_cotsimgscanprm.GetStopParamArea().ToString();
+            if (StopModeDialog == null)
+            {
+                StopModeDialog = new frmMeasureStopMode();
+                StopModeDialog.FieldMode = m_cotsimgscanprm.GetStopParamFields();
+                StopModeDialog.TimeMode = m_cotsimgscanprm.GetStopParamMeasTime();
+                StopModeDialog.ParticleMode = m_cotsimgscanprm.GetStopParamParticles();
+                StopModeDialog.AreaMode = m_cotsimgscanprm.GetStopParamArea();
+                StopModeDialog.StopMode = tB_StopMode.Text;
+            }
             //取图方式
             //取图方式
             foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
             foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
             {
             {