fix the enum value format of the xml result file.

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CFieldPositionMgr.cs

@@ -65,7 +65,7 @@ namespace OTSModelSharp
             }
             var scanfieldsize = m_poSEMDataMsr.GetScanFieldSize();
 
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = GetImageScanParam().GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = GetImageScanParam().GetImageResulotion();
             long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
             
             fieldmgrclr = new CFieldMgrClr(scanfieldsize, RESOLUTION_VALUE[nResulotionId]);
@@ -104,7 +104,7 @@ namespace OTSModelSharp
         public double CalculateTotalFields(CDomain a_pMeasureArea, double a_dScanFieldSizeX, System.Drawing.Size a_sizePixelImage)
         {
             CDomainClr domainclr = new CDomainClr((int)a_pMeasureArea.GetShape(), a_pMeasureArea.GetRectDomain());
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poImageScanParam.GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poImageScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             System.Drawing.Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
           return  fieldmgrclr.CalculateTotalFields(domainclr, a_dScanFieldSizeX, sizePixelImage);
@@ -129,7 +129,7 @@ namespace OTSModelSharp
             }
 
             // get image size
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poImageScanParam.GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poImageScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             System.Drawing.Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
             // scan field size (x, y)

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CMsrThread.cs

@@ -496,11 +496,11 @@ namespace OTSModelSharp
             COTSImgScanPrm poImageScanParam = new COTSImgScanPrm();
             poImageScanParam.SetStopMode(OTS_MEASURE_STOP_MODE.CoverMode);
             poImageScanParam.SetStartImageMode(OTS_GET_IMAGE_MODE.FROM_CENTER);
-            poImageScanParam.SetScanImageSpeed(OTS_THREE_TIES_OPTIONS.low);
+            poImageScanParam.SetScanImageSpeed(OTS_IMAGE_SCANSPEED_OPTIONS.low);
             //poImageScanParam.SetImagePixelSize(OTS_FIVE_TIES_OPTIONS.TIE1);
 
             CSampleParam poMsrParams = pHoleSample.GetMsrParams();
-            poImageScanParam.SetImagePixelSize(m_listMeasurableSamples[0].GetMsrParams().GetImageScanParam().GetImagePixelSize());//由于各样品分辨率应该一致，故此处没有读取选取的特定样品孔样品
+            poImageScanParam.SetImageResulotion(m_listMeasurableSamples[0].GetMsrParams().GetImageScanParam().GetImageResulotion());//由于各样品分辨率应该一致，故此处没有读取选取的特定样品孔样品
             poMsrParams.SetImageScanParam(poImageScanParam);
             pHoleSample.SetMsrParams(poMsrParams);
 

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -170,7 +170,7 @@ namespace OTSModelSharp
             var pImgScanParam = pMsrParam.GetImageScanParam();
 
             // get image size
-            var nImageSizeId = pImgScanParam.GetImagePixelSize();
+            var nImageSizeId = pImgScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 
@@ -186,19 +186,19 @@ namespace OTSModelSharp
             }
 
             // get dwell time 
-            OTS_THREE_TIES_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
+            OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
 
             // convert dwell time to bruker dwell time (8, 16, 32)
             int nBrukerDwellTimeId=3;
             switch (nDwellTime)
             {
-                case OTS_THREE_TIES_OPTIONS.low:
+                case OTS_IMAGE_SCANSPEED_OPTIONS.low:
                     nBrukerDwellTimeId = 3;
                     break;
-                case OTS_THREE_TIES_OPTIONS.meddium:
+                case OTS_IMAGE_SCANSPEED_OPTIONS.meddium:
                     nBrukerDwellTimeId = 4;
                     break;
-                case OTS_THREE_TIES_OPTIONS.high:
+                case OTS_IMAGE_SCANSPEED_OPTIONS.high:
                     nBrukerDwellTimeId = 5;
                     break;
                 default:
@@ -250,7 +250,7 @@ namespace OTSModelSharp
             var pImgScanParam = pMsrParam.GetImageScanParam();
 
             // get image size
-            var nImageSizeId = pImgScanParam.GetImagePixelSize();
+            var nImageSizeId = pImgScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 
@@ -267,7 +267,7 @@ namespace OTSModelSharp
             }
 
             // get dwell time 
-            OTS_THREE_TIES_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
+            OTS_IMAGE_SCANSPEED_OPTIONS nDwellTime = pImgScanParam.GetScanImageSpeed();
 
             // convert dwell time to bruker dwell time (6, 16, 32)
             long nBrukerDwellTime = DWELLTIME_BRUKER_VALUES[2];// choose the third option, so the dwell time will be 4 . there's no need to change here. it shoud be a const.

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

@@ -156,7 +156,7 @@ namespace OTSModelSharp
                 pImageScanParam.SetStopParamParticles(DataPublic.PARTICL_NUM);
                 pImageScanParam.SetStartImageMode(DataPublic.FETCH_IMAGE_MODE);
                 pImageScanParam.SetScanImageSpeed(DataPublic.SCAN_SPEED);
-                pImageScanParam.SetImagePixelSize(DataPublic.IMAGE_WIDTH);
+                pImageScanParam.SetImageResulotion(DataPublic.IMAGE_SIZE);
                 
 
                 //image process parameter
@@ -176,8 +176,8 @@ namespace OTSModelSharp
                 // X-Ray parameter
                 COTSXRayParam pXRayParam = new COTSXRayParam();
                 pXRayParam.SetScanMode(DataPublic.SCAN_MODE);
-                pXRayParam.SetSearchSpeed(DataPublic.SEARCH_SPEED);
-                pXRayParam.SetXRaySearchCount(DataPublic.SEARCH_COUNT);
+                //pXRayParam.SetSearchSpeed(DataPublic.SEARCH_SPEED);
+                //pXRayParam.SetXRaySearchCount(DataPublic.SEARCH_COUNT);
                 pXRayParam.SetAnalySpeed(DataPublic.ANALYSIS_SPEED);
                 pXRayParam.SetAnalyExpCount(DataPublic.ANALYSIS_EXPECT_COUNT);
                 CSampleParam msrParam = new CSampleParam();

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/OTSGeneralParam.cs

@@ -207,7 +207,7 @@ namespace OTSModelSharp
             m_strPartSTDLibFolderName = ("");
             m_StdLibTypeIndex = 0;
             m_DefaultmembraneType = otsdataconst.MEMBRANE_TYPE.Abrasive;
-            m_nDefaultShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+            m_nDefaultShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             m_dDefaultArea = 0;
             //m_DefaultMsrParam =  new CSampleParam();
 

OTSIncAMeasureApp/0-OTSModel/Measure/ParamData/StageParam.cs

@@ -333,7 +333,7 @@ namespace OTSModelSharp
             nValue = Convert.ToInt32(strValue);
             
             // check the shape value
-            if (nValue < (int)DOMAIN_SHAPE.MIN || nValue > (int)DOMAIN_SHAPE.MAX)
+            if (nValue < (int)DOMAIN_SHAPE.ROUND || nValue > (int)DOMAIN_SHAPE.RECTANGLE)
             {
                 return pDomain;
             }

OTSIncAMeasureApp/0-OTSModel/OTSDataType/CDomain.cs

@@ -22,7 +22,7 @@ namespace OTSDataType
 
         public CDomain()
         {
-            m_nShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+            m_nShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             m_rectangle = new Rectangle(0, 0, 0, 0);
             m_PolygonPoint = new List<Point>();
        
@@ -62,7 +62,7 @@ namespace OTSDataType
         }
         public bool IsInvalid()
         {
-            return (m_nShape < otsdataconst.DOMAIN_SHAPE.MIN) || m_nShape > otsdataconst.DOMAIN_SHAPE.MAX || m_rectangle.IsEmpty;
+            return (m_nShape < otsdataconst.DOMAIN_SHAPE.ROUND) || m_nShape > otsdataconst.DOMAIN_SHAPE.RECTANGLE || m_rectangle.IsEmpty;
 
         }
 
