修改添加类

OTS/OTSIncAMeasureApp/OTSDataMgrFunction/OTSDataMgrFun.cs

@@ -186,7 +186,7 @@ namespace OTSIncAMeasureApp
             m_ProgParamFile.SetGenParam(GenParam);
             //设置 general parameter
             //COTSImgScanPrm
-            COTSImgScanPrm ImageScan = m_ProgParamFile.GetImageScanParam();
+            COTSImgXRayParam ImageScan = m_ProgParamFile.GetImageScanParam();
             if (null == ImageScan)
             {              
                 return false;
@@ -1097,7 +1097,7 @@ namespace OTSIncAMeasureApp
             pMsrArea = WSample.GetMsrArea();
 
            
-            COTSImgScanPrm  pImgScanParam = m_ProjDataMgr.GetImageScanParam();
+            COTSImgXRayParam  pImgScanParam = m_ProjDataMgr.GetImageScanParam();
             CSEMDataMsr pSEMDataMsr = new CSEMDataMsr();
             //设置参数
             pSEMDataMsr.SetMagnification(m_ProjDataMgr.GetWorkingSample().GetSEMDataMsr().GetMagnification());

OTS/OTSIncAMeasureApp/OTSProgMgrInfo/OTSProgMgrInfoFunction/OTSProgMgrInfoFun.cs

@@ -278,7 +278,7 @@ enum OTS_FIVE_TIES_OPTIONS
         public COTSProgMgrParamFile m_cotsprogmgrparamfileclr;          //参数类
         //
         public CSEMStageData m_csemstagedataclr;                        //SEM样品台处理类
-        public COTSImgScanPrm m_cotsimgscanprmclr;                      //图像扫描类
+        public COTSImgXRayParam m_cotsimgscanprmclr;                      //图像扫描类
         public COTSGeneralParameters m_cgenparamclr;                                //一般参数类
         public COTSImageProcessParam m_cotsimgprocprmclr;                      //图像处理类
         public COTSXRayParam m_cotsxrayprmclr;                            //X-Ray类

OTS/OTSIncAMeasureApp/SourceGridStringProvider/SgStringProvider.cs

@@ -167,7 +167,7 @@ namespace OTSIncAMeasureApp.SourceGridStringProvider
                 case OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.IMAGESCAN:
                     {
                         // start mode
-                       COTSImgScanPrm pScanParam = new COTSImgScanPrm();   //COTSImageScanParam pScanParam = new COTSImageScanParam();    //OTSMODEL  OTSImageScanParam.h
+                       COTSImgXRayParam pScanParam = new COTSImgXRayParam();   //COTSImageScanParam pScanParam = new COTSImageScanParam();    //OTSMODEL  OTSImageScanParam.h
                         pScanParam = m_poMsrParams.GetImageScanParam();
 
 

OTS/OTSModelSharp/Measure/GetBSEPic/FieldMgr.cs

@@ -28,7 +28,7 @@ namespace OTSModelSharp
         List<System.Drawing.Point> m_listMeasuredFieldCentrePoints;
 
         // image scan parameter
-        COTSImgScanPrm  m_poImageScanParam;
+        COTSImgXRayParam  m_poImageScanParam;
 
         const int RESOLUTION_ID_FIRST_TIE = 2;
    
@@ -41,11 +41,11 @@ namespace OTSModelSharp
         // unmeasured field centre points list
         List<System.Drawing.Point> m_listUnmeasuredFieldCentrePoints;
 
-        public bool Init(CDomain a_pMeasureArea, COTSImgScanPrm  a_poImageScanParam, CSEMDataMsr a_poSEMDataMsr, List<System.Drawing.Point> a_listMeasuredFieldCentrePoints)
+        public bool Init(CDomain a_pMeasureArea, COTSImgXRayParam  a_poImageScanParam, CSEMDataMsr a_poSEMDataMsr, List<System.Drawing.Point> a_listMeasuredFieldCentrePoints)
         {
             // assign class member
             m_pMeasureArea = new CDomain(a_pMeasureArea);
-            m_poImageScanParam = new COTSImgScanPrm (a_poImageScanParam);
+            m_poImageScanParam = new COTSImgXRayParam (a_poImageScanParam);
             m_poSEMDataMsr = new CSEMDataMsr(a_poSEMDataMsr);
 
             // calculate field centre points list
@@ -289,7 +289,7 @@ namespace OTSModelSharp
 
         // reset
         public bool Reset(CDomain a_pMeasureArea,
-             COTSImgScanPrm  a_poImageScanParam,
+             COTSImgXRayParam  a_poImageScanParam,
              CSEMDataMsr a_poSEMDataMsr,
            List<System.Drawing.Point> a_listMeasuredFieldCentrePoints)
         {
@@ -580,16 +580,16 @@ namespace OTSModelSharp
         }
 
         // image scan parameter
-        public COTSImgScanPrm  GetImageScanParam()
+        public COTSImgXRayParam  GetImageScanParam()
         {
             return m_poImageScanParam;
         }
 
         // image scan parameter
-        public void SetImageScanParam(COTSImgScanPrm  a_poImageScanParam)
+        public void SetImageScanParam(COTSImgXRayParam  a_poImageScanParam)
         {
 
-            m_poImageScanParam = new COTSImgScanPrm (a_poImageScanParam);
+            m_poImageScanParam = new COTSImgXRayParam (a_poImageScanParam);
         }
 
         // SEM data (measurement)

OTS/OTSModelSharp/Measure/GetBSEPic/MsrThread.cs

@@ -149,7 +149,7 @@ namespace OTSModelSharp
 
        public otsdataconst.OTS_MSR_THREAD_STATUS m_nStatus;
 
-       public COTSImgScanPrm ImageScanParam = new COTSImgScanPrm();
+       public COTSImgXRayParam ImageScanParam = new COTSImgXRayParam();
 
        public int IDS_ERROR_WARNING = 12322;
 
@@ -683,7 +683,7 @@ namespace OTSModelSharp
             pHoleSample.SetSEMDataMsr(poSEMDataMsr);
 
             // Set image scan param
-            COTSImgScanPrm poImageScanParam = new COTSImgScanPrm();
+            COTSImgXRayParam poImageScanParam = new COTSImgXRayParam();
             poImageScanParam.SetStopMode(OTS_MEASURE_STOP_MODE.CoverMode);
             poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.FROM_CENTER);
             poImageScanParam.SetScanImageSpeed(OTS_THREE_TIES_OPTIONS.TIE1);

OTS/OTSModelSharp/Measure/GetBSEPic/SmplMeasure.cs

@@ -328,7 +328,7 @@ namespace OTSModelSharp
 
             // sample measure parameters
             CMsrParams pMsrParam = m_pSample.GetMsrParams();
-            COTSImgScanPrm poImageScanParam = pMsrParam.GetImageScanParam();
+            COTSImgXRayParam poImageScanParam = pMsrParam.GetImageScanParam();
             CSEMDataMsr poSEMDataMsr = m_pSample.GetSEMDataMsr();
             CMsrSampleStatus pStatus = m_pSample.GetMsrStatus();
 
@@ -359,7 +359,7 @@ namespace OTSModelSharp
             return m_pMsrThread.IsMeasureStopped();
         }
 
-        bool IsSampleOver(COTSImgScanPrm a_pScanParam, int a_nTotalFields)
+        bool IsSampleOver(COTSImgXRayParam a_pScanParam, int a_nTotalFields)
         {
             Debug.Assert(a_pScanParam == null);
 
@@ -622,7 +622,7 @@ namespace OTSModelSharp
                 }
 
                 // check if sample measurement completes
-                COTSImgScanPrm pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
+                COTSImgXRayParam pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
                 int nTotalFieldSize = (int)umMeasuredlistFieldCenter.Count;
                 Debug.Assert(pScanParam == null);
 
@@ -826,7 +826,7 @@ namespace OTSModelSharp
                 }
 
                 // check if sample measurement completes
