complete the field enable or disable shift function.

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -6,7 +6,7 @@
     <Member RegName="IncArea" end="100" start="2" />
     <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="0:Spiral" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
   <Member RegName="StageData" ControlDelay="1000" MinMag="65" scanFieldSize="1270" xAxisDir="0:LEFT_TOWARD" yAxisDir="1:DOWN_TOWARD">
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1114,7 +1114,7 @@ field of view(%)" />
 	  <Control name="rbSemFunction" text="SemControl" />
 	  <Control name="rbAddSample" text="Add" />
 	  <Control name="rbDeleteSample" text="Delete" />
-	  <Control name="ribReset" text="Reset" />
+	  <Control name="ribInvers" text="InversSelect" />
 	  <Control name="rbMeasureCircle" text="Circle" />
 	  <Control name="rbMeasureRectangle" text="Rectangle" />
 	  <Control name="ribCircle" text="Circle" />

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1024,7 +1024,7 @@
 	  <Control name="rbSemFunction" text="Sem控制" />
 	  <Control name="rbAddSample" text="添加" />
 	  <Control name="rbDeleteSample" text="删除" />
-	  <Control name="ribReset" text="复位" />
+	  <Control name="ribInvers" text="反选" />
 	  <Control name="rbMeasureCircle" text="圆形" />
 	  <Control name="rbMeasureRectangle" text="矩形" />
 	  <Control name="ribCircle" text="圆形" />

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSField.cs

@@ -1069,20 +1069,23 @@ namespace OTSDataType
         public override void Serialize(bool isStoring, XmlDocument classDoc, XmlNode rootNode)
         {
             xPoint xPos = new xPoint();
+            xBool xenable = new xBool();
             Slo slo = new Slo();
             slo.Register("OTSPosition", xPos);
-
+            slo.Register("Enable", xenable);
 
             if (isStoring)
             {
 
                 xPos.AssignValue(new System.Drawing.Point((int)m_otsPos.X, (int)m_otsPos.Y));
+                xenable.AssignValue(this.Enable);
                 slo.Serialize(true, classDoc, rootNode);
             }
             else
             {
                 slo.Serialize(false, classDoc, rootNode);
                 m_otsPos = xPos.value();
+                this.Enable=xenable.value();
             }
         }
     }

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSRect.cs

