optimize the source grid operating code.

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -429,7 +429,7 @@ namespace OTSDataType
                         m_poMsrParams.SetSteelTechnology((STEEL_TECHNOLOGY)(int)objVal);
                     }
                     break;
-                case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
+                case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                     {
                         if (OTS_GET_IMAGE_MODE.FROM_CENTER > (OTS_GET_IMAGE_MODE)(int)objVal || (OTS_GET_IMAGE_MODE)(int)objVal > OTS_GET_IMAGE_MODE.DOWN_TO_UP)
                         {
@@ -522,132 +522,10 @@ namespace OTSDataType
 
             return bSetFalg;
         }
-        //public bool SetPropboolData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, bool a_bValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH:
-        //            {
-        //                m_bSwitch = a_bValue;
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SYS_STD_SWITCH:
-        //            {
-        //                m_poMsrParams.SetSysSTDSwitch(a_bValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.USING_XRAY:
-        //            {
-        //                //int m_UsingXray = a_bValue ? 1 : 0;
-                        
-        //                m_poMsrParams.GetXRayParam().SetUsingXray(a_bValue);
-        //            }
-        //            break;
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-
-
-        //    }
-
-        //    // failed, return false
-        //    return true;
-        //}
+      
 
         public CDomain GetMsrDomain() { return m_poMsrArea; }
-        //public bool SetPropdoubleData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, double a_dValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION:
-        //            {
-        //                // value validation
-        //                if (a_dValue < MAGNIFICATION_MIN || a_dValue > MAGNIFICATION_MAX)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poSEMDataMsr.SetMagnification(a_dValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE:
-        //            {
-        //                if (a_dValue < RESOLUTION_MIN || a_dValue > RESOLUTION_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-                    
-
-        //                int nScanFieldSize=0;
-        //                int nScanFieldHeight=0;
-        //                  CalculateScanFieldSize(a_dValue,ref nScanFieldSize,ref nScanFieldHeight);
-
-        //                m_poSEMDataMsr.SetScanFieldWidth(nScanFieldSize);
-        //                m_poSEMDataMsr.SetScanFieldHeight(nScanFieldHeight);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_AREA_MIN:
-        //            {
-        //                if (PARTICLE_AREA_MIN > a_dValue || a_dValue > PARTICLE_AREA_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                CDoubleRange oIncArea = new CDoubleRange();
-        //                double start = m_poMsrParams.GetImageProcessParam().GetIncAreaRange().GetStart();
-        //                double end = m_poMsrParams.GetImageProcessParam().GetIncAreaRange().GetEnd();
-        //                oIncArea.SetStart(a_dValue);
-        //                oIncArea.SetEnd(end);
-        //                m_poMsrParams.GetImageProcessParam().SetIncAreaRange(oIncArea);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_AREA_MAX:
-        //            {
-        //                if (PARTICLE_AREA_MIN > a_dValue || a_dValue > PARTICLE_AREA_MAX)
-        //                {
-        //                    return false;
-        //                }
-        //                CDoubleRange oIncArea = new CDoubleRange();
-        //                double start = m_poMsrParams.GetImageProcessParam().GetIncAreaRange().GetStart();
-        //                double end = m_poMsrParams.GetImageProcessParam().GetIncAreaRange().GetEnd();
-        //                oIncArea.SetStart(start);
-        //                oIncArea.SetEnd(a_dValue);
-        //                m_poMsrParams.GetImageProcessParam().SetIncAreaRange(oIncArea);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.XRAY_QUANTIFY_MINSIZE:
-        //            {
-        //                if (0 >= a_dValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetQuantifyMinSize(a_dValue);
-        //            }
-        //            break;
-
-        //        // read only property, tread as default. 
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.WORKING_DISTANCE:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.RATIO:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_TO_MEASURE_AREA:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_AREA:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE_AREA:
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-        //            //break;
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
+       
         // duplication 
         public void Duplicate(COTSSample a_oSource)
         {
@@ -992,7 +870,7 @@ namespace OTSDataType
 
             }
 
-            // ok, return true
+          
             return true;
         }
 
@@ -1001,235 +879,7 @@ namespace OTSDataType
             throw new NotImplementedException();
         }
 
