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

OTSIncAMeasureApp/2-OTSMeasureParamManage/OTSMeasureParam.cs

@@ -140,7 +140,7 @@ namespace OTSMeasureApp
                     return false;
                 }
                 m_ResultData.SetStage(Stage);
-
+                
 
                 // 设置 SEM stage data
                 CSEMStageData SEMData = m_DefaultParam.GetStageDataParam();

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -1179,30 +1179,30 @@ namespace OTSMeasureApp
         /// </summary>
         private void OpenMeasureProjectFile()
         {
-            if (m_ProjData.IsModified())    // 文件被修改
-            {
-                int iRev = ShowSaveInfoMsgBox();
-                if ((int)MessageBoxRev.DIALOG_YES == iRev)
-                {
-                    if (!m_ProjData.Save())
-                    {
-                        return;
-                    }
-                }
-                else if((int)MessageBoxRev.DIALOG_CANCEL== iRev)
-                {
-                    return;
-                }
-            }
+            //if (m_ProjData.IsModified())    // 文件被修改
+            //{
+            //    int iRev = ShowSaveInfoMsgBox();
+            //    if ((int)MessageBoxRev.DIALOG_YES == iRev)
+            //    {
+            //        if (!m_ProjData.Save())
+            //        {
+            //            return;
+            //        }
+            //    }
+            //    else if((int)MessageBoxRev.DIALOG_CANCEL== iRev)
+            //    {
+            //        return;
+            //    }
+            //}
 
             bool bOpenFlag=false;
             COTSMsrPrjResultData ProjDataMgr = new COTSMsrPrjResultData();
-            m_ProjParam.m_ResultData = ProjDataMgr;
-            m_ProjParam.InitResultData();
-            m_ProjData = ProjDataMgr;
+            
             if (ProjDataMgr.Load())
             {
-             
+                m_ProjParam.m_ResultData = ProjDataMgr;
+                m_ProjParam.InitResultData();
+                m_ProjData = ProjDataMgr;
                 bOpenFlag = true;
             }