Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

OTSIncAReportApp/Control_Graph/OTSIncAReportGraphFuncation/OTSIncAReportFun.cs

@@ -405,12 +405,12 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
                 string str4 = "电镜是已经连接的状态，准备断开";
                 str4 = table["str4"].ToString();
                 log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str4 + ":--" + m_SEMConnectionState + "---");
-                if (m_cfun.DisConnectSem())
-                {
-                    string str5 = "电镜是已经连接的状态，完成断开后状态";
-                    str5 = table["str5"].ToString();
-                    log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str5 + ":--" + m_SEMConnectionState + "---");
-                }
+                //if (m_cfun.DisConnectSem())
+                //{
+                //    string str5 = "电镜是已经连接的状态，完成断开后状态";
+                //    str5 = table["str5"].ToString();
+                //    log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str5 + ":--" + m_SEMConnectionState + "---");
+                //}
             }
         }
 
@@ -444,12 +444,12 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
                 string str9 = "电镜是已经连接的状态，准备断开";
                 str9 = table["str9"].ToString();
                 log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)str9:--" + m_SEMConnectionState + "---");
-                if (m_cfun.DisConnectSem())
-                {
-                    string str10 = "电镜是已经连接的状态，完成断开后状态";
-                    str10 = table["str10"].ToString();
-                    log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str10 + ":--" + m_SEMConnectionState + "---");
-                }
+                //if (m_cfun.DisConnectSem())
+                //{
+                //    string str10 = "电镜是已经连接的状态，完成断开后状态";
+                //    str10 = table["str10"].ToString();
+                //    log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str10 + ":--" + m_SEMConnectionState + "---");
+                //}
             }
         }
 
@@ -551,12 +551,12 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             string str21 = "准备关闭电镜连接";
             str21 = table["str21"].ToString();
             log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str21);
-            if (m_cfun.DisConnectSem() == true)
-            {
-                string str22 = "准备关闭电镜连接";
-                str22 = table["str22"].ToString();
-                log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str22);
-            }
+            //if (m_cfun.DisConnectSem() == true)
+            //{
+            //    string str22 = "准备关闭电镜连接";
+            //    str22 = table["str22"].ToString();
+            //    log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str22);
+            //}
             string str23 = "准备释放DLL";
             str23 = table["str23"].ToString();
             log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str23);
@@ -573,10 +573,10 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             string str24 = "准备关闭电镜连接";
             str24 = table["str24"].ToString();
             log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str24);
-            if (m_cfun.DisConnectSem() == true)
-            {
-                log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str24);
-            }
+            //if (m_cfun.DisConnectSem() == true)
+            //{
+            //    log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str24);
+            //}
             string str25 = "准备释放DLL";
             str25 = table["str25"].ToString();
             log.Trace("(DisConnectSEM_ForDrawDistrbutionImageAndBSE)" + str25);

OTSPartA_STDEditor/Form_STDConstantsEditor.cs

@@ -3548,7 +3548,7 @@ namespace OTSPartA_STDEditor
             finally
             {
                 //EDS过程结束
-                m_cfun.EDSFinishedInstance();
+                //m_cfun.EDSFinishedInstance();
 
                 //关闭连接
                 DisConnectSem(connectionEnumType.EDSOnlyPointXRay);

OTSPartA_STDEditor/STDEditor.cs

@@ -547,7 +547,7 @@ namespace OTSPartA_STDEditor
             finally
             {
                 //EDS过程结束
-                m_cfun.EDSFinishedInstance();
+                //m_cfun.EDSFinishedInstance();
 
                 //关闭连接
                 DisConnectSem(connectionEnumType.EDSOnlyPointXRay);
@@ -722,7 +722,7 @@ namespace OTSPartA_STDEditor
             bool bDisConnResult = false;
             if (m_bConnectionState)
             {
-                bDisConnResult = m_cfun.DisConnectSem();
+                //bDisConnResult = m_cfun.DisConnectSem();
             }
             if (bDisConnResult)
             {

OTSPartA_STDEditor/XrayContrastForm.cs

@@ -693,7 +693,7 @@ namespace OTSPartA_STDEditor
             finally
             {
                 //EDS过程结束
-                m_cfun.EDSFinishedInstance();
+                //m_cfun.EDSFinishedInstance();
 
                 //关闭连接
                 DisConnectSem(connectionEnumType.EDSOnlyPointXRay);
@@ -732,7 +732,7 @@ namespace OTSPartA_STDEditor
             bool bDisConnResult = false;
             if (m_bConnectionState)
             {
-                bDisConnResult = m_cfun.DisConnectSem();
+                //bDisConnResult = m_cfun.DisConnectSem();
             }
             if (bDisConnResult)
             {