@@ -49,7 +49,7 @@ namespace OTSMeasureApp._0_OTSModel.OTSDataType
 
 		public bool PointInRect(PointF p)
 		{
-			if (p.X > m_left && p.X < m_right && p.X > m_bottom && p.X < m_top)
+			if (p.X > m_left && p.X < m_right && p.Y > m_bottom && p.Y < m_top)
 			{
 				return true;
 			}

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -21,7 +21,7 @@ namespace OTSDataType
         const string NOT_APPLIED = "N/A";
         private string m_strName;
         private string m_strHoleName;
-        private bool m_bParamLock;
+        //private bool m_bParamLock;
      
         private bool m_bSwitch;
     
@@ -42,7 +42,7 @@ namespace OTSDataType
         {
             m_strName = "";
             m_strHoleName = "";
-            m_bParamLock = false;
+            //m_bParamLock = false;
             m_bSwitch = true;
           
             m_poMsrParams = new CSampleParam();
@@ -103,8 +103,8 @@ namespace OTSDataType
         public void SetSampleHoleName(string a_strHoleName) { m_strHoleName = a_strHoleName; }
 
         // param modify lock
-        public bool GetParamLock() { return m_bParamLock; }
-        public void SetParamLock(bool a_bParamLock) { m_bParamLock = a_bParamLock; }
+        //public bool GetParamLock() { return m_bParamLock; }
+        //public void SetParamLock(bool a_bParamLock) { m_bParamLock = a_bParamLock; }
 
         // switch
         public bool GetSwitch() { return m_bSwitch; }
@@ -201,6 +201,10 @@ namespace OTSDataType
                 if (fld.GetOTSRect().PointInRect(OTScoord))
                 { 
                    fld.Enable = enable;
+                    if (enable == false)
+                    {
+                        NLog.LogManager.GetCurrentClassLogger().Info("Field " + fld.GetId() + " Disabled");
+                    }
                 }
             
             }
@@ -388,7 +392,7 @@ namespace OTSDataType
         {
             xString xstrSampleName = new xString();
             xString xstrHoleName = new xString();
-            xBool xParamLock = new xBool();
+            //xBool xParamLock = new xBool();
             xBool xSwitch = new xBool();
             xDouble xTotalArea = new xDouble();
          
@@ -396,7 +400,7 @@ namespace OTSDataType
             Slo slo = new Slo();
             slo.Register("SampleName", xstrSampleName);
             slo.Register("HoleName", xstrHoleName);
-            slo.Register("ParamLock", xParamLock);
+            //slo.Register("ParamLock", xParamLock);
             slo.Register("Switch", xSwitch);
          
             slo.Register("MsrArea", m_poMsrArea);
@@ -408,7 +412,7 @@ namespace OTSDataType
             {
                 xstrSampleName.AssignValue(m_strName);
                 xstrHoleName.AssignValue(m_strHoleName);
-                xParamLock.AssignValue(m_bParamLock);
+                //xParamLock.AssignValue(m_bParamLock);
                 xSwitch.AssignValue(m_bSwitch);
                 xTotalArea.AssignValue(this.GetTotalToMeasureArea());
                 foreach (var f in m_listFieldData)
@@ -423,7 +427,7 @@ namespace OTSDataType
                 slo.Serialize(false, classDoc, rootNode);
                 m_strName = xstrSampleName.value();
                 m_strHoleName = xstrHoleName.value();
-                m_bParamLock = xParamLock.value();
+                //m_bParamLock = xParamLock.value();
                 m_bSwitch = xSwitch.value();
                 int i = 0;
                 foreach (var f in fielddata.m_vCollection)

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CMsrResultItems.cs

@@ -1,10 +1,7 @@
 using OTSCLRINTERFACE;
-using OTSDataType;
-using System;
+
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 namespace OTSModelSharp
 {
     //public double DEFAULT_RADIO = 1.0;

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -111,7 +111,10 @@ namespace OTSModelSharp
                 pSEMCtrl.SetWorkingDistance(dWorkDis);
                 pSEMCtrl.SetSemBrightness(bri);
                 pSEMCtrl.SetSemContrast(contra);
-
+                log.Warn("set magnification " + dMag);
+                log.Warn("set wd "+ dWorkDis);
+                log.Warn("set brightness "+bri);
+                log.Warn("set contrast "+contra);
 
             }
             catch (Exception e) 
@@ -611,12 +614,12 @@ namespace OTSModelSharp
 
 
 
-                var pSEMDataGnr = new CSEMDataGnr();
+                var pSEMDataUsing = new CSEMDataGnr();
                 log.Info("Get Kv, Brightness and Contrast!");
-                GetSEMDataGnrFromHw(ref pSEMDataGnr);
+                GetSEMDataGnrFromHw(ref pSEMDataUsing);
 
 
-                m_pSampleRstFile.SetSEMGnr(pSEMDataGnr);
+                m_pSampleRstFile.SetSEMGnr(pSEMDataUsing);
 
                 // record SEM data
                 COTSMsrPrjResultData pProjMgrFile = m_pMsrThread.GetProjResultData();
@@ -657,6 +660,10 @@ namespace OTSModelSharp
                         {
                             continue;
                         }
+                        if (curFld.Enable == false)
+                        {
+                            continue;
+                        }
                         if (IsPaused())
                         {// measure stopped			
                             pStatus.SetStatus(OTS_MSR_SAMPLE_STATUS.PAUSED);

OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMsrResult.cs

@@ -126,10 +126,10 @@ namespace OTSModelSharp
             m_pSample = a_pSample;
 
         }
-        public CSEMStageData GetSEMStageData()
-        {
-            return m_pSEMStageData;
-        }
+        //public CSEMStageData GetSEMStageData()
+        //{
+        //    return m_pSEMStageData;
+        //}
         public void SetSEMStageData(CSEMStageData a_pSEMStageData)
         {
          
@@ -176,8 +176,8 @@ namespace OTSModelSharp
             slo.Register("Version", xnVersion);
             slo.Register("Switch", xbSwitch);
             slo.Register("SEMStageData", m_pSEMStageData);
-            slo.Register("Stage", m_pStage);
-            slo.Register("SEMData", m_pSEMData);
+            //slo.Register("Stage", m_pStage);
+            //slo.Register("SEMData", m_pSEMData);
             slo.Register("Sample", m_pSample);
             slo.Register("Fields", xfields);
             if (isStoring)

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -695,17 +695,17 @@ namespace OTSMeasureApp
             Domain.SetShape((otsdataconst.DOMAIN_SHAPE)iShape);
         }
 
-        public bool SetWorkSampleParamLock(bool ParaLockFlag)
-        {
-            COTSSample WSample = GetResultData().GetWorkingSample();
-            if (null == WSample)
-            {
-                return false;
-            }
-            WSample.SetParamLock(ParaLockFlag);
-            GetResultData().SetModify(true);
-            return true;
-        }
+        //public bool SetWorkSampleParamLock(bool ParaLockFlag)
+        //{
+        //    COTSSample WSample = GetResultData().GetWorkingSample();
+        //    if (null == WSample)
+        //    {
+        //        return false;
+        //    }
+        //    WSample.SetParamLock(ParaLockFlag);
+        //    GetResultData().SetModify(true);
+        //    return true;
+        //}
 
         public bool CheckSampleParam(bool bCheckFlag)
         {

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -371,7 +371,7 @@ namespace OTSMeasureApp
         public void DrawRingShapeArea()
         {
             //手绘测量区域类型为圆形
-            //m_DrawMeasureType = CreateRectangleType.RingShape;
+          
             RingGdiDataInput frmInput = new RingGdiDataInput();
             if (frmInput.ShowDialog() == DialogResult.OK)
             {
@@ -506,7 +506,7 @@ namespace OTSMeasureApp
                             CDisplayGDIObject gdi = m_visualStage.GetCtrlCoordRect(xHole, yHole, (GDIType)SMeasrueArea.iShape, "", "");
                             gdi.SampleName = SMeasrueArea.sSampleName;
                             gdi.NameOrHoleName = SMeasrueArea.sampleHoleName;
-                            //gdi.Shape = SMeasrueArea.iShape;
+                           
                             CMeasureArea measureGdi;
                             if (m_visualStage.GetMeasureGdiObjectFromSampleGdi(gdi, out measureGdi))
                             {

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/VisualGDIObjects/CVisualStage.cs

@@ -702,18 +702,23 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
         }
         public bool GetMeasureGdiObjectFromSampleGdi(CDisplayGDIObject sampleGDIObject, out CMeasureArea outMeasureRect)
         {
+       
+            CMeasureArea r = new CMeasureArea();
+            r.NameOrHoleName = sampleGDIObject.NameOrHoleName;
+            r.SampleName = sampleGDIObject.SampleName;
+            r.SetInitRegionF(sampleGDIObject.GetOrigionalDrawRegionF());
 
-            //添加测量区域
-            GDIType shape = sampleGDIObject.GDIType;
-
+            r.IsWorkSample = sampleGDIObject.IsWorkSample;
+            r.SetZoomedRegionF(sampleGDIObject.GetZoomedRegionF());
 
 
-            var Measuregdi = sampleGDIObject.Duplicate();
-            //MeasureRect.GPath = MeasurePath;
-            Measuregdi.SelColor = Color.Red;
+            r.SetDisplayRefPoint(this.GetDisplayRefPoint());
+            r.SetZoomNumber(sampleGDIObject.GetZoomNumber());
 
+            
+            r.SelColor = Color.Red;
 
-            outMeasureRect = (CMeasureArea)Measuregdi;
+            outMeasureRect = r;
             return true;
 
         }

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSDisplayTreeBase.cs

@@ -516,19 +516,19 @@ namespace OTSMeasureApp
 
        
         //设置样品参数锁的状态
-        public void SetSampleParaLockStatu()
-        {
-            if (m_SolutionWindow.SampleParaLock.Checked)
-            {
-                m_SolutionWindow.m_MeasureAppForm.m_ProjParam.SetWorkSampleParamLock(true);
-                m_SolutionWindow.SampleParaLock.Checked = true;
-            }
-            else
-            {
-                m_SolutionWindow.m_MeasureAppForm.m_ProjParam.SetWorkSampleParamLock(false);
-                m_SolutionWindow.SampleParaLock.Checked = false;
-            }
-        }
+        //public void SetSampleParaLockStatu()
+        //{
+        //    if (m_SolutionWindow.SampleParaLock.Checked)
+        //    {
+        //        m_SolutionWindow.m_MeasureAppForm.m_ProjParam.SetWorkSampleParamLock(true);
+        //        m_SolutionWindow.SampleParaLock.Checked = true;
+        //    }
+        //    else
+        //    {
+        //        m_SolutionWindow.m_MeasureAppForm.m_ProjParam.SetWorkSampleParamLock(false);
+        //        m_SolutionWindow.SampleParaLock.Checked = false;
+        //    }
+        //}
 
         //返回右键选中节点的样品参数锁状态
         public bool GetSampleNodeLockStatu(ref bool CheckTNodeLockStatu)

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSSolutionWindow.Designer.cs

@@ -35,7 +35,6 @@
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.DeleteNode = new System.Windows.Forms.ToolStripMenuItem();
             this.RightClickCheckContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.SampleParaLock = new System.Windows.Forms.ToolStripMenuItem();
             this.ClearMeasureData = new System.Windows.Forms.ToolStripMenuItem();
             this.reClassifyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.RightClickNoCheckContextMenuStrip.SuspendLayout();
@@ -98,20 +97,10 @@
             this.RightClickCheckContextMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.RightClickCheckContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.DeleteNode,
-            this.SampleParaLock,
             this.ClearMeasureData,
             this.reClassifyToolStripMenuItem});
             this.RightClickCheckContextMenuStrip.Name = "contextMenuStrip1";
-            this.RightClickCheckContextMenuStrip.Size = new System.Drawing.Size(181, 114);
-            // 
-            // SampleParaLock
-            // 
-            this.SampleParaLock.CheckOnClick = true;
-            this.SampleParaLock.Name = "SampleParaLock";
-            this.SampleParaLock.Size = new System.Drawing.Size(180, 22);
-            this.SampleParaLock.Text = "样品参数编辑锁";
-            this.SampleParaLock.Visible = false;
-            this.SampleParaLock.Click += new System.EventHandler(this.SampleParaLock_Click);
+            this.RightClickCheckContextMenuStrip.Size = new System.Drawing.Size(181, 92);
             // 
             // ClearMeasureData
             // 
@@ -138,7 +127,7 @@
             this.DockAreas = ((OTS.WinFormsUI.Docking.DockAreas)((((OTS.WinFormsUI.Docking.DockAreas.DockLeft | OTS.WinFormsUI.Docking.DockAreas.DockRight) 
             | OTS.WinFormsUI.Docking.DockAreas.DockTop) 
             | OTS.WinFormsUI.Docking.DockAreas.DockBottom)));
-            this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OTSSolutionWindow";
@@ -163,7 +152,6 @@
         private System.Windows.Forms.ToolStripMenuItem DeleteNode;
         private System.Windows.Forms.ContextMenuStrip RightClickCheckContextMenuStrip;
         private System.Windows.Forms.ToolStripMenuItem ClearMeasureData;
-        public System.Windows.Forms.ToolStripMenuItem SampleParaLock;
         private System.Windows.Forms.ToolStripMenuItem reClassifyToolStripMenuItem;
     }
 }

OTSIncAMeasureApp/6-OTSDisplayTreeViewData/OTSSolutionWindow.cs

@@ -14,7 +14,7 @@ namespace OTSMeasureApp
     public partial class OTSSolutionWindow : DockContent
     {
       
-        //如果没有样品标题信息，就使用默认 "未加载样品名";
+     
         public String m_DefaultSolutionName = "未加载样品名";
         public String m_DefaultSampleName = "样品";
         public OTSIncAMeasureAppForm m_MeasureAppForm = null;
@@ -79,7 +79,7 @@ namespace OTSMeasureApp
             m_TreeViewBase.DisplayWorkSampleTree(m_WorkSampleParam);
         }
 
-        //MeasureApp窗口给 OTSSolutionWindow 发送窗口删除样品回复
+       
         public void DeletCurrentSampleNode()
         {
             treeView1.Nodes.Remove(m_WorkSampleNode);   //移除当前工作样品
@@ -105,7 +105,7 @@ namespace OTSMeasureApp
             m_TreeViewBase.SetSampleCheckboxStatu(sSampleName, bCheckBoxStatu);
         }
 
-        // MeasureApp 窗口给 OTSSolutionWindow 窗口编辑样品名回复
+       
         public void Rev_MeasureApp_EditEditSample_Event(string sSampleOldName, string sSampleNewName)
         {
             if (sSampleNewName == "")   //修改的样品新名称为空，则说明不允许修改
@@ -238,33 +238,13 @@ namespace OTSMeasureApp
             }
         }
 
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, ref TVITEM lParam);
+        
 
         private void treeView1_DrawNode(object sender, DrawTreeNodeEventArgs e)
         {
             e.DrawDefault = true;
         }