@@ -134,7 +134,7 @@ namespace OTSDataType
         }
          protected void Init()
         {
-            m_nShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+            m_nShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             m_rectangle = new Rectangle(0, 0, 0, 0);
             m_PolygonPoint = new List<Point>();
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageProcParam.cs

@@ -102,8 +102,8 @@ namespace OTSDataType
             slo.Register("ParticleGray", m_oParticleGray);
            
 
-            xInt xnBGRemoveType = new xInt();
-            xInt xnautoBGRemoveType = new xInt();
+            xString xnBGRemoveType = new xString();
+            xString xnautoBGRemoveType = new xString();
 
             slo.Register("m_BGRemoveType", xnBGRemoveType);
             slo.Register("m_autoBGRemoveType", xnautoBGRemoveType);
@@ -111,16 +111,16 @@ namespace OTSDataType
             if (isStoring)
             {
                
-                xnBGRemoveType.AssignValue((int)m_BGRemoveType);
-                xnautoBGRemoveType.AssignValue((int)m_autoBGRemoveType);
+                xnBGRemoveType.AssignValue(m_BGRemoveType.ToString());
+                xnautoBGRemoveType.AssignValue(m_autoBGRemoveType.ToString());
                 slo.Serialize(true, classDoc, rootNode);
             }
             else
             {
                 slo.Serialize(false, classDoc, rootNode);
                 //自动去背景设置
-                m_BGRemoveType = (OTS_BGREMOVE_TYPE)xnBGRemoveType.value(); ;
-                m_autoBGRemoveType = (OTS_AUTOBGREMOVE_TYPE)xnautoBGRemoveType.value();
+                m_BGRemoveType = (OTS_BGREMOVE_TYPE)Enum.Parse(typeof(OTS_BGREMOVE_TYPE),xnBGRemoveType.value()) ;
+                m_autoBGRemoveType = (OTS_AUTOBGREMOVE_TYPE)Enum.Parse(typeof(OTS_AUTOBGREMOVE_TYPE),xnautoBGRemoveType.value());
               
             }
         }

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSImageScanParam.cs

@@ -15,8 +15,8 @@ namespace OTSDataType
         private int m_nStopParamFields;
         private int m_nStopParamParticles;
         private OTS_GET_IMAGE_MODE m_nSatrtImageMode;
-        private OTS_THREE_TIES_OPTIONS m_nScanImageSpeed;
-        private OTS_FIVE_TIES_OPTIONS m_nImagePixelSize;
+        private OTS_IMAGE_SCANSPEED_OPTIONS m_nScanImageSpeed;
+        private OTS_IMAGE_RESULOTION_OPTIONS m_nImageResulotion;
         private OTS_MEASURE_FIELD_STOP_MODE m_nFieldStopMode;
         private int m_nFieldAreaPercentage;
         private int m_nFieldLargeParticles;
@@ -37,10 +37,10 @@ namespace OTSDataType
          const OTS_GET_IMAGE_MODE DEFAULT_IMAGEMODE = OTS_GET_IMAGE_MODE.FROM_CENTER;
 
         // scan speed
-         const OTS_THREE_TIES_OPTIONS DEFAULE_SCAN_SPEED = OTS_THREE_TIES_OPTIONS.meddium;
+         const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_SCAN_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 
         // image size
-         const OTS_FIVE_TIES_OPTIONS DEFAULE_IMAGE_SIZE = OTS_FIVE_TIES_OPTIONS.TIE4;
+        const OTS_IMAGE_RESULOTION_OPTIONS DEFAULE_IMAGE_SIZE = OTS_IMAGE_RESULOTION_OPTIONS._1024_768;
         void Init()
         {
 
@@ -50,7 +50,7 @@ namespace OTSDataType
             m_nStopParamParticles = DEFUALT_PARAM_PARTICLE;                     //夹杂物数
             m_nSatrtImageMode = DEFAULT_IMAGEMODE;                              //取图方式
             m_nScanImageSpeed = DEFAULE_SCAN_SPEED;
-            m_nImagePixelSize = DEFAULE_IMAGE_SIZE;
+            m_nImageResulotion = DEFAULE_IMAGE_SIZE;
 
             m_nFieldStopMode = OTS_MEASURE_FIELD_STOP_MODE.ParticlesPercentage;
             m_nFieldAreaPercentage = 100;
@@ -76,7 +76,7 @@ namespace OTSDataType
 		m_nStopParamFields = a_oSource.m_nStopParamFields;
 		m_nStopParamParticles = a_oSource.m_nStopParamParticles;
 		m_nSatrtImageMode = a_oSource.m_nSatrtImageMode;
-		m_nImagePixelSize = a_oSource.m_nImagePixelSize;
+		m_nImageResulotion = a_oSource.m_nImageResulotion;
 		m_nScanImageSpeed = a_oSource.m_nScanImageSpeed;
 
 		m_nFieldStopMode = a_oSource.m_nFieldStopMode;
@@ -104,7 +104,7 @@ namespace OTSDataType
 			(m_nStopParamFields == a_oSource.m_nStopParamFields) &&
 			(m_nStopParamParticles == a_oSource.m_nStopParamParticles) &&
 			(m_nSatrtImageMode == a_oSource.m_nSatrtImageMode) &&
-			(m_nImagePixelSize == a_oSource.m_nImagePixelSize));
+			(m_nImageResulotion == a_oSource.m_nImageResulotion));
 
 	}
 
@@ -153,27 +153,27 @@ namespace OTSDataType
 
 
         //扫描图尺寸
-        public OTS_FIVE_TIES_OPTIONS GetImagePixelSize() { return m_nImagePixelSize; }
-        public void SetImagePixelSize(OTS_FIVE_TIES_OPTIONS a_nImagePixelSize) { m_nImagePixelSize = a_nImagePixelSize; }
+        public OTS_IMAGE_RESULOTION_OPTIONS GetImageResulotion() { return m_nImageResulotion; }
+        public void SetImageResulotion(OTS_IMAGE_RESULOTION_OPTIONS a_nImagePixelSize) { m_nImageResulotion = a_nImagePixelSize; }
 
 
         //扫描图精度
-        public OTS_THREE_TIES_OPTIONS GetScanImageSpeed() { return m_nScanImageSpeed; }
-        public void SetScanImageSpeed(OTS_THREE_TIES_OPTIONS a_nScanImageSpeed) { m_nScanImageSpeed = a_nScanImageSpeed; }
+        public OTS_IMAGE_SCANSPEED_OPTIONS GetScanImageSpeed() { return m_nScanImageSpeed; }
+        public void SetScanImageSpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nScanImageSpeed) { m_nScanImageSpeed = a_nScanImageSpeed; }
 
        
 
         public override void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
-            xInt xnStopMode=new xInt();
+            xString xnStopMode=new xString();
             xInt xnStopParamMeasTime=new xInt();
             xInt xnStopParamFields = new xInt();
             xInt xnStopParamParticles = new xInt();
-            xInt xnSatrtImageMode = new xInt();
-            xInt xnScanImageSpeed = new xInt();
-            xInt xnImagePixelSize = new xInt();
+            xString xnSatrtImageMode = new xString();
+            xString xnScanImageSpeed = new xString();
+            xString xnImageSize = new xString();
 
-            xInt xnFieldStopMode = new xInt();
+            xString xnFieldStopMode = new xString();
             xInt xnFieldAreaPercentage = new xInt();
             xInt xnFieldLargeParticles = new xInt();
             xInt xnFieldLargeParticlePercentage = new xInt();
