Merge branch 'GSP' into Release2.7

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -75,7 +75,8 @@ namespace OTSDataType
         //设置工作样品的属性值
         public bool SetParamVal(OTS_SAMPLE_PROP_GRID_ITEMS ItemId, OTS_ITEM_TYPES ValType, object objVal)
         {
-
+            var logstr = "set value " + ItemId.ToString() + "=" + objVal.ToString();
+            NLog.LogManager.GetCurrentClassLogger().Warn(logstr);
 
             bool bSetFalg=true ;
 

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -340,7 +340,7 @@ namespace OTSMeasureApp
             pSample.SetName(strNewSampleName);
             pSample.SetSampleHoleName(pHole.GetName());
             pSample.SetSwitch(m_pParam.GetMeasurementSwitch());
-            pSample.GetMsrParams().SetSysSTDSwitch(m_pParam.GetSysSTD());
+            poMsrParams.SetSysSTDSwitch(m_pParam.GetSysSTD());
             pSample.SetMsrDomain(pMsrArea);
             pSample.SetMembraneType(a_nVal);
             pSample.SetMsrParams(poMsrParams);
@@ -528,6 +528,7 @@ namespace OTSMeasureApp
             bool bSetFalg = false;
         
             bSetFalg = WSample.SetParamVal(ItemId, ValType, objVal);
+           
 
             if (bSetFalg)
             {

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -335,8 +335,7 @@ namespace OTSMeasureApp
                                 m_PropWindow.PropGrid[Row, 1].View = m_Col_NameMode;
                                 m_PropWindow.PropGrid[Row, 2].View = m_Col_ValMode;
 
-                                //SourceGrid.Cells.Controllers.CustomEvents clickEvent = new SourceGrid.Cells.Controllers.CustomEvents();
-                                //clickEvent.Click += new EventHandler(clickEvent_Click);
+                               
 
                                 if (bReadOnly)          //只读模式
                                 {
@@ -1223,7 +1222,7 @@ namespace OTSMeasureApp
                     String sName = (string)m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 1].Value;
                     object objVal = m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 2].Value;
 
-                    m_Grid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, OTS_ITEM_TYPES.BOOL, objVal);
+                    m_Grid.m_PropWindow.SampleGridInfoChange(SampleId, OTS_ITEM_TYPES.BOOL, objVal);
                 }
 
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -457,14 +457,15 @@ 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_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)
             {