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

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/OTSDefaultParam.cs

@@ -215,7 +215,10 @@ namespace OTSModelSharp
             return strOTSProDataPathName;
         }
 
-
+        public string GetSysType()
+        {
+            return m_nPackId.ToString();
+        }
 
         // get software pack preference file path name
         public String GetOTSMeasurePrefFileName()
@@ -365,7 +368,8 @@ namespace OTSModelSharp
             slo.Register("XrayParam", m_pXRayParam);
             if (isStoring)
             {
-                
+                xSysType.AssignValue(m_nPackId.ToString());
+                xRunMode.AssignValue(m_runmode.ToString());
                 slo.Serialize(true, classDoc, rootNode);
             }
             else

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -948,7 +948,6 @@ namespace OTSMeasureApp
             LoadImageProc();
             LoadXRayParam();
 
-            
             if (m_b_checkstagefile == false)
                 btnok.Enabled = true;
             else
@@ -964,6 +963,17 @@ namespace OTSMeasureApp
             this.folderBrowserDialog1.SelectedPath = m_ParameterPath;
             IDC_EDIT_MEASUREPARAMPATH.Text = m_ParameterPath;
             IDC_EDIT_ANALYSESTDLIBPATH.Text = m_STDPath;
+
+            if(m_cotsprogmgrparamfile.GetSysType() == "IncA")
+            {
+                label42.Visible = true;
+                IDC_COMBO_TECHNOLOGY.Visible = true;
+            }
+            else
+            {
+                label42.Visible = false;
+                IDC_COMBO_TECHNOLOGY.Visible = false;
+            }
         }
         #endregion