Sfoglia il codice sorgente

三点法画圆代码尝试理解

CXS 3 anni fa
parent
commit
c2c0b1ef66

+ 43 - 2
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/CreateRectangle.cs

@@ -812,6 +812,46 @@ namespace OTSMeasureApp
                 Pen pen = new Pen(myColor, 1);
                 e.Graphics.DrawRectangle(pen, m_Region);
             }
+
+
+
+
+
+            //绘制多边形测量区域
+            else if (createType == (int)CreateRectangleType.CircleByThreePoints)
+            {
+                e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;  //图片柔顺模式选择
+                e.Graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;//高质量
+                e.Graphics.CompositingQuality = CompositingQuality.HighQuality;//再加一点
+                Color myColor = selColor;
+                System.Drawing.SolidBrush sampleBrush = new System.Drawing.SolidBrush(myColor);
+                Pen pen = new Pen(myColor, 1);
+                if (PolygonPointRegionF.Count > 0)
+                {
+                    List<PointF> PolygonPointF = new List<PointF>();
+                    foreach (var item in PolygonPointRegionF)
+                    {
+                        PolygonPointF.Add(item);
+                    }
+                    if (EndPoint.X != 0 && EndPoint.Y != 0)
+                    {
+                        PolygonPointF.Add(EndPoint);
+                    }
+                    try
+                    {
+                        e.Graphics.DrawLines(pen, PolygonPointF.ToArray());
+                        //多边形的外接矩形
+                        //if (Region != null)
+                        //{
+                        //    e.Graphics.DrawRectangle(new Pen(Color.Green), Region);
+                        //}
+                    }
+                    catch (Exception ex)
+                    {
+                        //MessageBox.Show(ex.ToString());
+                    }
+                }
+            }
         }
         public override bool IsDragging
         {
@@ -956,8 +996,9 @@ namespace OTSMeasureApp
         //多边形
         Polygon = 15,
         //多边形完成标识
-        DrawPolygonFinish = 16
-
+        DrawPolygonFinish = 16,
+        //圆形三点法
+        CircleByThreePoints=17
     }
     public enum ContextMenuType
     {

+ 6 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceGraphicsPanelFun.cs

@@ -1387,6 +1387,12 @@ namespace OTSMeasureApp
                 PolygonMeasurePath.AddPolygon(measureItem.PolygonPointRegionF.ToArray());
                 GPath = PolygonMeasurePath;
             }
+            else if(measureItem.CreateType == (int)CreateRectangleType.CircleByThreePoints)
+            {
+                GraphicsPath PolygonMeasurePath = new GraphicsPath();
+                PolygonMeasurePath.AddPolygon(measureItem.PolygonPointRegionF.ToArray());
+                GPath = PolygonMeasurePath;
+            }
             else
             {
                 if (measureItem.Shape == (int)CreateRectangleType.Circle)

+ 77 - 0
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -255,6 +255,22 @@ namespace OTSMeasureApp
             m_PolygonPoint = new List<PointF>();
             this.Cursor = Cursors.Hand;
         }
+
+        /// <summary>
+        /// 三点画圆形测试区域 事件
+        /// </summary>
+        public void Rev_DDrawCircleMeasureByThreePoints_MeasureAppToSampleWindow_Event()
+        {
+            //多边形测量区域完成标识
+            m_DrawPolygonFinishGDIObjects = new List<ARectangleGDIObject>();
+            //手绘测量区域类型为圆形
+            m_DrawMeasureType = (int)CreateRectangleType.CircleByThreePoints;
+            m_IsDrawMeasureReady = true;
+            m_IsDrawMeasure = true;
+            m_RectangIsDragging = false;
+            m_PolygonPoint = new List<PointF>();
+            this.Cursor = Cursors.Hand;
+        }
         /// <summary>
         /// 当修改了GRID 的样品台测量精度、放大倍数和图片像素大小 时,SAMPLEWINDOW重新绘制样品台
         /// </summary>
@@ -1081,6 +1097,55 @@ namespace OTSMeasureApp
                     }
                     return;
                 }
