amend the color of stage hole to white.

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/CreateRectangle.cs

@@ -273,24 +273,7 @@ namespace OTSMeasureApp
             OTSX = OTSx;
             OTSY = OTSy;
         }
-        /// <summary>
-        /// 绘制颗粒图
-        /// </summary>
-        /// <param name="lineStartPoint">绘制直线开始点</param>
-        /// <param name="lineLength">直线的长度</param>
-        /// <param name="cType">类型</param>
-        /// <param name="lineColor">颜色</param>
-        public CreateRectangle(PointF lineStartPoint, float lineLength, CreateRectangleType cType, Color lineColor)
-        {
-            m_Region = new Rectangle((int)lineStartPoint.X, (int)lineStartPoint.Y, (int)lineLength, 1);
-            m_RegionF = new RectangleF(lineStartPoint.X, lineStartPoint.Y, lineLength, 1);
-            LineColor = lineColor;
-            CreateType = cType;
-            LineStartPoint = lineStartPoint;
-            LineLength = lineLength;
-            OTSX = -1;
-            OTSY = -1;
-        }
+
         /// <summary>
         /// 获取样品孔中BSE图像
         /// </summary>
@@ -323,17 +306,7 @@ namespace OTSMeasureApp
             //绘制类型
             CreateType = cType;
         }
-        /// <summary>
-        /// 获取SEM中心位置
-        /// </summary>
-        /// <param name="semCPoint"></param>
-        /// <param name="cType"></param>
-        public CreateRectangle(PointF semCPoint, CreateRectangleType cType)
-        {
-            CreateType = cType;
-            ID = System.Guid.NewGuid().ToString();
-            semCenterPoint = semCPoint;
-        }
+
 
         public CreateRectangle(RectangleF rect, Point ImgPoint, float m_Multiple, CreateRectangleType cType)
         {
@@ -557,7 +530,7 @@ namespace OTSMeasureApp
             //圆形
             else if (createType == CreateRectangleType.Circle)
             {
-                System.Drawing.SolidBrush sampleBrush = new System.Drawing.SolidBrush(System.Drawing.Color.FloralWhite);
+                System.Drawing.SolidBrush sampleBrush = new System.Drawing.SolidBrush(System.Drawing.Color.White);
                 e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;  //图片柔顺模式选择
                 e.Graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;//高质量
                 e.Graphics.CompositingQuality = CompositingQuality.HighQuality;//再加一点
@@ -691,7 +664,7 @@ namespace OTSMeasureApp
                 e.Graphics.FillEllipse(sampleBrush, m_Region);
             }
             //绘制帧图
-            else if (createType == CreateRectangleType.SingleRectangle)
+            else if (createType == CreateRectangleType.FieldRectangle)
             {
                 Color myColor = SelColor;
                 System.Drawing.SolidBrush sampleBrush = new System.Drawing.SolidBrush(myColor);
@@ -930,7 +903,7 @@ namespace OTSMeasureApp
         private GraphicsPath g_Path;
         private PointF startPoint;
         private PointF endPoint;
-        private PointF sampleCenterDifferCenterPoint;
+        //private PointF sampleCenterDifferCenterPoint;
         //绘制颗粒图
         private Color lineColor;
         private float lineLength;
@@ -992,7 +965,7 @@ namespace OTSMeasureApp
         //表样-圆形
         SpecimenCircle = 8,
         //帧图-矩形绘制
-        SingleRectangle = 9,
+        FieldRectangle = 9,
         //颗粒直线图
         ParticleLine = 10,
         //颗粒分布图 鼠标

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -3831,7 +3831,7 @@ namespace OTSMeasureApp
                     //设置颜色
                     string ColorStr = OTSSamplespaceGraphicsPanelFun.GetColorValue(ColorType.SingleColor);
                   
-                    CreateRectangle createRect = new CreateRectangle(rectZoomSingle, fieldRects[i].X, fieldRects[i].Y, CreateRectangleType.SingleRectangle, sampleHoleName, sampleName, ColorTranslator.FromHtml(ColorStr));
+                    CreateRectangle createRect = new CreateRectangle(rectZoomSingle, fieldRects[i].X, fieldRects[i].Y, CreateRectangleType.FieldRectangle, sampleHoleName, sampleName, ColorTranslator.FromHtml(ColorStr));
                     //如果选择为测量区域BSE照片 则添加样品名称
                     if (CMStrip.Items[(int)MenuIndex.ShootBSEPicture].Tag != null)
                     {

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -190,7 +190,7 @@ namespace OTSMeasureApp
                     }
                     else
                     {
-                        log.Error("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  InitResultData() failed");
+                        log.Error(" InitResultData() failed");
                     }
                 }
                 else