-        //public bool SetPropIntData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, int a_nValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE:
-        //            {
-        //                // value validation
-        //                if (STOP_PARAM_PARTICLE_MIN >= a_nValue || a_nValue > STOP_PARAM_PARTICLE_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                if (m_poMsrParams.GetImageScanParam().GetStopParamParticles() != a_nValue)
-        //                {
-        //                    m_poMsrParams.GetImageScanParam().SetStopParamParticles(a_nValue);
-        //                    m_Status.SetStatus(OTS_MSR_SAMPLE_STATUS.UNMEASURED);
-        //                }
-
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD:
-        //            {
-        //                if (STOP_PARAM_FIELD_MIN >= a_nValue || a_nValue > STOP_PARAM_FIELD_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                if (m_poMsrParams.GetImageScanParam().GetStopParamFields() != a_nValue)
-        //                {
-        //                    m_poMsrParams.GetImageScanParam().SetStopParamFields(a_nValue);
-        //                    m_Status.SetStatus(OTS_MSR_SAMPLE_STATUS.UNMEASURED);
-        //                }
-
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME:
-        //            {
-        //                if (STOP_PARAM_MSR_TINE_MIN >= a_nValue || a_nValue > STOP_PARAM_MSR_TINE_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                if (m_poMsrParams.GetImageScanParam().GetStopParamMeasTime() != a_nValue)
-        //                {
-        //                    m_poMsrParams.GetImageScanParam().SetStopParamMeasTime(a_nValue);
-        //                    m_Status.SetStatus(OTS_MSR_SAMPLE_STATUS.UNMEASURED);
-        //                }
-
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA:
-        //            {
-        //                if (STOP_PARAM_MSR_TINE_MIN >= a_nValue || a_nValue > STOP_PARAM_FIELD_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                if (m_poMsrParams.GetImageScanParam().GetStopParamArea() != a_nValue)
-        //                {
-        //                    m_poMsrParams.GetImageScanParam().SetStopParamArea(a_nValue);
-        //                    m_Status.SetStatus(OTS_MSR_SAMPLE_STATUS.UNMEASURED);
-        //                }
-
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.BG_GRAY_MIN:
-        //            {
-        //                if (GRAY_LEVEL_MIN > a_nValue || a_nValue > GRAY_LEVEL_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                if (m_poMsrParams == null)
-        //                {
-        //                    return false;
-        //                }
-
-        //                COTSImageProcParam pImageProcessParam = m_poMsrParams.GetImageProcessParam();
-        //                if (pImageProcessParam == null)
-        //                {
-        //                    return false;
-        //                }
-
-        //                CIntRange oBGGray = m_poMsrParams.GetImageProcessParam().GetBGGray();
-        //                oBGGray.SetStart(a_nValue);
-        //                m_poMsrParams.GetImageProcessParam().SetBGGray(oBGGray);
-
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.BG_GRAY_MAX:
-        //            {
-        //                if (GRAY_LEVEL_MIN > a_nValue || a_nValue > GRAY_LEVEL_MAX)
-        //                {
-        //                    return false;
-        //                }
-
-        //                CIntRange oBGGray = m_poMsrParams.GetImageProcessParam().GetBGGray();
-        //                oBGGray.SetEnd(a_nValue);
-        //                m_poMsrParams.GetImageProcessParam().SetBGGray(oBGGray);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MIN:
-        //            {
-        //                if (GRAY_LEVEL_MIN > a_nValue || a_nValue > GRAY_LEVEL_MAX)
-        //                {
-        //                    return false;
-        //                }
-        //                CIntRange oParticleGray = m_poMsrParams.GetImageProcessParam().GetParticleGray();
-        //                oParticleGray.SetStart(a_nValue);
-        //                m_poMsrParams.GetImageProcessParam().SetParticleGray(oParticleGray);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.PARTICLE_GRAY_MAX:
-        //            {
-        //                if (GRAY_LEVEL_MIN > a_nValue || a_nValue > GRAY_LEVEL_MAX)
-        //                {
-        //                    return false;
-        //                }
-        //                CIntRange oParticleGray = m_poMsrParams.GetImageProcessParam().GetParticleGray();
-        //                oParticleGray.SetEnd(a_nValue);
-        //                m_poMsrParams.GetImageProcessParam().SetParticleGray(oParticleGray);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.LOW_COUNTS:
-        //            {
-        //                if (COUNTS_MIN > a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_COUNTS:
-        //            {
-        //                if (COUNTS_MIN > a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetAnalyExpCount(a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION:
-        //            {
-        //                if (0 >= a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetMidAnalyAQTime(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELDSTOP_AREAPERCENTAGE:
-        //            {
-
-        //                m_poMsrParams.GetImageScanParam().SetFieldAreaPercentage(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELDSTOP_LARGEPARTICLES:
-        //            {
-
-        //                m_poMsrParams.GetImageScanParam().SetFieldLargeParticleNum(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELDSTOP_LARGEPARTICLESPERCENTAGE:
-        //            {
-
-        //                m_poMsrParams.GetImageScanParam().SetFieldLargeParticlePercentage(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELDSTOP_SMALLPARTICLES:
-        //            {
-        //                if (0 >= a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetImageScanParam().SetFieldSmallParticleNum(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELDSTOP_SMALLPARTICLESPERCENTAGE:
-        //            {
-        //                if ((0 >= a_nValue) || (100 < a_nValue))
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetImageScanParam().SetFieldSmallParticlePercentage(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.XRAY_FASTTIME:
-        //            {
-        //                if (0 >= a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetFastXrayTime(a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.XrayLimit:
-        //            {
-        //                if (0 >= a_nValue)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetXrayLimit(a_nValue);
-        //            }
-        //            break;
-        //        // read only properties, treat same as default
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_FIELDS:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.COMPLETED_FIELDS:
-                
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE:
-                
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
+        
 
         public bool SetPropItemGrpsForIncA()
         {
@@ -1328,7 +978,7 @@ namespace OTSDataType
                             COTSImgScanPrm pScanParam = m_poMsrParams.GetImageScanParam();
                             
                                 poPropItem = new CPropItem();
-                                nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE;
+                                nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE;
                                 poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, bShow);
                                 a_listPropItems.Add(poPropItem);
                            
@@ -1771,7 +1421,7 @@ namespace OTSDataType
                             COTSImgScanPrm pScanParam = m_poMsrParams.GetImageScanParam();
 
                             poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE;
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE;
                             poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, bShow);
                             a_listPropItems.Add(poPropItem);
 
@@ -2144,7 +1794,7 @@ namespace OTSDataType
                 case OTS_SAMPLE_PROP_GRID_ITEMS.MEASURE_PARAM_FILE_NAME:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME:
                 // image param group
