edit MeasureAppForm.

OTS/OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -303,6 +303,10 @@
       <Project>{63A944EC-AF52-4BD4-BEFF-B09F5DDDA9B1}</Project>
       <Name>OTSModelSharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OTSSysMgrApp\OTSSysMgrApp.csproj">
+      <Project>{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}</Project>
+      <Name>OTSSysMgrApp</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Image\保存.png" />

OTS/OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -13,6 +13,8 @@ using OTSIncAMeasureApp.OTSMeasureThread;
 //using OTSProgMgrInfo;
 
 using System.Collections;
+using OTSDataType;
+using OTSSysMgrApp;
 //using OTSSysMgrApp;
 namespace OTSIncAMeasureApp
 {
@@ -262,7 +264,7 @@ namespace OTSIncAMeasureApp
                 if (MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information) == DialogResult.OK)
                 {
                     //释放日志指针
-                    Nloger.EndCSharpLogFile();
+                   // Nloger.EndCSharpLogFile();
                     this.Close();
                     Application.Exit();
                     Application.ExitThread();
@@ -308,17 +310,17 @@ namespace OTSIncAMeasureApp
                     }
                     else
                     {
-                        Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  this.CheckMeasureSysFileExist() = false");
+                        Nloger.Error("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  this.CheckMeasureSysFileExist() = false");
                     }
                 }
                 else
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  (m_DataMgrFun.CheckParamFile() && m_DataMgrFun.CheckStageFile()) = false");
+                    Nloger.Error("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  (m_DataMgrFun.CheckParamFile() && m_DataMgrFun.CheckStageFile()) = false");
                 }
             }
             catch (Exception ex)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load) OTSIncAMeasureAppForm_Load:" + ex.ToString());
+                Nloger.Error("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load) OTSIncAMeasureAppForm_Load:" + ex.ToString());
             }
 
         }
@@ -370,7 +372,7 @@ namespace OTSIncAMeasureApp
 
                 catch (Exception ex)
                 {
-                    Nloger.TraceErrorLog("OTSIncAReportApp:" + ex.ToString());
+                    Nloger.Error("OTSIncAReportApp:" + ex.ToString());
                 }
             }
         }
@@ -642,7 +644,7 @@ namespace OTSIncAMeasureApp
             OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
             if (!m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.UpDataSamplePropVal)  m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.UpDataSamplePropVal)  m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
                 return;
             }
 
@@ -670,14 +672,14 @@ namespace OTSIncAMeasureApp
                     }
                 }
                 //释放日志指针
-                Nloger.EndCSharpLogFile();
+                //Nloger.EndCSharpLogFile();
 
                 Application.ExitThread();
             }
             catch (Exception ex)
             {
                 string message = table["message3"].ToString();
-                Nloger.TraceErrorLog("OTSIncAMeasureAppForm_FormClosing-"+ message + ":" + ex.ToString());
+                Nloger.Error("OTSIncAMeasureAppForm_FormClosing-"+ message + ":" + ex.ToString());
             }
         }
 
@@ -690,14 +692,14 @@ namespace OTSIncAMeasureApp
             {
                 if (!this.OpenExistSampleFile())
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbOpen_Click)  OpenExistSampleFile() = false Failed !");
+                    Nloger.Error("(OTSIncAMeasureAppForm.rbOpen_Click)  OpenExistSampleFile() = false Failed !");
                     return;
                 }
                 m_RibbonFun.SetAllRibbonButnStatu(true);
             }
             else
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbOpen_Click)  m_DataMgrFun.OpenExistSampleFile() Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.rbOpen_Click)  m_DataMgrFun.OpenExistSampleFile() Failed !");
             }
         }
 
@@ -707,7 +709,7 @@ namespace OTSIncAMeasureApp
 
             if (!m_DataMgrFun.CreateNewFile())
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbNew_CreateWorkspace_Click)  m_DataMgrFun.CreateNewFile() Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.rbNew_CreateWorkspace_Click)  m_DataMgrFun.CreateNewFile() Failed !");
                 return;
             }
             m_RibbonFun.SetAllRibbonButnStatu(true);
@@ -751,7 +753,7 @@ namespace OTSIncAMeasureApp
 
             if (!m_DataMgrFun.OpenExistSampleFile(ref TSampleParamList))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.OpenExistSampleFile(ref SMInfoList) = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.OpenExistSampleFile(ref SMInfoList) = false Failed !");
                 return false;
             }
 
@@ -759,7 +761,7 @@ namespace OTSIncAMeasureApp
             OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
             if (!m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
                 return false;
             }
 
@@ -773,7 +775,7 @@ namespace OTSIncAMeasureApp
 
             if (!m_DataMgrFun.OpenExistSampleMeasureArea(ref SampleMeasureAreaList))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.OpenExistSampleMeasureArea(ref SampleMeasureAreaList) = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.OpenExistSampleMeasureArea(ref SampleMeasureAreaList) = false Failed !");
                 return false;
             }
 