@@ -190,7 +190,7 @@ namespace OTSDataType
             slo.Register("StopParamParticles", xnStopParamParticles);
             slo.Register("SatrtImageMode", xnSatrtImageMode);
             slo.Register("ScanImageSpeed", xnScanImageSpeed);
-            slo.Register("ImagePixelSize", xnImagePixelSize);
+            slo.Register("ImageResolution", xnImageSize);
 
             slo.Register("FieldStopMode", xnFieldStopMode);
             slo.Register("FieldAreaPercentage", xnFieldAreaPercentage);
@@ -203,17 +203,17 @@ namespace OTSDataType
 
             if (isStoring)
             {
-                xnStopMode.AssignValue((int)m_nStopMode);
-                xnStopParamMeasTime.AssignValue((int) m_nStopParamMeasTime);
-                xnStopParamFields.AssignValue((int)m_nStopParamFields);
-                xnStopParamParticles.AssignValue((int)m_nStopParamParticles);
-                xnSatrtImageMode.AssignValue((int)m_nSatrtImageMode);
-                xnScanImageSpeed.AssignValue( (int)m_nScanImageSpeed);
-                xnImagePixelSize.AssignValue( (int)m_nImagePixelSize);
-
-                xnFieldStopMode.AssignValue((int)m_nFieldStopMode);
-                xnFieldSmallParticles.AssignValue((int)m_nFieldSmallParticles);
-                xnFieldSmallParticlePercentage .AssignValue((int)m_nFieldSmallParticlesPercentage);
+                xnStopMode.AssignValue(m_nStopMode.ToString());
+                xnStopParamMeasTime.AssignValue( m_nStopParamMeasTime);
+                xnStopParamFields.AssignValue(m_nStopParamFields);
+                xnStopParamParticles.AssignValue(m_nStopParamParticles);
+                xnSatrtImageMode.AssignValue(m_nSatrtImageMode.ToString());
+                xnScanImageSpeed.AssignValue( m_nScanImageSpeed.ToString());
+                xnImageSize.AssignValue( m_nImageResulotion.ToString());
+
+                xnFieldStopMode.AssignValue(m_nFieldStopMode.ToString());
+                xnFieldSmallParticles.AssignValue(m_nFieldSmallParticles);
+                xnFieldSmallParticlePercentage .AssignValue(m_nFieldSmallParticlesPercentage);
 
               
 
@@ -223,15 +223,15 @@ namespace OTSDataType
             {
                 slo.Serialize(false, classDoc, rootNode);
 
-                m_nStopMode = (OTS_MEASURE_STOP_MODE)xnStopMode.value();
+                m_nStopMode =(OTS_MEASURE_STOP_MODE)Enum.Parse(typeof(OTS_MEASURE_STOP_MODE), xnStopMode.value());
                 m_nStopParamMeasTime = xnStopParamMeasTime.value();
                 m_nStopParamFields = xnStopParamFields.value();
                 m_nStopParamParticles = xnStopParamParticles.value();
-                m_nSatrtImageMode = (OTS_GET_IMAGE_MODE)xnSatrtImageMode.value();
-                m_nScanImageSpeed = (OTS_THREE_TIES_OPTIONS)xnScanImageSpeed.value();
-                m_nImagePixelSize = (OTS_FIVE_TIES_OPTIONS)xnImagePixelSize.value();
+                m_nSatrtImageMode = (OTS_GET_IMAGE_MODE)Enum.Parse(typeof(OTS_GET_IMAGE_MODE), xnSatrtImageMode.value());
+                m_nScanImageSpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)Enum.Parse(typeof(OTS_IMAGE_SCANSPEED_OPTIONS), xnScanImageSpeed.value());
+                m_nImageResulotion = (OTS_IMAGE_RESULOTION_OPTIONS)Enum.Parse(typeof(OTS_IMAGE_RESULOTION_OPTIONS), xnImageSize.value());
 
-                m_nFieldStopMode = (OTS_MEASURE_FIELD_STOP_MODE)xnFieldStopMode.value();
+                m_nFieldStopMode = (OTS_MEASURE_FIELD_STOP_MODE)Enum.Parse(typeof(OTS_MEASURE_FIELD_STOP_MODE),xnFieldStopMode.value());
                 m_nFieldAreaPercentage = xnFieldAreaPercentage.value();
                 m_nFieldLargeParticles = xnFieldLargeParticles.value();
                 m_nFieldLargeParticlesPercentage = xnFieldLargeParticlePercentage.value();

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -338,7 +338,7 @@ namespace OTSDataType
             if (!m_poSEMDataMsr.Equals(new CSEMDataMsr()))
             {
                 // get image size
-                OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImagePixelSize();
+                OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImageResulotion();
                 long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
                 int nImageSize = RESOLUTION_VALUE[nResulotionId].Width;
 
@@ -358,7 +358,7 @@ namespace OTSDataType
 
 
             // get image size
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = pImgScanParam.GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = pImgScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 
@@ -524,12 +524,7 @@ namespace OTSDataType
                     }
                     break;
 
-                case OTS_SAMPLE_PROP_GRID_ITEMS.LOW_COUNTS:
-                    {
-                        a_nValue = m_poMsrParams.GetXRayParam().GetXRaySearchCount();
-                    }
-                    break;
-
+          
                 case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_COUNTS:
                     {
                         a_nValue = m_poMsrParams.GetXRayParam().GetAnalyExpCount();
@@ -734,7 +729,7 @@ namespace OTSDataType
                         {
                             return false;
                         }
-                        m_poMsrParams.GetXRayParam().SetXRaySearchCount(a_nValue);
+                        //m_poMsrParams.GetXRayParam().SetXRaySearchCount(a_nValue);
                     }
                     break;
 
@@ -2174,15 +2169,11 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        a_nValue = (int)m_poMsrParams.GetImageScanParam().GetImagePixelSize();
+                        a_nValue = (int)m_poMsrParams.GetImageScanParam().GetImageResulotion();
                     }
                     break;
 