-                case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
+                case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD:
@@ -2263,7 +1913,7 @@ namespace OTSDataType
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME:
                 // image param group
                 // image param group
-                case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
+                case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE:
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD:
@@ -2482,61 +2132,15 @@ namespace OTSDataType
 
             }
 
-            // ok, return true
+          
             return true;
         }
-        //public bool SetPropStringData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, string a_strValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME:
-        //            {
-        //                //we think the samplename as the Identification of the sample,if we change the name then reset the status.
-        //                //so we can remeasure the sample by change the sample name.
-        //                if (m_strName != a_strValue)
-        //                {
-        //                    m_strName = a_strValue;
-        //                    m_Status = new CMsrSampleStatus();
-        //                }
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE:
-        //            {
-        //                if (m_poMsrParams.GetImageScanParam().GetStopMode() != a_strValue)
-        //                {
-        //                    m_poMsrParams.GetImageScanParam().SetStopMode(a_strValue);
-        //                }
-        //            }
-        //            break;
-
-        //        // read only property, tread as default. 
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_HOLE_NAME:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.WORKING_DISTANCE:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_FIELDS:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_TO_MEASURE_AREA:
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.MEASURE_STATAU:
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-        //            //break;
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
-
-        // combo data (7)
+       
         public bool GetPropComboData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, out int a_nValue)
         {
             switch (a_nId)
             {
-                case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
+                case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                     {
                         a_nValue = (int)m_poMsrParams.GetImageScanParam().GetFieldStartMode();
                     }
@@ -2605,120 +2209,7 @@ namespace OTSDataType
             // ok, return true
             return true;
         }
-        //public bool SetPropComboData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, int a_nValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.STEEL_TECHNOLOGY:
-        //            {
-        //                if (STEEL_TECHNOLOGY.GeneralProcessMode > (STEEL_TECHNOLOGY)a_nValue || (STEEL_TECHNOLOGY)a_nValue > STEEL_TECHNOLOGY.RareEarthMode)
-        //                {
-        //                    return false;
-        //                }
-
-        //                m_poMsrParams.SetSteelTechnology((STEEL_TECHNOLOGY)a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
-        //            {
-        //                if (OTS_GET_IMAGE_MODE.FROM_CENTER > (OTS_GET_IMAGE_MODE)a_nValue || (OTS_GET_IMAGE_MODE)a_nValue > OTS_GET_IMAGE_MODE.DOWN_TO_UP)
-        //                {
-        //                    return false;
-        //                }
-
-        //                m_poMsrParams.GetImageScanParam().SetStartImageMode((OTS_GET_IMAGE_MODE)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_SPEED:
-        //            {
-        //                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_IMAGE_SCANSPEED_OPTIONS)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_RESOLUTION:
-        //            {
-        //                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().SetImageResulotion((OTS_IMAGE_RESULOTION_OPTIONS)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SEARCH_RESOLUTION:
-        //            {
-        //                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_IMAGE_SCANSPEED_OPTIONS)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.ANALYSIS_RESOLUTION:
-        //            {
-        //                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_IMAGE_SCANSPEED_OPTIONS)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE:
-        //            {
-        //                if (OTS_X_RAY_SCAN_MODE.PointMode > (OTS_X_RAY_SCAN_MODE)a_nValue || (OTS_X_RAY_SCAN_MODE)a_nValue > OTS_X_RAY_SCAN_MODE.FeatureMode)
-        //                {
-        //                    return false;
-        //                }
-        //                m_poMsrParams.GetXRayParam().SetScanMode((OTS_X_RAY_SCAN_MODE)a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.MEMBRANE_TYPE:
-        //            {
-        //                if (MEMBRANE_TYPE.MIN > (MEMBRANE_TYPE)a_nValue || (MEMBRANE_TYPE)a_nValue > MEMBRANE_TYPE.MAX)
-        //                {
-        //                    return false;
-        //                }
-        //                this.SetMembraneType((MEMBRANE_TYPE)a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FIELD_STOP_TYPE:
-        //            {
-                     
-        //                m_poMsrParams.GetImageScanParam().SetFieldStopMode((OTS_MEASURE_FIELD_STOP_MODE)a_nValue);
-        //            }
-        //            break;
-
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.BGREMOVE_TYPE:
-        //            {
-                    
-        //                m_poMsrParams.GetImageProcessParam().SetBGRemoveType((OTS_BGREMOVE_TYPE)a_nValue);
-        //            }
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.AUTOBGREMOVE_TYPE:
-        //            {
-                    
-        //                m_poMsrParams.GetImageProcessParam().SetAutoBGRemoveType((OTS_AUTOBGREMOVE_TYPE)a_nValue);
-        //            }
-        //            break;
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-        //            //break;
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
+        
         public bool GetPropComboStrings(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, List<string> a_listComboStrings)
         {
 
@@ -2730,7 +2221,7 @@ namespace OTSDataType
             string strItem;
             switch (a_nId)
             {
-                case OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE:
+                case OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE:
                     {
                         for (int i = (int)OTS_GET_IMAGE_MODE.FROM_CENTER; i <= (int)OTS_GET_IMAGE_MODE.DOWN_TO_UP; ++i)
                         {
@@ -2850,33 +2341,12 @@ namespace OTSDataType
 
             }
 
-            // ok, return true
+      
             return true;
         }
 
 
-        //public bool SetPropTimeData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, DateTime a_oValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        // read only property, tread as default. 
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.START_TIME:
-        //            break;
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.FINISH_TIME:
-        //            break;
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
-        // time span data (1)
+        
         public bool GetPropTimeSpanData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, ref TimeSpan a_oValue)
         {
             switch (a_nId)
@@ -2894,30 +2364,10 @@ namespace OTSDataType
                     }
 
 
-            }
-
-            // ok, return true
+            }          
             return true;
         }
