修改OTSDataMgrFun中的方法，添加几个需要的方法

OTS/OTSIncAMeasureApp/OTSDataMgrFunction/OTSDataMgrFun.cs

@@ -72,6 +72,8 @@ namespace OTSIncAMeasureApp
 
         public OTS_MSR_THREAD_STATUS Status;
 
+        COTSGeneralParameters m_OTSGeneralParameters;
+
 
 
         public OTSDataMgrFun(OTSIncAMeasureAppForm MeasureApp)
@@ -181,30 +183,30 @@ namespace OTSIncAMeasureApp
             {              
                 return false;
             }
-            m_ProjDataMgr.SetGenParam(GenParam);
+            m_ProgParamFile.SetGenParam(GenParam);
             //设置 general parameter
             //COTSImgScanPrm
-            COTSProgMgrParamFile ImageScan = m_ProgParamFile.GetImageScanParam();
+            COTSImgScanPrm ImageScan = m_ProgParamFile.GetImageScanParam();
             if (null == ImageScan)
             {              
                 return false;
             }
-            m_ProjDataMgr.SetImageScanParam(ImageScan);
+            m_ProgParamFile.SetImageScanParam(ImageScan);
             //设置 image process parameter
-            COTSProgMgrParamFile ImageProc = m_ProgParamFile.GetImageProcParam();
+            COTSImageProcessParam ImageProc = m_ProgParamFile.GetImageProcParam();
             if (null == ImageProc)
             {                
                 return false;
             }
-            m_ProjDataMgr.SetImageProcParam(ImageProc);
+            m_ProgParamFile.SetImageProcParam(ImageProc);
             //设置 XRay parameter
             //COTSXRayPrm
-            COTSProgMgrParamFile XRayParam = m_ProgParamFile.GetXRayParam();
+            COTSXRayParam XRayParam = m_ProgParamFile.GetXRayParam();
             if (null == XRayParam)
             {               
                 return false;
             }
-            m_ProjDataMgr.SetXRayParam(XRayParam);
+            m_ProgParamFile.SetXRayParam(XRayParam);
 
             //判断以上6类参数设置是否成功
             if (!m_ProjDataMgr.IsValid())

OTS/OTSModelSharp/CGenParam.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OTSModelSharp
-{
-    //一般参数类
-   public class CGenParam
-    {
-    }
-}

OTS/OTSModelSharp/Measure/GetParam/COTSProjMgrFile.cs

@@ -1801,18 +1801,20 @@ namespace OTSModelSharp
         public  void SetDefaultParameters(COTSGeneralParameters val) { m_DefaultParameters = val; }
 
         //合并后新添加的需要的方法
-        public bool SetGenParam(COTSProgMgrParamFile GenParam) { return false; }
+       
 
-        public bool SetImageScanParam(COTSProgMgrParamFile ImageScan) { return false; }
+        public bool SetImageScanParam(COTSGeneralParameters ImageScan) { return false; }
 
-        public bool SetImageProcParam(COTSProgMgrParamFile ImageProc) { return false; }
+       
 
-        public bool SetXRayParam(COTSProgMgrParamFile XRayParam) { return false; }
+        
 
        
 
         public COTSImgScanPrm  GetImageScanParam() { return null; }
 
 
+
+
     }
 }

OTS/OTSModelSharp/Measure/GetParam/OTSGeneralParameters.cs

@@ -239,5 +239,7 @@ namespace OTSModelSharp
             m_strOperatorName = a_oSource.m_strOperatorName;
             m_strComment = a_oSource.m_strComment;
         }
+
+        public bool SetGenParam(COTSGeneralParameters GenParam) { return false; }
     }
 }

OTS/OTSModelSharp/Measure/GetParam/OTSProgMgrParamFile.cs

@@ -73,6 +73,16 @@ namespace OTSModelSharp
 
         const String STR_SYSTEM_DATA = "SysData";
 
+        COTSProgMgrParamFile m_LpProgMgrParamFile;
+
+        COTSGeneralParameters m_LpGenParam;
+
+        COTSProjMgrFile  m_LpProjMgr;
+
+        COTSImageProcessParam m_LpImgProParam;
+
+        COTSXRayParam m_LpXRayParam;
+
         public COTSProgMgrParamFile()
         {
             Init();
@@ -99,10 +109,7 @@ namespace OTSModelSharp
             Duplicate(a_poSource);
         }
 
-        public COTSImgScanPrm GetImageScanParam() { return null; }
-
-        public COTSImageProcessParam GetImageProcParam() { return null; }
-        public COTSXRayParam GetXRayParam() { return null; }
+        public COTSImgScanPrm GetImageScanParam() { return null; }       
 
         //COTSProgMgrParamFile(const COTSProgMgrParamFile&);					// copy constructor
         //COTSProgMgrParamFile& operator=(const COTSProgMgrParamFile&);		// =operator
@@ -131,7 +138,7 @@ namespace OTSModelSharp
             return m_strPathName;
         }
 
-        public COTSGeneralParameters GetGenParam() { return null; }
+        
         // set path name
         public void SetPathName(string a_strPathName)
         {
@@ -637,5 +644,151 @@ namespace OTSModelSharp
             m_strPathName = a_oSource.m_strPathName;
             m_pParam = new COTSGeneralParameters(a_oSource.m_pParam);
         }
