|
@@ -799,12 +799,11 @@ namespace OTSMeasureApp
|
|
|
|
|
|
|
|
|
|
if (DialogResult.OK == ProgMgrForm.ShowDialog())
|
|
if (DialogResult.OK == ProgMgrForm.ShowDialog())
|
|
- {
|
|
|
|
- //m_DataMgrFun.SetSysPartSTDData(ProgMgrForm.GetCPartSTDDataClr());
|
|
|
|
- //检查\\Config\\SysData 是否有OTSProgMgrParam.pmf文件
|
|
|
|
|
|
+ {
|
|
|
|
+
|
|
if (m_ProjParam.LoadParamFile() && m_ProjParam.LoadStageParamFile())
|
|
if (m_ProjParam.LoadParamFile() && m_ProjParam.LoadStageParamFile())
|
|
{
|
|
{
|
|
- //检查\\Config\\SysData 是否有OTSProgMgrParam.pmf文件
|
|
|
|
|
|
+
|
|
if (m_ProjParam.InitResultData())
|
|
if (m_ProjParam.InitResultData())
|
|
{
|
|
{
|
|
m_RibbonFun.SetAllRibbonButnStatus(true);
|
|
m_RibbonFun.SetAllRibbonButnStatus(true);
|
|
@@ -812,7 +811,7 @@ namespace OTSMeasureApp
|
|
//当样品台上有样品,则不更新样品台数据
|
|
//当样品台上有样品,则不更新样品台数据
|
|
if (0 == m_ProjParam.GetSampleCount())
|
|
if (0 == m_ProjParam.GetSampleCount())
|
|
{
|
|
{
|
|
- //通过委托事件将样品台数据发送给SamplespaceWindwo
|
|
|
|
|
|
+
|
|
|
|
|
|
m_SamplepaceWindow.InitStageDisplay(m_ProjData.GetStage(), m_ProjData.GetSEMStageData());
|
|
m_SamplepaceWindow.InitStageDisplay(m_ProjData.GetStage(), m_ProjData.GetSEMStageData());
|
|
}
|
|
}
|