-                case OTS_SAMPLE_PROP_GRID_ITEMS.SEARCH_RESOLUTION:
-                    {
-                        a_nValue = (int)m_poMsrParams.GetXRayParam().GetSearchSpeed();
-                    }
-                    break;
+           
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION:
                     {
@@ -2274,41 +2265,41 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_SPEED:
                     {
-                        if (OTS_THREE_TIES_OPTIONS.low > (OTS_THREE_TIES_OPTIONS)a_nValue || (OTS_THREE_TIES_OPTIONS)a_nValue > OTS_THREE_TIES_OPTIONS.high)
+                        if (OTS_IMAGE_SCANSPEED_OPTIONS.low > (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue || (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue > OTS_IMAGE_SCANSPEED_OPTIONS.high)
                         {
                             return false;
                         }
-                        m_poMsrParams.GetImageScanParam().SetScanImageSpeed((OTS_THREE_TIES_OPTIONS)a_nValue);
+                        m_poMsrParams.GetImageScanParam().SetScanImageSpeed((OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue);
                     }
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        if (OTS_FIVE_TIES_OPTIONS.TIE1 > (OTS_FIVE_TIES_OPTIONS)a_nValue || (OTS_FIVE_TIES_OPTIONS)a_nValue > OTS_FIVE_TIES_OPTIONS.TIE8)
+                        if (OTS_IMAGE_RESULOTION_OPTIONS._512_384 > (OTS_IMAGE_RESULOTION_OPTIONS)a_nValue || (OTS_IMAGE_RESULOTION_OPTIONS)a_nValue > OTS_IMAGE_RESULOTION_OPTIONS._4096_3072)
                         {
                             return false;
                         }
-                        m_poMsrParams.GetImageScanParam().SetImagePixelSize((OTS_FIVE_TIES_OPTIONS)a_nValue);
+                        m_poMsrParams.GetImageScanParam().SetImageResulotion((OTS_IMAGE_RESULOTION_OPTIONS)a_nValue);
                     }
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.SEARCH_RESOLUTION:
                     {
-                        if (OTS_THREE_TIES_OPTIONS.low > (OTS_THREE_TIES_OPTIONS)a_nValue || (OTS_THREE_TIES_OPTIONS)a_nValue > OTS_THREE_TIES_OPTIONS.high)
+                        if (OTS_IMAGE_SCANSPEED_OPTIONS.low > (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue || (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue > OTS_IMAGE_SCANSPEED_OPTIONS.high)
                         {
                             return false;
                         }
-                        m_poMsrParams.GetXRayParam().SetSearchSpeed((OTS_THREE_TIES_OPTIONS)a_nValue);
+                        //m_poMsrParams.GetXRayParam().SetSearchSpeed((OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue);
                     }
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION:
                     {
-                        if (OTS_THREE_TIES_OPTIONS.low > (OTS_THREE_TIES_OPTIONS)a_nValue || (OTS_THREE_TIES_OPTIONS)a_nValue > OTS_THREE_TIES_OPTIONS.high)
+                        if (OTS_IMAGE_SCANSPEED_OPTIONS.low > (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue || (OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue > OTS_IMAGE_SCANSPEED_OPTIONS.high)
                         {
                             return false;
                         }
-                        m_poMsrParams.GetXRayParam().SetAnalySpeed((OTS_THREE_TIES_OPTIONS)a_nValue);
+                        m_poMsrParams.GetXRayParam().SetAnalySpeed((OTS_IMAGE_SCANSPEED_OPTIONS)a_nValue);
                     }
                     break;
 
@@ -2332,29 +2323,29 @@ namespace OTSDataType
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.FIELD_STOP_TYPE:
                     {
-                        if (OTS_MEASURE_FIELD_STOP_MODE.MIN > (OTS_MEASURE_FIELD_STOP_MODE)a_nValue || (OTS_MEASURE_FIELD_STOP_MODE)a_nValue > OTS_MEASURE_FIELD_STOP_MODE.MAX)
-                        {
-                            return false;
-                        }
+                        //if (OTS_MEASURE_FIELD_STOP_MODE.MIN > (OTS_MEASURE_FIELD_STOP_MODE)a_nValue || (OTS_MEASURE_FIELD_STOP_MODE)a_nValue > OTS_MEASURE_FIELD_STOP_MODE.MAX)
+                        //{
+                        //    return false;
+                        //}
                         m_poMsrParams.GetImageScanParam().SetFieldStopMode((OTS_MEASURE_FIELD_STOP_MODE)a_nValue);
                     }
                     break;
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.BGREMOVE_TYPE:
                     {
-                        if (OTS_BGREMOVE_TYPE.MIN > (OTS_BGREMOVE_TYPE)a_nValue || (OTS_BGREMOVE_TYPE)a_nValue > OTS_BGREMOVE_TYPE.MAX)
-                        {
-                            return false;
-                        }
+                        //if (OTS_BGREMOVE_TYPE.MIN > (OTS_BGREMOVE_TYPE)a_nValue || (OTS_BGREMOVE_TYPE)a_nValue > OTS_BGREMOVE_TYPE.MAX)
+                        //{
+                        //    return false;
+                        //}
                         m_poMsrParams.GetImageProcessParam().SetBGRemoveType((OTS_BGREMOVE_TYPE)a_nValue);
                     }
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.AUTOBGREMOVE_TYPE:
                     {
-                        if (OTS_AUTOBGREMOVE_TYPE.MIN > (OTS_AUTOBGREMOVE_TYPE)a_nValue || (OTS_AUTOBGREMOVE_TYPE)a_nValue > OTS_AUTOBGREMOVE_TYPE.MAX)
-                        {
-                            return false;
-                        }
+                        //if (OTS_AUTOBGREMOVE_TYPE.MIN > (OTS_AUTOBGREMOVE_TYPE)a_nValue || (OTS_AUTOBGREMOVE_TYPE)a_nValue > OTS_AUTOBGREMOVE_TYPE.MAX)
+                        //{
+                        //    return false;
+                        //}
                         m_poMsrParams.GetImageProcessParam().SetAutoBGRemoveType((OTS_AUTOBGREMOVE_TYPE)a_nValue);
                     }
                     break;
@@ -2406,7 +2397,7 @@ namespace OTSDataType
                 case OTS_SAMPLE_PROP_GRID_ITEMS.SEARCH_RESOLUTION:
                     //case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION:
                     {
-                        for (int i = (int)OTS_THREE_TIES_OPTIONS.low; i <= (int)OTS_THREE_TIES_OPTIONS.high; ++i)
+                        for (int i = (int)OTS_IMAGE_SCANSPEED_OPTIONS.low; i <= (int)OTS_IMAGE_SCANSPEED_OPTIONS.high; ++i)
                         {
                             strItem = XmlResourceData.GetInstance().GetStringByKey(GrpImageScan, IDS_THREE_TIES_OPTIONS_FIRST + i);
                             a_listComboStrings.Add(strItem);
@@ -2416,7 +2407,7 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
                     {
-                        for (int i = (int)OTS_FIVE_TIES_OPTIONS.TIE1; i <= (int)OTS_FIVE_TIES_OPTIONS.TIE8; ++i)
+                        for (int i = 0; i < Enum.GetValues(typeof(OTS_IMAGE_RESULOTION_OPTIONS)).Length; i++)
                         {
                             strItem = RESOLUTION_STRINGS[RESOLUTION_ID_FIRST_TIE + i];
                             a_listComboStrings.Add(strItem);
@@ -2445,7 +2436,7 @@ namespace OTSDataType
 
                 case OTS_SAMPLE_PROP_GRID_ITEMS.BGREMOVE_TYPE:
                     {
-                        for (int i = (int)OTS_BGREMOVE_TYPE.MIN; i <= (int)OTS_BGREMOVE_TYPE.MAX; ++i)
+                        for (int i = 0; i <(int)Enum.GetValues(typeof(OTS_BGREMOVE_TYPE)).Length; ++i)
                         {
                             strItem = XmlResourceData.GetInstance().GetStringByKey(GrpImageProcess, IDS_BGREMOVE_TYPE + i);
                             a_listComboStrings.Add(strItem);
@@ -2454,7 +2445,7 @@ namespace OTSDataType
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.AUTOBGREMOVE_TYPE:
                     {
-                        for (int i = (int)OTS_AUTOBGREMOVE_TYPE.MIN; i <= (int)OTS_AUTOBGREMOVE_TYPE.MAX; ++i)
+                        for (int i = (int)OTS_AUTOBGREMOVE_TYPE.MIDDLE; i <= (int)OTS_AUTOBGREMOVE_TYPE.UPWARD; ++i)
                         {
                             strItem = XmlResourceData.GetInstance().GetStringByKey(GrpImageProcess, IDS_AUTOBGREMOVE_TYPE + i);
                             a_listComboStrings.Add(strItem);
@@ -2581,7 +2572,7 @@ namespace OTSDataType
                 int nScanFieldSize = m_poSEMDataMsr.GetScanFieldSize();
 
                 // get image size
-                OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImagePixelSize();
+                OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImageResulotion();
                 long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
                 int nImageSize = RESOLUTION_VALUE[nResulotionId].Width;
 
@@ -2598,7 +2589,7 @@ namespace OTSDataType
              // get scan field size
              int nScanFieldSize = m_poSEMDataMsr.GetScanFieldSize();
             // get image size
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImageResulotion();
             long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
             return RESOLUTION_VALUE[nResulotionId];
         }
@@ -2754,7 +2745,7 @@ namespace OTSDataType
             if (m_poSEMDataMsr != new CSEMDataMsr())
             {
                 // get image size
-                OTS_FIVE_TIES_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImagePixelSize();
+                OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = m_poMsrParams.GetImageScanParam().GetImageResulotion();
                 long nResulotionId = RESOLUTION_ID_FIRST_TIE + (long)nImageSizeId;
                 int nImageSize = RESOLUTION_VALUE[nResulotionId].Width;
 
@@ -2781,7 +2772,7 @@ namespace OTSDataType
 
 
             // get image size
-            OTS_FIVE_TIES_OPTIONS nImageSizeId = pImgScanParam.GetImagePixelSize();
+            OTS_IMAGE_RESULOTION_OPTIONS nImageSizeId = pImgScanParam.GetImageResulotion();
             int nResulotionId = RESOLUTION_ID_FIRST_TIE + (int)nImageSizeId;
             Size sizePixelImage = RESOLUTION_VALUE[nResulotionId];
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -17,10 +17,10 @@ namespace OTSDataType
         const int DEFAULE_XRAY_LOW_COUNT = 800;
 
         // search x-ray speed
-        const OTS_THREE_TIES_OPTIONS DEFAULE_SEARCH_XRAY_SPEED = OTS_THREE_TIES_OPTIONS.meddium;
+        const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_SEARCH_XRAY_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 
         // analysis x-ray speed
-        const OTS_THREE_TIES_OPTIONS DEFAULE_ANALYSIS_XRAY_SPEED = OTS_THREE_TIES_OPTIONS.meddium;
+        const OTS_IMAGE_SCANSPEED_OPTIONS DEFAULE_ANALYSIS_XRAY_SPEED = OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 
         // x-ray expect counts 
         const int DEFAULE_XRAY_EXP_COUNT = 4500;
@@ -35,25 +35,22 @@ namespace OTSDataType
 
         const int DEFAULE_FASTXRAYTIME = 100;
         private OTS_X_RAY_SCAN_MODE m_nScanMode;
-        private OTS_THREE_TIES_OPTIONS m_nSearchSpeed;
+        //private OTS_IMAGE_SCANSPEED_OPTIONS m_nSearchSpeed;
         private int m_nXRaySearchCount;
-        private OTS_THREE_TIES_OPTIONS m_nAnalySpeed;
+        private OTS_IMAGE_SCANSPEED_OPTIONS m_nAnalySpeed;
         private int m_nAnalyExpCount;
         private int m_nMidSearchAQTime;
         private int m_nMidAnalyAQTime;
         private int m_nQutantifyMinSize;
         private int m_nFastXrayTime;
 
-        private bool m_nShowScanMode = true;
-        private bool m_nShowSpeed = true;
-        private bool m_nShowExpCount = true;
         private int m_nUsingXray;
 
         void Init()
         {
             m_nScanMode = DEFAULE_XRAY_SCAN_MODE;
-            m_nSearchSpeed = DEFAULE_SEARCH_XRAY_SPEED;
-            m_nXRaySearchCount = DEFAULE_XRAY_LOW_COUNT;
+            //m_nSearchSpeed = DEFAULE_SEARCH_XRAY_SPEED;
+            //m_nXRaySearchCount = DEFAULE_XRAY_LOW_COUNT;
             m_nAnalySpeed = DEFAULE_ANALYSIS_XRAY_SPEED;
             m_nAnalyExpCount = DEFAULE_XRAY_EXP_COUNT;
             m_nMidSearchAQTime = DEFAULE_XRAY_SEARCH_MID_TIME;
@@ -71,17 +68,15 @@ namespace OTSDataType
 
             // copy data over
             m_nScanMode = a_oSource.m_nScanMode;
-            m_nSearchSpeed = a_oSource.m_nSearchSpeed;
-            m_nXRaySearchCount = a_oSource.m_nXRaySearchCount;
+            //m_nSearchSpeed = a_oSource.m_nSearchSpeed;
+            //m_nXRaySearchCount = a_oSource.m_nXRaySearchCount;
             m_nAnalySpeed = a_oSource.m_nAnalySpeed;
             m_nAnalyExpCount = a_oSource.m_nAnalyExpCount;
             m_nMidSearchAQTime = a_oSource.m_nMidSearchAQTime;
             m_nMidAnalyAQTime = a_oSource.m_nMidAnalyAQTime;
             m_nQutantifyMinSize = a_oSource.m_nQutantifyMinSize;
             m_nFastXrayTime = a_oSource.m_nFastXrayTime;
-            m_nShowScanMode = a_oSource.m_nShowScanMode;
-            m_nShowSpeed = a_oSource.m_nShowSpeed;
-            m_nShowExpCount = a_oSource.m_nShowExpCount;
+      
             m_nUsingXray = a_oSource.m_nUsingXray>0?0:1;
         }
         // copy constructor
@@ -94,17 +89,15 @@ namespace OTSDataType
         {
             // return test result
             return m_nScanMode == a_oSource.m_nScanMode &&
-                m_nSearchSpeed == a_oSource.m_nSearchSpeed &&
-                m_nXRaySearchCount == a_oSource.m_nXRaySearchCount &&
+                //m_nSearchSpeed == a_oSource.m_nSearchSpeed &&
+                //m_nXRaySearchCount == a_oSource.m_nXRaySearchCount &&
                 m_nAnalySpeed == a_oSource.m_nAnalySpeed &&
                 m_nAnalyExpCount == a_oSource.m_nAnalyExpCount &&
                 m_nMidSearchAQTime == a_oSource.m_nMidSearchAQTime &&
                 m_nMidAnalyAQTime == a_oSource.m_nMidAnalyAQTime &&
                 m_nQutantifyMinSize == a_oSource.m_nQutantifyMinSize &&
                 m_nFastXrayTime == a_oSource.m_nFastXrayTime &&
-                m_nShowScanMode == a_oSource.m_nShowScanMode &&
-                m_nShowSpeed == a_oSource.m_nShowSpeed &&
-                m_nShowExpCount == a_oSource.m_nShowExpCount &&
+           
                 m_nUsingXray == a_oSource.m_nUsingXray;
 
         }
@@ -114,15 +107,15 @@ namespace OTSDataType
         public OTS_X_RAY_SCAN_MODE GetScanMode() { return m_nScanMode; }
         public void SetScanMode(OTS_X_RAY_SCAN_MODE a_nVal) { m_nScanMode = a_nVal; }
 
-        public OTS_THREE_TIES_OPTIONS GetSearchSpeed() { return m_nSearchSpeed; }
-        public void SetSearchSpeed(OTS_THREE_TIES_OPTIONS a_nVal) { m_nSearchSpeed = a_nVal; }
+        //public OTS_IMAGE_SCANSPEED_OPTIONS GetSearchSpeed() { return m_nSearchSpeed; }
+        //public void SetSearchSpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nVal) { m_nSearchSpeed = a_nVal; }
 
         // low count
-        public int GetXRaySearchCount() { return m_nXRaySearchCount; }
-        public void SetXRaySearchCount(int a_nVal) { m_nXRaySearchCount = a_nVal; }
+        //public int GetXRaySearchCount() { return m_nXRaySearchCount; }
+        //public void SetXRaySearchCount(int a_nVal) { m_nXRaySearchCount = a_nVal; }
 
-        public OTS_THREE_TIES_OPTIONS GetAnalySpeed() { return m_nAnalySpeed; }
-        public void SetAnalySpeed(OTS_THREE_TIES_OPTIONS a_nVal) { m_nAnalySpeed = a_nVal; }
+        public OTS_IMAGE_SCANSPEED_OPTIONS GetAnalySpeed() { return m_nAnalySpeed; }
+        public void SetAnalySpeed(OTS_IMAGE_SCANSPEED_OPTIONS a_nVal) { m_nAnalySpeed = a_nVal; }
 
         public int GetAnalyExpCount() { return m_nAnalyExpCount; }
         public void SetAnalyExpCount(int a_nVal) { m_nAnalyExpCount = a_nVal; }
@@ -171,23 +164,7 @@ namespace OTSDataType
             m_nMidSearchAQTime = (int)(a_nHighAnalyAQTime * 4 / 5 + 0.5);
         }
 
-        public bool GetShowScanMode() { return m_nShowScanMode; }
-        public void SetShowScanMode(bool a_nShowScanMode)
-        {
-            m_nShowScanMode = a_nShowScanMode;
-        }
-
-        public bool GetShowSpeed() { return m_nShowSpeed; }
-        public void SetShowSpeed(bool a_nShowSpeed)
-        {
-            m_nShowSpeed = a_nShowSpeed;
-        }
-
-        public bool GetShowExpCount() { return m_nShowExpCount; }
-        public void SetShowExpCount(bool a_nShowExpCount)
-        {
-            m_nShowExpCount = a_nShowExpCount;
-        }
+ 
         public int GetUsingXray() { return m_nUsingXray; }
         public void SetUsingXray(int a_nUsingXray)
         {
@@ -195,65 +172,56 @@ namespace OTSDataType
         }
         public override void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
-            xInt xnScanMode = new xInt();
-            xInt xnSearchSpeed = new xInt();
-            xInt xnXRaySearchCount = new xInt();
-            xInt xnAnalySpeed = new xInt();
+            xString xnScanMode = new xString();
+            //xInt xnSearchSpeed = new xInt();
+            //xInt xnXRaySearchCount = new xInt();
+            //xInt xnAnalySpeed = new xInt();
             xInt xnAnalyExpCount = new xInt();
-            xInt xnMidSearchAQTime = new xInt();
+            //xInt xnMidSearchAQTime = new xInt();
             xInt xnMidAnalyAQTime = new xInt();
             xInt xnUsingXray = new xInt();
 
-            xBool xbShowScanMode = new xBool();
-            xBool xbShowSpeed = new xBool();
-            xBool xbShowExpCount = new xBool();
+    
             Slo slo = new Slo();
 
             slo.Register("ScanMode", xnScanMode);
-            slo.Register("SearchSpeed", xnSearchSpeed);
-            slo.Register("XRaySearchCount", xnXRaySearchCount);
-            slo.Register("AnalySpeed", xnAnalySpeed);
+            //slo.Register("SearchSpeed", xnSearchSpeed);
+            //slo.Register("XRaySearchCount", xnXRaySearchCount);
+            //slo.Register("AnalySpeed", xnAnalySpeed);
             slo.Register("AnalyExpCount", xnAnalyExpCount);
-            slo.Register("MidSearchAQTime", xnMidSearchAQTime);
+            //slo.Register("MidSearchAQTime", xnMidSearchAQTime);
             slo.Register("MidAnalyAQTime", xnMidAnalyAQTime);
 
-            slo.Register("ShowScanMode", xbShowScanMode);
-            slo.Register("ShowSpeed", xbShowSpeed);
-            slo.Register("ShowExpCount", xbShowExpCount);
             slo.Register("UsingXray", xnUsingXray);
 
 
 
+
             if (isStoring)
             {
-                xnScanMode.AssignValue((int)m_nScanMode);
-                xnSearchSpeed.AssignValue((int)m_nSearchSpeed);
-                xnXRaySearchCount.AssignValue(m_nXRaySearchCount);
-                xnMidAnalyAQTime.AssignValue((int)m_nAnalySpeed);
+                xnScanMode.AssignValue(m_nScanMode.ToString());
+                //xnSearchSpeed.AssignValue((int)m_nSearchSpeed);
+                //xnXRaySearchCount.AssignValue(m_nXRaySearchCount);
+                //xnMidAnalyAQTime.AssignValue((int)m_nAnalySpeed);
                 xnAnalyExpCount.AssignValue(m_nAnalyExpCount);
-                xnMidSearchAQTime.AssignValue(m_nMidSearchAQTime);
+                //xnMidSearchAQTime.AssignValue(m_nMidSearchAQTime);
                 xnMidAnalyAQTime.AssignValue(m_nMidAnalyAQTime);
-                xbShowScanMode.AssignValue(m_nShowScanMode);
-                xbShowSpeed.AssignValue(m_nShowSpeed);
-                xbShowExpCount.AssignValue(m_nShowExpCount);
+            
                 xnUsingXray.AssignValue(m_nUsingXray);
                 slo.Serialize(true, classDoc, rootNode);
             }
             else
             {
                 slo.Serialize(false, classDoc, rootNode);
-                m_nScanMode = (OTS_X_RAY_SCAN_MODE)xnScanMode.value();
-                m_nSearchSpeed = (OTS_THREE_TIES_OPTIONS)xnSearchSpeed.value();
-                m_nAnalySpeed = (OTS_THREE_TIES_OPTIONS)xnAnalySpeed.value();
-                m_nXRaySearchCount = xnXRaySearchCount.value();
+                m_nScanMode = (OTS_X_RAY_SCAN_MODE)Enum.Parse(typeof(OTS_X_RAY_SCAN_MODE),xnScanMode.value());
+                //m_nSearchSpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)xnSearchSpeed.value();
+                //m_nAnalySpeed = (OTS_IMAGE_SCANSPEED_OPTIONS)xnAnalySpeed.value();
+                //m_nXRaySearchCount = xnXRaySearchCount.value();
                 m_nAnalyExpCount = xnAnalyExpCount.value();
-                m_nMidSearchAQTime = xnMidSearchAQTime.value();
+                //m_nMidSearchAQTime = xnMidSearchAQTime.value();
                 m_nMidAnalyAQTime = xnMidAnalyAQTime.value();
-                m_nShowScanMode = xbShowScanMode.value();
-                m_nShowSpeed = xbShowSpeed.value();
-                m_nShowExpCount = xbShowExpCount.value();
-                m_nUsingXray = xnUsingXray.value();
 
+                m_nUsingXray = xnUsingXray.value();
             }
         }
     }

OTSIncAMeasureApp/0-OTSModel/OTSDataType/DataPublic.cs

@@ -46,9 +46,9 @@ namespace OTSModelSharp
 		// get image mode
 		public const otsdataconst.OTS_GET_IMAGE_MODE FETCH_IMAGE_MODE = otsdataconst.OTS_GET_IMAGE_MODE.FROM_CENTER;
 		// scan speed
-		public const otsdataconst.OTS_THREE_TIES_OPTIONS SCAN_SPEED = otsdataconst.OTS_THREE_TIES_OPTIONS.meddium;
+		public const otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS SCAN_SPEED = otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 		// image size
-		public const otsdataconst.OTS_FIVE_TIES_OPTIONS IMAGE_WIDTH = otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE1;
+		public const otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS IMAGE_SIZE = otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS._1024_768;
 		// particle area																						
 		public readonly CDoubleRange INCA_AREA = new CDoubleRange(5, 100);
 
@@ -59,11 +59,11 @@ namespace OTSModelSharp
 		// XRay scan mode												
 		public const otsdataconst.OTS_X_RAY_SCAN_MODE SCAN_MODE = otsdataconst.OTS_X_RAY_SCAN_MODE.PointMode;
 		// XRay search speed
-		public const otsdataconst.OTS_THREE_TIES_OPTIONS SEARCH_SPEED = otsdataconst.OTS_THREE_TIES_OPTIONS.meddium;
+		public const otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS SEARCH_SPEED = otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 		// XRay search count
 		public const int SEARCH_COUNT = 5000;
 		// XRay analysis speed
-		public const otsdataconst.OTS_THREE_TIES_OPTIONS ANALYSIS_SPEED = otsdataconst.OTS_THREE_TIES_OPTIONS.meddium;
+		public const otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS ANALYSIS_SPEED = otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.meddium;
 		// XRay analysis expect count
 		public const int ANALYSIS_EXPECT_COUNT = 10000;
 

OTSIncAMeasureApp/0-OTSModel/OTSDataType/otsdataconst.cs

@@ -168,43 +168,43 @@ namespace OTSDataType
         }
         public enum DOMAIN_SHAPE
         {
-            INVALID = -1,
-            MIN = 0,
+           
             ROUND = 0,
+            //ROUND = 0,
             RECTANGLE = 1,
-            MAX = 1
+           
         }
         public enum OTS_MEASURE_FIELD_STOP_MODE
         {
-            INVALID = -1,
-            MIN = 0,
+           
+            //MIN = 0,
             //AreaPercentage = 0,
             //Particles = 1,
             //ParticlesPercentage = 2,
             ParticlesPercentage = 0,
             Particles = 1,
 
-            MAX = 1
+          
         }
 
 
         public enum OTS_BGREMOVE_TYPE
         {
-            INVALID = -1,
-            MIN = 0,
+           
+            //MIN = 0,
             AUTO = 0,
             MANUAL = 1,
-            MAX = 1
+           
         }
 
         public enum OTS_AUTOBGREMOVE_TYPE
         {
-            INVALID = -1,
-            MIN = 0,
+           
+           
             MIDDLE = 0,
             DOWNWARD = 1,
             UPWARD = 2,
-            MAX = 2
+           
         }
 
         public enum OTS_GET_IMAGE_MODE
@@ -216,7 +216,7 @@ namespace OTSDataType
         }
 
 
-        public enum OTS_THREE_TIES_OPTIONS
+        public enum OTS_IMAGE_SCANSPEED_OPTIONS
         {
             low = 0,//低
             meddium = 1,//中
@@ -224,16 +224,16 @@ namespace OTSDataType
         }
 
 
-        public enum OTS_FIVE_TIES_OPTIONS
+        public enum OTS_IMAGE_RESULOTION_OPTIONS
         {
-            TIE1 = 0,
-            TIE2 = 1,
-            TIE3 = 2,
-            TIE4 = 3,
-            TIE5 = 4,
-            TIE6 = 5,
-            TIE7=6,
-            TIE8 = 7
+            _512_384 = 0,
+            _1024_684 = 1,
+            _1024_704 = 2,
+            _1024_768 = 3,
+            _2048_1408 = 4,
+            _2048_1536 = 5,
+            _3072_2048= 6,
+            _4096_3072 = 7
         }
 
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -180,7 +180,7 @@ namespace OTSMeasureApp
             this.IDC_COMBO_FETCHIMGMODE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_FETCHIMGMODE_SelectedIndexChanged);
             //扫描图精度
             IDC_COMBO_IMGSCANSPEED.Items.Clear();
-            foreach (otsdataconst.OTS_THREE_TIES_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_THREE_TIES_OPTIONS)))
+            foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
                 cbi.Text = GetScanSpeedString(enum_one);
@@ -193,7 +193,7 @@ namespace OTSMeasureApp
             this.IDC_COMBO_IMGSCANSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_IMGSCANSPEED_SelectedIndexChanged);
             //扫描图尺寸
             IDC_COMBO_IMGSIZE.Items.Clear();
-            foreach (otsdataconst.OTS_FIVE_TIES_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_FIVE_TIES_OPTIONS)))
+            foreach (otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
                 cbi.Text = GetImageSizeIdString(enum_one);
@@ -206,7 +206,7 @@ namespace OTSMeasureApp
             this.IDC_COMBO_IMGSIZE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_IMGSIZE_SelectedIndexChanged);
             //搜索X-Ray精度
             IDC_COMBO_SEARCHXRAYSPEED.Items.Clear();
-            foreach (otsdataconst.OTS_THREE_TIES_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_THREE_TIES_OPTIONS)))
+            foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
                 cbi.Text = GetXRaySearchSpeedIdString(enum_one);
@@ -278,7 +278,7 @@ namespace OTSMeasureApp
             this.IDC_COMBO_USINGXRAYS.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_USINGXRAYS_SelectedIndexChanged);
             //分析X-Ray精度
             IDC_COMBO_ANALYXRAYSPEED.Items.Clear();
-            foreach (otsdataconst.OTS_THREE_TIES_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_THREE_TIES_OPTIONS)))
+            foreach (otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS enum_one in Enum.GetValues(typeof(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)))
             {
                 ComboBoxItem cbi = new ComboBoxItem();
                 cbi.Text = GetXRayAnalySpeedIdString(enum_one);
@@ -495,7 +495,7 @@ namespace OTSMeasureApp
             foreach (ComboBoxItem cbi in IDC_COMBO_IMGSIZE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == (int)m_cotsimgscanprm.GetImagePixelSize())
+                    if (Convert.ToInt32(cbi.Value) == (int)m_cotsimgscanprm.GetImageResulotion())
                     {
                         IDC_COMBO_IMGSIZE.SelectedItem = cbi;
                     }
@@ -634,20 +634,20 @@ namespace OTSMeasureApp
         public void LoadXRayParam()
         {
             //搜索X-ray精度
-            foreach (ComboBoxItem cbi in IDC_COMBO_SEARCHXRAYSPEED.Items)
-            {
-                if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == (int)m_cotsxrayprm.GetSearchSpeed())
-                    {
-                        IDC_COMBO_SEARCHXRAYSPEED.SelectedItem = cbi;
-                    }
-            }
+            //foreach (ComboBoxItem cbi in IDC_COMBO_SEARCHXRAYSPEED.Items)
+            //{
+            //    if (cbi.Value.ToString() != "")
+            //        if (Convert.ToInt32(cbi.Value) == (int)m_cotsxrayprm.GetSearchSpeed())
+            //        {
+            //            IDC_COMBO_SEARCHXRAYSPEED.SelectedItem = cbi;
+            //        }
+            //}
 
             //搜索X-ray精度对应的时间
             IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text = m_cotsxrayprm.GetMidSearchAQTime().ToString();
 
             //搜索X-ray最低计数
-            IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Text = m_cotsxrayprm.GetXRaySearchCount().ToString();
+            //IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Text = m_cotsxrayprm.GetXRaySearchCount().ToString();
             //X-ray扫描方式
             foreach (ComboBoxItem cbi in IDC_COMBO_XRAYSCANMODE.Items)
             {
@@ -685,9 +685,9 @@ namespace OTSMeasureApp
             //分析X-ray计数期望值
             IDC_EDIT_ANALYXRAYAIMVALUE.Text = m_cotsxrayprm.GetAnalyExpCount().ToString();
 
-            IDC_XRAY_MODE_SWITCH.Checked = m_cotsxrayprm.GetShowScanMode();
-            IDC_XRAY_TIME_SWITCH.Checked = m_cotsxrayprm.GetShowSpeed();
-            IDC_XRAY_COUNT_SWITCH.Checked = m_cotsxrayprm.GetShowExpCount();
+            //IDC_XRAY_MODE_SWITCH.Checked = m_cotsxrayprm.GetShowScanMode();
+            //IDC_XRAY_TIME_SWITCH.Checked = m_cotsxrayprm.GetShowSpeed();
+            //IDC_XRAY_COUNT_SWITCH.Checked = m_cotsxrayprm.GetShowExpCount();
         }
 
         /// <summary>
@@ -745,11 +745,11 @@ namespace OTSMeasureApp
 
             //扫描图精度
             ComboBoxItem enum_imgscanspeed = (ComboBoxItem)IDC_COMBO_IMGSCANSPEED.SelectedItem;
-            m_cotsimgscanprm.SetScanImageSpeed((otsdataconst.OTS_THREE_TIES_OPTIONS)Convert.ToInt32(enum_imgscanspeed.Value));
+            m_cotsimgscanprm.SetScanImageSpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_imgscanspeed.Value));
 
             //扫描图尺寸
             ComboBoxItem enum_imgsize = (ComboBoxItem)IDC_COMBO_IMGSIZE.SelectedItem;