-        //public bool SetPropTimeSpanData(OTS_SAMPLE_PROP_GRID_ITEMS a_nId, TimeSpan a_oValue)
-        //{
-        //    switch (a_nId)
-        //    {
-        //        // read only property, tread as default. 
-        //        case OTS_SAMPLE_PROP_GRID_ITEMS.USED_TIME:
-        //            break;
-        //        default:
-        //            {
-        //                // something wrong, return false
-        //                return false;
-        //            }
-
-
-        //    }
-
-        //    // ok, return true
-        //    return true;
-        //}
+       
         public double CalculatePixelSize()
         {
             // pixel size 

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -441,49 +441,42 @@ namespace OTSMeasureApp
             if (a_strHoleName != "")
             {
                 // try to find matched hole
-                //bool IsChanged = false;
-                //int holeIndex = -1;
+             
                 for (int i = 0; i < listHoles.Count; i++)
                 {
                     if (listHoles[i].GetName() == a_strHoleName)
                     {
                         cReHole = listHoles[i];
                         return cReHole;
-                        //listHoles.RemoveAt(itr);
-                        //IsChanged = true;
-                        //holeIndex = itr;
-                        //break;
+                       
                     }
                 }
 
-                //if (IsChanged)
-                //{
-                    
-                //}
+               
             }
 
             // can't find a matched hole, then pick the first empty hole
-            //没有按照孔进行添加，则与样品列表进行判断
+          
             // go through the holes list
-            //foreach (var pHole in listHoles)
-            //{
-            //    // has this hole any sample in it?
-            //    String strHoleName = pHole.GetName();
-            //    bool IsChanged = false;
-            //    var m_listSamples = GetResultData().GetSampleList();
-            //    foreach (COTSSample sampleItem in m_listSamples)
-            //    {
-            //        if (strHoleName == sampleItem.GetSampleHoleName())
-            //        {
-            //            //listHoles.RemoveAt(itr);
-            //            IsChanged = true;
-            //        }
-            //    }
-            //    if (!IsChanged)
-            //    {
-            //        return pHole;
-            //    }
-            //}
+            foreach (var pHole in listHoles)
+            {
+                // has this hole any sample in it?
+                String strHoleName = pHole.GetName();
+                bool IsChanged = false;
+                var m_listSamples = GetResultData().GetSampleList();
+                foreach (COTSSample sampleItem in m_listSamples)
+                {
+                    if (strHoleName == sampleItem.GetSampleHoleName())
+                    {
+                       
+                        IsChanged = true;
+                    }
+                }
+                if (!IsChanged)
+                {
+                    return pHole;
+                }
+            }
 
             // no empty hole, then the first hole will be the one
             return listHoles[0];
@@ -675,23 +668,23 @@ namespace OTSMeasureApp
 
 
         //修改了ITEMID后，重新更新GROUPID和ITEMID
-        //public void UpdateGroupValAndItemVal(OTS_SAMPLE_PROP_GRID_ITEMS ItemID)
-        //{
-        //    OTS_SAMPLE_PROP_GRID_ITEM_GROUPS GroupID = OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.INVALID;
-        //    OTS_SAMPLE_PROP_GRID_ITEMS iItemID = OTS_SAMPLE_PROP_GRID_ITEMS.INVALID;
-        //    COTSSample WSample = GetResultData().GetWorkingSample();
-        //    if (null == WSample)
-        //    {
-        //        return;
-        //    }
-        //    if (!WSample.GetRelatedPropItemGrp((OTS_SAMPLE_PROP_GRID_ITEMS)ItemID, ref GroupID))
-        //    {
-        //        bool bFlag = WSample.GetRelatedPropItem(ItemID, ref iItemID);
-        //    }
-
-        //}
-
-  
+        public void UpdateGroupValAndItemVal(OTS_SAMPLE_PROP_GRID_ITEMS ItemID)
+        {
+            OTS_SAMPLE_PROP_GRID_ITEM_GROUPS GroupID = OTS_SAMPLE_PROP_GRID_ITEM_GROUPS.INVALID;
+            OTS_SAMPLE_PROP_GRID_ITEMS iItemID = OTS_SAMPLE_PROP_GRID_ITEMS.INVALID;
+            COTSSample WSample = GetResultData().GetWorkingSample();
+            if (null == WSample)
+            {
+                return;
+            }
+            if (!WSample.GetRelatedPropItemGrp((OTS_SAMPLE_PROP_GRID_ITEMS)ItemID, ref GroupID))
+            {
+                bool bFlag = WSample.GetRelatedPropItem(ItemID, ref iItemID);
+            }
+
+        }
+
+
 
         //设置样品参数锁
         //bool ParaLockFlag : 样品参数锁
@@ -1360,6 +1353,7 @@ namespace OTSMeasureApp
 
         public bool GetWorkSamplePerameter(COTSSample Sample, ref OTSSamplePropertyInfo SMeasureInfo)
         {
+            SMeasureInfo.ClearGrp();
             //设置工作样品属性项
             if (Sample.GetMsrParams().m_nPackId == OTS_SysType_ID.CleannessA)
             {
@@ -1369,10 +1363,7 @@ namespace OTSMeasureApp
             {
                 Sample.SetPropItemGrpsForIncA();
             }
-            else if (Sample.GetMsrParams().m_nPackId == OTS_SysType_ID.MiningA)
-            {
-                Sample.SetPropItemGrpsWithOutIncASysLib();
-            }
+           
 
                 bool MeasurementStatus = false;
            

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -892,7 +892,7 @@ namespace OTSMeasureApp
             if (m_SampleGrid.m_PropWindow.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag != null)   //需要判断每行的Tag 是否绑定sampleID
             {
                 OTS_SAMPLE_PROP_GRID_ITEMS SampleId = (OTS_SAMPLE_PROP_GRID_ITEMS)m_SampleGrid.m_PropWindow.PropGrid.Rows[m_SampleGrid.m_ClickRow].Tag;
-                String sName = (string)m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 1].Value;
+             
                 object objVal = m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value;               
                 if(m_SampleGrid.m_ReqChangeValFlag)
                 {
@@ -904,7 +904,7 @@ namespace OTSMeasureApp
                         objVal= m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Editor.StandardValuesIndexOf(objVal);
                     }
 
-                    m_SampleGrid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, ValType, objVal);
+                    m_SampleGrid.m_PropWindow.SampleGridInfoChange(SampleId, ValType, objVal);
                 }
             }
         }