-                COTSImgScanPrm pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
+                COTSImgXRayParam pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
                 int nTotalFieldSize = listFieldCenter.Count;
                 Debug.Assert(pScanParam == null);
 
@@ -1142,7 +1142,7 @@ namespace OTSModelSharp
                 }
 
                 // check if sample measurement completes
-                COTSImgScanPrm pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
+                COTSImgXRayParam pScanParam = m_pSample.GetMsrParams().GetImageScanParam();
                 //int nTotalFieldSize = (int)umMeasuredlistFieldCenter.size();
 
 

OTS/OTSModelSharp/Measure/GetParam/OTSProgMgr.cs

@@ -371,7 +371,7 @@ namespace OTSModelSharp
                 pGenParam.SetPartSTDLibFolderName(strOTSProDataPathName);
 
                 //image scan parameter
-                COTSImgScanPrm pImageScanParam = new COTSImgScanPrm();
+                COTSImgXRayParam pImageScanParam = new COTSImgXRayParam();
                 pImageScanParam.SetStopMode(STOPT_MODE);
                 pImageScanParam.SetStopParamMeasTime(MEASURE_TIME);
                 pImageScanParam.SetStopParamFields(FIELDS_NUM);

OTS/OTSModelSharp/Measure/GetParam/OTSProgMgrParamFile.cs