-            m_cotsimgscanprm.SetImagePixelSize((otsdataconst.OTS_FIVE_TIES_OPTIONS)Convert.ToInt32(enum_imgsize.Value));
+            m_cotsimgscanprm.SetImageResulotion((otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS)Convert.ToInt32(enum_imgsize.Value));
            
         }
 
@@ -831,13 +831,13 @@ namespace OTSMeasureApp
 
             //搜索X-ray精度
             ComboBoxItem enum_searchxrayspeed = (ComboBoxItem)IDC_COMBO_SEARCHXRAYSPEED.SelectedItem;
-            m_cotsxrayprm.SetSearchSpeed((otsdataconst.OTS_THREE_TIES_OPTIONS)Convert.ToInt32(enum_searchxrayspeed.Value));
+            //m_cotsxrayprm.SetSearchSpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_searchxrayspeed.Value));
 
             //搜索X - ray精度对应的时间
             m_cotsxrayprm.SetMidSearchAQTime(Convert.ToInt32(IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text.Trim()));
 
             //搜索X-ray最低计数
-            m_cotsxrayprm.SetXRaySearchCount(Convert.ToInt32(IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Text));
+            //m_cotsxrayprm.SetXRaySearchCount(Convert.ToInt32(IDC_EDIT_SEARCHXRAYCOUNTLIMIT.Text));
 
             //X-ray扫描方式
             ComboBoxItem enum_xrayscanmode = (ComboBoxItem)IDC_COMBO_XRAYSCANMODE.SelectedItem;