@@ -1222,7 +1222,7 @@ namespace OTSMeasureApp
                     OTS_SAMPLE_PROP_GRID_ITEMS SampleId = (OTS_SAMPLE_PROP_GRID_ITEMS)m_Grid.m_PropWindow.PropGrid.Rows[m_Grid.m_ClickRow].Tag;
                     String sName = (string)m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 1].Value;
                     object objVal = m_Grid.m_PropWindow.PropGrid[m_Grid.m_ClickRow, 2].Value;
-                  
+
                     m_Grid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, OTS_ITEM_TYPES.BOOL, objVal);
                 }
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -83,101 +83,25 @@ namespace OTSMeasureApp
 
         public void SampleGridInfoChange(OTS_SAMPLE_PROP_GRID_ITEMS SampleId, OTS_ITEM_TYPES ValType, object ObjVal)
         {
-            var m_measurePara = m_MeasureAppForm.m_ProjParam;
-            string sWSampleName = m_measurePara.GetWorkSampleName();
-            if ("" == sWSampleName)
-            {
-                return;
-            }
+           
 
             var PropertyMeasureThreadRunFlag = m_MeasureAppForm.m_MsrThreadWrapper.BGWorkThreadIsRunning();
             var measureTreadIsPaused= m_MeasureAppForm.m_MsrThreadWrapper.BgWorkIsPaused();
-          
-            
-          
-            OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
-            
-            //var curSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
-            //var curpara = curSample.GetMsrParams();
-            //当前正在测量
-            //if (PropertyMeasureThreadRunFlag && measureTreadIsPaused == false)//measureThread is running and is not paused
-            //{
-
-
-
-
-            // 修改TREEVIEW 工作样品的CHECKBOX值
-            //if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
-            //{
-            //    //修改TREEVIEW对应的样品的CHECKBOX值
-            //    m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
-            //    // 设置 开始 ,停止 和检查参数 按钮状态
-            //   m_MeasureAppForm. m_RibbonFun.SetMeasureRibbonButnStatu();
-            //}
-
-            //sWSampleName = m_measurePara.GetWorkSampleName();
-            //if ("" != sWSampleName)
-            //{
-            //    m_MeasureAppForm.m_SamplepaceWindow.ChangeWorkSampleName(sWSampleName);
-            //}
-
-            //当修改了 样品图尺寸、放大倍数和样品图的Pix大小等，SAMPLEWINDOW需要重新绘制样品台
-            //if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId
-            //    || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
-            //    || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
-            //    || OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE == SampleId
-            //    || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
-            //    )
-            //{
-
-
-
-            //        var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
-
-            //        m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
 
-
-
-            //}
-            //m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-            //DisplaySampleMeasureInfo(SMInfo);
-            //return;
-
-
-            //} 
             if (measureTreadIsPaused == false && PropertyMeasureThreadRunFlag == true)
             {
                 return;
             }
 
-            
-            if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId
-                    || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
-                    || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
-                    || OTS_SAMPLE_PROP_GRID_ITEMS.START_MODE == SampleId
-                    || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
-                    )
-            {
-
 
 
-                var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
-
-                m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
-
-
-                m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                DisplaySampleMeasureInfo(SMInfo);
-                return;
-            }
-               
-
-
-         
+            var m_measurePara = m_MeasureAppForm.m_ProjParam;
+            string sWSampleName = m_measurePara.GetWorkSampleName();
            
 
+            OTSSamplePropertyInfo SMInfo = new OTSSamplePropertyInfo();
+
 
-            //更新 STD_FILE_NAME FILE_LIST
             switch (SampleId)
             {
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME:
@@ -194,17 +118,18 @@ namespace OTSMeasureApp
                     string str = (string)ObjVal;
                     str = str.Trim();
 
-                    if (!m_measurePara.CheckSampleNameIsValid(str))
+                    if (m_measurePara.CheckSampleNameIsValid(str))
                     {
                         m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME, OTS_ITEM_TYPES.STRING, str);
-                        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-
-
-                        DisplaySampleMeasureInfo(SMInfo);
-                        return;
+                       
+                       
                     }