-        private const int TVIF_STATE = 0x8;
-        private const int TVIS_STATEIMAGEMASK = 0xF000;
-        private const int TV_FIRST = 0x1100;
-        private const int TVM_SETITEM = TV_FIRST + 63;
-        private void HideCheckBox(TreeView tvw, TreeNode node)
-        {
-
-            TVITEM tvi = new TVITEM();
-
-            tvi.hItem = node.Handle;
-
-            tvi.mask = TVIF_STATE;
-
-            tvi.stateMask = TVIS_STATEIMAGEMASK;
-
-            tvi.state = 0;
-
-            SendMessage(tvw.Handle, TVM_SETITEM, IntPtr.Zero, ref tvi);
-
-        }
+       
 
         [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Auto)]
 
@@ -311,7 +291,7 @@ namespace OTSMeasureApp
                 {
                    log.Error("(OTSSolutionWindow.treeView1_NodeMouseClick )  m_TreeViewBase.GetSampleNodeLockStatu(m_WorkSampleNode, ref bLockStatu) = false  Failed !");
                 }
-                SampleParaLock.Checked = bLockStatu;
+                //SampleParaLock.Checked = bLockStatu;
                 //显示清除测量数据
                 COTSSample cSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
                 if (cSample.GetName() == tn.Text)