@@ -849,16 +849,16 @@ namespace OTSMeasureApp
 
             //分析X-ray精度
             ComboBoxItem enum_analyxrayspeed = (ComboBoxItem)IDC_COMBO_ANALYXRAYSPEED.SelectedItem;
-            m_cotsxrayprm.SetAnalySpeed((otsdataconst.OTS_THREE_TIES_OPTIONS)Convert.ToInt32(enum_analyxrayspeed.Value));
+            m_cotsxrayprm.SetAnalySpeed((otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS)Convert.ToInt32(enum_analyxrayspeed.Value));
 
             //分析X-ray精度对应的时间
             m_cotsxrayprm.SetMidAnalyAQTime(Convert.ToInt32(IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Text.Trim()));
 
             //分析X-ray计数期望值
             m_cotsxrayprm.SetAnalyExpCount(Convert.ToInt32(IDC_EDIT_ANALYXRAYAIMVALUE.Text));
-            m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
-            m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);
-            m_cotsxrayprm.SetShowExpCount(IDC_XRAY_COUNT_SWITCH.Checked);
+            //m_cotsxrayprm.SetShowScanMode(IDC_XRAY_MODE_SWITCH.Checked);
+            //m_cotsxrayprm.SetShowSpeed(IDC_XRAY_TIME_SWITCH.Checked);
+            //m_cotsxrayprm.SetShowExpCount(IDC_XRAY_COUNT_SWITCH.Checked);
         }
 
         /// <summary>

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.cs