@@ -90,7 +90,7 @@ namespace OTSModelSharp
         COTSGeneralParameters m_pGenParam;
 
         // image scan parameter
-        COTSImgScanPrm m_pImageScanParam;
+        COTSImgXRayParam m_pImageScanParam;
 
         // image process parameter
         COTSImageProcessParam m_pImageProcParam;
@@ -295,7 +295,7 @@ namespace OTSModelSharp
                 pGenParam.SetPartSTDLibFolderName(strOTSProDataPathName);
 
                 //image scan parameter
-                COTSImgScanPrm  pImageScanParam = new COTSImgScanPrm ();
+                COTSImgXRayParam  pImageScanParam = new COTSImgXRayParam ();
                 pImageScanParam.SetStopMode(DataPublic.STOPT_MODE);
                 pImageScanParam.SetStopParamMeasTime(DataPublic.MEASURE_TIME);
                 pImageScanParam.SetStopParamFields(DataPublic.FIELDS_NUM);
@@ -617,7 +617,7 @@ namespace OTSModelSharp
             // create stage data
             m_pStageData = new CSEMStageData();
             m_pParam = new COTSGeneralParameters();
-            m_pImageScanParam = new COTSImgScanPrm();
+            m_pImageScanParam = new COTSImgXRayParam();
             m_pImageProcParam = new COTSImageProcessParam();
             m_pXRayParam = new COTSXRayParam();
 
@@ -739,7 +739,7 @@ namespace OTSModelSharp
         }
 
         // get image scan parameter
-        public COTSImgScanPrm GetImageScanParam() { return m_pImageScanParam; }
+        public COTSImgXRayParam GetImageScanParam() { return m_pImageScanParam; }
 
         public COTSGeneralParameters GetCOTSGeneralParameters()
         {
@@ -776,7 +776,7 @@ namespace OTSModelSharp
         }
 
         // set image scan parameter
-      public  void SetImageScanParam(COTSImgScanPrm a_pImageScanParam)
+      public  void SetImageScanParam(COTSImgXRayParam a_pImageScanParam)
         {
             if (m_LpProjMgr == null)
             {

OTS/OTSModelSharp/Measure/GetParticle/IncAFileMgr.cs

@@ -75,6 +75,34 @@ namespace OTSModelSharp
             }
         }
 