+                    m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+
+                    DisplaySampleMeasureInfo(SMInfo);
                     var m_SolutionWindows = m_MeasureAppForm.m_SolutionWindows;
                     m_SolutionWindows.m_TreeViewBase.EditTreeWorkSampleName(sWSampleName, (string)ObjVal);
+
                     break;
                 case OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE:
                     if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, frmStopModeDialog.FieldMode))    // Prop值变化，修改样品值成功
@@ -259,105 +184,52 @@ namespace OTSMeasureApp
            
             }
 
+            //---after modify the value of current sample properties,update the corresponding value of HMI.---
+
+            if (OTS_SAMPLE_PROP_GRID_ITEMS.IMAGE_GRP_MAX == SampleId
+                   || OTS_SAMPLE_PROP_GRID_ITEMS.MAGNIFICATION == SampleId
+                   || OTS_SAMPLE_PROP_GRID_ITEMS.IMAGERESOLUTION_SIZE == SampleId
+                   || OTS_SAMPLE_PROP_GRID_ITEMS.START_PHOTO_MODE == SampleId
+                   || OTS_SAMPLE_PROP_GRID_ITEMS.SCAN_MODE == SampleId
+                   )
+            {
+
+
+
+                var sam = m_MeasureAppForm.m_SamplepaceWindow.GetWorkingVisualSample();
+
+                m_MeasureAppForm.m_SamplepaceWindow.PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
+
+
+                m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+                DisplaySampleMeasureInfo(SMInfo);
+                return;
+            }
 
 
-            // if (OTS_SAMPLE_PROP_GRID_ITEMS.STD_FILE_NAME == SampleId)
-            //{
-            //    if (m_measurePara.SetSTDFileName((int)ObjVal))
-            //    {
+            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
+            if (OTS_SAMPLE_PROP_GRID_ITEMS.SWITCH == SampleId)
+            {
               
-            //        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                   
-            //        DisplaySampleMeasureInfo(SMInfo);
-            //        return;
-            //    }
-            //}
-            //else
-            //{
-            //    if (OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME == SampleId)
-            //    {
-            //        //去除修改GRID的样品名的前后空格
-            //        string str = (string)ObjVal;
-            //        str = str.Trim();
-                   
-            //        if (!m_measurePara.CheckSampleNameIsValid(str))
-            //        {
-            //            m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME, OTS_ITEM_TYPES.STRING, str);
-            //            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                      
-            //            DisplaySampleMeasureInfo(SMInfo);
-            //            return;
-            //        }
-
-            //    }
-            //    //更新COMBBOX值
-            //    if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化，修改样品值成功
-            //    {
-                  
-            //        m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                   
-                  
-            //        DisplaySampleMeasureInfo(SMInfo);
-            //        return;
-            //    }
-            //    if(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE==SampleId)
-            //    {
-            //        if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, StopModeDialog.FieldMode))    // Prop值变化，修改样品值成功
-            //        {
-                       
-            //            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                 
-            //            DisplaySampleMeasureInfo(SMInfo);
-            //            return;
-            //        }
-            //        if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, StopModeDialog.TimeMode))    // Prop值变化，修改样品值成功
-            //        {
-                      
-            //            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                    
-            //            DisplaySampleMeasureInfo(SMInfo);
-            //            return;
-            //        }
-            //        if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, StopModeDialog.ParticleMode))    // Prop值变化，修改样品值成功
-            //        {
-                      
-            //            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                       
-                    
-            //            DisplaySampleMeasureInfo(SMInfo);
-            //            return;
-            //        }
-            //        if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_AREA, OTS_ITEM_TYPES.INT, StopModeDialog.AreaMode))    // Prop值变化，修改样品值成功
-            //        {
-                     
-            //            m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
-                            
-                      
-            //            DisplaySampleMeasureInfo(SMInfo);
-            //            return;
-            //        }
-            //    }
-            //}
-            //更新GROUPID和ITEMID的变化
-            //OTS_SAMPLE_PROP_GRID_ITEMS ItemID = (OTS_SAMPLE_PROP_GRID_ITEMS)SampleId;
-            //m_measurePara.UpdateGroupValAndItemVal(ItemID);
-
-            //修改Treeview 工作样品名字
-            //if (OTS_SAMPLE_PROP_GRID_ITEMS.SAMPLE_NAME == SampleId)
-            //{
-            //    m_SolutionWindows.m_TreeViewBase.EditTreeWorkSampleName(sWSampleName, (string)ObjVal);
-
-             
-            //}
-
-        //HERE:
+                m_MeasureAppForm.m_SolutionWindows.Rev_MeasureApp_CheckboxStatuChange_Event(m_measurePara.GetWorkSampleName(), SMInfo.TSampleParam.bSwitch);
+                // 设置 开始 ,停止 和检查参数 按钮状态
+                m_MeasureAppForm.m_RibbonFun.SetMeasureRibbonButnStatu();
+            }
 
+         
            