@@ -511,7 +511,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
             }
 
             CDomain pBoundery = a_pStage.GetBoundary();
-            otsdataconst.DOMAIN_SHAPE nShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+            otsdataconst.DOMAIN_SHAPE nShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             nShape = pBoundery.GetShape();
 
             Rectangle PixRect = new Rectangle();
@@ -527,7 +527,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
             }
 
             CDomain pSTD = a_pStage.GetSTD();
-            otsdataconst.DOMAIN_SHAPE nShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+            otsdataconst.DOMAIN_SHAPE nShape = (otsdataconst.DOMAIN_SHAPE)(-1);
             nShape = pSTD.GetShape();
 
             Rectangle PixRect = new Rectangle();
@@ -551,7 +551,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
 
             foreach (var pHole in a_pStage.GetHoleList())
             {
-                otsdataconst.DOMAIN_SHAPE nShape = otsdataconst.DOMAIN_SHAPE.INVALID;
+                otsdataconst.DOMAIN_SHAPE nShape = (otsdataconst.DOMAIN_SHAPE)(-1);
                 nShape = pHole.GetShape();
 
                 Rectangle PixRect = new Rectangle();

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -118,12 +118,12 @@ namespace OTSModelSharp.ResourceManage
         }
 
         // get scan speed