+        // duplication
+      public  void Duplicate( CIncAFileMgr a_oSource)
+	  {
+		// initialization
+		m_strPathName = "";
+
+        // particle list
+        m_listParticle.Clear();
+
+            // X-ray list
+            m_listPosXray.Clear();
+
+		// copy data over
+		foreach (var pPosXray in a_oSource.m_listPosXray)
+		{
+			CPosXray pPosXrayNew = new CPosXray(pPosXray);
+            m_listPosXray.Add(pPosXrayNew);
+		}
+
+		foreach (var pParticle in a_oSource.m_listParticle)
+		{
+			COTSParticle pParticleNew = new COTSParticle(pParticle);
+            m_listParticle.Add(pParticleNew);
+		}
+
+            m_strPathName = a_oSource.m_strPathName;
+	  }
+
       public CSegmentDB GetSegmentDB()
         {
             if (m_pSegmentDB!=null)
@@ -268,9 +296,14 @@ namespace OTSModelSharp
             }
         }
 
-       public  void SetFieldPos(System.Drawing.Point p) { m_FieldPos = p; }
+        // X-ray list
+      public  List<CPosXray> GetPosXrayList() { return m_listPosXray; }
+
+        public  void SetFieldPos(System.Drawing.Point p) { m_FieldPos = p; }
+
+       public Point GetFieldPos() { return m_FieldPos; }
 
-       public  void SetMsrStatus(CMsrSampleStatus s) { msrStatus = s; }
+        public  void SetMsrStatus(CMsrSampleStatus s) { msrStatus = s; }
 
        public bool Save(String a_strPathName/* = _T("")*/)
         {
@@ -384,7 +417,57 @@ namespace OTSModelSharp
              return true;
 	   }
 
-       
+        public bool Update(String a_strPathName/* = _T("")*/)
 
-}
+        {
+            //AFX_MANAGE_STATE(AfxGetStaticModuleState());
+
+            // check file pathname
+            a_strPathName.Trim();
+           
+
+            if (a_strPathName == "")
+            {
+                // file open dialog
+                OpenFileDialog openFileDialog = new OpenFileDialog();
+                if (openFileDialog.ShowDialog() != DialogResult.OK)
+                {
+                    return false;
+
+                }
+
+                // get file pathname
+               
+                a_strPathName = openFileDialog.FileName;
+            }
+
+            // file pathname
+            m_strPathName = a_strPathName;
+
+            /*	if (!CreateIncAFile())
+                {
+                    LogErrorTrace(__FILE__, __LINE__, _T("Create or open X-ray file failed."));
+                    return FALSE;
+                }*/
+
+            //if (!UpdateIncAList())
+            //{
+            //    // LogErrorTrace(__FILE__, __LINE__, _T("Update IncAList failed."));
+            //    return false;
+            //}
+
+            // ok, return TRUE
+            return true;
+        }
+
+        // file pathname
+       public String GetPathName() { return m_strPathName; }
+
+      public  CMsrSampleStatus GetMsrStatus() { return msrStatus; }
+
+
+
+
+
+    }
 }

OTS/OTSModelSharp/OTSDataType/CMsrParams.cs

@@ -12,7 +12,7 @@ namespace OTSDataType
     {
         private string m_strName;
         private string m_strSTDName;
-        private COTSImgScanPrm  m_poImageScanParam;
+        private COTSImgXRayParam  m_poImageScanParam;
         private COTSImageProcessParam  m_poImageProcessParam;
         private COTSXRayParam m_poXRayParam;
         private STEEL_TECHNOLOGY m_SteelTech;
@@ -28,7 +28,7 @@ namespace OTSDataType
             m_strName = "MsrParam";
 
             m_strSTDName = "";
-            m_poImageScanParam = new COTSImgScanPrm ();
+            m_poImageScanParam = new COTSImgXRayParam ();
             m_poImageProcessParam = new COTSImageProcessParam ();
             m_poXRayParam = new COTSXRayParam();
         }
@@ -40,7 +40,7 @@ namespace OTSDataType
             // copy data over
             m_strName = a_oSource.m_strName;
 		    m_strSTDName = a_oSource.m_strSTDName;
-		    m_poImageScanParam =new COTSImgScanPrm ( a_oSource.m_poImageScanParam);
+		    m_poImageScanParam =new COTSImgXRayParam ( a_oSource.m_poImageScanParam);
 		    m_poImageProcessParam = new COTSImageProcessParam ( a_oSource.m_poImageProcessParam);
 		    m_poXRayParam =new COTSXRayParam( a_oSource.m_poXRayParam);
 	    }