+            m_measurePara.UpdateGroupValAndItemVal(SampleId);
+
+            sWSampleName = m_measurePara.GetWorkSampleName();
+          
+            m_MeasureAppForm.m_SamplepaceWindow.ChangeWorkSampleName(sWSampleName);
+          
+
            
 
+            DisplaySampleMeasureInfo(SMInfo);
+
+
         }
 
         private void toolStrip1_Paint(object sender, PaintEventArgs e)

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -2978,21 +2978,10 @@ namespace OTSMeasureApp
                     var ctrlPos = m_visualStage.OTSCoordToCtrlCoord(fieldPos);
                     if (sam.FrameOfHoleGDIObjects[i].IfContains(ctrlPos))
                     { 
-                        //ImgRegionF = sam.FieldGDIObjects[i].GetOrigionalDrawRegionF();
-                        //ImgRegionWidth = Convert.ToInt32(ImgRegionF.Width);
-                        //ImgRegionHeight = Convert.ToInt32(ImgRegionF.Height);
 
-                        //获取图片
                         bseImage = CImageHandler.ToGrayBitmap(ImageData, m_iWidth, m_iHeigh);
                         sam.FrameOfHoleGDIObjects[i].BSEImage = bseImage;
-                        //绘制图像
-                        //CRectangleGDIObject createImageRect =new CRectangleGDIObject (ImgRegionF, fieldPos.X, fieldPos.Y, itemWorkSample.SampleName, itemWorkSample.NameOrHoleName, bseImage, ImgRegionWidth, ImgRegionHeight, CreateRectangleType.DrawFrameOfHoleBSEImage);
-                        ////添加至List集合中
-                        //createImageRect.SetInitRegionF(sam.FieldGDIObjects[i].GetOrigionalDrawRegionF());
-                        //createImageRect.NameOrHoleName =sam. FieldGDIObjects[i].NameOrHoleName;
-                        //createImageRect.SetZoomNumber(m_visualStage.GetZoomNum());
-                        //createImageRect.SetDisplayRefPoint(m_visualStage.GetDisplayRefPoint());
-                        //sam. FrameOfHoleGDIObjects.Add(createImageRect);
+                
                        
                         break;
                     }
@@ -3009,7 +2998,7 @@ namespace OTSMeasureApp
         public void DeleteHoleBSEImageDataNoMessageBox()
         {
           
-            //GetWorkingVisualSample().FieldGDIObjects.Clear();
+         
             GetWorkingVisualSample().FrameOfHoleGDIObjects.Clear();
             Invalidate();
 

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSDisplayTreeBase.cs

@@ -56,8 +56,7 @@ namespace OTSMeasureApp
             m_SolutionWindow.treeView1.Focus();
             m_SolutionWindow.m_WorkSampleNode = node;
           
-            //根据样品属性数据中的SWITCH状态来设定Treeview的checkbox状态 和工作样品焦点
-            //      this.SetSampleCheckBoxAndWorkSampleFoucs();
+           
 
             m_SolutionWindow.treeView1.ExpandAll();    //展开Treeview 树形节点
             m_SolutionWindow.treeView1.Refresh();
@@ -168,32 +167,18 @@ namespace OTSMeasureApp
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
                 bSwithFlag = false;
-                FindWorkSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sWOldName, sWNewName);
-            }
-
-            m_SolutionWindow.treeView1.Refresh();
-        }
-
-        private void FindWorkSampleNode(TreeNode node, string sWOldName, string sNewWSampleName)
-        {
-            if (node.IsSelected)
-            {
-                node.Text = sNewWSampleName;
-            }
-
-            if (node.Nodes.Count != 0)
-            {
-                for (int i = 0; i < node.Nodes.Count; i++)
+                var curNode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+              
+                if (curNode.Text == sWOldName)
                 {
-
-                    FindWorkSampleNode(node.Nodes[i], sWOldName, sNewWSampleName);
+                    curNode.Text = sWNewName;
                 }
             }
 
+            m_SolutionWindow.treeView1.Refresh();
         }
 
-        //List<CTreeSampleParam> TSampleParamList  打开已保存的样品文件中的样品列表
-        //CTreeSampleParam WorkSampleParam ：  工作样品
+
         public void DisplayTreeViewData(List<CTreeSampleParam> TSampleParamList, CTreeSampleParam WorkSampleParam)
         {
             m_SolutionWindow.treeView1.Nodes.Clear();     //清除Treeview所有节点    
@@ -246,35 +231,23 @@ namespace OTSMeasureApp
 
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-               
-                FindEditSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sOldSampleName, sNewSampleName);
+                var node = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (node.Text == sOldSampleName)
+                {
+                    node.Text = sNewSampleName;
+                }
+              
             }
 
             m_SolutionWindow.treeView1.ExpandAll();
             m_SolutionWindow.treeView1.Show();
-            m_SolutionWindow.treeView1.Visible = true; ;
+            m_SolutionWindow.treeView1.Visible = true; 
             m_SolutionWindow.treeView1.Refresh();
             m_SolutionWindow.treeView1.Update();
             m_SolutionWindow.Invalidate();
         }
 
-        private void FindEditSampleNode(TreeNode node, string sWOldName, string sNewWSampleName)
-        {
-            if (node.Text == sWOldName)
-            {
-                node.Text = sNewWSampleName;
-            }
-
-            if (node.Nodes.Count != 0)
-            {
-                for (int i = 0; i < node.Nodes.Count; i++)
-                {
-
-                    FindEditSampleNode(node.Nodes[i], sWOldName, sNewWSampleName);
-                }
-            }
-
-        }
+        
 
         //根据样品的SWITCH状态设置TREEVIEW的CHECKBOX值
         private void SetSampleNodeCheckBox(TreeNode node, List<OTSSamplePropertyInfo> SampleNameList)