+
+        // set general parameter
+      public  bool SetGenParam(COTSGeneralParameters a_pGenParam)
+        {
+            if (m_LpProgMgrParamFile == null)
+            {
+                logger.Trace("SetGenParam: invalid pointer.");
+                return false;
+            }
+           
+            COTSGeneralParameters pGenParam = GetCOTSGeneralParameters();
+         
+            COTSProgMgrParamFile pProgFile = GetCOTSProgMgrParamFile();
+          
+            pProgFile.SetDefaultParam(pGenParam);
+
+            return true;
+        }
+
+       public COTSGeneralParameters GetCOTSGeneralParameters()
+        {
+            return m_LpGenParam;
+        }
+
+       public COTSProgMgrParamFile GetCOTSProgMgrParamFile()
+        {
+            return m_LpProgMgrParamFile;
+
+        }
+
+     public COTSGeneralParameters GetGenParam()
+	 {
+		if (m_LpProgMgrParamFile == null)
+		{
+                logger.Trace("GetGenParam: invalid pointer.");
+			return null;
+		}
+        COTSProgMgrParamFile pProgMgr = GetCOTSProgMgrParamFilePtr();
+    
+
+        COTSGeneralParameters pGenParam = pProgMgr.GetDefaultParam();
+
+        COTSGeneralParameters OTSGeneralParameters = new COTSGeneralParameters(pGenParam);
+
+		return OTSGeneralParameters;
+	 }
+
+     public   COTSProgMgrParamFile GetCOTSProgMgrParamFilePtr()
+        {
+            return m_LpProgMgrParamFile;
+
+        }
+
+        // set image scan parameter
+      public  void SetImageScanParam(COTSImgScanPrm a_pImageScanParam)
+        {
+            if (m_LpProjMgr == null)
+            {
+                logger.Error("SetImageScanParam: invalid pointer.");
+                return;
+            }
+            COTSProjMgrFile pProjMgrFile = GetCProjMgrPtr();
+            
+            
+
+            pProjMgrFile.GetDefaultParameters().GetMsrParam().SetImageScanParam(a_pImageScanParam.GetImgScanPrmPtr());
+        }
+
+      public  COTSProjMgrFile GetCProjMgrPtr()
+        {
+            return m_LpProjMgr;
+        }
+
+       public COTSImageProcessParam GetImageProcParam()
+	   {
+		if (m_LpProgMgrParamFile == null)
+		{
+            logger.Error("GetImageProcParam: invalid pointer.");
+			return null;
+		}
+        COTSProgMgrParamFile pProgMgr = GetCOTSProgMgrParamFilePtr();
+   
+
+        COTSImageProcessParam pImgProc = pProgMgr.GetDefaultParam().GetMsrParam().GetImageProcessParam();
+
+        COTSImageProcessParam pImgProcClr = new COTSImageProcessParam(pImgProc);
+
+		return pImgProcClr;
+	   }
+
+        // set image process parameter
+      public  void SetImageProcParam(COTSImageProcessParam a_pImageProcParam)
+        {
+            if (m_LpProjMgr == null)
+            {
+                logger.Error("SetImageProcParam: invalid pointer.");
+                return;
+            }
+            COTSProjMgrFile pProjMgrFile = GetCProjMgrPtr();
+           
+            pProjMgrFile.GetDefaultParameters().GetMsrParam().SetImageProcessParam(GetImgPrcPrmPtr());
+        }
+
+       public COTSImageProcessParam GetImgPrcPrmPtr()
+        {
+            return m_LpImgProParam;
+        }
+
+      public  COTSXRayParam GetXRayParam()
+	  {
+		if (m_LpProgMgrParamFile == null)
+		{
+                logger.Error("GetXRayParam: invalid pointer.");
+			return null;
+		}
+        COTSProgMgrParamFile pProgMgr = GetCOTSProgMgrParamFilePtr();
+   
+
+        COTSXRayParam pXrayPrm = pProgMgr.GetDefaultParam().GetMsrParam().GetXRayParam();
+
+
+        COTSXRayParam XrayPrmClr = new COTSXRayParam(pXrayPrm);
+
+        return XrayPrmClr;
+	  }
+
+        // set XRay parameter
+       public void SetXRayParam(COTSXRayParam a_pXRayParam)
+        {
+            if (m_LpProjMgr == null)
+            {
+                logger.Error("SetXRayParam: invalid pointer.");
+                return;
+            }
+            COTSProjMgrFile pProjMgrFile = GetCProjMgrPtr();
+            
+
+            pProjMgrFile.GetDefaultParameters().GetMsrParam().SetXRayParam(GetCOTSXRayPrmPtr());
+        }
+
+        // get x-ray pointer
+       public COTSXRayParam GetCOTSXRayPrmPtr()
+        {
+            return m_LpXRayParam;
+        }
+
     }
 }

OTS/OTSModelSharp/OTSDataType/COTSImageScanParam.cs

@@ -38,6 +38,8 @@ namespace OTSDataType
 
         // image size
          const OTS_FIVE_TIES_OPTIONS DEFAULE_IMAGE_SIZE = OTS_FIVE_TIES_OPTIONS.TIE3;
+
+        COTSImgScanPrm m_LpScanParam;
         void Init()
         {
 
@@ -222,6 +224,11 @@ namespace OTSDataType
             }
         }
 
-       
+       public COTSImgScanPrm GetImgScanPrmPtr()
+        {
+            return m_LpScanParam;
+        }
+
+
     }
 }