Prechádzať zdrojové kódy

sysmgr system handle.

gsp 4 rokov pred
rodič
commit
27fedabd2c

+ 20 - 20
OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -1065,19 +1065,19 @@ namespace OTSDataType
                                         a_listPropItems.Add(poPropItem);
                                     //here,no longer consider the gray range of particles,for we can get the same result by regulate the background range.(gsp 2021.8.13)
                                     //---------------------------------------
-                                    // particle gray level min
+                                    //// particle gray level min
 
-                                    poPropItem = new CPropItem();
-                                    nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MIN;
-                                    poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                                    a_listPropItems.Add(poPropItem);
+                                    //poPropItem = new CPropItem();
+                                    //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MIN;
+                                    //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                                    //a_listPropItems.Add(poPropItem);
 
-                                    // particle gray level max
+                                    //// particle gray level max
 
-                                    poPropItem = new CPropItem();
-                                    nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MAX;
-                                    poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                                    a_listPropItems.Add(poPropItem);
+                                    //poPropItem = new CPropItem();
+                                    //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MAX;
+                                    //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                                    //a_listPropItems.Add(poPropItem);
                                     //----------------------------------------
 
                                     // particle area min
@@ -1532,19 +1532,19 @@ namespace OTSDataType
                                     a_listPropItems.Add(poPropItem);
                                     //here,no longer consider the gray range of particles,for we can get the same result by regulate the background range.(gsp 2021.8.13)
                                     //---------------------------------------------
-                                    // particle gray level min
+                                    //// particle gray level min
 
-                                    poPropItem = new CPropItem();
-                                    nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MIN;
-                                    poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                                    a_listPropItems.Add(poPropItem);
+                                    //poPropItem = new CPropItem();
+                                    //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MIN;
+                                    //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                                    //a_listPropItems.Add(poPropItem);
 
-                                    // particle gray level max
+                                    //// particle gray level max
 
-                                    poPropItem = new CPropItem();
-                                    nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MAX;
-                                    poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                                    a_listPropItems.Add(poPropItem);
+                                    //poPropItem = new CPropItem();
+                                    //nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MAX;
+                                    //poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                                    //a_listPropItems.Add(poPropItem);
                                     //----------------------------------------------
 
                                     // particle area min

+ 23 - 23
OTSSysMgrApp/ControllerSettingForm.cs

@@ -125,18 +125,18 @@ namespace OTSSysMgrApp
             //获取关闭电镜类型
             string connTypeStr = GetConnectionType(disConnectType);
             bool DisConnResult = false;
-           if (ConnectionState)
-            {
-                DisConnResult = cfun.DisConnectSem();
-            }
-            if (DisConnResult)
-            {
-                ConnectionState = false;
-            }
-            else
-            {
-                ConnectionState = true;
-            }
+           //if (ConnectionState)
+           // {
+           //     DisConnResult = cfun.DisConnectSem();
+           // }
+           // if (DisConnResult)
+           // {
+           //     ConnectionState = false;
+           // }
+           // else
+           // {
+           //     ConnectionState = true;
+           // }
             return DisConnResult;
         }
         /// <summary>
@@ -355,9 +355,9 @@ namespace OTSSysMgrApp
                 btnClearData.Enabled = true;
                 btnClearData.Refresh();
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
                 //关闭连接
-                DisConnectSem(connectionEnumType.EDSOnlyPointXRay);
+                //DisConnectSem(connectionEnumType.EDSOnlyPointXRay);
             }
         }
 
@@ -380,7 +380,7 @@ namespace OTSSysMgrApp
                 //绑定数据源
                 chartData(XData, a_XrayData);
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
             }
             catch (Exception ex)
             {
@@ -834,13 +834,13 @@ namespace OTSSysMgrApp
                 if (tabSetting.SelectedIndex == 0)
                 {
                     //线程调用 关闭Scan EDSInit初始化
-                    cfun.ScanFinishedInstance();
+                    //cfun.ScanFinishedInstance();
                     EDSInit();
                 }
                 else if (tabSetting.SelectedIndex == 1)
                 {
                     //线程调用 关闭EDS  ScanInit初始化
-                    cfun.EDSFinishedInstance();
+                    //cfun.EDSFinishedInstance();
                     ScanInit();
                 }
             }
@@ -928,9 +928,9 @@ namespace OTSSysMgrApp
                 btnClearData.Enabled = true;
                 btnClearData.Refresh();
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
                 //关闭连接
-                DisConnectSem(connectionEnumType.EDSMultiPointXRay);
+                //DisConnectSem(connectionEnumType.EDSMultiPointXRay);
             }
         }
         private void btnAreaRay_Click(object sender, EventArgs e)
@@ -1003,9 +1003,9 @@ namespace OTSSysMgrApp
                 btnClearData.Enabled = true;
                 btnClearData.Refresh();
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
                 //关闭连接
-                DisConnectSem(connectionEnumType.EDSAreaXRay);
+                //DisConnectSem(connectionEnumType.EDSAreaXRay);
             }
         }
         private void btnClearData_Click(object sender, EventArgs e)
@@ -1044,7 +1044,7 @@ namespace OTSSysMgrApp
                 lbXrayCount.Text = nXrayCount.ToString();
                 chartXRay.Refresh();
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
                 log.Info("Cleared successfully!");
             }
             catch (Exception ex)
@@ -1134,7 +1134,7 @@ namespace OTSSysMgrApp
                 btnClearData.Enabled = true;
                 btnClearData.Refresh();
                 //EDS过程结束
-                cfun.EDSFinishedInstance();
+                //cfun.EDSFinishedInstance();
                 //关闭连接
                 DisConnectSem(connectionEnumType.EDSAreaXRay);
             }

+ 9 - 9
OTSSysMgrApp/SemTestForms.cs

@@ -499,14 +499,14 @@ namespace OTSSysMgrApp
             {
                 string str = table["str2"].ToString();
                 //断开电镜连接
-                if (cfun.DisConnectSem())
-                {
-                    log.Info(table["message10"].ToString());
-                }
-                else
-                {
-                    //ShowMessage(9);
-                }
+                //if (cfun.DisConnectSem())
+                //{
+                //    log.Info(table["message10"].ToString());
+                //}
+                //else
+                //{
+                //    //ShowMessage(9);
+                //}
                 BtnConnect.Text = str;
                 ConnectionState = false;
                 GetBtnState(false);
@@ -518,7 +518,7 @@ namespace OTSSysMgrApp
             try
             {
                 //断开电镜连接
-                cfun.DisConnectSem();
+                //cfun.DisConnectSem();
                 //释放DLL内存
                 cfun.FreeHardware();