Browse Source

fix the bugs in opening existing project.

gsp 1 year ago
parent
commit
e1a2411009

+ 2 - 2
OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/COTSMsrPrjResultData.cs

@@ -451,11 +451,11 @@ namespace OTSModelSharp
                 //get MsrResults data from map.
                 List<CMsrResultItem> rstItms = new List<CMsrResultItem>();
                 double allPartArea = 0;
-                int typeNum = 0;
+                int typeNum;
                 double typeArea = 0;
                 foreach (var typeParticles in mapTypeParticles)
                 {
-
+                    typeNum = 0;
                     CMsrResultItem rstItm = new CMsrResultItem();
                     foreach (var p in typeParticles.Value)
                     {

+ 0 - 2
OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -107,8 +107,6 @@ namespace OTSMeasureApp
                         //实例窗体
                         m_OTSMeasureResultWindow = m_MeasureApp.m_MeasureResultWindow;
                     }
-                    ////设置工作样品
-                    //m_MeasureApp.m_ProjParam.SetWorkSample(m_OTSSamplespaceWindow.GetWorkingVisualSample().GetSampleName());
                     //获取工作样品信息
                     COTSSample WSample = m_MeasureApp.m_ProjParam.GetWorkSample();
                     CMsrResultItems MsrResults = WSample.GetMsrResults();

+ 2 - 1
OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureResultWindow.cs

@@ -353,8 +353,9 @@ namespace OTSMeasureApp
 
         public void UpdateResultInfoBySampleName(string sampleName)
         {
-            //显示样品名称信息
             COTSSample sample = m_MeasureAppForm.m_ProjParam.GetResultData().GetSampleByName(sampleName);
+         
+           
             //设置当前样品名称
             SetSampleName(sampleName);
             //已完成的数量

+ 4 - 20
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -535,17 +535,9 @@ namespace OTSMeasureApp
          
             m_SamplepaceWindow.OpenExistSampleFile(m_ProjData.GetStage(), m_ProjData.GetSEMStageData(), SampleMeasureAreaList);
 
+          
 
-            //获取工作样品信息
-            COTSSample WSample = m_ProjParam.GetWorkSample();
-            CMsrResultItems MsrResults = WSample.GetMsrResults();
-            //获取结果文件 颗粒列表信息
-            List<CMsrResultItem> cMsrResultItemClrList = MsrResults.GetResultItems();
-
-            //设置测量状态数据列表
-
-            m_MeasureResultWindow.SetMeasureListInfo(cMsrResultItemClrList);
-            m_MeasureResultWindow.UpdateResultInfoBySampleName(WSample.GetName());
+            m_MeasureResultWindow.UpdateResultInfoBySampleName(sWSampleName);
             return true;
         }
         public bool OpenExistSampleMeasureArea(ref List<SampleMeasurePara> SampleMeasureParaList)
@@ -812,10 +804,7 @@ namespace OTSMeasureApp
         public bool GetWorkSampleParamLock(ref CTreeSampleParam TSParamLock)
         {
             OTSSampleVisualPropertyInfo SMInfo = new OTSSampleVisualPropertyInfo(m_ProjParam.GetWorkSample(),m_ProjParam.GetDefaultParam().GetSysType());
-            //if (!m_ProjParam.GetWSampleParaLock(ref SMInfo))
-            //{
-            //    return false;
-            //}
+           
 
             TSParamLock = SMInfo.TSampleParam;
             return true;
@@ -1040,12 +1029,7 @@ namespace OTSMeasureApp
 
         public bool SwitchDisplayMeasureSample(string sMsrSampleName)
         {
-            //if (!m_ProjParam.SetWorkSample(sMsrSampleName))
-            //{
-            //    log.Error("(OTSIncAMeasureAppForm.SwitchMeasureSample)  SetWorkSample(sMsrSampleName =" + sMsrSampleName + ") Failed !");
-
-            //    return false;
-            //}
+         
 
             OTSSampleVisualPropertyInfo SMInfo = new OTSSampleVisualPropertyInfo(m_ProjParam.GetWorkSample(),m_ProjParam.GetDefaultParam().GetSysType());