-        public static string GetScanSpeedString(otsdataconst.OTS_THREE_TIES_OPTIONS a_nScanSpeed)
+        public static string GetScanSpeedString(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS a_nScanSpeed)
         {
 
             string strScanSpeedId = "";
 
-            if (a_nScanSpeed >= otsdataconst.OTS_THREE_TIES_OPTIONS.low && a_nScanSpeed <= otsdataconst.OTS_THREE_TIES_OPTIONS.high)
+            if (a_nScanSpeed >= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.low && a_nScanSpeed <= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.high)
             {
                 strScanSpeedId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_SCANSPEED + (int)a_nScanSpeed);
             }
@@ -132,15 +132,15 @@ namespace OTSModelSharp.ResourceManage
         }
 
         // get image size id
-        public static string GetImageSizeIdString(otsdataconst.OTS_FIVE_TIES_OPTIONS a_nImageSize)
+        public static string GetImageSizeIdString(otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS a_nImageSize)
         {
 
             string strImageSizeId = "";
 
-            if (a_nImageSize >= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE1 && a_nImageSize <= otsdataconst.OTS_FIVE_TIES_OPTIONS.TIE8)
-            {
+            //if (a_nImageSize >= otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS._512_384 && a_nImageSize <= otsdataconst.OTS_IMAGE_RESULOTION_OPTIONS._4096_3072)
+            //{
                 strImageSizeId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_SCANSIZE + (int)a_nImageSize);
-            }
+            //}
             return strImageSizeId;
         }
 
@@ -157,12 +157,12 @@ namespace OTSModelSharp.ResourceManage
         }
 
         // get XRay analysis speed id
-        public static string GetXRayAnalySpeedIdString(otsdataconst.OTS_THREE_TIES_OPTIONS a_nXRayAnalySpeed)
+        public static string GetXRayAnalySpeedIdString(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS a_nXRayAnalySpeed)
         {
 
             string strXRayAnalySpeedId = "";
 
-            if (a_nXRayAnalySpeed >= otsdataconst.OTS_THREE_TIES_OPTIONS.low && a_nXRayAnalySpeed <= otsdataconst.OTS_THREE_TIES_OPTIONS.high)
+            if (a_nXRayAnalySpeed >= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.low && a_nXRayAnalySpeed <= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.high)
             {
                 strXRayAnalySpeedId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_ANALYSPEED + (int)a_nXRayAnalySpeed);
             }
@@ -185,12 +185,12 @@ namespace OTSModelSharp.ResourceManage
         }
 
         // get XRay search speed id
-        public static string GetXRaySearchSpeedIdString(otsdataconst.OTS_THREE_TIES_OPTIONS a_nXRaySearchSpeed)
+        public static string GetXRaySearchSpeedIdString(otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS a_nXRaySearchSpeed)
         {
 
             string strXRaySearchSpeedId = "";
 
-            if (a_nXRaySearchSpeed >= otsdataconst.OTS_THREE_TIES_OPTIONS.low && a_nXRaySearchSpeed <= otsdataconst.OTS_THREE_TIES_OPTIONS.high)
+            if (a_nXRaySearchSpeed >= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.low && a_nXRaySearchSpeed <= otsdataconst.OTS_IMAGE_SCANSPEED_OPTIONS.high)
             {
                 strXRaySearchSpeedId = XmlResourceData.GetInstance().GetStringByKey(ResourceID.GrpOtherParam, ResourceID.IDS_SEARCHSPEED + (int)a_nXRaySearchSpeed);
             }