+                else if(m_DrawMeasureType == (int)CreateRectangleType.CircleByThreePoints)
+                {
+                    //显示绘制多边形完成标识
+                    if (m_PolygonPoint.Count == 3)
+                    {
+                        Point startPoint = new Point((int)(m_PolygonPoint[0].X), (int)(m_PolygonPoint[0].Y));
+                        
+                                //清除当前的样品测量区域
+                                for (int measureIndex = m_MeasureGDIObjects.Count - 1; measureIndex >= 0; measureIndex--)
+                                {
+                                    if (m_MeasureGDIObjects[measureIndex].SampleName == sampleName)
+                                    {
+                                        m_MeasureGDIObjects.RemoveAt(measureIndex);
+                                        break;
+                                    }
+                                }
+                                //删除存在的帧图
+                                for (int singleIndex = m_SingleGDIObjects.Count - 1; singleIndex >= 0; singleIndex--)
+                                {
+                                    if (m_SingleGDIObjects[singleIndex].SampleName == sampleName)
+                                    {
+                                        m_SingleGDIObjects.RemoveAt(singleIndex);
+                                    }
+                                }
+                                //设置手绘标识
+                                m_IsDrawMeasureReady = false;
+                                m_IsDrawMeasure = false;
+                                m_IsDrawPolygonFinish = false;
+                                this.Cursor = Cursors.Default;
+                                return;
+                           
+                        }
+                    
+                    //添加多边形点信息
+                    m_MouseDownPoint = new Point((int)(m_MouseDownPoint.X), (int)(m_MouseDownPoint.Y));
+                    m_PolygonPoint.Add(m_MouseDownPoint);
+                    CreateRectangle createPoint = new CreateRectangle(m_PolygonPoint, (int)CreateRectangleType.CircleByThreePoints, m_DrawMeasureType, sampleHoleName, sampleName, Color.Red);
+                    if (m_DrawMeasureGDIObjects.Count > 0)
+                    {
+                        m_DrawMeasureGDIObjects[0] = createPoint;
+                    }
+                    else
+                    {
+                        m_DrawMeasureGDIObjects.Add(createPoint);
+                        System.Threading.Thread.Sleep(1);
+                        //MessageBox.Show("a");
+                    }
+                    return;
+                }
                 else
                 {
                     //在样品台内部缩放
@@ -1611,6 +1676,18 @@ namespace OTSMeasureApp
                         }
                     }
                 }
+                //圆形三点法
+                else if (m_DrawMeasureType == (int)CreateRectangleType.CircleByThreePoints)
+                {
+                    PointF startPoint = new PointF();
+                    PointF endPoint = new PointF();
+                    //显示直线开始点与鼠标当前位置的直线
+                    if (m_PolygonPoint.Count > 0)
+                    {
+                        startPoint = m_PolygonPoint[0];
+                        endPoint = m_PolygonPoint[m_PolygonPoint.Count - 1];
+                    }
+                }
                 else
                 {
                     if (m_DrawMeasureGDIObjects == null || m_RectangleGDIObjects == null)

+ 91 - 89
OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -29,21 +29,21 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTSIncAMeasureAppForm));
-            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new OTS.WinFormsUI.Docking.DockPanelSkin();
-            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient8 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
-            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient9 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient10 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient11 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient12 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new OTS.WinFormsUI.Docking.DockPanelGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient13 = new OTS.WinFormsUI.Docking.TabGradient();
-            OTS.WinFormsUI.Docking.TabGradient tabGradient14 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new OTS.WinFormsUI.Docking.DockPanelSkin();
+            OTS.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new OTS.WinFormsUI.Docking.AutoHideStripSkin();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient1 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new OTS.WinFormsUI.Docking.DockPaneStripSkin();
+            OTS.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient2 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient3 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new OTS.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient4 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient5 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new OTS.WinFormsUI.Docking.DockPanelGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient6 = new OTS.WinFormsUI.Docking.TabGradient();
+            OTS.WinFormsUI.Docking.TabGradient tabGradient7 = new OTS.WinFormsUI.Docking.TabGradient();
             this.rbNew = new System.Windows.Forms.RibbonButton();
             this.rbOpen = new System.Windows.Forms.RibbonButton();
             this.rbSave = new System.Windows.Forms.RibbonButton();