@@ -786,12 +788,12 @@ namespace OTSIncAMeasureApp
             }
             if ("" == sWSampleName)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetWorkSampleName() = null Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetWorkSampleName() = null Failed !");
                 return false;
             }
             if (!m_DataMgrFun.GetSampleStageData())
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetSampleStageData() = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.OpenExistSampleFile)  m_DataMgrFun.GetSampleStageData() = false Failed !");
                 return false;
             }
             m_SamplepaceWindow.Rev_MeasureApp_OpenExistSampleFile_Event(m_DataMgrFun.m_SStageData, SampleMeasureAreaList, sWSampleName);
@@ -807,7 +809,7 @@ namespace OTSIncAMeasureApp
             {
                 if (!this.OpenExistSampleFile())
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbOpen_Click)  OpenExistSampleFile() = false Failed !");
+                    Nloger.Error("(OTSIncAMeasureAppForm.rbOpen_Click)  OpenExistSampleFile() = false Failed !");
                     return;
                 }
 
@@ -816,7 +818,7 @@ namespace OTSIncAMeasureApp
             }
             else
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbOpen_Click)  m_DataMgrFun.OpenExistSampleFile() Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.rbOpen_Click)  m_DataMgrFun.OpenExistSampleFile() Failed !");
             }
             string fileName = m_DataMgrFun.m_ProjDataMgr.GetFileName();
             string str = table[this.Name.ToLower()].ToString();
@@ -838,7 +840,7 @@ namespace OTSIncAMeasureApp
             string sWSampleName = m_DataMgrFun.GetWorkSampleName();
             if ("" == sWSampleName)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  m_DataMgrFun.GetWorkSampleName() = null Failed");
+                Nloger.Error("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  m_DataMgrFun.GetWorkSampleName() = null Failed");
                 return;
             }
             string message = table["message5"].ToString();
@@ -852,7 +854,7 @@ namespace OTSIncAMeasureApp
                 //删除样品成功
                 if (!this.DeleteSample(sWSampleName))
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  DeleteSample(sWSampleName) = false Failed, sWSampleName = " + sWSampleName);
+                    Nloger.Error("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  DeleteSample(sWSampleName) = false Failed, sWSampleName = " + sWSampleName);
                     return;
                 }
 
@@ -860,7 +862,7 @@ namespace OTSIncAMeasureApp
                 sWSampleName = m_DataMgrFun.GetWorkSampleName();
                 if ("" == sWSampleName)
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  m_DataMgrFun.GetWorkSampleName() = null Failed");
+                    Nloger.Error("(OTSIncAMeasureAppForm.rbDeleteSample_Click)  m_DataMgrFun.GetWorkSampleName() = null Failed");
                     return;
                 }
                 m_SolutionWindows.m_TreeViewBase.GetTreeWorkSampleNode(sWSampleName);
@@ -880,7 +882,7 @@ namespace OTSIncAMeasureApp
         {
             if (!m_DataMgrFun.DeleteWorkSample(sDeleteWSampleName))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.DeleteWorkSample(sDeleteWSampleName) Failed, sDeleteWSampleName = " + sDeleteWSampleName);
+                Nloger.Error("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.DeleteWorkSample(sDeleteWSampleName) Failed, sDeleteWSampleName = " + sDeleteWSampleName);
                 //return false;
             }
             // 设置 开始 ,停止 和检查参数 按钮状态
@@ -915,14 +917,14 @@ namespace OTSIncAMeasureApp
             string sNewWSName = m_DataMgrFun.GetWorkSampleName();
             if ("" == sNewWSName)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.GetWorkSampleName() = null Failed");
+                Nloger.Error("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.GetWorkSampleName() = null Failed");
                 return true;
             }
             //获取新的工作样品属性值
             OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
             if (!m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(),ref SMInfo) = false Failed");
+                Nloger.Error("(OTSIncAMeasureAppForm.DeleteSample)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(),ref SMInfo) = false Failed");
                 return false;
             }
 
@@ -951,7 +953,7 @@ namespace OTSIncAMeasureApp
             {
                 // 设置 开始 ,停止 和检查参数 按钮状态
                 m_RibbonFun.SetMeasureRibbonButnStatu();
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.AddNewSample)  m_DataMgrFun.AddNewSample(sSampleHoleName) = null ");
+                Nloger.Error("(OTSIncAMeasureAppForm.AddNewSample)  m_DataMgrFun.AddNewSample(sSampleHoleName) = null ");
                 return;
             }
             //给SampleWindow 发送样品信息