@@ -330,8 +310,7 @@ namespace OTSMeasureApp
         //Treeview增加测量样品节点
         public void toolStripMenuItem1_AddNode_Click(object sender, EventArgs e)
         {
-            //   m_TreeViewBase.AddTreeViewNode();
-            //m_MeasureAppForm.m_EventFun.Send_AddSample_SoluWindowReqMeasureApp_Event_Fun();
+    
             m_MeasureAppForm.SoluwindowReqAddSample();
         }
         private void treeView1_AfterLabelEdit(object sender, NodeLabelEditEventArgs e)
@@ -503,11 +482,11 @@ namespace OTSMeasureApp
 
 
         //设置样品参数锁
-        private void SampleParaLock_Click(object sender, EventArgs e)
-        {
+        //private void SampleParaLock_Click(object sender, EventArgs e)
+        //{
             
-            m_TreeViewBase.SetSampleParaLockStatu();
-        }
+        //    m_TreeViewBase.SetSampleParaLockStatu();
+        //}
         private void treeView1_MouseDown(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Right)

OTSIncAMeasureApp/9-OTSRibbon/OTSRibbonFun.cs

@@ -268,7 +268,7 @@ namespace OTSMeasureApp
                 }
                 if (RibbonButnIDList[i] == (int)RibbonButnID.Sample_Reset)
                 {
-                    m_MeasureAppForm.ribReset.Enabled = bFlag;
+                    m_MeasureAppForm.ribInvers.Enabled = bFlag;
                     continue;
                 }
                 if (RibbonButnIDList[i] == (int)RibbonButnID.Sample_DrawCircle)

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -66,7 +66,7 @@
             this.rbPanelSample = new System.Windows.Forms.RibbonPanel();
             this.rbAddSample = new System.Windows.Forms.RibbonButton();
             this.rbDeleteSample = new System.Windows.Forms.RibbonButton();