@@ -69,6 +69,8 @@
             this.rbMeasureCircle = new System.Windows.Forms.RibbonButton();
             this.rbMeasureRectangle = 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();
             this.ribRectangle = new System.Windows.Forms.RibbonButton();
             this.ribPolygon = new System.Windows.Forms.RibbonButton();
             this.rbPanelFunction = new System.Windows.Forms.RibbonPanel();
@@ -93,8 +95,6 @@
             this.dockPanel = new OTS.WinFormsUI.Docking.DockPanel();
             this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
             this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
-            this.rbCircleCenter = new System.Windows.Forms.RibbonButton();
-            this.rbThreePoints = new System.Windows.Forms.RibbonButton();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -473,6 +473,36 @@
             this.ribCircle.ToolTipTitle = null;
             this.ribCircle.Click += new System.EventHandler(this.ribCircle_Click);
             // 
+            // rbCircleCenter
+            // 
+            this.rbCircleCenter.AltKey = null;
+            this.rbCircleCenter.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.rbCircleCenter.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rbCircleCenter.Image = ((System.Drawing.Image)(resources.GetObject("rbCircleCenter.Image")));
+            this.rbCircleCenter.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbCircleCenter.SmallImage")));
+            this.rbCircleCenter.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbCircleCenter.Tag = null;
+            this.rbCircleCenter.Text = "圆心法";
+            this.rbCircleCenter.ToolTip = null;
+            this.rbCircleCenter.ToolTipImage = null;
+            this.rbCircleCenter.ToolTipTitle = null;
+            this.rbCircleCenter.Click += new System.EventHandler(this.ribCircle_Click);
+            // 
+            // rbThreePoints
+            // 
+            this.rbThreePoints.AltKey = null;
+            this.rbThreePoints.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.rbThreePoints.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rbThreePoints.Image = ((System.Drawing.Image)(resources.GetObject("rbThreePoints.Image")));
+            this.rbThreePoints.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbThreePoints.SmallImage")));
+            this.rbThreePoints.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rbThreePoints.Tag = null;
+            this.rbThreePoints.Text = "三点法";
+            this.rbThreePoints.ToolTip = null;
+            this.rbThreePoints.ToolTipImage = null;
+            this.rbThreePoints.ToolTipTitle = null;
+            this.rbThreePoints.Click += new System.EventHandler(this.rbThreePoints_Click);
+            // 
             // ribRectangle
             // 
             this.ribRectangle.AltKey = null;
@@ -749,50 +779,50 @@
             this.dockPanel.Margin = new System.Windows.Forms.Padding(6);
             this.dockPanel.Name = "dockPanel";
             this.dockPanel.Size = new System.Drawing.Size(1924, 880);