@@ -1004,12 +1006,12 @@ namespace OTSIncAMeasureApp
                     }
                     else
                     {
-                        Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbSelectDlg_Click)  this.CheckMeasureSysFileExist() = false");
+                        Nloger.Error("(OTSIncAMeasureAppForm.rbSelectDlg_Click)  this.CheckMeasureSysFileExist() = false");
                     }
                 }
                 else
                 {
-                    Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbSelectDlg_Click)  (m_DataMgrFun.CheckParamFile() && m_DataMgrFun.CheckStageFile()) = false");
+                    Nloger.Error("(OTSIncAMeasureAppForm.rbSelectDlg_Click)  (m_DataMgrFun.CheckParamFile() && m_DataMgrFun.CheckStageFile()) = false");
                 }
             }
         }
@@ -1086,7 +1088,7 @@ namespace OTSIncAMeasureApp
         {
             if (!m_DataMgrFun.GetField(ref pFieldList, ref iSzie))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.GetField)  m_DataMgrFun.GetField(ref pFieldList) = false Failed");
+                Nloger.Error("(OTSIncAMeasureAppForm.GetField)  m_DataMgrFun.GetField(ref pFieldList) = false Failed");
                 return false;
             }
             return true;
@@ -1101,7 +1103,7 @@ namespace OTSIncAMeasureApp
             OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
             if (!m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.SetSEMData)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(),ref SMInfo) = false Failed");
+                Nloger.Error("(OTSIncAMeasureAppForm.SetSEMData)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(),ref SMInfo) = false Failed");
             }
             // MeasureApp 窗口给 OTSPropertyWindow窗口 Grid显示的样品属性信息
             m_SPropertyWindows.Rev_MeasureApp_SampleInfo_Event(SMInfo);
@@ -1133,10 +1135,10 @@ namespace OTSIncAMeasureApp
             bool iRev = m_DataMgrFun.SaveAsFile();
             if (!iRev)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.ribbonOrbMenuItemSaveAs_Click)  m_DataMgrFun.SaveAsFile()  Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.ribbonOrbMenuItemSaveAs_Click)  m_DataMgrFun.SaveAsFile()  Failed !");
                 return;
             }
-            Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbSaveAs_Click)   m_DataMgrFun.SaveAsFile()  Success !");
+            Nloger.Error("(OTSIncAMeasureAppForm.rbSaveAs_Click)   m_DataMgrFun.SaveAsFile()  Success !");
         }
 
         private void rbSaveFile_Click(object sender, EventArgs e)
@@ -1144,10 +1146,10 @@ namespace OTSIncAMeasureApp
             bool iRev = m_DataMgrFun.SaveFile();
             if (!iRev)
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbSaveFile_Click)  m_DataMgrFun.SaveFile()  Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.rbSaveFile_Click)  m_DataMgrFun.SaveFile()  Failed !");
                 return;
             }
-            Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.rbSaveAs_Click)  m_DataMgrFun.SaveFile()  Success !");
+            Nloger.Error("(OTSIncAMeasureAppForm.rbSaveAs_Click)  m_DataMgrFun.SaveFile()  Success !");
         }
 
         private void rbCheckParam_Click(object sender, EventArgs e)
@@ -1333,7 +1335,7 @@ namespace OTSIncAMeasureApp
         {
             if (!m_DataMgrFun.SetWorkSample(sMsrSampleName))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.SwitchMeasureSample)  SetWorkSample(sMsrSampleName =" + sMsrSampleName + ") Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.SwitchMeasureSample)  SetWorkSample(sMsrSampleName =" + sMsrSampleName + ") Failed !");
 
                 return false;
             }
@@ -1342,7 +1344,7 @@ namespace OTSIncAMeasureApp
             OTSSampleMeaInfo SMInfo = new OTSSampleMeaInfo();
             if (!m_DataMgrFun.GetWorkSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo))
             {
-                Nloger.TraceErrorLog("(OTSIncAMeasureAppForm.SwitchMeasureSample)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
+                Nloger.Error("(OTSIncAMeasureAppForm.SwitchMeasureSample)  m_DataMgrFun.GetSamplePropertyVal(m_DataMgrFun.GetWorkSample(), ref SMInfo) = false Failed !");
                 return false;
             }
 
@@ -1362,7 +1364,7 @@ namespace OTSIncAMeasureApp
         /// <param name="doRunType"></param>
         /// <param name="HoleID"></param>
         /// <param name="c_DomainMessure"></param>
-        public void StartSampleHoleBSEImage(int doRunType, int HoleID, CDomainClr c_DomainMessure)
+        public void StartSampleHoleBSEImage(int doRunType, int HoleID, CDomain c_DomainMessure)
         {
             //线程执行类型 1：测量类型 2：获取样品孔图片类型
             m_MeasureThread.SetDoRunType(doRunType);
@@ -1444,7 +1446,7 @@ namespace OTSIncAMeasureApp
             }
             catch (Exception ex)
             {
-                Nloger.TraceErrorLog("OTSPartA_STDEditor:" + ex.ToString());
+                Nloger.Error("OTSPartA_STDEditor:" + ex.ToString());
             }
         }
     }