修改界面保存为保存至默认管理

OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/OTSDefaultParam.cs

@@ -76,13 +76,22 @@ namespace OTSModelSharp
         public COTSXRayParam GetXRayParam() { return m_pXRayParam; }
 
         public CSEMStageData GetStageDataParam() { return m_pStageDataParam; }
+        public COTSGeneralParam GetGenParam() { return m_GenParam; }
 
 
-     
+        
 
 
 
-        public COTSGeneralParam GetGenParam() { return m_GenParam; }
+        public void SetGenParam(COTSGeneralParam a_cOTSGeneralParam) { m_GenParam=a_cOTSGeneralParam; }
+
+        public void SetImageScanParam(COTSImgScanPrm a_cOTSImgScanPrm) { m_pImageScanParam= a_cOTSImgScanPrm; }
+
+        public void SetImageProcParam(COTSImageProcParam a_cOTSImageProcParam) { m_pImageProcParam=a_cOTSImageProcParam; }
+        public void SetXRayParam(COTSXRayParam a_cOTSXRayParam) { m_pXRayParam=a_cOTSXRayParam; }
+
+        public void SetStageDataParam(CSEMStageData a_cSEMStageData) { m_pStageDataParam=a_cSEMStageData; }
+
 
 
         public bool LoadInfoFromProgMgrFile()

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -1135,6 +1135,8 @@ namespace OTSMeasureApp
             // get file pathname
             string strPathName = saveFileDialog.FileName;
             SMeasureParamData.Save(strPathName);
+
+
             return true;
         }
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.Designer.cs

@@ -98,6 +98,7 @@
             this.TSLoad.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.TSLoad.Name = "TSLoad";
             this.TSLoad.Size = new System.Drawing.Size(28, 23);
+            this.TSLoad.Visible = false;
             this.TSLoad.Click += new System.EventHandler(this.TSLoad_Click);
             // 
             // PropGrid

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -333,10 +333,17 @@ namespace OTSMeasureApp
 
         private void TSSaveAs_Click(object sender, EventArgs e)
         {
-           
-                m_MeasureAppForm.m_ProjParam.SaveWorkMeasureFile();
-           
-
+            OTSModelSharp.COTSDefaultParam m_cotsprogmgrparamfile = m_MeasureAppForm.m_ProjParam.GetDefaultParam();
+            COTSSample WSample = m_MeasureAppForm.m_ProjParam.GetResultData().GetWorkingSample();
+            m_cotsprogmgrparamfile.SetImageProcParam(WSample.GetMsrParams().GetImageProcessParam());
+            m_cotsprogmgrparamfile.SetImageScanParam(WSample.GetMsrParams().GetImageScanParam());
+            m_cotsprogmgrparamfile.SetXRayParam(WSample.GetMsrParams().GetXRayParam());
+            OTSModelSharp.COTSGeneralParam m_cgenparam = m_cotsprogmgrparamfile.GetGenParam();
+            m_cgenparam.SetSysSTD(WSample.GetMsrParams().GetSysSTDSwitch());
+            m_cgenparam.SetSteelTechnology((int)WSample.GetMsrParams().GetSteelTechnology());
+            m_cgenparam.SetSTDSelect(WSample.GetMsrParams().GetSTDName().ToString());
+            m_cotsprogmgrparamfile.SetGenParam(m_cgenparam);
+            m_cotsprogmgrparamfile.SaveInfoToProgMgrFile();
         }
 
         private void TSEdit_Click(object sender, EventArgs e)

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.resx

@@ -134,32 +134,32 @@
   <data name="TSEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
 </value>
   </data>
   <data name="TSSaveAs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">