-            dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight;
-            autoHideStripSkin2.DockStripGradient = dockPanelGradient4;
-            tabGradient8.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient8.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            autoHideStripSkin2.TabGradient = tabGradient8;
-            dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2;
-            tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight;
-            tabGradient9.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient2.ActiveTabGradient = tabGradient9;
-            dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control;
-            dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control;
-            dockPaneStripGradient2.DockStripGradient = dockPanelGradient5;
-            tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight;
-            tabGradient10.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripGradient2.InactiveTabGradient = tabGradient10;
-            dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2;
-            tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption;
-            tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
-            tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
-            dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11;
-            tabGradient12.EndColor = System.Drawing.SystemColors.Control;
-            tabGradient12.StartColor = System.Drawing.SystemColors.Control;
-            tabGradient12.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12;
-            dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight;
-            dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight;
-            dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6;
-            tabGradient13.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
-            tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
-            tabGradient13.TextColor = System.Drawing.SystemColors.ControlText;
-            dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13;
-            tabGradient14.EndColor = System.Drawing.Color.Transparent;
-            tabGradient14.StartColor = System.Drawing.Color.Transparent;
-            tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark;
-            dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14;
-            dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2;
-            dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2;
-            this.dockPanel.Skin = dockPanelSkin2;
+            dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
+            autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
+            tabGradient1.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient1.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            autoHideStripSkin1.TabGradient = tabGradient1;
+            dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
+            tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
+            tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
+            dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
+            dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
+            dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
+            tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+            tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
+            dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
+            tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
+            tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+            tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+            dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
+            tabGradient5.EndColor = System.Drawing.SystemColors.Control;
+            tabGradient5.StartColor = System.Drawing.SystemColors.Control;
+            tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
+            dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
+            dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
+            dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
+            tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+            tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+            tabGradient6.TextColor = System.Drawing.SystemColors.ControlText;
+            dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
+            tabGradient7.EndColor = System.Drawing.Color.Transparent;
+            tabGradient7.StartColor = System.Drawing.Color.Transparent;
+            tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+            dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
+            dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
+            dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
+            this.dockPanel.Skin = dockPanelSkin1;
             this.dockPanel.TabIndex = 4;
             // 
             // ribbonButton3
@@ -823,34 +853,6 @@
             this.ribbonButton1.ToolTipImage = null;
             this.ribbonButton1.ToolTipTitle = null;
             // 
-            // rbCircleCenter
-            // 
-            this.rbCircleCenter.AltKey = null;
-            this.rbCircleCenter.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.rbCircleCenter.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbCircleCenter.Image = ((System.Drawing.Image)(resources.GetObject("rbCircleCenter.Image")));
-            this.rbCircleCenter.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbCircleCenter.SmallImage")));
-            this.rbCircleCenter.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.rbCircleCenter.Tag = null;
-            this.rbCircleCenter.Text = "圆心法";
-            this.rbCircleCenter.ToolTip = null;
-            this.rbCircleCenter.ToolTipImage = null;
-            this.rbCircleCenter.ToolTipTitle = null;
-            // 
-            // rbThreePoints
-            // 
-            this.rbThreePoints.AltKey = null;
-            this.rbThreePoints.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.rbThreePoints.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbThreePoints.Image = ((System.Drawing.Image)(resources.GetObject("rbThreePoints.Image")));
-            this.rbThreePoints.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbThreePoints.SmallImage")));
-            this.rbThreePoints.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.rbThreePoints.Tag = null;
-            this.rbThreePoints.Text = "三点法";
-            this.rbThreePoints.ToolTip = null;
-            this.rbThreePoints.ToolTipImage = null;
-            this.rbThreePoints.ToolTipTitle = null;
-            // 
             // OTSIncAMeasureAppForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);

+ 7 - 1
OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -910,7 +910,11 @@ namespace OTSMeasureApp
             //修改工作样品的测量区域为圆形
             m_SamplepaceWindow.Rev_DDrawCircleMeasure_MeasureAppToSampleWindow_Event();
         }
-
+        private void rbThreePoints_Click(object sender, EventArgs e)
+        {
+            //修改工作样品的测量区域为圆形
+            m_SamplepaceWindow.Rev_DDrawCircleMeasureByThreePoints_MeasureAppToSampleWindow_Event();
+        }
         //绘制矩形测量区域
         private void ribRectangle_Click(object sender, EventArgs e)
         {
@@ -1220,5 +1224,7 @@ namespace OTSMeasureApp
             About m_about = new About();
             m_about.ShowDialog();
         }
+
+        
     }
 }

+ 8 - 12
OTSIncAMeasureApp/OTSIncAMeasureAppForm.resx

@@ -156,30 +156,26 @@
   </data>
   <data name="rbCircleCenter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
-        QwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
+        JQAAFiUBSVIk8AAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="rbCircleCenter.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
-        TkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
+        JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="rbThreePoints.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
-        QwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
+        JQAAFiUBSVIk8AAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="rbThreePoints.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
-        TkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAW
+        JQAAFiUBSVIk8AAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribCircle.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">