소스 검색

联合测量结束条件3

CXS 3 년 전
부모
커밋
68ef48a7f3
1개의 변경된 파일19개의 추가작업 그리고 17개의 파일을 삭제
  1. 19 17
      OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

+ 19 - 17
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -944,17 +944,19 @@ namespace OTSDataType
                                 a_listPropItems.Add(poPropItem);
 
                             //// stop parameter
-                            // field
+                            
+
                             poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
                             a_listPropItems.Add(poPropItem);
 
+                            // field
                             poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
                             a_listPropItems.Add(poPropItem);
-                            
+
                             // used time
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
@@ -1376,25 +1378,25 @@ namespace OTSDataType
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.STRING, true, bShow);
                             a_listPropItems.Add(poPropItem);
 
+                            
+                            // particle
+
                             poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
                             a_listPropItems.Add(poPropItem);
-                                        // particle
 
-                                        poPropItem = new CPropItem();
-                                        nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
-                                        poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
-                                        a_listPropItems.Add(poPropItem);
-
-                                       
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                            a_listPropItems.Add(poPropItem);
 
-                                        // used time
+                            // used time
 
-                                        poPropItem = new CPropItem();
-                                        nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
-                                        poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
-                                        a_listPropItems.Add(poPropItem);
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                            a_listPropItems.Add(poPropItem);
 
 
                             // scan speed