@@ -91,7 +91,7 @@ namespace OTSDataType
             }
         }
 
-       public  void SetImageScanParam(COTSImgScanPrm  a_poImageScanParam)
+       public  void SetImageScanParam(COTSImgXRayParam  a_poImageScanParam)
         {
 
             m_poImageScanParam = a_poImageScanParam;
@@ -120,7 +120,7 @@ namespace OTSDataType
             m_poXRayParam = a_poXRayParam;
 
         }
-        public COTSImgScanPrm  GetImageScanParam() { return m_poImageScanParam; }
+        public COTSImgXRayParam  GetImageScanParam() { return m_poImageScanParam; }
         public COTSImageProcessParam  GetImageProcessParam() { return m_poImageProcessParam; }
         public COTSXRayParam GetXRayParam() { return m_poXRayParam; }
     }

OTS/OTSModelSharp/OTSDataType/COTSImageScanParam.cs

@@ -8,7 +8,7 @@ using static OTSDataType.otsdataconst;
 
 namespace OTSDataType
 {
-   public class COTSImgScanPrm :ISlo
+   public class COTSImgXRayParam :ISlo
     {
         private OTS_MEASURE_STOP_MODE m_nStopMode;
         private int m_nStopParamMeasTime;
@@ -39,7 +39,7 @@ namespace OTSDataType
         // image size
          const OTS_FIVE_TIES_OPTIONS DEFAULE_IMAGE_SIZE = OTS_FIVE_TIES_OPTIONS.TIE3;
 
-        COTSImgScanPrm m_LpScanParam;
+        COTSImgXRayParam m_LpScanParam;
         void Init()
         {
 
@@ -59,14 +59,14 @@ namespace OTSDataType
             m_nFieldSmallParticlesPercentage = 100;
 
         }
-        public COTSImgScanPrm ()
+        public COTSImgXRayParam ()
         {
 
 
             // copy data over
             Init();
         }
-        void Duplicate( COTSImgScanPrm  a_oSource)
+        void Duplicate( COTSImgXRayParam  a_oSource)
 	{
 
         // copy data over
@@ -86,14 +86,14 @@ namespace OTSDataType
 		m_nFieldSmallParticlesPercentage = 100;
 	}
 
-     public  COTSImgScanPrm ( COTSImgScanPrm  a_oSource)
+     public  COTSImgXRayParam ( COTSImgXRayParam  a_oSource)
 	{
 	
 
 		// copy data over
 		Duplicate(a_oSource);
     }
-      public  bool Equals(COTSImgScanPrm  a_oSource) 
+      public  bool Equals(COTSImgXRayParam  a_oSource) 
 	{
 		// return test result
 		return((m_nStopMode == a_oSource.m_nStopMode) &&
@@ -224,7 +224,7 @@ namespace OTSDataType
             }
         }
 
-       public COTSImgScanPrm GetImgScanPrmPtr()
+       public COTSImgXRayParam GetImgScanPrmPtr()
         {
             return m_LpScanParam;
         }

OTS/OTSModelSharp/OTSDataType/COTSSample.cs

@@ -291,7 +291,7 @@ public enum   OTS_SAMPLE_PROP_GRID_ITEM_GROUPS
             // scan parameters
             CMsrParams pMsrParam = GetMsrParams();
 
-            COTSImgScanPrm  pImgScanParam = pMsrParam.GetImageScanParam();
+            COTSImgXRayParam  pImgScanParam = pMsrParam.GetImageScanParam();
 
 
             // get image size
@@ -1344,7 +1344,7 @@ public enum   OTS_SAMPLE_PROP_GRID_ITEM_GROUPS
             CMsrParams pMsrParam = GetMsrParams();
          
         
-            COTSImgScanPrm  pImgScanParam = pMsrParam.GetImageScanParam();
+            COTSImgXRayParam  pImgScanParam = pMsrParam.GetImageScanParam();
 
 
             // get image size