|
@@ -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());
|
|
|
|