@@ -367,10 +340,9 @@ namespace OTSMeasureApp
         /// <param name="SNameList">排序后节点名称列表</param>
         private void GetAfterSortTreeNode(TreeNode node,ref List<string> SNameList)
         {
-            //if (null != node.Parent)
-            //{
+            
                 SNameList.Add(node.Text);
-            //}
+           
 
             if (node.Nodes.Count != 0)
             {
@@ -429,61 +401,41 @@ namespace OTSMeasureApp
         {
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-                FindTreeNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sSampleName, bStatu);
-            }
-        }
-
-
-        private void FindTreeNode(TreeNode Tnode, string sSampleName, bool bStatu)
-        {
-            if (Tnode.Text == sSampleName)
-            {
-                Tnode.Checked = bStatu;
-                m_SolutionWindow.treeView1.SelectedNode = Tnode;
-                m_SolutionWindow.treeView1.Focus();
-                return;
-            }
-
-            if (Tnode.Nodes.Count != 0)
-            {
-                for (int i = 0; i < Tnode.Nodes.Count; i++)
+                var Tnode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (Tnode.Text == sSampleName)
                 {
-                    FindTreeNode(Tnode.Nodes[i], sSampleName, bStatu);
+                    Tnode.Checked = bStatu;
+                    m_SolutionWindow.treeView1.SelectedNode = Tnode;
+                    m_SolutionWindow.treeView1.Focus();
+                    
                 }
+              
             }
         }
 
+
+       
+
         //根据工作样品名称查找TREEVIEW 中工作样品节点
         public void GetTreeWorkSampleNode(string sWorkSampleName)
         {
             for (int iTNodeCount = 0; iTNodeCount < m_SolutionWindow.treeView1.Nodes.Count; iTNodeCount++)
             {
-                FindTreeWorkSampleNode(m_SolutionWindow.treeView1.Nodes[iTNodeCount], sWorkSampleName);
-            }
-        }
-
-
-        private void FindTreeWorkSampleNode(TreeNode Tnode, string sWorkSampleName)
-        {
-            if (Tnode.Text == sWorkSampleName)
-            {
-                m_SolutionWindow.m_WorkSampleNode = Tnode;
-                m_SolutionWindow.treeView1.SelectedNode = Tnode;
-                m_SolutionWindow.treeView1.Focus();
-                return;
-            }
-
-            if (Tnode.Nodes.Count != 0)
-            {
-                for (int i = 0; i < Tnode.Nodes.Count; i++)
+                var Tnode = m_SolutionWindow.treeView1.Nodes[iTNodeCount];
+                if (Tnode.Text == sWorkSampleName)
                 {
-                    FindTreeWorkSampleNode(Tnode.Nodes[i], sWorkSampleName);
+                    m_SolutionWindow.m_WorkSampleNode = Tnode;
+                    m_SolutionWindow.treeView1.SelectedNode = Tnode;
+                    m_SolutionWindow.treeView1.Focus();
+                    return;
                 }
+             
             }
         }
 
 
 
+
         //重新设置TREEVIEW的工作样品焦点
         public void ReSetWorkSampleFoucs()
         {

OTSIncAMeasureApp/8-OTSSampleMeasureInfo/OTSSampleMeasureInfo.cs

@@ -9,12 +9,6 @@ namespace OTSMeasureApp
 {
 
 
-   
-
-
-
-
-
     //MeasureApp 给 SoluWindow 发送添加样品的样品信息
     public class CTreeSampleParam
     {
@@ -32,8 +26,7 @@ namespace OTSMeasureApp
         public string sSampleName;
         public string sampleHoleName;
         public ShapeType iShape;   //测量区域形状                                
-        //public List<Point> PolygonPointRegion;//多边形点集合                                
-        //public List<PointF> PolygonPointRegionF;//多边形点集合                                
+                              
         public List<PointF> DrawPolygonPointList;//多边形点集合
         public RectangleF MeasureRect;      //测量区域大小
     };
@@ -115,6 +108,11 @@ namespace OTSMeasureApp
         {
             return SampleDataGrps;
         }
+        public void ClearGrp()
+        {
+            SampleDataGrps.Clear();
+            SampleDataList.Clear();
+        }
 
         public String sSampleSoluName;          //样品的标题名 (Treeview的根节点名)
         public bool bSwitch;                   //样品参数锁，默认都是false， 当执行测量完成后，设置为true，则客户不允许修改GRID等数据。
@@ -122,7 +120,7 @@ namespace OTSMeasureApp
         //MeasureApp 给SampleWindow窗口发送添加样品的样品孔名，测量区域信息
         public SampleMeasurePara SMeasurePara;
 
-        //public SampleNodeMeaInfo st_SNodeMeaInfo;
+       
 
         public CTreeSampleParam TSampleParam;
 

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -5,7 +5,7 @@ namespace OTSModelSharp.ResourceManage
     //every possible display item in the sample property grid should be a member in this enum.
     public enum OTS_SAMPLE_PROP_GRID_ITEMS
     {// we prepare 10 items for every group.so the first group starts from 0,the second starts from 10,and so on.
-     //the item's value is contrast to the position exactly when it's displayed in the property grid.and the caption string is read from the resource file by the value too.
+     //the item's value is corresponding to the position exactly when it's displayed in the property grid.and the caption string is read from the resource file by the value too.
         INVALID = -1,
         MIN = 0,
         GENERAL_GRP_MIN = 0,
@@ -20,7 +20,7 @@ namespace OTSModelSharp.ResourceManage
         SYS_STD_SWITCH = 8,
         GENERAL_GRP_MAX = 8,
         IMAGE_GRP_MIN = 10,
-        START_MODE = 10,
+        START_PHOTO_MODE = 10,
         STOP_MODE = 11,
         STOP_PARAM_PARTICLE = 12,
         STOP_PARAM_FIELD = 13,