-            this.ribReset = new System.Windows.Forms.RibbonButton();
+            this.ribInvers = new System.Windows.Forms.RibbonButton();
             this.ribCircle = new System.Windows.Forms.RibbonButton();
             this.rbCircleCenter = new System.Windows.Forms.RibbonButton();
             this.rbThreePoints = new System.Windows.Forms.RibbonButton();
@@ -396,7 +396,7 @@
             this.rbPanelSample.ButtonMoreVisible = false;
             this.rbPanelSample.Items.Add(this.rbAddSample);
             this.rbPanelSample.Items.Add(this.rbDeleteSample);
-            this.rbPanelSample.Items.Add(this.ribReset);
+            this.rbPanelSample.Items.Add(this.ribInvers);
             this.rbPanelSample.Items.Add(this.ribCircle);
             this.rbPanelSample.Items.Add(this.ribRectangle);
             this.rbPanelSample.Items.Add(this.ribPolygon);
@@ -433,20 +433,20 @@
             this.rbDeleteSample.ToolTipTitle = null;
             this.rbDeleteSample.Click += new System.EventHandler(this.rbDeleteSample_Click);
             // 
-            // ribReset
-            // 
-            this.ribReset.AltKey = null;
-            this.ribReset.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
-            this.ribReset.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.ribReset.Image = global::OTSMeasureApp.Properties.Resources.复位32;
-            this.ribReset.SmallImage = global::OTSMeasureApp.Properties.Resources.复位;
-            this.ribReset.Style = System.Windows.Forms.RibbonButtonStyle.SplitDropDown;
-            this.ribReset.Tag = "ribReset";
-            this.ribReset.Text = "复位";
-            this.ribReset.ToolTip = null;
-            this.ribReset.ToolTipImage = null;
-            this.ribReset.ToolTipTitle = null;
-            this.ribReset.Click += new System.EventHandler(this.ribReset_Click);
+            // ribInvers
+            // 
+            this.ribInvers.AltKey = null;
+            this.ribInvers.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
+            this.ribInvers.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.ribInvers.Image = global::OTSMeasureApp.Properties.Resources.复位32;
+            this.ribInvers.SmallImage = global::OTSMeasureApp.Properties.Resources.复位;
+            this.ribInvers.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.ribInvers.Tag = "ribReset";
+            this.ribInvers.Text = "反选";
+            this.ribInvers.ToolTip = null;
+            this.ribInvers.ToolTipImage = null;
+            this.ribInvers.ToolTipTitle = null;
+            this.ribInvers.Click += new System.EventHandler(this.ribReset_Click);
             // 
             // ribCircle
             // 
@@ -1018,7 +1018,7 @@
         public System.Windows.Forms.RibbonOrbMenuItem rbExitApp;
         public System.Windows.Forms.RibbonOrbOptionButton rbSelectDlg;
         public System.Windows.Forms.RibbonButton ribbonButton3;
-        public System.Windows.Forms.RibbonButton ribReset;
+        public System.Windows.Forms.RibbonButton ribInvers;
         public System.Windows.Forms.RibbonButton ribCircle;
         public System.Windows.Forms.RibbonButton ribRectangle;
         public System.Windows.Forms.RibbonPanel rbPanelFile;

OTSIncAMeasureApp/OTSIncAMeasureAppForm.resx

@@ -205,7 +205,7 @@
   <data name="ribPolygon.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">