数据统计线程保护

设置删除工位失效bug

CanFly/UI/GuidePanel/GuideHeightCtrl.resx

@@ -142,4 +142,7 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

CanFly/UI/SizePanel/SizeBaseGuideControl.cs

@@ -0,0 +1,160 @@
+using CanFly.Canvas.Shape;
+using CanFly.Canvas.UI;
+using CanFly.Helper;
+using DH.Commons.Base;
+using HalconDotNet;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+
+namespace CanFly.UI.SizePanel
+{
+
+    public class SizeBaseGuideControl : UserControl
+    {
+        public Action? OnControlCloseEvent;
+
+        public event Action<string,string> OnDataPassed;
+
+
+        private string _currentImageFile;
+
+        public string CurrentImageFile;
+
+        public CameraBase cameraBase;
+
+        protected string _hScriptsDir = Path.Combine(Environment.CurrentDirectory, "hscripts");
+
+        protected HObject? hImage = null;
+
+        protected FlyCanvas _canvas;
+
+        private HDevEngineTool? tool = null;
+
+
+
+        public void DataToTriggerEvent(string input,string output)
+        {
+        
+            OnDataPassed?.Invoke(input, output);
+        }
+
+        protected virtual void UpdateShape(FlyShape shape)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected virtual string GetScriptFileName()
+        {
+            throw new NotImplementedException();
+        }
+
+
+
+        /// <summary>
+        /// 执行Halcon脚本
+        /// </summary>
+        /// <param name="inputImg">输入图像</param>
+        /// <param name="inputDic">输入参数</param>
+        /// <param name="outputParamKeys">输出参数</param>
+        protected void ExecuteHScript(
+            Dictionary<string, HObject> inputImg,
+            Dictionary<string, HTuple> inputDic,
+            List<string> outputParamKeys,
+            Action<Exception>? exceptionHandler = null)
+        {
+
+            string filePath = Path.Combine(_hScriptsDir, GetScriptFileName());
+            if (!File.Exists(filePath))
+            {
+                MessageBox.Show($"文件 {filePath} 不存在");
+                return;
+            }
+
+            try
+            {
+                if (tool == null)
+                {
+                    tool = new HDevEngineTool(_hScriptsDir);
+                    tool.LoadProcedure(Path.GetFileNameWithoutExtension(GetScriptFileName()));
+                }
+
+
+
+                //tool.InputImageDic["INPUT_Image"] = hImage;
+                //tool.InputTupleDic["XCenter"] = _x;
+                //tool.InputTupleDic["YCenter"] = _y;
+                //tool.InputTupleDic["Radius"] = _r;
+
+                tool.InputImageDic = inputImg;
+                tool.InputTupleDic = inputDic;
+
+
+                Dictionary<string, HTuple> outputParams = new Dictionary<string, HTuple>();
+
+
+                if (!tool.RunProcedure(out string error, out int timeElasped))
+                {
+                    OnExecuteHScriptResult(false, outputParams, timeElasped);
+                    return;
+                }
+
+                for (int i = 0; i < outputParamKeys.Count; i++)
+                {
+                    string k = outputParamKeys[i];
+                    outputParams[k] = tool.GetResultTuple(k);
+                }
+
+                OnExecuteHScriptResult(true, outputParams, timeElasped);
+            }
+            catch (Exception ex)
+            {
+                exceptionHandler?.Invoke(ex);
+            }
+            finally
+            {
+                hImage?.Dispose();
+                hImage = null;
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// Halcon脚本执行结果回调函数，重写该方法以自行处理算法执行结果
+        /// </summary>
+        /// <param name="success">算法执行是否成功</param>
+        /// <param name="resultDic">算法输出结果</param>
+        /// <param name="timeElasped">算法耗时，单位：ms</param>
+        protected virtual void OnExecuteHScriptResult(bool success, Dictionary<string, HTuple> resultDic, int timeElasped)
+        {
+            throw new NotImplementedException();
+        }
+
+
+        protected void OpenImageFile(Action<Bitmap> callback)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.Filter = "图像文件|*.jpg;*.jpeg;*.png";
+            ofd.Multiselect = false;
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                CurrentImageFile = ofd.FileName;
+                Bitmap bitmap = (Bitmap)Image.FromFile(CurrentImageFile);
+                callback?.Invoke(bitmap);
+            }
+        }
+
+
+        protected void OnControlClose()
+        {
+            OnControlCloseEvent?.Invoke();
+        }
+    }
+}

CanFly/UI/SizePanel/SizeBaseGuideControl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

CanFly/UI/SizePanel/SizeCtrlTitleBar.Designer.cs

@@ -0,0 +1,77 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeCtrlTitleBar
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            btnClose = new PictureBox();
+            j = new Label();
+            ((System.ComponentModel.ISupportInitialize)btnClose).BeginInit();
+            SuspendLayout();
+            // 
+            // btnClose
+            // 
+            btnClose.Dock = DockStyle.Right;
+            btnClose.Image = XKRS.CanFly.Properties.Resources.Close;
+            btnClose.Location = new Point(516, 3);
+            btnClose.Name = "btnClose";
+            btnClose.Size = new Size(30, 30);
+            btnClose.SizeMode = PictureBoxSizeMode.StretchImage;
+            btnClose.TabIndex = 1;
+            btnClose.TabStop = false;
+            btnClose.Click += btnClose_Click;
+            // 
+            // j
+            // 
+            j.Dock = DockStyle.Fill;
+            j.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Bold);
+            j.Location = new Point(3, 3);
+            j.Name = "j";
+            j.Size = new Size(513, 30);
+            j.TabIndex = 2;
+            j.Text = "标题";
+            j.TextAlign = ContentAlignment.MiddleLeft;
+            // 
+            // SizeCtrlTitleBar
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(j);
+            Controls.Add(btnClose);
+            MinimumSize = new Size(0, 36);
+            Name = "SizeCtrlTitleBar";
+            Padding = new Padding(3);
+            Size = new Size(549, 36);
+            ((System.ComponentModel.ISupportInitialize)btnClose).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private PictureBox btnClose;
+        private Label j;
+    }
+}

CanFly/UI/SizePanel/SizeCtrlTitleBar.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeCtrlTitleBar : UserControl
+    {
+        public event Action? OnCloseClicked;
+
+
+
+        [DisplayName("Title")]
+        public string Title
+        {
+            get { return this.j.Text; }
+            set { this.j.Text = value; }
+        }
+
+
+        public SizeCtrlTitleBar()
+        {
+            InitializeComponent();
+            this.Dock = DockStyle.Top;
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            OnCloseClicked?.Invoke();
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideCircleCtrl.Designer.cs

@@ -0,0 +1,364 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeGuideCircleCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeGuideCircleCtrl));
+            splitContainer = new SplitContainer();
+            panel1 = new Panel();
+            canvas = new Canvas.UI.FlyCanvas();
+            statusStrip1 = new StatusStrip();
+            lblStatus = new ToolStripStatusLabel();
+            btnClose = new PictureBox();
+            label4 = new Label();
+            btnExecute = new Button();
+            lblElapsed = new Label();
+            ctrlTitleBar = new SizeCtrlTitleBar();
+            groupBox1 = new GroupBox();
+            label1 = new Label();
+            label2 = new Label();
+            label3 = new Label();
+            tbR = new TextBox();
+            tbY = new TextBox();
+            tbX = new TextBox();
+            btnLoadImage = new Button();
+            btnCreateCircle = new Button();
+            btnSave = new Button();
+            label6 = new Label();
+            lblResult = new Label();
+            panelGuide = new Panel();
+            ((System.ComponentModel.ISupportInitialize)splitContainer).BeginInit();
+            splitContainer.Panel1.SuspendLayout();
+            splitContainer.Panel2.SuspendLayout();
+            splitContainer.SuspendLayout();
+            panel1.SuspendLayout();
+            statusStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)btnClose).BeginInit();
+            groupBox1.SuspendLayout();
+            panelGuide.SuspendLayout();
+            SuspendLayout();
+            // 
+            // splitContainer
+            // 
+            splitContainer.Dock = DockStyle.Fill;
+            splitContainer.Location = new Point(0, 0);
+            splitContainer.Name = "splitContainer";
+            // 
+            // splitContainer.Panel1
+            // 
+            splitContainer.Panel1.Controls.Add(panelGuide);
+            splitContainer.Panel1MinSize = 150;
+            // 
+            // splitContainer.Panel2
+            // 
+            splitContainer.Panel2.Controls.Add(panel1);
+            splitContainer.Size = new Size(1280, 640);
+            splitContainer.SplitterDistance = 200;
+            splitContainer.TabIndex = 12;
+            // 
+            // panel1
+            // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
+            panel1.Controls.Add(canvas);
+            panel1.Controls.Add(statusStrip1);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(1076, 640);
+            panel1.TabIndex = 1;
+            // 
+            // canvas
+            // 
+            canvas.AllowMultiSelect = false;
+            canvas.CreateMode = Canvas.Shape.ShapeTypeEnum.Polygon;
+            canvas.Dock = DockStyle.Fill;
+            canvas.Enabled = false;
+            canvas.FillDrawing = false;
+            canvas.Location = new Point(0, 0);
+            canvas.Margin = new Padding(2);
+            canvas.Name = "canvas";
+            canvas.OutsideShapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.OutsideShapes");
+            canvas.Scale = 1F;
+            canvas.Shapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.Shapes");
+            canvas.Size = new Size(1074, 616);
+            canvas.TabIndex = 2;
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Items.AddRange(new ToolStripItem[] { lblStatus });
+            statusStrip1.Location = new Point(0, 616);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(1074, 22);
+            statusStrip1.TabIndex = 1;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // lblStatus
+            // 
+            lblStatus.Name = "lblStatus";
+            lblStatus.Size = new Size(44, 17);
+            lblStatus.Text = "         ";
+            // 
+            // btnClose
+            // 
+            btnClose.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            btnClose.Image = XKRS.CanFly.Properties.Resources.Close;
+            btnClose.InitialImage = XKRS.CanFly.Properties.Resources.Close;
+            btnClose.Location = new Point(1102, 3);
+            btnClose.Name = "btnClose";
+            btnClose.Size = new Size(33, 33);
+            btnClose.SizeMode = PictureBoxSizeMode.StretchImage;
+            btnClose.TabIndex = 5;
+            btnClose.TabStop = false;
+            btnClose.Click += btnClose_Click;
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(6, 307);
+            label4.Name = "label4";
+            label4.Size = new Size(44, 17);
+            label4.TabIndex = 3;
+            label4.Text = "耗时：";
+            // 
+            // btnExecute
+            // 
+            btnExecute.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnExecute.Location = new Point(6, 272);
+            btnExecute.Name = "btnExecute";
+            btnExecute.Size = new Size(186, 32);
+            btnExecute.TabIndex = 2;
+            btnExecute.Text = "执行";
+            btnExecute.UseVisualStyleBackColor = true;
+            btnExecute.Click += btnExecute_Click;
+            // 
+            // lblElapsed
+            // 
+            lblElapsed.AutoSize = true;
+            lblElapsed.Location = new Point(56, 307);
+            lblElapsed.Name = "lblElapsed";
+            lblElapsed.Size = new Size(32, 17);
+            lblElapsed.TabIndex = 4;
+            lblElapsed.Text = "0ms";
+            // 
+            // ctrlTitleBar
+            // 
+            ctrlTitleBar.Dock = DockStyle.Top;
+            ctrlTitleBar.Location = new Point(0, 0);
+            ctrlTitleBar.MinimumSize = new Size(0, 36);
+            ctrlTitleBar.Name = "ctrlTitleBar";
+            ctrlTitleBar.Padding = new Padding(3);
+            ctrlTitleBar.Size = new Size(198, 36);
+            ctrlTitleBar.TabIndex = 11;
+            ctrlTitleBar.Title = "圆形测量";
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(tbX);
+            groupBox1.Controls.Add(tbY);
+            groupBox1.Controls.Add(tbR);
+            groupBox1.Controls.Add(label3);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Dock = DockStyle.Top;
+            groupBox1.Location = new Point(0, 36);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(198, 116);
+            groupBox1.TabIndex = 12;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "圆参数";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 25);
+            label1.Name = "label1";
+            label1.Size = new Size(19, 17);
+            label1.TabIndex = 0;
+            label1.Text = "X:";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(6, 54);
+            label2.Name = "label2";
+            label2.Size = new Size(18, 17);
+            label2.TabIndex = 1;
+            label2.Text = "Y:";
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new Point(3, 83);
+            label3.Name = "label3";
+            label3.Size = new Size(44, 17);
+            label3.TabIndex = 2;
+            label3.Text = "半径：";
+            // 
+            // tbR
+            // 
+            tbR.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbR.Location = new Point(56, 80);
+            tbR.Name = "tbR";
+            tbR.Size = new Size(136, 23);
+            tbR.TabIndex = 3;
+            // 
+            // tbY
+            // 
+            tbY.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbY.Location = new Point(56, 51);
+            tbY.Name = "tbY";
+            tbY.Size = new Size(136, 23);
+            tbY.TabIndex = 4;
+            // 
+            // tbX
+            // 
+            tbX.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbX.Location = new Point(56, 22);
+            tbX.Name = "tbX";
+            tbX.Size = new Size(136, 23);
+            tbX.TabIndex = 5;
+            // 
+            // btnLoadImage
+            // 
+            btnLoadImage.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnLoadImage.Location = new Point(6, 158);
+            btnLoadImage.Name = "btnLoadImage";
+            btnLoadImage.Size = new Size(186, 32);
+            btnLoadImage.TabIndex = 13;
+            btnLoadImage.Text = "打开图片";
+            btnLoadImage.UseVisualStyleBackColor = true;
+            btnLoadImage.Click += btnLoadImage_Click;
+            // 
+            // btnCreateCircle
+            // 
+            btnCreateCircle.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnCreateCircle.Location = new Point(6, 196);
+            btnCreateCircle.Name = "btnCreateCircle";
+            btnCreateCircle.Size = new Size(186, 32);
+            btnCreateCircle.TabIndex = 14;
+            btnCreateCircle.Text = "创建圆形";
+            btnCreateCircle.UseVisualStyleBackColor = true;
+            btnCreateCircle.Click += btnCreateCircle_Click;
+            // 
+            // btnSave
+            // 
+            btnSave.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnSave.Location = new Point(9, 397);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new Size(186, 32);
+            btnSave.TabIndex = 15;
+            btnSave.Text = "保存数据";
+            btnSave.UseVisualStyleBackColor = true;
+            btnSave.Click += btnSave_Click;
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new Point(6, 338);
+            label6.Name = "label6";
+            label6.Size = new Size(44, 17);
+            label6.TabIndex = 16;
+            label6.Text = "结果：";
+            // 
+            // lblResult
+            // 
+            lblResult.AutoSize = true;
+            lblResult.Location = new Point(56, 338);
+            lblResult.Name = "lblResult";
+            lblResult.Size = new Size(20, 17);
+            lblResult.TabIndex = 17;
+            lblResult.Text = "无";
+            // 
+            // panelGuide
+            // 
+            panelGuide.BorderStyle = BorderStyle.FixedSingle;
+            panelGuide.Controls.Add(lblResult);
+            panelGuide.Controls.Add(label6);
+            panelGuide.Controls.Add(btnSave);
+            panelGuide.Controls.Add(btnCreateCircle);
+            panelGuide.Controls.Add(btnLoadImage);
+            panelGuide.Controls.Add(groupBox1);
+            panelGuide.Controls.Add(ctrlTitleBar);
+            panelGuide.Controls.Add(lblElapsed);
+            panelGuide.Controls.Add(btnExecute);
+            panelGuide.Controls.Add(label4);
+            panelGuide.Dock = DockStyle.Fill;
+            panelGuide.Location = new Point(0, 0);
+            panelGuide.Name = "panelGuide";
+            panelGuide.Size = new Size(200, 640);
+            panelGuide.TabIndex = 0;
+            // 
+            // GuideCircleCtrl
+            // 
+            Controls.Add(splitContainer);
+            Controls.Add(btnClose);
+            Name = "GuideCircleCtrl";
+            Size = new Size(1280, 640);
+            splitContainer.Panel1.ResumeLayout(false);
+            splitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)splitContainer).EndInit();
+            splitContainer.ResumeLayout(false);
+            panel1.ResumeLayout(false);
+            panel1.PerformLayout();
+            statusStrip1.ResumeLayout(false);
+            statusStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)btnClose).EndInit();
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            panelGuide.ResumeLayout(false);
+            panelGuide.PerformLayout();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private SplitContainer splitContainer;
+        private Panel panel1;
+        private Canvas.UI.FlyCanvas canvas;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel lblStatus;
+        private PictureBox btnClose;
+        private Panel panelGuide;
+        private Label lblResult;
+        private Label label6;
+        private Button btnSave;
+        private Button btnCreateCircle;
+        private Button btnLoadImage;
+        private GroupBox groupBox1;
+        private TextBox tbX;
+        private TextBox tbY;
+        private TextBox tbR;
+        private Label label3;
+        private Label label2;
+        private Label label1;
+        private SizeCtrlTitleBar ctrlTitleBar;
+        private Label lblElapsed;
+        private Button btnExecute;
+        private Label label4;
+    }
+}

CanFly/UI/SizePanel/SizeGuideCircleCtrl.cs

@@ -0,0 +1,361 @@
+using CanFly.Canvas.Shape;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using CanFly.Canvas.Helper;
+using CanFly.Helper;
+using HalconDotNet;
+using System.Diagnostics;
+using CanFly.Canvas.UI;
+
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeGuideCircleCtrl : SizeBaseGuideControl
+    {
+
+        private float _x;
+        private float _y;
+        private float _r;
+        private FlyShape? _circle;
+
+
+        protected override string GetScriptFileName() => "CircleMeasure.hdvp";
+
+
+
+
+        public SizeGuideCircleCtrl()
+        {
+            InitializeComponent();
+
+
+            this.canvas.mouseMoved += Canvas_mouseMoved;
+            this.canvas.OnShapeUpdateEvent += UpdateShape;
+            this.canvas.selectionChanged += Canvas_selectionChanged;
+
+            this.canvas.OnShapeMoving += Canvas_OnShapeMoving;
+            this.canvas.newShape += Canvas_newShape;
+
+            this.ctrlTitleBar.OnCloseClicked += OnControlClose;
+        }
+
+
+
+        protected override void UpdateShape(FlyShape shape)
+        {
+            this._circle = shape;
+
+            _x = shape.Points[0].X;
+            _y = shape.Points[0].Y;
+            _r = PointHelper.Distance(shape.Points[0], shape.Points[1]);
+
+            this.tbX.Text = shape.Points[0].X.ToString("F3");
+            this.tbY.Text = shape.Points[0].Y.ToString("F3");
+            this.tbR.Text = _r.ToString("F3");
+        }
+
+
+
+
+        private void btnExecute_Click(object sender, EventArgs e)
+        {
+
+
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            if(this.tbX.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("请先创建圆形");
+                return;
+            }
+       
+
+            this.canvas.OutsideShapes.Clear();
+            this.canvas.Invalidate();
+
+            flag = new List<double>();
+            x = new List<double>();
+            y = new List<double>();
+            r = new List<double>();
+            Dictionary<string, HObject> inputImg = new Dictionary<string, HObject>();
+
+            if (hImage == null)
+            {
+                HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+            }
+            inputImg["INPUT_Image"] = hImage;
+
+            Dictionary<string, HTuple> inputPara = new Dictionary<string, HTuple>();
+
+
+            inputPara["XCenter"] = _x;
+            inputPara["YCenter"] = _y;
+            inputPara["Radius"] = _r;
+
+
+            List<string> outputKeys = new List<string>()
+            {
+                "OUTPUT_PreTreatedImage",
+                "OUTPUT_Flag",
+                "RXCenter",
+                "RYCenter",
+                "RRadius"
+            };
+
+            ExecuteHScript(
+                    inputImg,
+                    inputPara,
+                    outputKeys);
+
+        }
+        List<double> flag = new List<double>(), x=new List<double>(),y=new List<double>(),r=new List<double>();
+
+        protected override void OnExecuteHScriptResult(
+            bool success,
+            Dictionary<string, HTuple> resultDic,
+            int timeElasped)
+        {
+            if (!success)
+            {
+                return;
+            }
+
+
+            /*
+               "OUTPUT_Flag",
+                "RXCenter",
+                "RYCenter",
+                "RRadius"
+             */
+           
+            //取图？？？？？
+
+
+
+            flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+             x = resultDic["RXCenter"].HTupleToDouble();
+             y = resultDic["RYCenter"].HTupleToDouble();
+             r = resultDic["RRadius"].HTupleToDouble();
+
+         
+         
+
+
+
+
+
+
+            if (flag.Count > 0)
+            {
+                lblResult.Text = flag[0].ToString();
+
+            }
+            else
+            {
+                lblResult.Text = "无";
+            }
+            if (flag.Count > 0 && x.Count > 0 && y.Count > 0 && r.Count > 0)
+            {
+
+                //detectResult.VisionImageSet.MLImage = resultDic["RRadius"].GetResultObject("OUTPUT_PreTreatedImage");
+                this.canvas.DrawCircle(new PointF((float)x[0], (float)y[0]), (float)r[0]);
+                lblElapsed.Text = $"{timeElasped} ms";
+            }
+        }
+
+
+
+
+        private void Test()
+        {
+            string filePath = Path.Combine(_hScriptsDir, GetScriptFileName());
+            if (!File.Exists(filePath))
+            {
+                MessageBox.Show($"文件 {filePath} 不存在");
+                return;
+            }
+
+
+            try
+            {
+                HDevEngineTool tool = new HDevEngineTool(_hScriptsDir);
+                tool.LoadProcedure(Path.GetFileNameWithoutExtension(GetScriptFileName()));
+
+
+                if (hImage == null)
+                {
+                    HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+                }
+
+                tool.InputImageDic["INPUT_Image"] = hImage;
+                tool.InputTupleDic["XCenter"] = _x;
+                tool.InputTupleDic["YCenter"] = _y;
+                tool.InputTupleDic["Radius"] = _r;
+
+
+
+                if (!tool.RunProcedure(out string error, out int timeElasped))
+                {
+                    throw new Exception();
+                }
+
+                HTuple hFlag = tool.GetResultTuple("OUTPUT_Flag");
+
+                var flag = tool.GetResultTuple("OUTPUT_Flag").HTupleToDouble();
+                List<double> x = tool.GetResultTuple("RXCenter").HTupleToDouble();
+                var y = tool.GetResultTuple("RYCenter").HTupleToDouble();
+                var r = tool.GetResultTuple("RRadius").HTupleToDouble();
+                if (flag.Count > 0)
+                {
+                    lblResult.Text = flag[0].ToString();
+
+                }
+                else
+                {
+                    lblResult.Text = "无";
+                }
+                if (flag.Count > 0 && x.Count > 0 && y.Count > 0 && r.Count > 0)
+                {
+                    this.canvas.DrawCircle(new PointF((float)x[0], (float)y[0]), (float)r[0]);
+                    lblElapsed.Text = $"{timeElasped} ms";
+                }
+
+                //
+                Debug.WriteLine("");
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            finally
+            {
+                hImage?.Dispose();
+                hImage = null;
+            }
+
+
+        }
+
+
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            OnControlCloseEvent?.Invoke();
+        }
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            OpenImageFile(bitmap =>
+            {
+                this.canvas.LoadPixmap(bitmap);
+                this.canvas.Enabled = true;
+            });
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(Canvas_mouseMoved, pos);
+                return;
+            }
+
+            lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    // panelGuide.Controls.Clear();
+            //    return;
+            //}
+            //SwitchGuideForm(shapes[0].ShapeType);
+            // Canvas_OnShapeUpdateEvent(shapes[0]);
+
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+            UpdateShape(shapes[0]);
+
+        }
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+
+            UpdateShape(shapes[0]);
+        }
+
+        private void btnCreateCircle_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            this.tbX.Text = string.Empty;
+            this.tbY.Text = string.Empty;
+            this.tbR.Text = string.Empty;
+            this.canvas.Shapes.Clear();
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Circle);
+            this.canvas.Enabled = true;
+        }
+
+
+
+        private void Canvas_newShape()
+        {
+
+            this.canvas.StopDraw();
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            if (lblResult.Text.Equals("无"))
+            {
+                MessageBox.Show("请先进行绘制");
+                return;
+            }
+            if(lblResult.Text != "0")
+            {
+                MessageBox.Show("测量计算错误，无法保存");
+                return;
+            }
+
+            //List<double> x = tool.GetResultTuple("RXCenter").HTupleToDouble();
+            //var y = tool.GetResultTuple("RYCenter").HTupleToDouble();
+            //var r = tool.GetResultTuple("RRadius").HTupleToDouble();
+            //tool.InputTupleDic["XCenter"] = _x;
+            //tool.InputTupleDic["YCenter"] = _y;
+            //tool.InputTupleDic["Radius"] = _r;
+            string inputput = $"XCenter:{string.Join(";", _x)};YCenter:{string.Join(";", _y)};RRadius:{string.Join(";", _r)}";
+            string output = $"RXCenter:{string.Join(";", x[0])};RYCenter:{string.Join(";", y[0])};RRadius:{string.Join(";", r[0])}";
+
+            DataToTriggerEvent(inputput,output);
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideCircleCtrl.resx

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="canvas.OutsideShapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <data name="canvas.Shapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

CanFly/UI/SizePanel/SizeGuideHeightCtrl.Designer.cs

@@ -0,0 +1,471 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeGuideHeightCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeGuideHeightCtrl));
+            splitter1 = new AntdUI.Splitter();
+            panel1 = new AntdUI.Panel();
+            canvas = new Canvas.UI.FlyCanvas();
+            panel2 = new AntdUI.Panel();
+            ctrlTitleBar = new GuidePanel.CtrlTitleBar();
+            statusStrip1 = new StatusStrip();
+            lblStatus = new ToolStripStatusLabel();
+            groupBox2 = new GroupBox();
+            tbLineX1 = new AntdUI.Input();
+            label1 = new AntdUI.Label();
+            label4 = new AntdUI.Label();
+            tbLineY1 = new AntdUI.Input();
+            label3 = new AntdUI.Label();
+            tbLineY2 = new AntdUI.Input();
+            label5 = new AntdUI.Label();
+            tbLineX2 = new AntdUI.Input();
+            label6 = new AntdUI.Label();
+            label7 = new AntdUI.Label();
+            tbwidth = new AntdUI.Input();
+            tbheight = new AntdUI.Input();
+            label2 = new AntdUI.Label();
+            CamName = new AntdUI.Input();
+            groupBox1 = new GroupBox();
+            switch1 = new AntdUI.Switch();
+            label8 = new AntdUI.Label();
+            button1 = new AntdUI.Button();
+            button2 = new AntdUI.Button();
+            button3 = new AntdUI.Button();
+            label9 = new AntdUI.Label();
+            lblElapsed = new AntdUI.Label();
+            lblResult = new AntdUI.Label();
+            label12 = new AntdUI.Label();
+            btnSave = new AntdUI.Button();
+            ((System.ComponentModel.ISupportInitialize)splitter1).BeginInit();
+            splitter1.Panel1.SuspendLayout();
+            splitter1.Panel2.SuspendLayout();
+            splitter1.SuspendLayout();
+            panel1.SuspendLayout();
+            panel2.SuspendLayout();
+            statusStrip1.SuspendLayout();
+            groupBox2.SuspendLayout();
+            groupBox1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // splitter1
+            // 
+            splitter1.Dock = DockStyle.Fill;
+            splitter1.Location = new Point(0, 0);
+            splitter1.Name = "splitter1";
+            // 
+            // splitter1.Panel1
+            // 
+            splitter1.Panel1.Controls.Add(panel2);
+            // 
+            // splitter1.Panel2
+            // 
+            splitter1.Panel2.Controls.Add(panel1);
+            splitter1.Size = new Size(1280, 640);
+            splitter1.SplitterDistance = 286;
+            splitter1.TabIndex = 0;
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(statusStrip1);
+            panel1.Controls.Add(canvas);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(990, 640);
+            panel1.TabIndex = 0;
+            panel1.Text = "panel1";
+            // 
+            // canvas
+            // 
+            canvas.AllowMultiSelect = false;
+            canvas.CreateMode = Canvas.Shape.ShapeTypeEnum.Polygon;
+            canvas.Dock = DockStyle.Fill;
+            canvas.FillDrawing = false;
+            canvas.Location = new Point(0, 0);
+            canvas.Margin = new Padding(2);
+            canvas.Name = "canvas";
+            canvas.OutsideShapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.OutsideShapes");
+            canvas.Scale = 1F;
+            canvas.Shapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.Shapes");
+            canvas.Size = new Size(990, 640);
+            canvas.TabIndex = 0;
+            // 
+            // panel2
+            // 
+            panel2.Controls.Add(btnSave);
+            panel2.Controls.Add(lblResult);
+            panel2.Controls.Add(label12);
+            panel2.Controls.Add(lblElapsed);
+            panel2.Controls.Add(label9);
+            panel2.Controls.Add(button3);
+            panel2.Controls.Add(button2);
+            panel2.Controls.Add(groupBox1);
+            panel2.Controls.Add(groupBox2);
+            panel2.Controls.Add(ctrlTitleBar);
+            panel2.Dock = DockStyle.Fill;
+            panel2.Location = new Point(0, 0);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(286, 640);
+            panel2.TabIndex = 0;
+            panel2.Text = "panel2";
+            // 
+            // ctrlTitleBar
+            // 
+            ctrlTitleBar.Dock = DockStyle.Top;
+            ctrlTitleBar.Location = new Point(0, 0);
+            ctrlTitleBar.MinimumSize = new Size(0, 36);
+            ctrlTitleBar.Name = "ctrlTitleBar";
+            ctrlTitleBar.Padding = new Padding(3);
+            ctrlTitleBar.Size = new Size(286, 36);
+            ctrlTitleBar.TabIndex = 12;
+            ctrlTitleBar.Title = "高度测量";
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Items.AddRange(new ToolStripItem[] { lblStatus });
+            statusStrip1.Location = new Point(0, 618);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(990, 22);
+            statusStrip1.TabIndex = 2;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // lblStatus
+            // 
+            lblStatus.Name = "lblStatus";
+            lblStatus.Size = new Size(44, 17);
+            lblStatus.Text = "         ";
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(tbheight);
+            groupBox2.Controls.Add(tbwidth);
+            groupBox2.Controls.Add(label7);
+            groupBox2.Controls.Add(label6);
+            groupBox2.Controls.Add(label3);
+            groupBox2.Controls.Add(tbLineY2);
+            groupBox2.Controls.Add(label5);
+            groupBox2.Controls.Add(tbLineX2);
+            groupBox2.Controls.Add(label4);
+            groupBox2.Controls.Add(tbLineY1);
+            groupBox2.Controls.Add(label1);
+            groupBox2.Controls.Add(tbLineX1);
+            groupBox2.Dock = DockStyle.Top;
+            groupBox2.Location = new Point(0, 36);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(286, 229);
+            groupBox2.TabIndex = 14;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "线参数";
+            // 
+            // tbLineX1
+            // 
+            tbLineX1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX1.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbLineX1.Location = new Point(62, 22);
+            tbLineX1.Name = "tbLineX1";
+            tbLineX1.Radius = 3;
+            tbLineX1.Size = new Size(214, 32);
+            tbLineX1.TabIndex = 17;
+            // 
+            // label1
+            // 
+            label1.Location = new Point(6, 22);
+            label1.Name = "label1";
+            label1.Size = new Size(38, 32);
+            label1.TabIndex = 19;
+            label1.Text = "  X1:";
+            // 
+            // label4
+            // 
+            label4.Location = new Point(6, 60);
+            label4.Name = "label4";
+            label4.Size = new Size(38, 32);
+            label4.TabIndex = 23;
+            label4.Text = "  Y1:";
+            // 
+            // tbLineY1
+            // 
+            tbLineY1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY1.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbLineY1.Location = new Point(62, 60);
+            tbLineY1.Name = "tbLineY1";
+            tbLineY1.Radius = 3;
+            tbLineY1.Size = new Size(214, 32);
+            tbLineY1.TabIndex = 22;
+            // 
+            // label3
+            // 
+            label3.Location = new Point(6, 136);
+            label3.Name = "label3";
+            label3.Size = new Size(38, 32);
+            label3.TabIndex = 27;
+            label3.Text = "  Y2:";
+            // 
+            // tbLineY2
+            // 
+            tbLineY2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY2.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbLineY2.Location = new Point(62, 136);
+            tbLineY2.Name = "tbLineY2";
+            tbLineY2.Radius = 3;
+            tbLineY2.Size = new Size(214, 32);
+            tbLineY2.TabIndex = 26;
+            // 
+            // label5
+            // 
+            label5.Location = new Point(6, 98);
+            label5.Name = "label5";
+            label5.Size = new Size(38, 32);
+            label5.TabIndex = 25;
+            label5.Text = "  X2:";
+            // 
+            // tbLineX2
+            // 
+            tbLineX2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX2.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbLineX2.Location = new Point(62, 98);
+            tbLineX2.Name = "tbLineX2";
+            tbLineX2.Radius = 3;
+            tbLineX2.Size = new Size(214, 32);
+            tbLineX2.TabIndex = 24;
+            // 
+            // label6
+            // 
+            label6.Location = new Point(6, 174);
+            label6.Name = "label6";
+            label6.Size = new Size(50, 32);
+            label6.TabIndex = 28;
+            label6.Text = "  宽:";
+            // 
+            // label7
+            // 
+            label7.Location = new Point(145, 177);
+            label7.Name = "label7";
+            label7.Size = new Size(29, 32);
+            label7.TabIndex = 29;
+            label7.Text = "高:";
+            // 
+            // tbwidth
+            // 
+            tbwidth.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbwidth.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbwidth.Location = new Point(62, 177);
+            tbwidth.Name = "tbwidth";
+            tbwidth.Radius = 3;
+            tbwidth.Size = new Size(77, 32);
+            tbwidth.TabIndex = 30;
+            // 
+            // tbheight
+            // 
+            tbheight.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbheight.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tbheight.Location = new Point(180, 177);
+            tbheight.Name = "tbheight";
+            tbheight.Radius = 3;
+            tbheight.Size = new Size(96, 32);
+            tbheight.TabIndex = 31;
+            // 
+            // label2
+            // 
+            label2.Location = new Point(6, 22);
+            label2.Name = "label2";
+            label2.Size = new Size(55, 32);
+            label2.TabIndex = 1;
+            label2.Text = "相机名：";
+            // 
+            // CamName
+            // 
+            CamName.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            CamName.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            CamName.Location = new Point(64, 22);
+            CamName.Name = "CamName";
+            CamName.Radius = 3;
+            CamName.ReadOnly = true;
+            CamName.Size = new Size(212, 32);
+            CamName.TabIndex = 18;
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(button1);
+            groupBox1.Controls.Add(label8);
+            groupBox1.Controls.Add(switch1);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(CamName);
+            groupBox1.Dock = DockStyle.Top;
+            groupBox1.Location = new Point(0, 265);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(286, 105);
+            groupBox1.TabIndex = 19;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "相机控制";
+            // 
+            // switch1
+            // 
+            switch1.Location = new Point(67, 60);
+            switch1.Name = "switch1";
+            switch1.Size = new Size(72, 32);
+            switch1.TabIndex = 19;
+            switch1.Text = "switch1";
+            // 
+            // label8
+            // 
+            label8.Location = new Point(6, 60);
+            label8.Name = "label8";
+            label8.Size = new Size(55, 32);
+            label8.TabIndex = 20;
+            label8.Text = "硬触发：";
+            // 
+            // button1
+            // 
+            button1.Location = new Point(145, 60);
+            button1.Name = "button1";
+            button1.Size = new Size(131, 32);
+            button1.TabIndex = 21;
+            button1.Text = "软触发一次";
+            // 
+            // button2
+            // 
+            button2.Location = new Point(0, 376);
+            button2.Name = "button2";
+            button2.Size = new Size(276, 37);
+            button2.TabIndex = 22;
+            button2.Text = "创建矩形";
+            button2.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // button3
+            // 
+            button3.Location = new Point(0, 419);
+            button3.Name = "button3";
+            button3.Size = new Size(276, 36);
+            button3.TabIndex = 23;
+            button3.Text = "执行";
+            button3.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // label9
+            // 
+            label9.Location = new Point(6, 461);
+            label9.Name = "label9";
+            label9.Size = new Size(50, 23);
+            label9.TabIndex = 24;
+            label9.Text = "耗时：";
+            // 
+            // lblElapsed
+            // 
+            lblElapsed.Location = new Point(67, 461);
+            lblElapsed.Name = "lblElapsed";
+            lblElapsed.Size = new Size(72, 23);
+            lblElapsed.TabIndex = 25;
+            lblElapsed.Text = "0 ms";
+            // 
+            // lblResult
+            // 
+            lblResult.Location = new Point(67, 490);
+            lblResult.Name = "lblResult";
+            lblResult.Size = new Size(72, 23);
+            lblResult.TabIndex = 27;
+            lblResult.Text = "无";
+            // 
+            // label12
+            // 
+            label12.Location = new Point(6, 490);
+            label12.Name = "label12";
+            label12.Size = new Size(50, 23);
+            label12.TabIndex = 26;
+            label12.Text = "结果：";
+            // 
+            // btnSave
+            // 
+            btnSave.Location = new Point(0, 519);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new Size(276, 36);
+            btnSave.TabIndex = 28;
+            btnSave.Text = "保存数据";
+            btnSave.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // SizeGuideHeightCtrl
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(splitter1);
+            Name = "SizeGuideHeightCtrl";
+            Size = new Size(1280, 640);
+            Load += GuideLineCircleCtrl_Load;
+            splitter1.Panel1.ResumeLayout(false);
+            splitter1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)splitter1).EndInit();
+            splitter1.ResumeLayout(false);
+            panel1.ResumeLayout(false);
+            panel1.PerformLayout();
+            panel2.ResumeLayout(false);
+            statusStrip1.ResumeLayout(false);
+            statusStrip1.PerformLayout();
+            groupBox2.ResumeLayout(false);
+            groupBox1.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private TextBox tbRectWidth1;
+        private AntdUI.Splitter splitter1;
+        private AntdUI.Panel panel1;
+        private Canvas.UI.FlyCanvas canvas;
+        private AntdUI.Panel panel2;
+        private GuidePanel.CtrlTitleBar ctrlTitleBar;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel lblStatus;
+        private GroupBox groupBox2;
+     
+        private Canvas.UI.FlyCanvas flyCanvas1;
+        private AntdUI.Input tbLineX1;
+        private AntdUI.Label label1;
+        private AntdUI.Label label3;
+        private AntdUI.Input tbLineY2;
+        private AntdUI.Label label5;
+        private AntdUI.Input tbLineX2;
+        private AntdUI.Label label4;
+        private AntdUI.Input tbLineY1;
+        private AntdUI.Label label7;
+        private AntdUI.Label label6;
+        private AntdUI.Input tbwidth;
+        private AntdUI.Input tbheight;
+        private GroupBox groupBox1;
+        private AntdUI.Label label2;
+        private AntdUI.Input CamName;
+        private AntdUI.Button button1;
+        private AntdUI.Label label8;
+        private AntdUI.Switch switch1;
+        private AntdUI.Button button2;
+        private AntdUI.Button button3;
+        private AntdUI.Label lblElapsed;
+        private AntdUI.Label label9;
+        private AntdUI.Label lblResult;
+        private AntdUI.Label label12;
+        private AntdUI.Button btnSave;
+    }
+}

CanFly/UI/SizePanel/SizeGuideHeightCtrl.cs

@@ -0,0 +1,346 @@
+using CanFly.Canvas.Helper;
+using CanFly.Canvas.Shape;
+using CanFly.Canvas.UI;
+using CanFly.Helper;
+using HalconDotNet;
+using OpenCvSharp;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeGuideHeightCtrl : SizeBaseGuideControl
+    {
+
+
+
+        private FlyShape? _line;
+
+
+        private float _lineX1;
+        private float _lineY1;
+        private float _lineX2;
+        private float _lineY2;
+        float width, height;
+        private float _lineWidth;
+        private PointF[] _rectPoints = new PointF[4];
+        //private float _LineLX=new float();
+        //private float _LineLY =new float();
+        //private float _LineRX =new float();
+        //private float _LineRY =new float();
+
+
+
+
+
+        protected override string GetScriptFileName() => "HeightMeasure.hdvp";
+
+
+
+        public SizeGuideHeightCtrl()
+        {
+            InitializeComponent();
+
+            this.canvas.mouseMoved += Canvas_mouseMoved;
+            this.canvas.OnShapeUpdateEvent += UpdateShape;
+            this.canvas.selectionChanged += Canvas_selectionChanged;
+
+            this.canvas.OnShapeMoving += Canvas_OnShapeMoving;
+            this.canvas.newShape += Canvas_newShape;
+
+            this.ctrlTitleBar.OnCloseClicked += OnControlClose;
+
+
+
+        }
+
+
+
+        protected override void UpdateShape(FlyShape shape)
+        {
+            switch (shape.ShapeType)
+            {
+                case ShapeTypeEnum.Rectangle:
+                    this._line = shape;
+
+                    var pts = this._line.Points;
+
+                    _lineX1 = pts[0].X;
+                    _lineY1 = pts[0].Y;
+                    _lineX2 = pts[1].X;
+                    _lineY2 = pts[1].Y;
+                    _lineWidth = shape.LineVirtualRectWidth;
+                    _rectPoints = shape.LineVirtualRectPoints;
+                    //_LineLX = (shape.LineVirtualRectPoints[0].X + shape.LineVirtualRectPoints[3].X) / 2;
+                    //_LineLY = (shape.LineVirtualRectPoints[0].Y + shape.LineVirtualRectPoints[3].Y) / 2;
+                    //_LineRX = (shape.LineVirtualRectPoints[1].X + shape.LineVirtualRectPoints[2].X) / 2;
+                    //_LineRY = (shape.LineVirtualRectPoints[1].Y + shape.LineVirtualRectPoints[2].Y) / 2;
+
+                    width = Math.Abs(_lineX2 - _lineX1);
+                    height = Math.Abs(_lineY2 - _lineY1);
+
+
+                    tbLineX1.Text = _lineX1.ToString("F3");
+                    tbLineY1.Text = _lineY1.ToString("F3");
+                    tbLineX2.Text = _lineX2.ToString("F3");
+                    tbLineY2.Text = _lineY2.ToString("F3");
+                    tbwidth.Text = width.ToString();
+                    tbheight.Text = height.ToString();
+                    // NumRectWidth1.Value = (decimal)_lineWidth;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+
+
+
+
+        private void GuideLineCircleCtrl_Load(object sender, EventArgs e)
+        {
+
+
+
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(Canvas_mouseMoved, pos);
+                return;
+            }
+
+            lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    // panelGuide.Controls.Clear();
+            //    return;
+            //}
+            //SwitchGuideForm(shapes[0].ShapeType);
+            // Canvas_OnShapeUpdateEvent(shapes[0]);
+
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+            UpdateShape(shapes[0]);
+
+        }
+
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+
+            UpdateShape(shapes[0]);
+        }
+
+
+
+
+
+
+
+        private void btnCreateLine_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            tbLineX1.Text = string.Empty;
+            tbLineY1.Text = string.Empty;
+            tbLineX2.Text = string.Empty;
+            tbLineY2.Text = string.Empty; ;
+            tbwidth.Text = string.Empty; ;
+            tbheight.Text = string.Empty; ;
+            this.canvas.Shapes.RemoveAll(shp => shp.ShapeType == ShapeTypeEnum.Rectangle);
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Rectangle);
+
+        }
+
+
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            OpenImageFile(bitmap =>
+            {
+                this.canvas.LoadPixmap(bitmap);
+                this.canvas.Enabled = true;
+
+
+            });
+        }
+
+
+        private void Canvas_newShape()
+        {
+            this.canvas.StopDraw();
+        }
+
+        private void btnExecute_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            if (this.tbLineX1.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("请先创建矩形");
+                return;
+            }
+            this.canvas.OutsideShapes.Clear();
+            this.canvas.Invalidate();
+
+
+            flag = new List<double>();
+
+            Line1Para = new List<double>();
+            Line2Para = new List<double>();
+            iHeight = new List<double>();
+            Dictionary<string, HObject> inputImg = new Dictionary<string, HObject>();
+
+            if (hImage == null)
+            {
+                HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+            }
+            inputImg["INPUT_Image"] = hImage;
+
+
+            Dictionary<string, HTuple> inputPara = new Dictionary<string, HTuple>();
+
+
+            inputPara["row"] = _lineY1;
+            inputPara["column"] = _lineX1;
+            inputPara["Width"] = width;
+            inputPara["Height"] = height;
+
+
+
+            List<string> outputKeys = new List<string>()
+            {
+                "OUTPUT_PreTreatedImage",
+                "OUTPUT_Flag",
+
+                "Line1Para",
+                "Line2Para",
+                "iHeight"
+            };
+
+            ExecuteHScript(
+                    inputImg,
+                    inputPara,
+                    outputKeys);
+
+        }
+
+
+        List<double> flag = new List<double>();
+        List<double> Line1Para = new List<double>();
+        List<double> Line2Para = new List<double>();
+
+        List<double> iHeight = new List<double>();
+
+
+        protected override void OnExecuteHScriptResult(
+            bool success,
+            Dictionary<string, HTuple> resultDic,
+            int timeElasped)
+        {
+            if (!success)
+            {
+                return;
+            }
+
+
+            /*
+               "OUTPUT_Flag",
+                "RXCenter",
+                "RYCenter",
+                "RRadius"
+             */
+
+            flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+
+            Line1Para = resultDic["Line1Para"].HTupleToDouble();
+            Line2Para = resultDic["Line2Para"].HTupleToDouble();
+            // EndRow = resultDic["EndRow"].HTupleToDouble();
+            //EndCloumn = resultDic["EndColumn"].HTupleToDouble();
+            iHeight = resultDic["iHeight"].HTupleToDouble();
+
+            if (flag.Count > 0)
+            {
+                lblResult.Text = flag[0].ToString();
+
+            }
+            else
+            {
+                lblResult.Text = "无";
+            }
+            if (flag.Count > 0 && Line1Para.Count == 4 && Line2Para.Count == 4 && iHeight.Count > 0)
+            {
+                float width = 0;
+                this.canvas.DrawLine(new PointF((float)Line1Para[1], (float)Line1Para[0]), new PointF((float)Line1Para[3], (float)Line1Para[2]), 0);
+                this.canvas.DrawLine(new PointF((float)Line2Para[1], (float)Line2Para[0]), new PointF((float)Line2Para[3], (float)Line2Para[2]), 0);
+                this.canvas.Invalidate();
+                lblElapsed.Text = $"{timeElasped} ms";
+            }
+        }
+
+
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            if (lblResult.Text.Equals("无"))
+            {
+                MessageBox.Show("请先进行绘制");
+                return;
+            }
+            if (lblResult.Text != "0")
+            {
+                MessageBox.Show("测量计算错误，无法保存");
+                return;
+            }
+
+
+
+            string input = $"row:{string.Join(";", _lineY1)};column:{string.Join(";", _lineX1)};" +
+                $"Width:{string.Join(";", width)};Height:{string.Join(";", height)}";
+
+            string output = $"iHeight:{string.Join(";", iHeight[0])}";
+            DataToTriggerEvent(input, output);
+        }
+
+        private void tbLineX1_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideHeightCtrl.resx

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="canvas.OutsideShapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <data name="canvas.Shapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

CanFly/UI/SizePanel/SizeGuideLineCircleCtrl.Designer.cs

@@ -0,0 +1,550 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeGuideLineCircleCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeGuideLineCircleCtrl));
+            lblElapsed = new Label();
+            label4 = new Label();
+            splitContainer = new SplitContainer();
+            panelGuide = new Panel();
+            lblDistance = new Label();
+            label17 = new Label();
+            lblResult = new Label();
+            label15 = new Label();
+            btnCreateLine = new Button();
+            btnCreateCircle = new Button();
+            btnLoadImage = new Button();
+            label9 = new Label();
+            btnExecute = new Button();
+            label10 = new Label();
+            groupBox2 = new GroupBox();
+            NumRectWidth1 = new NumericUpDown();
+            label11 = new Label();
+            tbLineX2 = new TextBox();
+            label8 = new Label();
+            tbLineY2 = new TextBox();
+            label5 = new Label();
+            tbLineX1 = new TextBox();
+            tbLineY1 = new TextBox();
+            label6 = new Label();
+            label7 = new Label();
+            groupBox1 = new GroupBox();
+            tbCircleX = new TextBox();
+            tbCircleY = new TextBox();
+            tbCircleR = new TextBox();
+            label3 = new Label();
+            label2 = new Label();
+            label1 = new Label();
+            ctrlTitleBar = new SizeCtrlTitleBar();
+            panel1 = new Panel();
+            canvas = new Canvas.UI.FlyCanvas();
+            statusStrip1 = new StatusStrip();
+            lblStatus = new ToolStripStatusLabel();
+            btnSave = new Button();
+            ((System.ComponentModel.ISupportInitialize)splitContainer).BeginInit();
+            splitContainer.Panel1.SuspendLayout();
+            splitContainer.Panel2.SuspendLayout();
+            splitContainer.SuspendLayout();
+            panelGuide.SuspendLayout();
+            groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).BeginInit();
+            groupBox1.SuspendLayout();
+            panel1.SuspendLayout();
+            statusStrip1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // lblElapsed
+            // 
+            lblElapsed.AutoSize = true;
+            lblElapsed.Location = new Point(50, 328);
+            lblElapsed.Name = "lblElapsed";
+            lblElapsed.Size = new Size(32, 17);
+            lblElapsed.TabIndex = 9;
+            lblElapsed.Text = "0ms";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(0, 328);
+            label4.Name = "label4";
+            label4.Size = new Size(44, 17);
+            label4.TabIndex = 8;
+            label4.Text = "耗时：";
+            // 
+            // splitContainer
+            // 
+            splitContainer.Dock = DockStyle.Fill;
+            splitContainer.Location = new Point(0, 0);
+            splitContainer.Name = "splitContainer";
+            // 
+            // splitContainer.Panel1
+            // 
+            splitContainer.Panel1.Controls.Add(panelGuide);
+            splitContainer.Panel1MinSize = 150;
+            // 
+            // splitContainer.Panel2
+            // 
+            splitContainer.Panel2.Controls.Add(panel1);
+            splitContainer.Size = new Size(1280, 640);
+            splitContainer.SplitterDistance = 200;
+            splitContainer.TabIndex = 11;
+            // 
+            // panelGuide
+            // 
+            panelGuide.BorderStyle = BorderStyle.FixedSingle;
+            panelGuide.Controls.Add(btnSave);
+            panelGuide.Controls.Add(lblDistance);
+            panelGuide.Controls.Add(label17);
+            panelGuide.Controls.Add(lblResult);
+            panelGuide.Controls.Add(label15);
+            panelGuide.Controls.Add(btnCreateLine);
+            panelGuide.Controls.Add(btnCreateCircle);
+            panelGuide.Controls.Add(btnLoadImage);
+            panelGuide.Controls.Add(label9);
+            panelGuide.Controls.Add(btnExecute);
+            panelGuide.Controls.Add(label10);
+            panelGuide.Controls.Add(groupBox2);
+            panelGuide.Controls.Add(groupBox1);
+            panelGuide.Controls.Add(ctrlTitleBar);
+            panelGuide.Dock = DockStyle.Fill;
+            panelGuide.Location = new Point(0, 0);
+            panelGuide.Name = "panelGuide";
+            panelGuide.Size = new Size(200, 640);
+            panelGuide.TabIndex = 0;
+            // 
+            // lblDistance
+            // 
+            lblDistance.AutoSize = true;
+            lblDistance.Location = new Point(54, 505);
+            lblDistance.Name = "lblDistance";
+            lblDistance.Size = new Size(15, 17);
+            lblDistance.TabIndex = 29;
+            lblDistance.Text = "0";
+            // 
+            // label17
+            // 
+            label17.AutoSize = true;
+            label17.Location = new Point(6, 505);
+            label17.Name = "label17";
+            label17.Size = new Size(44, 17);
+            label17.TabIndex = 28;
+            label17.Text = "距离：";
+            // 
+            // lblResult
+            // 
+            lblResult.AutoSize = true;
+            lblResult.Location = new Point(54, 479);
+            lblResult.Name = "lblResult";
+            lblResult.Size = new Size(20, 17);
+            lblResult.TabIndex = 27;
+            lblResult.Text = "无";
+            // 
+            // label15
+            // 
+            label15.AutoSize = true;
+            label15.Location = new Point(6, 479);
+            label15.Name = "label15";
+            label15.Size = new Size(44, 17);
+            label15.TabIndex = 26;
+            label15.Text = "结果：";
+            // 
+            // btnCreateLine
+            // 
+            btnCreateLine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnCreateLine.Location = new Point(6, 406);
+            btnCreateLine.Name = "btnCreateLine";
+            btnCreateLine.Size = new Size(186, 32);
+            btnCreateLine.TabIndex = 20;
+            btnCreateLine.Text = "创建直线";
+            btnCreateLine.UseVisualStyleBackColor = true;
+            btnCreateLine.Click += btnCreateLine_Click;
+            // 
+            // btnCreateCircle
+            // 
+            btnCreateCircle.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnCreateCircle.Location = new Point(6, 368);
+            btnCreateCircle.Name = "btnCreateCircle";
+            btnCreateCircle.Size = new Size(186, 32);
+            btnCreateCircle.TabIndex = 19;
+            btnCreateCircle.Text = "创建圆形";
+            btnCreateCircle.UseVisualStyleBackColor = true;
+            btnCreateCircle.Click += btnCreateCircle_Click;
+            // 
+            // btnLoadImage
+            // 
+            btnLoadImage.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnLoadImage.Location = new Point(6, 330);
+            btnLoadImage.Name = "btnLoadImage";
+            btnLoadImage.Size = new Size(186, 32);
+            btnLoadImage.TabIndex = 18;
+            btnLoadImage.Text = "打开图片";
+            btnLoadImage.UseVisualStyleBackColor = true;
+            btnLoadImage.Click += btnLoadImage_Click;
+            // 
+            // label9
+            // 
+            label9.AutoSize = true;
+            label9.Location = new Point(56, 525);
+            label9.Name = "label9";
+            label9.Size = new Size(32, 17);
+            label9.TabIndex = 17;
+            label9.Text = "0ms";
+            // 
+            // btnExecute
+            // 
+            btnExecute.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnExecute.Location = new Point(6, 444);
+            btnExecute.Name = "btnExecute";
+            btnExecute.Size = new Size(186, 32);
+            btnExecute.TabIndex = 15;
+            btnExecute.Text = "执行";
+            btnExecute.UseVisualStyleBackColor = true;
+            btnExecute.Click += btnExecute_Click;
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new Point(6, 525);
+            label10.Name = "label10";
+            label10.Size = new Size(44, 17);
+            label10.TabIndex = 16;
+            label10.Text = "耗时：";
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(NumRectWidth1);
+            groupBox2.Controls.Add(label11);
+            groupBox2.Controls.Add(tbLineX2);
+            groupBox2.Controls.Add(label8);
+            groupBox2.Controls.Add(tbLineY2);
+            groupBox2.Controls.Add(label5);
+            groupBox2.Controls.Add(tbLineX1);
+            groupBox2.Controls.Add(tbLineY1);
+            groupBox2.Controls.Add(label6);
+            groupBox2.Controls.Add(label7);
+            groupBox2.Dock = DockStyle.Top;
+            groupBox2.Location = new Point(0, 152);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(198, 172);
+            groupBox2.TabIndex = 13;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "线参数";
+            // 
+            // NumRectWidth1
+            // 
+            NumRectWidth1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            NumRectWidth1.Location = new Point(56, 138);
+            NumRectWidth1.Maximum = new decimal(new int[] { 9000, 0, 0, 0 });
+            NumRectWidth1.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            NumRectWidth1.Name = "NumRectWidth1";
+            NumRectWidth1.Size = new Size(136, 23);
+            NumRectWidth1.TabIndex = 13;
+            NumRectWidth1.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            // 
+            // label11
+            // 
+            label11.AutoSize = true;
+            label11.Location = new Point(6, 140);
+            label11.Name = "label11";
+            label11.Size = new Size(35, 17);
+            label11.TabIndex = 12;
+            label11.Text = "宽度:";
+            // 
+            // tbLineX2
+            // 
+            tbLineX2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX2.Location = new Point(56, 80);
+            tbLineX2.Name = "tbLineX2";
+            tbLineX2.Size = new Size(136, 23);
+            tbLineX2.TabIndex = 9;
+            // 
+            // label8
+            // 
+            label8.AutoSize = true;
+            label8.Location = new Point(6, 83);
+            label8.Name = "label8";
+            label8.Size = new Size(26, 17);
+            label8.TabIndex = 8;
+            label8.Text = "X2:";
+            // 
+            // tbLineY2
+            // 
+            tbLineY2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY2.Location = new Point(56, 109);
+            tbLineY2.Name = "tbLineY2";
+            tbLineY2.Size = new Size(136, 23);
+            tbLineY2.TabIndex = 7;
+            // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new Point(6, 112);
+            label5.Name = "label5";
+            label5.Size = new Size(25, 17);
+            label5.TabIndex = 6;
+            label5.Text = "Y2:";
+            // 
+            // tbLineX1
+            // 
+            tbLineX1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX1.Location = new Point(56, 22);
+            tbLineX1.Name = "tbLineX1";
+            tbLineX1.Size = new Size(136, 23);
+            tbLineX1.TabIndex = 5;
+            // 
+            // tbLineY1
+            // 
+            tbLineY1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY1.Location = new Point(56, 51);
+            tbLineY1.Name = "tbLineY1";
+            tbLineY1.Size = new Size(136, 23);
+            tbLineY1.TabIndex = 4;
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new Point(6, 54);
+            label6.Name = "label6";
+            label6.Size = new Size(25, 17);
+            label6.TabIndex = 1;
+            label6.Text = "Y1:";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new Point(6, 25);
+            label7.Name = "label7";
+            label7.Size = new Size(26, 17);
+            label7.TabIndex = 0;
+            label7.Text = "X1:";
+            // 
+            // groupBox1
+            // 
+            groupBox1.Controls.Add(tbCircleX);
+            groupBox1.Controls.Add(tbCircleY);
+            groupBox1.Controls.Add(tbCircleR);
+            groupBox1.Controls.Add(label3);
+            groupBox1.Controls.Add(label2);
+            groupBox1.Controls.Add(label1);
+            groupBox1.Dock = DockStyle.Top;
+            groupBox1.Location = new Point(0, 36);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(198, 116);
+            groupBox1.TabIndex = 12;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "圆参数";
+            // 
+            // tbCircleX
+            // 
+            tbCircleX.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbCircleX.Location = new Point(56, 22);
+            tbCircleX.Name = "tbCircleX";
+            tbCircleX.Size = new Size(136, 23);
+            tbCircleX.TabIndex = 5;
+            // 
+            // tbCircleY
+            // 
+            tbCircleY.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbCircleY.Location = new Point(56, 51);
+            tbCircleY.Name = "tbCircleY";
+            tbCircleY.Size = new Size(136, 23);
+            tbCircleY.TabIndex = 4;
+            // 
+            // tbCircleR
+            // 
+            tbCircleR.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbCircleR.Location = new Point(56, 80);
+            tbCircleR.Name = "tbCircleR";
+            tbCircleR.Size = new Size(136, 23);
+            tbCircleR.TabIndex = 3;
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new Point(3, 83);
+            label3.Name = "label3";
+            label3.Size = new Size(44, 17);
+            label3.TabIndex = 2;
+            label3.Text = "半径：";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(6, 54);
+            label2.Name = "label2";
+            label2.Size = new Size(18, 17);
+            label2.TabIndex = 1;
+            label2.Text = "Y:";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 25);
+            label1.Name = "label1";
+            label1.Size = new Size(19, 17);
+            label1.TabIndex = 0;
+            label1.Text = "X:";
+            // 
+            // ctrlTitleBar
+            // 
+            ctrlTitleBar.Dock = DockStyle.Top;
+            ctrlTitleBar.Location = new Point(0, 0);
+            ctrlTitleBar.MinimumSize = new Size(0, 36);
+            ctrlTitleBar.Name = "ctrlTitleBar";
+            ctrlTitleBar.Padding = new Padding(3);
+            ctrlTitleBar.Size = new Size(198, 36);
+            ctrlTitleBar.TabIndex = 11;
+            ctrlTitleBar.Title = "线圆测量";
+            // 
+            // panel1
+            // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
+            panel1.Controls.Add(canvas);
+            panel1.Controls.Add(statusStrip1);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(1076, 640);
+            panel1.TabIndex = 1;
+            // 
+            // canvas
+            // 
+            canvas.AllowMultiSelect = false;
+            canvas.CreateMode = Canvas.Shape.ShapeTypeEnum.Polygon;
+            canvas.Dock = DockStyle.Fill;
+            canvas.Enabled = false;
+            canvas.FillDrawing = false;
+            canvas.Location = new Point(0, 0);
+            canvas.Margin = new Padding(2);
+            canvas.Name = "canvas";
+            canvas.OutsideShapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.OutsideShapes");
+            canvas.Scale = 1F;
+            canvas.Shapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.Shapes");
+            canvas.Size = new Size(1074, 616);
+            canvas.TabIndex = 2;
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Items.AddRange(new ToolStripItem[] { lblStatus });
+            statusStrip1.Location = new Point(0, 616);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(1074, 22);
+            statusStrip1.TabIndex = 1;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // lblStatus
+            // 
+            lblStatus.Name = "lblStatus";
+            lblStatus.Size = new Size(44, 17);
+            lblStatus.Text = "         ";
+            // 
+            // btnSave
+            // 
+            btnSave.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnSave.Location = new Point(6, 545);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new Size(186, 32);
+            btnSave.TabIndex = 30;
+            btnSave.Text = "保存数据";
+            btnSave.UseVisualStyleBackColor = true;
+            btnSave.Click += btnSave_Click;
+            // 
+            // GuideLineCircleCtrl
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(splitContainer);
+            Controls.Add(lblElapsed);
+            Controls.Add(label4);
+            Name = "GuideLineCircleCtrl";
+            Size = new Size(1280, 640);
+            Load += GuideLineCircleCtrl_Load;
+            splitContainer.Panel1.ResumeLayout(false);
+            splitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)splitContainer).EndInit();
+            splitContainer.ResumeLayout(false);
+            panelGuide.ResumeLayout(false);
+            panelGuide.PerformLayout();
+            groupBox2.ResumeLayout(false);
+            groupBox2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).EndInit();
+            groupBox1.ResumeLayout(false);
+            groupBox1.PerformLayout();
+            panel1.ResumeLayout(false);
+            panel1.PerformLayout();
+            statusStrip1.ResumeLayout(false);
+            statusStrip1.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Label lblElapsed;
+        private Label label4;
+
+        private SplitContainer splitContainer;
+        private Panel panelGuide;
+        private Panel panel1;
+        private Canvas.UI.FlyCanvas canvas;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel lblStatus;
+        private GroupBox groupBox2;
+        private TextBox tbLineX2;
+        private Label label8;
+        private TextBox tbLineY2;
+        private Label label5;
+        private TextBox tbLineX1;
+        private TextBox tbLineY1;
+        private Label label6;
+        private Label label7;
+        private GroupBox groupBox1;
+        private TextBox tbCircleX;
+        private TextBox tbCircleY;
+        private TextBox tbCircleR;
+        private Label label3;
+        private Label label2;
+        private Label label1;
+        private SizeCtrlTitleBar ctrlTitleBar;
+        private Button btnCreateCircle;
+        private Button btnLoadImage;
+        private Label label9;
+        private Button btnExecute;
+        private Label label10;
+        private Button btnCreateLine;
+        private TextBox tbRectWidth1;
+        private Label label11;
+        private NumericUpDown NumRectWidth1;
+        private Label lblDistance;
+        private Label label17;
+        private Label lblResult;
+        private Label label15;
+        private Button btnSave;
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineCircleCtrl.cs

@@ -0,0 +1,449 @@
+using CanFly.Canvas.Helper;
+using CanFly.Canvas.Shape;
+using CanFly.Canvas.UI;
+using CanFly.Helper;
+using HalconDotNet;
+using OpenCvSharp;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeGuideLineCircleCtrl : SizeBaseGuideControl
+    {
+
+
+        private FlyShape? _circle;
+        private FlyShape? _line;
+
+
+        private float _lineX1;
+        private float _lineY1;
+        private float _lineX2;
+        private float _lineY2;
+        private float _lineWidth;
+
+
+        private float _circleX;
+        private float _circleY;
+        private float _circleR;
+
+
+
+
+        protected override string GetScriptFileName() => "LineToCircle.hdvp";
+
+
+
+        public SizeGuideLineCircleCtrl()
+        {
+            InitializeComponent();
+
+            this.canvas.mouseMoved += Canvas_mouseMoved;
+            this.canvas.OnShapeUpdateEvent += UpdateShape;
+            this.canvas.selectionChanged += Canvas_selectionChanged;
+
+            this.canvas.OnShapeMoving += Canvas_OnShapeMoving;
+            this.canvas.newShape += Canvas_newShape;
+
+            this.ctrlTitleBar.OnCloseClicked += OnControlClose;
+
+            NumRectWidth1.ValueChanged -= NumRectWidth1_ValueChanged;
+            NumRectWidth1.Value = 40;
+            NumRectWidth1.ValueChanged += NumRectWidth1_ValueChanged;
+
+        }
+
+
+
+        protected override void UpdateShape(FlyShape shape)
+        {
+            switch (shape.ShapeType)
+            {
+                case ShapeTypeEnum.Line:
+                    this._line = shape;
+                    _line.IsDrawLineVirtualRect = true;
+                    var pts = this._line.Points;
+
+                    _lineX1 = pts[0].X;
+                    _lineY1 = pts[0].Y;
+                    _lineX2 = pts[1].X;
+                    _lineY2 = pts[1].Y;
+                    _lineWidth = shape.LineVirtualRectWidth;
+
+                    tbLineX1.Text = _lineX1.ToString("F3");
+                    tbLineY1.Text = _lineY1.ToString("F3");
+                    tbLineX2.Text = _lineX2.ToString("F3");
+                    tbLineY2.Text = _lineY2.ToString("F3");
+                    // NumRectWidth1.Value = (decimal)_lineWidth;
+                    break;
+                case ShapeTypeEnum.Circle:
+                    this._circle = shape;
+
+                    _circleX = shape.Points[0].X;
+                    _circleY = shape.Points[0].Y;
+                    _circleR = PointHelper.Distance(shape.Points[0], shape.Points[1]);
+
+                    this.tbCircleX.Text = _circleX.ToString("F3");
+                    this.tbCircleY.Text = _circleY.ToString("F3");
+                    this.tbCircleR.Text = _circleR.ToString("F3");
+
+                    break;
+                default:
+                    break;
+            }
+        }
+
+
+
+
+
+        private void GuideLineCircleCtrl_Load(object sender, EventArgs e)
+        {
+
+
+
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(Canvas_mouseMoved, pos);
+                return;
+            }
+
+            lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    // panelGuide.Controls.Clear();
+            //    return;
+            //}
+            //SwitchGuideForm(shapes[0].ShapeType);
+            // Canvas_OnShapeUpdateEvent(shapes[0]);
+
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+            UpdateShape(shapes[0]);
+
+        }
+
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+
+            UpdateShape(shapes[0]);
+        }
+
+
+
+        private void btnCreateCircle_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            this.tbCircleX.Text = string.Empty;
+            this.tbCircleY.Text = string.Empty;
+            this.tbCircleR.Text = string.Empty;
+            this.canvas.Shapes.RemoveAll(shp => shp.ShapeType == ShapeTypeEnum.Circle);
+
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Circle);
+        }
+
+
+
+        private void btnCreateLine_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            tbLineX1.Text = string.Empty;
+            tbLineY1.Text = string.Empty;
+            tbLineX2.Text = string.Empty;
+            tbLineY2.Text = string.Empty;
+
+            this.canvas.Shapes.RemoveAll(shp => shp.ShapeType == ShapeTypeEnum.Line);
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Line);
+
+        }
+
+
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            OpenImageFile(bitmap =>
+            {
+                this.canvas.LoadPixmap(bitmap);
+                this.canvas.Enabled = true;
+
+
+            });
+        }
+
+
+        private void Canvas_newShape()
+        {
+            this.canvas.StopDraw();
+        }
+
+       
+       
+        string strarrayX=string.Empty; 
+        string strarrayY=string.Empty; 
+        private void btnExecute_Click(object sender, EventArgs e)
+        {
+
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            if (this.tbLineX1.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("请先创建直线");
+                return;
+            }
+            if (this.tbLineX1.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("请先创建圆形");
+                return;
+            }
+
+            this.canvas.OutsideShapes.Clear();
+            this.canvas.Invalidate();
+
+            flag = new List<double>();
+            Distance = new List<double>();
+            fRowCenter = new List<double>();
+            fColCenter = new List<double>();
+            fRadius = new List<double>();
+            RowBegin = new List<double>();
+            ColBegin = new List<double>();
+            RowEnd = new List<double>();
+            ColEnd = new List<double>();
+            Dictionary<string, HObject> inputImg = new Dictionary<string, HObject>();
+
+            if (hImage == null)
+            {
+                HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+            }
+            inputImg["INPUT_Image"] = hImage;
+
+            Dictionary<string, HTuple> inputPara = new Dictionary<string, HTuple>();
+
+            PointF[] Points = this._line.LineVirtualRectPoints;
+            PointF Point1 = Points[0];
+            PointF Point2 = Points[1];
+            PointF Point3 = Points[2];
+            PointF Point4 = Points[3];
+            PointF Point5 = Points[0];
+
+            float x1 = Point1.X;
+            float y1 = Point1.Y;
+
+            float x2 = Point2.X;
+            float y2 = Point2.Y;
+
+            float x3 = Point3.X;
+            float y3 = Point3.Y;
+
+            float x4 = Point4.X;
+            float y4 = Point4.Y;
+
+            float x5 = Point5.X;
+            float y5 = Point5.Y;
+
+
+            float[] arrayX = new float[] { x1, x2, x3, x4, x5 };
+            HTuple hTupleArrayX = new HTuple(arrayX);
+
+            float[] arrayY = new float[] { y1, y2, y3, y4, y5 };
+            HTuple hTupleArrayY = new HTuple(arrayY);
+
+            strarrayX=string.Join(",", arrayX); 
+            strarrayY=string.Join(",", arrayY); 
+
+            inputPara["LX"] = _lineX1;
+            inputPara["LY"] = _lineY1;
+            inputPara["RX"] = _lineX2;
+            inputPara["RY"] = _lineY2;
+            inputPara["XCenter"] = _circleX;
+            inputPara["YCenter"] = _circleY;
+            inputPara["Radius"] = _circleR;
+            inputPara["Line_XRect"] = hTupleArrayX;
+            inputPara["Line_YRect"] = hTupleArrayY;
+
+
+
+            List<string> outputKeys = new List<string>()
+            {
+                "OUTPUT_Flag",
+                "distance",
+                "fRowCenter",
+                "fColCenter",
+                "fRadius",
+                "RowBegin",
+                "ColBegin",
+                "RowEnd",
+                "ColEnd"
+            };
+
+            ExecuteHScript(
+                    inputImg,
+                    inputPara,
+                    outputKeys);
+
+        }
+        List<double> flag = new List<double>();
+        List<double> Distance = new List<double>();
+        List<double> fRowCenter = new List<double>();
+        List<double> fColCenter = new List<double>();
+        List<double> fRadius = new List<double>();
+        List<double> RowBegin = new List<double>();
+        List<double> ColBegin = new List<double>();
+        List<double> RowEnd = new List<double>();
+        List<double> ColEnd = new List<double>();
+        protected override void OnExecuteHScriptResult(
+         bool success,
+         Dictionary<string, HTuple> resultDic,
+         int timeElasped)
+        {
+            if (!success)
+            {
+                return;
+            }
+
+            //"OUTPUT_Flag",
+            //    "distance",
+            //    "fRowCenter",
+            //    "fColCenter",
+            //    "fRadius",
+            //    "RowBegin",
+            //    "ColBegin",
+            //    "RowEnd",
+            //    "ColEnd"
+
+            flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+            Distance = resultDic["distance"].HTupleToDouble();
+            fRowCenter = resultDic["fRowCenter"].HTupleToDouble();
+            fColCenter = resultDic["fColCenter"].HTupleToDouble();
+            fRadius = resultDic["fRadius"].HTupleToDouble();
+            RowBegin = resultDic["RowBegin"].HTupleToDouble();
+            ColBegin = resultDic["ColBegin"].HTupleToDouble();
+            RowEnd = resultDic["RowEnd"].HTupleToDouble();
+            ColEnd = resultDic["ColEnd"].HTupleToDouble();
+
+
+            if (flag.Count > 0)
+            {
+                lblResult.Text = flag[0].ToString();
+
+            }
+            else
+            {
+                lblResult.Text = "无";
+            }
+            if (Distance.Count > 0)
+            {
+                lblDistance.Text = Distance[0].ToString();
+            }
+            else
+            {
+                lblDistance.Text = "0";
+            }
+
+            if (flag.Count > 0 && Distance.Count > 0 && fRowCenter.Count > 0 && fColCenter.Count > 0 && fRadius.Count > 0 && RowBegin.Count > 0 && ColBegin.Count > 0 && RowEnd.Count > 0 && ColEnd.Count > 0)
+            {
+                float width = 0;
+                this.canvas.DrawLine(new PointF((float)ColBegin[0], (float)RowBegin[0]), new PointF((float)ColEnd[0], (float)RowEnd[0]), width);
+                this.canvas.DrawCircle(new PointF((float)fColCenter[0], (float)fRowCenter[0]), (float)fRadius[0]);
+
+                this.canvas.Invalidate();
+                lblElapsed.Text = $"{timeElasped} ms";
+            }
+        }
+
+
+
+
+
+
+        private void NumRectWidth1_ValueChanged(object sender, EventArgs e)
+        {
+            if (_line != null)
+            {
+                //_line1.IsDrawLineVirtualRect = true;
+                _line.LineVirtualRectWidth = (float)NumRectWidth1.Value;
+                UpdateShape(_line);
+                this.canvas.Invalidate();
+            }
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            if (lblResult.Text.Equals("无"))
+            {
+                MessageBox.Show("请先进行绘制");
+                return;
+            }
+            if (lblResult.Text != "0")
+            {
+                MessageBox.Show("测量计算错误，无法保存");
+                return;
+            }
+
+           
+           
+
+
+            string input = $"LX:{_lineX1};" +
+           $"LY:{_lineY1};" +
+           $"RX:{_lineX2};" +
+           $"RY:{_lineY2};" +
+           $"XCenter:{_circleX};" +
+           $"YCenter:{_circleY};" +
+           $"Radius:{_circleR};" +
+           $"Line_XRect:{strarrayX};"+
+           $"Line_YRect:{strarrayY}";
+
+
+
+
+            string result = $"distance:{Distance[0]};";
+            DataToTriggerEvent(input, result);
+
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineCircleCtrl.resx

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="canvas.OutsideShapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <data name="canvas.Shapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

CanFly/UI/SizePanel/SizeGuideLineCtrl.Designer.cs

@@ -0,0 +1,427 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeGuideLineCtrl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeGuideLineCtrl));
+            lblElapsed = new Label();
+            label4 = new Label();
+            splitContainer = new SplitContainer();
+            panelGuide = new Panel();
+            btnSave = new Button();
+            lblResult = new Label();
+            label1 = new Label();
+            btnCreateLine = new Button();
+            btnLoadImage = new Button();
+            label9 = new Label();
+            btnExecute = new Button();
+            label10 = new Label();
+            groupBox2 = new GroupBox();
+            NumRectWidth1 = new NumericUpDown();
+            label11 = new Label();
+            tbLineX2 = new TextBox();
+            label8 = new Label();
+            tbLineY2 = new TextBox();
+            label5 = new Label();
+            tbLineX1 = new TextBox();
+            tbLineY1 = new TextBox();
+            label6 = new Label();
+            label7 = new Label();
+            ctrlTitleBar = new SizeCtrlTitleBar();
+            panel1 = new Panel();
+            canvas = new Canvas.UI.FlyCanvas();
+            statusStrip1 = new StatusStrip();
+            lblStatus = new ToolStripStatusLabel();
+            ((System.ComponentModel.ISupportInitialize)splitContainer).BeginInit();
+            splitContainer.Panel1.SuspendLayout();
+            splitContainer.Panel2.SuspendLayout();
+            splitContainer.SuspendLayout();
+            panelGuide.SuspendLayout();
+            groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).BeginInit();
+            panel1.SuspendLayout();
+            statusStrip1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // lblElapsed
+            // 
+            lblElapsed.AutoSize = true;
+            lblElapsed.Location = new Point(50, 328);
+            lblElapsed.Name = "lblElapsed";
+            lblElapsed.Size = new Size(32, 17);
+            lblElapsed.TabIndex = 9;
+            lblElapsed.Text = "0ms";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(0, 328);
+            label4.Name = "label4";
+            label4.Size = new Size(44, 17);
+            label4.TabIndex = 8;
+            label4.Text = "耗时：";
+            // 
+            // splitContainer
+            // 
+            splitContainer.Dock = DockStyle.Fill;
+            splitContainer.Location = new Point(0, 0);
+            splitContainer.Name = "splitContainer";
+            // 
+            // splitContainer.Panel1
+            // 
+            splitContainer.Panel1.Controls.Add(panelGuide);
+            splitContainer.Panel1MinSize = 150;
+            // 
+            // splitContainer.Panel2
+            // 
+            splitContainer.Panel2.Controls.Add(panel1);
+            splitContainer.Size = new Size(1280, 640);
+            splitContainer.SplitterDistance = 200;
+            splitContainer.TabIndex = 11;
+            // 
+            // panelGuide
+            // 
+            panelGuide.BorderStyle = BorderStyle.FixedSingle;
+            panelGuide.Controls.Add(btnSave);
+            panelGuide.Controls.Add(lblResult);
+            panelGuide.Controls.Add(label1);
+            panelGuide.Controls.Add(btnCreateLine);
+            panelGuide.Controls.Add(btnLoadImage);
+            panelGuide.Controls.Add(label9);
+            panelGuide.Controls.Add(btnExecute);
+            panelGuide.Controls.Add(label10);
+            panelGuide.Controls.Add(groupBox2);
+            panelGuide.Controls.Add(ctrlTitleBar);
+            panelGuide.Dock = DockStyle.Fill;
+            panelGuide.Location = new Point(0, 0);
+            panelGuide.Name = "panelGuide";
+            panelGuide.Size = new Size(200, 640);
+            panelGuide.TabIndex = 0;
+            // 
+            // btnSave
+            // 
+            btnSave.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnSave.Location = new Point(6, 390);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new Size(186, 32);
+            btnSave.TabIndex = 23;
+            btnSave.Text = "保存数据";
+            btnSave.UseVisualStyleBackColor = true;
+            btnSave.Click += btnSave_Click;
+            // 
+            // lblResult
+            // 
+            lblResult.AutoSize = true;
+            lblResult.Location = new Point(59, 354);
+            lblResult.Name = "lblResult";
+            lblResult.Size = new Size(20, 17);
+            lblResult.TabIndex = 22;
+            lblResult.Text = "无";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(9, 354);
+            label1.Name = "label1";
+            label1.Size = new Size(44, 17);
+            label1.TabIndex = 21;
+            label1.Text = "结果：";
+            // 
+            // btnCreateLine
+            // 
+            btnCreateLine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnCreateLine.Location = new Point(9, 252);
+            btnCreateLine.Name = "btnCreateLine";
+            btnCreateLine.Size = new Size(186, 32);
+            btnCreateLine.TabIndex = 20;
+            btnCreateLine.Text = "创建直线";
+            btnCreateLine.UseVisualStyleBackColor = true;
+            btnCreateLine.Click += btnCreateLine_Click;
+            // 
+            // btnLoadImage
+            // 
+            btnLoadImage.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnLoadImage.Location = new Point(6, 214);
+            btnLoadImage.Name = "btnLoadImage";
+            btnLoadImage.Size = new Size(186, 32);
+            btnLoadImage.TabIndex = 18;
+            btnLoadImage.Text = "打开图片";
+            btnLoadImage.UseVisualStyleBackColor = true;
+            btnLoadImage.Click += btnLoadImage_Click;
+            // 
+            // label9
+            // 
+            label9.AutoSize = true;
+            label9.Location = new Point(59, 325);
+            label9.Name = "label9";
+            label9.Size = new Size(32, 17);
+            label9.TabIndex = 17;
+            label9.Text = "0ms";
+            // 
+            // btnExecute
+            // 
+            btnExecute.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnExecute.Location = new Point(9, 290);
+            btnExecute.Name = "btnExecute";
+            btnExecute.Size = new Size(186, 32);
+            btnExecute.TabIndex = 15;
+            btnExecute.Text = "执行";
+            btnExecute.UseVisualStyleBackColor = true;
+            btnExecute.Click += btnExecute_Click;
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new Point(9, 325);
+            label10.Name = "label10";
+            label10.Size = new Size(44, 17);
+            label10.TabIndex = 16;
+            label10.Text = "耗时：";
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(NumRectWidth1);
+            groupBox2.Controls.Add(label11);
+            groupBox2.Controls.Add(tbLineX2);
+            groupBox2.Controls.Add(label8);
+            groupBox2.Controls.Add(tbLineY2);
+            groupBox2.Controls.Add(label5);
+            groupBox2.Controls.Add(tbLineX1);
+            groupBox2.Controls.Add(tbLineY1);
+            groupBox2.Controls.Add(label6);
+            groupBox2.Controls.Add(label7);
+            groupBox2.Dock = DockStyle.Top;
+            groupBox2.Location = new Point(0, 36);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(198, 172);
+            groupBox2.TabIndex = 13;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "线参数";
+            // 
+            // NumRectWidth1
+            // 
+            NumRectWidth1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            NumRectWidth1.Location = new Point(56, 138);
+            NumRectWidth1.Maximum = new decimal(new int[] { 9000, 0, 0, 0 });
+            NumRectWidth1.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            NumRectWidth1.Name = "NumRectWidth1";
+            NumRectWidth1.Size = new Size(136, 23);
+            NumRectWidth1.TabIndex = 13;
+            NumRectWidth1.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            // 
+            // label11
+            // 
+            label11.AutoSize = true;
+            label11.Location = new Point(6, 140);
+            label11.Name = "label11";
+            label11.Size = new Size(35, 17);
+            label11.TabIndex = 12;
+            label11.Text = "宽度:";
+            // 
+            // tbLineX2
+            // 
+            tbLineX2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX2.Location = new Point(56, 80);
+            tbLineX2.Name = "tbLineX2";
+            tbLineX2.Size = new Size(136, 23);
+            tbLineX2.TabIndex = 9;
+            // 
+            // label8
+            // 
+            label8.AutoSize = true;
+            label8.Location = new Point(6, 83);
+            label8.Name = "label8";
+            label8.Size = new Size(26, 17);
+            label8.TabIndex = 8;
+            label8.Text = "X2:";
+            // 
+            // tbLineY2
+            // 
+            tbLineY2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY2.Location = new Point(56, 109);
+            tbLineY2.Name = "tbLineY2";
+            tbLineY2.Size = new Size(136, 23);
+            tbLineY2.TabIndex = 7;
+            // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new Point(6, 112);
+            label5.Name = "label5";
+            label5.Size = new Size(25, 17);
+            label5.TabIndex = 6;
+            label5.Text = "Y2:";
+            // 
+            // tbLineX1
+            // 
+            tbLineX1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineX1.Location = new Point(56, 22);
+            tbLineX1.Name = "tbLineX1";
+            tbLineX1.Size = new Size(136, 23);
+            tbLineX1.TabIndex = 5;
+            // 
+            // tbLineY1
+            // 
+            tbLineY1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLineY1.Location = new Point(56, 51);
+            tbLineY1.Name = "tbLineY1";
+            tbLineY1.Size = new Size(136, 23);
+            tbLineY1.TabIndex = 4;
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new Point(6, 54);
+            label6.Name = "label6";
+            label6.Size = new Size(25, 17);
+            label6.TabIndex = 1;
+            label6.Text = "Y1:";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new Point(6, 25);
+            label7.Name = "label7";
+            label7.Size = new Size(26, 17);
+            label7.TabIndex = 0;
+            label7.Text = "X1:";
+            // 
+            // ctrlTitleBar
+            // 
+            ctrlTitleBar.Dock = DockStyle.Top;
+            ctrlTitleBar.Location = new Point(0, 0);
+            ctrlTitleBar.MinimumSize = new Size(0, 36);
+            ctrlTitleBar.Name = "ctrlTitleBar";
+            ctrlTitleBar.Padding = new Padding(3);
+            ctrlTitleBar.Size = new Size(198, 36);
+            ctrlTitleBar.TabIndex = 11;
+            ctrlTitleBar.Title = "直线测量";
+            // 
+            // panel1
+            // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
+            panel1.Controls.Add(canvas);
+            panel1.Controls.Add(statusStrip1);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(1076, 640);
+            panel1.TabIndex = 1;
+            // 
+            // canvas
+            // 
+            canvas.AllowMultiSelect = false;
+            canvas.CreateMode = Canvas.Shape.ShapeTypeEnum.Polygon;
+            canvas.Dock = DockStyle.Fill;
+            canvas.Enabled = false;
+            canvas.FillDrawing = false;
+            canvas.Location = new Point(0, 0);
+            canvas.Margin = new Padding(2);
+            canvas.Name = "canvas";
+            canvas.OutsideShapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.OutsideShapes");
+            canvas.Scale = 1F;
+            canvas.Shapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.Shapes");
+            canvas.Size = new Size(1074, 616);
+            canvas.TabIndex = 2;
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Items.AddRange(new ToolStripItem[] { lblStatus });
+            statusStrip1.Location = new Point(0, 616);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(1074, 22);
+            statusStrip1.TabIndex = 1;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // lblStatus
+            // 
+            lblStatus.Name = "lblStatus";
+            lblStatus.Size = new Size(44, 17);
+            lblStatus.Text = "         ";
+            // 
+            // GuideLineCtrl
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(splitContainer);
+            Controls.Add(lblElapsed);
+            Controls.Add(label4);
+            Name = "GuideLineCtrl";
+            Size = new Size(1280, 640);
+            Load += GuideLineCircleCtrl_Load;
+            splitContainer.Panel1.ResumeLayout(false);
+            splitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)splitContainer).EndInit();
+            splitContainer.ResumeLayout(false);
+            panelGuide.ResumeLayout(false);
+            panelGuide.PerformLayout();
+            groupBox2.ResumeLayout(false);
+            groupBox2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).EndInit();
+            panel1.ResumeLayout(false);
+            panel1.PerformLayout();
+            statusStrip1.ResumeLayout(false);
+            statusStrip1.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Label lblElapsed;
+        private Label label4;
+
+        private SplitContainer splitContainer;
+        private Panel panelGuide;
+        private Panel panel1;
+        private Canvas.UI.FlyCanvas canvas;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel lblStatus;
+        private GroupBox groupBox2;
+        private TextBox tbLineX2;
+        private Label label8;
+        private TextBox tbLineY2;
+        private Label label5;
+        private TextBox tbLineX1;
+        private TextBox tbLineY1;
+        private Label label6;
+        private Label label7;
+        private SizeCtrlTitleBar ctrlTitleBar;
+        private Button btnLoadImage;
+        private Label label9;
+        private Button btnExecute;
+        private Label label10;
+        private Button btnCreateLine;
+        private TextBox tbRectWidth1;
+        private Label label11;
+        private NumericUpDown NumRectWidth1;
+        private Label lblResult;
+        private Label label1;
+        private Button btnSave;
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineCtrl.cs

@@ -0,0 +1,387 @@
+using CanFly.Canvas.Helper;
+using CanFly.Canvas.Shape;
+using CanFly.Canvas.UI;
+using CanFly.Helper;
+using HalconDotNet;
+using OpenCvSharp;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeGuideLineCtrl : SizeBaseGuideControl
+    {
+
+
+
+        private FlyShape? _line;
+
+
+        private float _lineX1;
+        private float _lineY1;
+        private float _lineX2;
+        private float _lineY2;
+        private float _lineWidth;
+        private PointF[] _rectPoints = new PointF[4];
+        //private float _LineLX=new float();
+        //private float _LineLY =new float();
+        //private float _LineRX =new float();
+        //private float _LineRY =new float();
+
+
+
+
+
+        protected override string GetScriptFileName() => "Line_detect.hdvp";
+
+
+
+        public SizeGuideLineCtrl()
+        {
+            InitializeComponent();
+
+            this.canvas.mouseMoved += Canvas_mouseMoved;
+            this.canvas.OnShapeUpdateEvent += UpdateShape;
+            this.canvas.selectionChanged += Canvas_selectionChanged;
+
+            this.canvas.OnShapeMoving += Canvas_OnShapeMoving;
+            this.canvas.newShape += Canvas_newShape;
+
+            this.ctrlTitleBar.OnCloseClicked += OnControlClose;
+
+            NumRectWidth1.ValueChanged -= NumRectWidth1_ValueChanged;
+            NumRectWidth1.Value = 40;
+            NumRectWidth1.ValueChanged += NumRectWidth1_ValueChanged;
+
+        }
+
+
+
+        protected override void UpdateShape(FlyShape shape)
+        {
+            switch (shape.ShapeType)
+            {
+                case ShapeTypeEnum.Line:
+                    this._line = shape;
+                    _line.IsDrawLineVirtualRect = true;
+                    var pts = this._line.Points;
+
+                    _lineX1 = pts[0].X;
+                    _lineY1 = pts[0].Y;
+                    _lineX2 = pts[1].X;
+                    _lineY2 = pts[1].Y;
+                    _lineWidth = shape.LineVirtualRectWidth;
+                    _rectPoints = shape.LineVirtualRectPoints;
+                    //_LineLX = (shape.LineVirtualRectPoints[0].X + shape.LineVirtualRectPoints[3].X) / 2;
+                    //_LineLY = (shape.LineVirtualRectPoints[0].Y + shape.LineVirtualRectPoints[3].Y) / 2;
+                    //_LineRX = (shape.LineVirtualRectPoints[1].X + shape.LineVirtualRectPoints[2].X) / 2;
+                    //_LineRY = (shape.LineVirtualRectPoints[1].Y + shape.LineVirtualRectPoints[2].Y) / 2;
+
+                    tbLineX1.Text = _lineX1.ToString("F3");
+                    tbLineY1.Text = _lineY1.ToString("F3");
+                    tbLineX2.Text = _lineX2.ToString("F3");
+                    tbLineY2.Text = _lineY2.ToString("F3");
+                    // NumRectWidth1.Value = (decimal)_lineWidth;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+
+
+
+
+        private void GuideLineCircleCtrl_Load(object sender, EventArgs e)
+        {
+
+
+
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(Canvas_mouseMoved, pos);
+                return;
+            }
+
+            lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    // panelGuide.Controls.Clear();
+            //    return;
+            //}
+            //SwitchGuideForm(shapes[0].ShapeType);
+            // Canvas_OnShapeUpdateEvent(shapes[0]);
+
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+            UpdateShape(shapes[0]);
+
+        }
+
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+
+            UpdateShape(shapes[0]);
+        }
+
+
+
+
+
+
+
+        private void btnCreateLine_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+
+            tbLineX1.Text = string.Empty;
+            tbLineY1.Text = string.Empty;
+            tbLineX2.Text = string.Empty;
+            tbLineY2.Text = string.Empty;
+
+
+            this.canvas.Shapes.RemoveAll(shp => shp.ShapeType == ShapeTypeEnum.Line);
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Line);
+
+        }
+
+
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            OpenImageFile(bitmap =>
+            {
+                this.canvas.LoadPixmap(bitmap);
+                this.canvas.Enabled = true;
+
+
+            });
+        }
+
+
+        private void Canvas_newShape()
+        {
+            this.canvas.StopDraw();
+        }
+        string strarrayX = string.Empty;
+        string strarrayY = string.Empty;
+        private void btnExecute_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+            if (this.tbLineX1.Text.Trim().Length == 0)
+            {
+                MessageBox.Show("请先创建直线");
+                return;
+            }
+            this.canvas.OutsideShapes.Clear();
+            this.canvas.Invalidate();
+
+
+            flag = new List<double>();
+            RowBegin = new List<double>();
+            ColBegin = new List<double>();
+            RowEnd = new List<double>();
+            ColEnd = new List<double>();
+            Dictionary<string, HObject> inputImg = new Dictionary<string, HObject>();
+
+            if (hImage == null)
+            {
+                HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+            }
+            inputImg["INPUT_Image"] = hImage;
+            // 创建一维数组
+
+            Dictionary<string, HTuple> inputPara = new Dictionary<string, HTuple>();
+
+            // 获取矩形的 4 个点
+            PointF[] Points = this._line.LineVirtualRectPoints;
+            PointF Point1 = Points[0];
+            PointF Point2 = Points[1];
+            PointF Point3 = Points[2];
+            PointF Point4 = Points[3];
+            PointF Point5 = Points[0];
+
+            float x1 = Point1.X;
+            float y1 = Point1.Y;
+
+            float x2 = Point2.X;
+            float y2 = Point2.Y;
+
+            float x3 = Point3.X;
+            float y3 = Point3.Y;
+
+            float x4 = Point4.X;
+            float y4 = Point4.Y;
+
+            float x5 = Point5.X;
+            float y5 = Point5.Y;
+
+
+            float[] arrayX = new float[] { x1, x2, x3, x4, x5 };
+            HTuple hTupleArrayX = new HTuple(arrayX);
+
+            float[] arrayY = new float[] { y1, y2, y3, y4, y5 };
+            HTuple hTupleArrayY = new HTuple(arrayY);
+
+            strarrayX = string.Join(",", arrayX);
+            strarrayY = string.Join(",", arrayY);
+
+            inputPara["LX"] = _lineX1;
+            inputPara["LY"] = _lineY1;
+            inputPara["RX"] = _lineX2;
+            inputPara["RY"] = _lineY2;
+            inputPara["XRect"] = hTupleArrayX;
+            inputPara["YRect"] = hTupleArrayY;
+
+
+
+            List<string> outputKeys = new List<string>()
+            {
+                "OUTPUT_Flag",
+                "RowBegin",
+                "ColBegin",
+                "RowEnd",
+                "ColEnd"
+            };
+
+            ExecuteHScript(
+                    inputImg,
+                    inputPara,
+                    outputKeys);
+
+        }
+
+
+        List<double> flag = new List<double>();
+        List<double> RowBegin = new List<double>();
+        List<double> ColBegin = new List<double>();
+        List<double> RowEnd = new List<double>();
+        List<double> ColEnd = new List<double>();
+
+
+        protected override void OnExecuteHScriptResult(
+            bool success,
+            Dictionary<string, HTuple> resultDic,
+            int timeElasped)
+        {
+            if (!success)
+            {
+                return;
+            }
+
+
+            /*
+               "OUTPUT_Flag",
+                "RXCenter",
+                "RYCenter",
+                "RRadius"
+             */
+
+            flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+            RowBegin = resultDic["RowBegin"].HTupleToDouble();
+            ColBegin = resultDic["ColBegin"].HTupleToDouble();
+            RowEnd = resultDic["RowEnd"].HTupleToDouble();
+            ColEnd = resultDic["ColEnd"].HTupleToDouble();
+            if (flag.Count > 0)
+            {
+                lblResult.Text = flag[0].ToString();
+
+            }
+            else
+            {
+                lblResult.Text = "无";
+            }
+            if (flag.Count > 0 && RowBegin.Count > 0 && ColBegin.Count > 0 && RowEnd.Count > 0 && ColEnd.Count > 0)
+            {
+                float width = 0;
+                this.canvas.DrawLine(new PointF((float)ColBegin[0], (float)RowBegin[0]), new PointF((float)ColEnd[0], (float)RowEnd[0]), width);
+                this.canvas.Invalidate();
+                lblElapsed.Text = $"{timeElasped} ms";
+            }
+        }
+
+
+        private void NumRectWidth1_ValueChanged(object sender, EventArgs e)
+        {
+            if (_line != null)
+            {
+                //_line1.IsDrawLineVirtualRect = true;
+                _line.LineVirtualRectWidth = (float)NumRectWidth1.Value;
+                UpdateShape(_line);
+                this.canvas.Invalidate();
+            }
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            if (lblResult.Text.Equals("无"))
+            {
+                MessageBox.Show("请先进行绘制");
+                return;
+            }
+            if (lblResult.Text != "0")
+            {
+                MessageBox.Show("测量计算错误，无法保存");
+                return;
+            }
+            //flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+            //RowBegin = resultDic["RowBegin"].HTupleToDouble();
+            //ColBegin = resultDic["ColBegin"].HTupleToDouble();
+            //RowEnd = resultDic["RowEnd"].HTupleToDouble();
+            //ColEnd = resultDic["ColEnd"].HTupleToDouble();
+
+
+            string input = $"LX:{_lineX1};" +
+          $"LY:{_lineY1};" +
+          $"RX:{_lineX2};" +
+          $"RY:{_lineY2};" +
+          $"Line_XRect:{strarrayX};" +
+          $"Line_YRect:{strarrayY}";
+
+
+            string result = $"RowBegin:{string.Join(";", RowBegin[0])};ColBegin:{string.Join(";", ColBegin[0])};RowEnd:{string.Join(";", RowEnd[0])};ColEnd:{string.Join(";", ColEnd[0])}";
+
+            DataToTriggerEvent(input, result);
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineCtrl.resx

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="canvas.OutsideShapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <data name="canvas.Shapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

CanFly/UI/SizePanel/SizeGuideLineLineCtrl.Designer.cs

@@ -0,0 +1,570 @@
+namespace CanFly.UI.SizePanel
+{
+    partial class SizeGuideLineLineCtrl
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeGuideLineLineCtrl));
+            lblStatus = new ToolStripStatusLabel();
+            panel1 = new Panel();
+            canvas = new Canvas.UI.FlyCanvas();
+            statusStrip1 = new StatusStrip();
+            ctrlTitleBar = new SizeCtrlTitleBar();
+            tbLine1X2 = new TextBox();
+            label8 = new Label();
+            tbLine1Y2 = new TextBox();
+            label5 = new Label();
+            label10 = new Label();
+            tbLine1X1 = new TextBox();
+            tbLine1Y1 = new TextBox();
+            label6 = new Label();
+            label7 = new Label();
+            btnLoadImage = new Button();
+            label9 = new Label();
+            btnExecute = new Button();
+            panelGuide = new Panel();
+            lblDistance = new Label();
+            label17 = new Label();
+            lblResult = new Label();
+            label15 = new Label();
+            groupBox3 = new GroupBox();
+            NumRectWidth2 = new NumericUpDown();
+            label2 = new Label();
+            tbLine2X2 = new TextBox();
+            label11 = new Label();
+            tbLine2Y2 = new TextBox();
+            label12 = new Label();
+            tbLine2X1 = new TextBox();
+            tbLine2Y1 = new TextBox();
+            label13 = new Label();
+            label14 = new Label();
+            groupBox2 = new GroupBox();
+            NumRectWidth1 = new NumericUpDown();
+            label1 = new Label();
+            splitContainer = new SplitContainer();
+            lblElapsed = new Label();
+            label4 = new Label();
+            btnSave = new Button();
+            panel1.SuspendLayout();
+            statusStrip1.SuspendLayout();
+            panelGuide.SuspendLayout();
+            groupBox3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth2).BeginInit();
+            groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)splitContainer).BeginInit();
+            splitContainer.Panel1.SuspendLayout();
+            splitContainer.Panel2.SuspendLayout();
+            splitContainer.SuspendLayout();
+            SuspendLayout();
+            // 
+            // lblStatus
+            // 
+            lblStatus.Name = "lblStatus";
+            lblStatus.Size = new Size(44, 17);
+            lblStatus.Text = "         ";
+            // 
+            // panel1
+            // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
+            panel1.Controls.Add(canvas);
+            panel1.Controls.Add(statusStrip1);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(1076, 640);
+            panel1.TabIndex = 1;
+            // 
+            // canvas
+            // 
+            canvas.AllowMultiSelect = false;
+            canvas.CreateMode = Canvas.Shape.ShapeTypeEnum.Polygon;
+            canvas.Dock = DockStyle.Fill;
+            canvas.Enabled = false;
+            canvas.FillDrawing = false;
+            canvas.Location = new Point(0, 0);
+            canvas.Margin = new Padding(2);
+            canvas.Name = "canvas";
+            canvas.OutsideShapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.OutsideShapes");
+            canvas.Scale = 1F;
+            canvas.Shapes = (List<Canvas.Shape.FlyShape>)resources.GetObject("canvas.Shapes");
+            canvas.Size = new Size(1074, 616);
+            canvas.TabIndex = 2;
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Items.AddRange(new ToolStripItem[] { lblStatus });
+            statusStrip1.Location = new Point(0, 616);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(1074, 22);
+            statusStrip1.TabIndex = 1;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // ctrlTitleBar
+            // 
+            ctrlTitleBar.Dock = DockStyle.Top;
+            ctrlTitleBar.Location = new Point(0, 0);
+            ctrlTitleBar.MinimumSize = new Size(0, 36);
+            ctrlTitleBar.Name = "ctrlTitleBar";
+            ctrlTitleBar.Padding = new Padding(3);
+            ctrlTitleBar.Size = new Size(198, 36);
+            ctrlTitleBar.TabIndex = 11;
+            ctrlTitleBar.Title = "线线测量";
+            // 
+            // tbLine1X2
+            // 
+            tbLine1X2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine1X2.Location = new Point(56, 80);
+            tbLine1X2.Name = "tbLine1X2";
+            tbLine1X2.Size = new Size(134, 23);
+            tbLine1X2.TabIndex = 9;
+            // 
+            // label8
+            // 
+            label8.AutoSize = true;
+            label8.Location = new Point(6, 83);
+            label8.Name = "label8";
+            label8.Size = new Size(26, 17);
+            label8.TabIndex = 8;
+            label8.Text = "X2:";
+            // 
+            // tbLine1Y2
+            // 
+            tbLine1Y2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine1Y2.Location = new Point(56, 109);
+            tbLine1Y2.Name = "tbLine1Y2";
+            tbLine1Y2.Size = new Size(134, 23);
+            tbLine1Y2.TabIndex = 7;
+            // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new Point(6, 112);
+            label5.Name = "label5";
+            label5.Size = new Size(25, 17);
+            label5.TabIndex = 6;
+            label5.Text = "Y2:";
+            // 
+            // label10
+            // 
+            label10.AutoSize = true;
+            label10.Location = new Point(6, 521);
+            label10.Name = "label10";
+            label10.Size = new Size(44, 17);
+            label10.TabIndex = 16;
+            label10.Text = "耗时：";
+            // 
+            // tbLine1X1
+            // 
+            tbLine1X1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine1X1.Location = new Point(56, 22);
+            tbLine1X1.Name = "tbLine1X1";
+            tbLine1X1.Size = new Size(134, 23);
+            tbLine1X1.TabIndex = 5;
+            // 
+            // tbLine1Y1
+            // 
+            tbLine1Y1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine1Y1.Location = new Point(56, 51);
+            tbLine1Y1.Name = "tbLine1Y1";
+            tbLine1Y1.Size = new Size(134, 23);
+            tbLine1Y1.TabIndex = 4;
+            // 
+            // label6
+            // 
+            label6.AutoSize = true;
+            label6.Location = new Point(6, 54);
+            label6.Name = "label6";
+            label6.Size = new Size(25, 17);
+            label6.TabIndex = 1;
+            label6.Text = "Y1:";
+            // 
+            // label7
+            // 
+            label7.AutoSize = true;
+            label7.Location = new Point(6, 25);
+            label7.Name = "label7";
+            label7.Size = new Size(26, 17);
+            label7.TabIndex = 0;
+            label7.Text = "X1:";
+            // 
+            // btnLoadImage
+            // 
+            btnLoadImage.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnLoadImage.Location = new Point(6, 394);
+            btnLoadImage.Name = "btnLoadImage";
+            btnLoadImage.Size = new Size(184, 32);
+            btnLoadImage.TabIndex = 18;
+            btnLoadImage.Text = "打开图片";
+            btnLoadImage.UseVisualStyleBackColor = true;
+            btnLoadImage.Click += btnLoadImage_Click;
+            // 
+            // label9
+            // 
+            label9.AutoSize = true;
+            label9.Location = new Point(54, 521);
+            label9.Name = "label9";
+            label9.Size = new Size(32, 17);
+            label9.TabIndex = 17;
+            label9.Text = "0ms";
+            // 
+            // btnExecute
+            // 
+            btnExecute.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnExecute.Location = new Point(5, 432);
+            btnExecute.Name = "btnExecute";
+            btnExecute.Size = new Size(184, 32);
+            btnExecute.TabIndex = 15;
+            btnExecute.Text = "执行";
+            btnExecute.UseVisualStyleBackColor = true;
+            btnExecute.Click += btnExecute_Click;
+            // 
+            // panelGuide
+            // 
+            panelGuide.BorderStyle = BorderStyle.FixedSingle;
+            panelGuide.Controls.Add(btnSave);
+            panelGuide.Controls.Add(lblDistance);
+            panelGuide.Controls.Add(label17);
+            panelGuide.Controls.Add(lblResult);
+            panelGuide.Controls.Add(label15);
+            panelGuide.Controls.Add(groupBox3);
+            panelGuide.Controls.Add(btnLoadImage);
+            panelGuide.Controls.Add(label9);
+            panelGuide.Controls.Add(btnExecute);
+            panelGuide.Controls.Add(label10);
+            panelGuide.Controls.Add(groupBox2);
+            panelGuide.Controls.Add(ctrlTitleBar);
+            panelGuide.Dock = DockStyle.Fill;
+            panelGuide.Location = new Point(0, 0);
+            panelGuide.Name = "panelGuide";
+            panelGuide.Size = new Size(200, 640);
+            panelGuide.TabIndex = 0;
+            // 
+            // lblDistance
+            // 
+            lblDistance.AutoSize = true;
+            lblDistance.Location = new Point(54, 493);
+            lblDistance.Name = "lblDistance";
+            lblDistance.Size = new Size(15, 17);
+            lblDistance.TabIndex = 25;
+            lblDistance.Text = "0";
+            // 
+            // label17
+            // 
+            label17.AutoSize = true;
+            label17.Location = new Point(6, 493);
+            label17.Name = "label17";
+            label17.Size = new Size(44, 17);
+            label17.TabIndex = 24;
+            label17.Text = "距离：";
+            // 
+            // lblResult
+            // 
+            lblResult.AutoSize = true;
+            lblResult.Location = new Point(54, 467);
+            lblResult.Name = "lblResult";
+            lblResult.Size = new Size(20, 17);
+            lblResult.TabIndex = 23;
+            lblResult.Text = "无";
+            // 
+            // label15
+            // 
+            label15.AutoSize = true;
+            label15.Location = new Point(6, 467);
+            label15.Name = "label15";
+            label15.Size = new Size(44, 17);
+            label15.TabIndex = 22;
+            label15.Text = "结果：";
+            // 
+            // groupBox3
+            // 
+            groupBox3.Controls.Add(NumRectWidth2);
+            groupBox3.Controls.Add(label2);
+            groupBox3.Controls.Add(tbLine2X2);
+            groupBox3.Controls.Add(label11);
+            groupBox3.Controls.Add(tbLine2Y2);
+            groupBox3.Controls.Add(label12);
+            groupBox3.Controls.Add(tbLine2X1);
+            groupBox3.Controls.Add(tbLine2Y1);
+            groupBox3.Controls.Add(label13);
+            groupBox3.Controls.Add(label14);
+            groupBox3.Dock = DockStyle.Top;
+            groupBox3.Location = new Point(0, 216);
+            groupBox3.Name = "groupBox3";
+            groupBox3.Size = new Size(198, 172);
+            groupBox3.TabIndex = 21;
+            groupBox3.TabStop = false;
+            groupBox3.Text = "线2参数";
+            // 
+            // NumRectWidth2
+            // 
+            NumRectWidth2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            NumRectWidth2.Location = new Point(53, 138);
+            NumRectWidth2.Maximum = new decimal(new int[] { 9000, 0, 0, 0 });
+            NumRectWidth2.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            NumRectWidth2.Name = "NumRectWidth2";
+            NumRectWidth2.Size = new Size(136, 23);
+            NumRectWidth2.TabIndex = 13;
+            NumRectWidth2.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(6, 140);
+            label2.Name = "label2";
+            label2.Size = new Size(35, 17);
+            label2.TabIndex = 12;
+            label2.Text = "宽度:";
+            // 
+            // tbLine2X2
+            // 
+            tbLine2X2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine2X2.Location = new Point(56, 80);
+            tbLine2X2.Name = "tbLine2X2";
+            tbLine2X2.Size = new Size(134, 23);
+            tbLine2X2.TabIndex = 9;
+            // 
+            // label11
+            // 
+            label11.AutoSize = true;
+            label11.Location = new Point(6, 83);
+            label11.Name = "label11";
+            label11.Size = new Size(26, 17);
+            label11.TabIndex = 8;
+            label11.Text = "X2:";
+            // 
+            // tbLine2Y2
+            // 
+            tbLine2Y2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine2Y2.Location = new Point(56, 109);
+            tbLine2Y2.Name = "tbLine2Y2";
+            tbLine2Y2.Size = new Size(136, 23);
+            tbLine2Y2.TabIndex = 7;
+            // 
+            // label12
+            // 
+            label12.AutoSize = true;
+            label12.Location = new Point(6, 112);
+            label12.Name = "label12";
+            label12.Size = new Size(25, 17);
+            label12.TabIndex = 6;
+            label12.Text = "Y2:";
+            // 
+            // tbLine2X1
+            // 
+            tbLine2X1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine2X1.Location = new Point(56, 22);
+            tbLine2X1.Name = "tbLine2X1";
+            tbLine2X1.Size = new Size(134, 23);
+            tbLine2X1.TabIndex = 5;
+            // 
+            // tbLine2Y1
+            // 
+            tbLine2Y1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            tbLine2Y1.Location = new Point(56, 51);
+            tbLine2Y1.Name = "tbLine2Y1";
+            tbLine2Y1.Size = new Size(134, 23);
+            tbLine2Y1.TabIndex = 4;
+            // 
+            // label13
+            // 
+            label13.AutoSize = true;
+            label13.Location = new Point(6, 54);
+            label13.Name = "label13";
+            label13.Size = new Size(25, 17);
+            label13.TabIndex = 1;
+            label13.Text = "Y1:";
+            // 
+            // label14
+            // 
+            label14.AutoSize = true;
+            label14.Location = new Point(6, 25);
+            label14.Name = "label14";
+            label14.Size = new Size(26, 17);
+            label14.TabIndex = 0;
+            label14.Text = "X1:";
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(NumRectWidth1);
+            groupBox2.Controls.Add(label1);
+            groupBox2.Controls.Add(tbLine1X2);
+            groupBox2.Controls.Add(label8);
+            groupBox2.Controls.Add(tbLine1Y2);
+            groupBox2.Controls.Add(label5);
+            groupBox2.Controls.Add(tbLine1X1);
+            groupBox2.Controls.Add(tbLine1Y1);
+            groupBox2.Controls.Add(label6);
+            groupBox2.Controls.Add(label7);
+            groupBox2.Dock = DockStyle.Top;
+            groupBox2.Location = new Point(0, 36);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(198, 180);
+            groupBox2.TabIndex = 13;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "线1参数";
+            // 
+            // NumRectWidth1
+            // 
+            NumRectWidth1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            NumRectWidth1.Location = new Point(54, 138);
+            NumRectWidth1.Maximum = new decimal(new int[] { 9000, 0, 0, 0 });
+            NumRectWidth1.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            NumRectWidth1.Name = "NumRectWidth1";
+            NumRectWidth1.Size = new Size(135, 23);
+            NumRectWidth1.TabIndex = 11;
+            NumRectWidth1.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(6, 140);
+            label1.Name = "label1";
+            label1.Size = new Size(35, 17);
+            label1.TabIndex = 10;
+            label1.Text = "宽度:";
+            // 
+            // splitContainer
+            // 
+            splitContainer.Dock = DockStyle.Fill;
+            splitContainer.Location = new Point(0, 0);
+            splitContainer.Name = "splitContainer";
+            // 
+            // splitContainer.Panel1
+            // 
+            splitContainer.Panel1.Controls.Add(panelGuide);
+            splitContainer.Panel1MinSize = 150;
+            // 
+            // splitContainer.Panel2
+            // 
+            splitContainer.Panel2.Controls.Add(panel1);
+            splitContainer.Size = new Size(1280, 640);
+            splitContainer.SplitterDistance = 200;
+            splitContainer.TabIndex = 11;
+            // 
+            // lblElapsed
+            // 
+            lblElapsed.AutoSize = true;
+            lblElapsed.Location = new Point(50, 328);
+            lblElapsed.Name = "lblElapsed";
+            lblElapsed.Size = new Size(32, 17);
+            lblElapsed.TabIndex = 13;
+            lblElapsed.Text = "0ms";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(0, 328);
+            label4.Name = "label4";
+            label4.Size = new Size(44, 17);
+            label4.TabIndex = 12;
+            label4.Text = "耗时：";
+            // 
+            // btnSave
+            // 
+            btnSave.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            btnSave.Location = new Point(3, 541);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new Size(186, 32);
+            btnSave.TabIndex = 26;
+            btnSave.Text = "保存数据";
+            btnSave.UseVisualStyleBackColor = true;
+            btnSave.Click += btnSave_Click;
+            // 
+            // GuideLineLineCtrl
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(splitContainer);
+            Controls.Add(lblElapsed);
+            Controls.Add(label4);
+            Name = "GuideLineLineCtrl";
+            Size = new Size(1280, 640);
+            panel1.ResumeLayout(false);
+            panel1.PerformLayout();
+            statusStrip1.ResumeLayout(false);
+            statusStrip1.PerformLayout();
+            panelGuide.ResumeLayout(false);
+            panelGuide.PerformLayout();
+            groupBox3.ResumeLayout(false);
+            groupBox3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth2).EndInit();
+            groupBox2.ResumeLayout(false);
+            groupBox2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)NumRectWidth1).EndInit();
+            splitContainer.Panel1.ResumeLayout(false);
+            splitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)splitContainer).EndInit();
+            splitContainer.ResumeLayout(false);
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private ToolStripStatusLabel lblStatus;
+        private Panel panel1;
+        private Canvas.UI.FlyCanvas canvas;
+        private StatusStrip statusStrip1;
+        private SizeCtrlTitleBar ctrlTitleBar;
+        private TextBox tbLine1X2;
+        private Label label8;
+        private TextBox tbLine1Y2;
+        private Label label5;
+        private Label label10;
+        private TextBox tbLine1X1;
+        private TextBox tbLine1Y1;
+        private Label label6;
+        private Label label7;
+        private Button btnLoadImage;
+        private Label label9;
+        private Button btnExecute;
+        private Panel panelGuide;
+        private GroupBox groupBox2;
+        private SplitContainer splitContainer;
+        private Label lblElapsed;
+        private Label label4;
+        private GroupBox groupBox3;
+        private TextBox tbLine2X2;
+        private Label label11;
+        private TextBox tbLine2Y2;
+        private Label label12;
+        private TextBox tbLine2X1;
+        private TextBox tbLine2Y1;
+        private Label label13;
+        private Label label14;
+        private Label label1;
+        private Label label2;
+        private NumericUpDown NumRectWidth2;
+        private NumericUpDown NumRectWidth1;
+        private Label lblDistance;
+        private Label label17;
+        private Label lblResult;
+        private Label label15;
+        private Button btnSave;
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineLineCtrl.cs

@@ -0,0 +1,526 @@
+using CanFly.Canvas.Helper;
+using CanFly.Canvas.Shape;
+using CanFly.Helper;
+using HalconDotNet;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace CanFly.UI.SizePanel
+{
+    public partial class SizeGuideLineLineCtrl : SizeBaseGuideControl
+    {
+        private FlyShape? _line1;
+        private FlyShape? _line2;
+
+        private float _line1X1;
+        private float _line1Y1;
+        private float _line1X2;
+        private float _line1Y2;
+        private float _lineWidth;
+
+        private float _line2X1;
+        private float _line2Y1;
+        private float _line2X2;
+        private float _line2Y2;
+        private float _line2Width;
+
+        protected override string GetScriptFileName() => "LineToLine.hdvp";
+
+
+        public SizeGuideLineLineCtrl()
+        {
+            InitializeComponent();
+            this.canvas.mouseMoved += Canvas_mouseMoved;
+            this.canvas.OnShapeUpdateEvent += UpdateShape;
+            this.canvas.selectionChanged += Canvas_selectionChanged;
+
+            this.canvas.OnShapeMoving += Canvas_OnShapeMoving;
+            this.canvas.newShape += Canvas_newShape;
+
+            this.ctrlTitleBar.OnCloseClicked += OnControlClose;
+            NumRectWidth1.ValueChanged -= NumRectWidth1_ValueChanged;
+            NumRectWidth1.Value = 40;
+            NumRectWidth1.ValueChanged += NumRectWidth1_ValueChanged;
+
+            NumRectWidth2.ValueChanged -= NumericUpDown2_ValueChanged;
+            NumRectWidth2.Value = 40;
+            NumRectWidth2.ValueChanged += NumericUpDown2_ValueChanged;
+
+        }
+        protected override void UpdateShape(FlyShape shape)
+        {
+            switch (shape.ShapeType)
+            {
+                case ShapeTypeEnum.Line:
+                    // 判断是否为第一条直线或第二条直线
+                    if (_line1 == shape)
+                    {
+                        //_line1 = shape;
+                        var pts1 = _line1.Points;
+                        _line1X1 = pts1[0].X;
+                        _line1Y1 = pts1[0].Y;
+                        _line1X2 = pts1[1].X;
+                        _line1Y2 = pts1[1].Y;
+                        _lineWidth = _line1.LineVirtualRectWidth;
+
+                        tbLine1X1.Text = _line1X1.ToString("F3");
+                        tbLine1Y1.Text = _line1Y1.ToString("F3");
+                        tbLine1X2.Text = _line1X2.ToString("F3");
+                        tbLine1Y2.Text = _line1Y2.ToString("F3");
+                        //NumRectWidth1.Value = (decimal)_lineWidth;
+                    }
+                    else
+                    {
+                        //_line2 = shape;
+                        var pts2 = _line2.Points;
+                        _line2X1 = pts2[0].X;
+                        _line2Y1 = pts2[0].Y;
+                        _line2X2 = pts2[1].X;
+                        _line2Y2 = pts2[1].Y;
+                        _line2Width = _line2.LineVirtualRectWidth;
+
+                        tbLine2X1.Text = _line2X1.ToString("F3");
+                        tbLine2Y1.Text = _line2Y1.ToString("F3");
+                        tbLine2X2.Text = _line2X2.ToString("F3");
+                        tbLine2Y2.Text = _line2Y2.ToString("F3");
+                        // NumRectWidth2.Value = (decimal)_line2Width;
+                    }
+
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+
+
+
+
+        private void GuideLineCircleCtrl_Load(object sender, EventArgs e)
+        {
+
+
+
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(Canvas_mouseMoved, pos);
+                return;
+            }
+
+            lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    // panelGuide.Controls.Clear();
+            //    return;
+            //}
+            //SwitchGuideForm(shapes[0].ShapeType);
+            // Canvas_OnShapeUpdateEvent(shapes[0]);
+
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+            UpdateShape(shapes[0]);
+
+        }
+
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                return;
+            }
+
+            UpdateShape(shapes[0]);
+        }
+        private void Canvas_newShape()
+        {
+            // 自动切换到下一条直线绘制
+            if (_line1 == null)
+            {
+                _line1 = this.canvas.Shapes.LastOrDefault(shp => shp.ShapeType == ShapeTypeEnum.Line);
+            }
+            else if (_line2 == null)
+            {
+                _line2 = this.canvas.Shapes.LastOrDefault(shp => shp.ShapeType == ShapeTypeEnum.Line);
+            }
+
+            // 停止绘制模式，用户可以根据需要重新启用
+            this.canvas.StopDraw();
+            //this.canvas.StopDraw();
+        }
+
+        private void btnCreateLineOne_Click(object sender, EventArgs e)
+        {
+            // this.canvas.Shapes.RemoveAll(shp => shp == _line1); // 移除第一条直线
+            this._line1 = null;
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Line); // 启动绘制模式
+            this.canvas.Enabled = true;
+        }
+
+        private void btnCreateLineTwo_Click(object sender, EventArgs e)
+        {
+            // this.canvas.Shapes.RemoveAll(shp => shp == _line2); // 移除第二条直线
+            this._line2 = null;
+            this.canvas.Invalidate();
+            this.canvas.StartDraw(ShapeTypeEnum.Line); // 启动绘制模式
+            this.canvas.Enabled = true;
+        }
+
+        private void btnExecute_Click(object sender, EventArgs e)
+        {
+            if (this.canvas.pixmap == null)
+            {
+                MessageBox.Show("请先打开图片");
+                return;
+            }
+        
+            this.canvas.OutsideShapes.Clear();
+            this.canvas.Invalidate();
+
+            flag = new List<double>();
+            Distance = new List<double>();
+            Line1_RowBegin = new List<double>();
+            Line1_ColBegin = new List<double>();
+            Line1_RowEnd = new List<double>();
+            Line1_ColEnd = new List<double>();
+            Line2_RowBegin = new List<double>();
+            Line2_ColBegin = new List<double>();
+            Line2_RowEnd = new List<double>();
+            Line2_ColEnd = new List<double>();
+            Dictionary<string, HObject> inputImg = new Dictionary<string, HObject>();
+
+            if (hImage == null)
+            {
+                HOperatorSet.ReadImage(out hImage, CurrentImageFile);
+            }
+            inputImg["INPUT_Image"] = hImage;
+
+            Dictionary<string, HTuple> inputPara = new Dictionary<string, HTuple>();
+
+
+            // 获取矩形的 4 个点
+            PointF[] Points = this._line1.LineVirtualRectPoints;
+            if (Points.Count() < 4)
+            {
+                return;
+            }
+            PointF Point1 = Points[0];
+            PointF Point2 = Points[1];
+            PointF Point3 = Points[2];
+            PointF Point4 = Points[3];
+            PointF Point5 = Points[0];
+
+            float x1 = Point1.X;
+            float y1 = Point1.Y;
+
+            float x2 = Point2.X;
+            float y2 = Point2.Y;
+
+            float x3 = Point3.X;
+            float y3 = Point3.Y;
+
+            float x4 = Point4.X;
+            float y4 = Point4.Y;
+
+            float x5 = Point5.X;
+            float y5 = Point5.Y;
+
+
+            float[] array1X = new float[] { x1, x2, x3, x4, x5 };
+            HTuple hTupleArray1X = new HTuple(array1X);
+
+            float[] array1Y = new float[] { y1, y2, y3, y4, y5 };
+            HTuple hTupleArray1Y = new HTuple(array1Y);
+
+
+            strarray1X = string.Join(",", array1X);
+            strarray1Y = string.Join(",", array1Y);
+
+
+            // 获取矩形的 4 个点
+            PointF[] Points2 = this._line2.LineVirtualRectPoints;
+            if (Points2.Count() < 4)
+            {
+                return;
+            }
+            PointF Point21 = Points2[0];
+            PointF Point22 = Points2[1];
+            PointF Point23 = Points2[2];
+            PointF Point24 = Points2[3];
+            PointF Point25 = Points2[0];
+
+            float x21 = Point21.X;
+            float y21 = Point21.Y;
+
+            float x22 = Point22.X;
+            float y22 = Point22.Y;
+
+            float x23 = Point23.X;
+            float y23 = Point23.Y;
+
+            float x24 = Point24.X;
+            float y24 = Point24.Y;
+
+            float x25 = Point25.X;
+            float y25 = Point25.Y;
+
+
+            float[] array2X = new float[] { x21, x22, x23, x24, x25 };
+            HTuple hTupleArray2X = new HTuple(array2X);
+
+            float[] array2Y = new float[] { y21, y22, y23, y24, y25 };
+            HTuple hTupleArray2Y = new HTuple(array2Y);
+
+
+            strarray2X = string.Join(",", array2X);
+            strarray2Y = string.Join(",", array2Y);
+
+            inputPara["Line1_LX"] = _line1X1;
+            inputPara["Line1_LY"] = _line1Y1;
+            inputPara["Line1_RX"] = _line1X2;
+            inputPara["Line1_RY"] = _line1Y2;
+
+            inputPara["Line2_LX"] = _line2X1;
+            inputPara["Line2_LY"] = _line2Y1;
+            inputPara["Line2_RX"] = _line2X2;
+            inputPara["Line2_RY"] = _line2Y2;
+
+
+
+            inputPara["Line1_XRect"] = hTupleArray1X;
+            inputPara["Line1_YRect"] = hTupleArray1Y;
+
+            inputPara["Line2_XRect"] = hTupleArray2X;
+            inputPara["Line2_YRect"] = hTupleArray2Y;
+
+            List<string> outputKeys = new List<string>()
+            {
+                "OUTPUT_Flag",
+                "Distance",
+                "Line1_RowBegin",
+                "Line1_ColBegin",
+                "Line1_RowEnd",
+                "Line1_ColEnd",
+                 "Line2_RowBegin",
+                 "Line2_ColBegin",
+                  "Line2_RowEnd",
+                  "Line2_ColEnd"
+
+            };
+
+            ExecuteHScript(
+                    inputImg,
+                    inputPara,
+                    outputKeys);
+        }
+
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            OpenImageFile(bitmap =>
+            {
+                this.canvas.LoadPixmap(bitmap);
+                this.canvas.Enabled = true;
+                _line1 = new FlyShape();
+                _line2 = new FlyShape();
+                _line1.AddPoint(new Point(10, 10));
+                _line1.AddPoint(new Point(50, 10));
+                _line2.AddPoint(new Point(10, 20));
+                _line2.AddPoint(new Point(60, 20));
+                _line1.ShapeType = ShapeTypeEnum.Line;
+                _line2.ShapeType = ShapeTypeEnum.Line;
+
+                _line1.IsDrawLineVirtualRect = true;
+                _line1.LineVirtualRectWidth = 40;
+                _line2.IsDrawLineVirtualRect = true;
+                _line2.LineVirtualRectWidth = 40;
+
+                canvas.Shapes.Add(_line1);
+                canvas.Shapes.Add(_line2);
+                canvas.Invalidate();
+
+                UpdateShape(_line1);
+                UpdateShape(_line2);
+            });
+        }
+        string strarray1X = string.Empty;
+        string strarray1Y = string.Empty;
+        string strarray2X = string.Empty;
+        string strarray2Y = string.Empty;
+        List<double> flag =new List<double>();
+        List<double> Distance = new List<double>();
+        List<double> Line1_RowBegin = new List<double>();
+        List<double> Line1_ColBegin = new List<double>();
+        List<double> Line1_RowEnd = new List<double>();
+        List<double> Line1_ColEnd = new List<double>();
+        List<double> Line2_RowBegin = new List<double>();
+        List<double> Line2_ColBegin = new List<double>();
+        List<double> Line2_RowEnd = new List<double>();
+        List<double> Line2_ColEnd = new List<double>();
+        protected override void OnExecuteHScriptResult(
+          bool success,
+          Dictionary<string, HTuple> resultDic,
+          int timeElasped)
+        {
+            if (!success)
+            {
+                return;
+            }
+
+            //"OUTPUT_Flag",
+            //    "Distance",
+            //    "Line1_RowBegin",
+            //    "Line1_ColBegin",
+            //    "Line1_RowEnd",
+            //    "Line1_ColEnd",
+            //     "Line2_RowBegin",
+            //     "Line2_ColBegin",
+            //      "Line2_RowEnd",
+            //      "Line2_ColEnd"
+
+
+            flag = resultDic["OUTPUT_Flag"].HTupleToDouble();
+            Distance = resultDic["Distance"].HTupleToDouble();
+            Line1_RowBegin = resultDic["Line1_RowBegin"].HTupleToDouble();
+            Line1_ColBegin = resultDic["Line1_ColBegin"].HTupleToDouble();
+            Line1_RowEnd = resultDic["Line1_RowEnd"].HTupleToDouble();
+            Line1_ColEnd = resultDic["Line1_ColEnd"].HTupleToDouble();
+            Line2_RowBegin = resultDic["Line2_RowBegin"].HTupleToDouble();
+            Line2_ColBegin = resultDic["Line2_ColBegin"].HTupleToDouble();
+            Line2_RowEnd = resultDic["Line2_RowEnd"].HTupleToDouble();
+            Line2_ColEnd = resultDic["Line2_ColEnd"].HTupleToDouble();
+
+            if (flag.Count > 0)
+            {
+                lblResult.Text = flag[0].ToString();
+
+            }
+            else
+            {
+                lblResult.Text = "无";
+            }
+            if (Distance.Count > 0)
+            {
+                lblDistance.Text = Distance[0].ToString();
+            }
+            else
+            {
+                lblDistance.Text = "0";
+            }
+
+            if (flag.Count > 0 && Distance.Count > 0 && Line1_RowBegin.Count > 0 && Line1_ColBegin.Count > 0 && Line1_RowEnd.Count > 0 && Line1_ColEnd.Count > 0 && Line2_RowBegin.Count > 0 && Line2_ColBegin.Count > 0 && Line2_RowEnd.Count > 0 && Line2_ColEnd.Count > 0)
+            {
+                float width = 0;
+                this.canvas.DrawLine(new PointF((float)Line1_ColBegin[0], (float)Line1_RowBegin[0]), new PointF((float)Line1_ColEnd[0], (float)Line1_RowEnd[0]), width);
+                this.canvas.DrawLine(new PointF((float)Line2_ColBegin[0], (float)Line2_RowBegin[0]), new PointF((float)Line2_ColEnd[0], (float)Line2_RowEnd[0]), width);
+                this.canvas.Invalidate();
+                lblElapsed.Text = $"{timeElasped} ms";
+            }
+        }
+
+        private void NumRectWidth1_ValueChanged(object sender, EventArgs e)
+        {
+            if (_line1 != null)
+            {
+                //_line1.IsDrawLineVirtualRect = true;
+                _line1.LineVirtualRectWidth = (float)NumRectWidth1.Value;
+                UpdateShape(_line1);
+                this.canvas.Invalidate();
+            }
+        }
+
+        private void NumericUpDown2_ValueChanged(object sender, EventArgs e)
+        {
+            if (_line2 != null)
+            {
+                // _line2.IsDrawLineVirtualRect = true;
+                _line2.LineVirtualRectWidth = (float)NumRectWidth2.Value;
+                UpdateShape(_line2);
+                this.canvas.Invalidate();
+            }
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            if (lblResult.Text.Equals("无"))
+            {
+                MessageBox.Show("请先进行绘制");
+                return;
+            }
+            if (lblResult.Text != "0")
+            {
+                MessageBox.Show("测量计算错误，无法保存");
+                return;
+            }
+
+
+
+            //inputPara["Line1_LX"] = _line1X1;
+            //inputPara["Line1_LY"] = _line1Y1;
+            //inputPara["Line1_RX"] = _line1X2;
+            //inputPara["Line1_RY"] = _line1Y2;
+
+            //inputPara["Line2_LX"] = _line2X1;
+            //inputPara["Line2_LY"] = _line2Y1;
+            //inputPara["Line2_RX"] = _line2X2;
+            //inputPara["Line2_RY"] = _line2Y2;
+
+
+
+            //inputPara["Line1_XRect"] = hTupleArray1X;
+            //inputPara["Line1_YRect"] = hTupleArray1Y;
+
+            //inputPara["Line2_XRect"] = hTupleArray2X;
+            //inputPara["Line2_YRect"] = hTupleArray2Y;
+
+
+            string input = $"Line1_LX:{_line1X1};" +
+                $"Line1_LY:{_line1Y1};" +
+                $"Line1_RX:{_line1X2};" +
+                $"Line1_RY:{_line1Y2};" +
+                $"Line2_LX:{_line2X1};" +
+                $"Line2_LY:{_line2Y1};" +
+                $"Line2_RX:{_line2X2};" +
+                $"Line2_RY:{_line2Y2};" +
+                $"Line1_XRect:{strarray1X};" +
+                $"Line1_YRect:{strarray1Y};" +
+                $"Line2_XRect:{strarray2X};" +
+                $"Line2_YRect:{strarray2Y}"
+                ;
+
+
+            string result = $"Distance:{Distance[0]}";
+
+
+            DataToTriggerEvent(input, result);
+
+        }
+    }
+}

CanFly/UI/SizePanel/SizeGuideLineLineCtrl.resx

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="canvas.OutsideShapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <data name="canvas.Shapes" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAERDYW5GbHkuQ2FudmFzLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1
+        cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAQBAAAAdlN5c3RlbS5Db2xsZWN0aW9ucy5HZW5l
+        cmljLkxpc3RgMVtbQ2FuRmx5LkNhbnZhcy5TaGFwZS5GbHlTaGFwZSwgQ2FuRmx5LkNhbnZhcywgQ3Vs
+        dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsXV0DAAAABl9pdGVtcwVfc2l6ZQhfdmVyc2lv
+        bgQAAB5DYW5GbHkuQ2FudmFzLlNoYXBlLkZseVNoYXBlW10CAAAACAgJAwAAAAAAAAAAAAAADAQAAAAz
+        Q2FuRmx5LkNhbnZhcywgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBwMAAAAAAQAA
+        AAAAAAAEHENhbkZseS5DYW52YXMuU2hhcGUuRmx5U2hhcGUEAAAACw==
+</value>
+  </data>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

CanFly/UI/UIMain/FrmMainSize.Designer.cs

@@ -0,0 +1,93 @@
+
+
+namespace XKRS.CanFly
+{
+    partial class FrmMainSize
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            statusStrip1 = new StatusStrip();
+            panelContent = new Panel();
+            pageHeader1 = new AntdUI.PageHeader();
+            panelContent.SuspendLayout();
+            SuspendLayout();
+            // 
+            // statusStrip1
+            // 
+            statusStrip1.Location = new Point(0, 808);
+            statusStrip1.Name = "statusStrip1";
+            statusStrip1.Size = new Size(1185, 22);
+            statusStrip1.TabIndex = 4;
+            statusStrip1.Text = "statusStrip1";
+            // 
+            // panelContent
+            // 
+            panelContent.Controls.Add(pageHeader1);
+            panelContent.Dock = DockStyle.Fill;
+            panelContent.Location = new Point(0, 0);
+            panelContent.Margin = new Padding(4, 3, 4, 3);
+            panelContent.Name = "panelContent";
+            panelContent.Size = new Size(1185, 808);
+            panelContent.TabIndex = 5;
+            // 
+            // pageHeader1
+            // 
+            pageHeader1.BackColor = Color.FromArgb(46, 108, 227);
+            pageHeader1.Dock = DockStyle.Top;
+            pageHeader1.Location = new Point(0, 0);
+            pageHeader1.Mode = AntdUI.TAMode.Dark;
+            pageHeader1.Name = "pageHeader1";
+            pageHeader1.ShowButton = true;
+            pageHeader1.ShowIcon = true;
+            pageHeader1.Size = new Size(1185, 33);
+            pageHeader1.TabIndex = 2;
+            pageHeader1.Text = "尺寸测量";
+            // 
+            // FrmMainSize
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1185, 830);
+            Controls.Add(panelContent);
+            Controls.Add(statusStrip1);
+            FormBorderStyle = FormBorderStyle.FixedSingle;
+            Margin = new Padding(2, 3, 2, 3);
+            Name = "FrmMainSize";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "尺寸测量";
+            Load += FrmMain_Load;
+            panelContent.ResumeLayout(false);
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+        private StatusStrip statusStrip1;
+        private Panel panelContent;
+        private AntdUI.PageHeader pageHeader1;
+    }
+}

CanFly/UI/UIMain/FrmMainSize.cs

@@ -0,0 +1,440 @@
+using AntdUI;
+using CanFly.Canvas.Shape;
+using CanFly.Helper;
+using CanFly.UI;
+using CanFly.UI.GuidePanel;
+using CanFly.UI.SizePanel;
+using CanFly.Util;
+using DH.Commons.Base;
+using HalconDotNet;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Windows.Forms;
+
+namespace XKRS.CanFly
+{
+  
+    public partial class FrmMainSize : Window
+    {
+
+        private string _currentImageFile = "";
+        private System.Windows.Forms.Timer _statusTimer = new System.Windows.Forms.Timer();
+        private SizeBaseGuideControl? _currentGuideCtrl;
+
+
+        private SizeGuideCircleCtrl guideCircleCtrl = new SizeGuideCircleCtrl();
+        private SizeGuideLineCircleCtrl guideLineCircleCtrl = new SizeGuideLineCircleCtrl();
+        private SizeGuideLineLineCtrl guideLineLineCtrl = new SizeGuideLineLineCtrl();
+        private SizeGuideLineCtrl guideLineCtrl = new SizeGuideLineCtrl();
+        private SizeGuideHeightCtrl guideHeightCtrl = new SizeGuideHeightCtrl();
+        string Type=string.Empty;
+
+
+        public string inputtext=string.Empty;
+        public string outtext = string.Empty;
+        DetectionConfig DetectionConfig;
+        public FrmMainSize(string type,DetectionConfig detectionConfig)
+        {
+            InitializeComponent();
+
+            DetectionConfig = detectionConfig;
+            Type=type;
+
+            guideCircleCtrl.Dock = DockStyle.Fill;
+            guideCircleCtrl.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            guideCircleCtrl.OnControlCloseEvent += () => panelContent.Controls.Clear();
+
+
+            guideLineCircleCtrl.Dock = DockStyle.Fill;
+            guideLineCircleCtrl.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            guideLineCircleCtrl.OnControlCloseEvent += () => panelContent.Controls.Clear();
+
+            guideLineLineCtrl.Dock = DockStyle.Fill;
+            guideLineLineCtrl.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            guideLineLineCtrl.OnControlCloseEvent += () => panelContent.Controls.Clear();
+
+            guideLineCtrl.Dock = DockStyle.Fill;
+            guideLineCtrl.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            guideLineCtrl.OnControlCloseEvent += () => panelContent.Controls.Clear();
+
+
+            guideHeightCtrl.Dock = DockStyle.Fill;
+            guideHeightCtrl.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            guideHeightCtrl.OnControlCloseEvent += () => panelContent.Controls.Clear();
+        }
+
+
+
+        private void FrmMain_Load(object sender, EventArgs e)
+        {
+            switch (Type) 
+            {
+                case "1":
+                    SwitchMeasureMode(guideCircleCtrl);
+                    break;
+                    case "2":
+                    SwitchMeasureMode(guideLineCtrl);
+                    break;
+                    case "3":
+                    SwitchMeasureMode(guideLineLineCtrl);
+                    break;
+                    case "4":
+                    SwitchMeasureMode(guideLineCircleCtrl);
+                    break;
+                    case "5":
+                    SwitchMeasureMode(guideHeightCtrl);
+                    break;
+                    default:
+                    break;
+            }
+        }
+
+
+        private void btnLoadImage_Click(object sender, EventArgs e)
+        {
+            //OpenFileDialog ofd = new OpenFileDialog();
+            //ofd.Filter = "ͼ<><CDBC><EFBFBD>ļ<EFBFBD>|*.jpg;*.png";
+            //ofd.Multiselect = false;
+            //if (ofd.ShowDialog() == DialogResult.OK)
+            //{
+            //    _currentImageFile = ofd.FileName; 
+            //    Bitmap bitmap = (Bitmap)Image.FromFile(_currentImageFile);
+            //    this.canvas.LoadPixmap(bitmap);
+            //    this.btnCreateCircle.Enabled = true;
+            //}
+        }
+
+
+
+        private void btnMeasureCircle_Click(object sender, EventArgs e)
+        {
+            //var contentCtrls = panelContent.Controls;
+
+            //if (contentCtrls.Count > 0)
+            //{
+            //    if (contentCtrls[0] == guideCircleCtrl)
+            //    {
+            //        return;
+            //    }
+            //}
+
+            //panelContent.Controls.Clear();
+            //panelContent.Controls.Add(guideCircleCtrl);
+
+            SwitchMeasureMode(guideCircleCtrl);
+        }
+
+
+        private void btnMeasureLineCircle_Click(object sender, EventArgs e)
+        {
+            SwitchMeasureMode(guideLineCircleCtrl);
+        }
+
+
+        private void SwitchMeasureMode(SizeBaseGuideControl control)
+        {
+            var contentCtrls = panelContent.Controls;
+
+            if (contentCtrls.Count > 0)
+            {
+                if (contentCtrls[0] == control)
+                {
+                    return;
+                }
+            }
+
+            panelContent.Controls.Clear();
+
+            control.OnDataPassed -= Control_OnDataPassed;
+            control.OnDataPassed += Control_OnDataPassed;
+
+
+
+            //control.Dock = DockStyle.Fill;
+            //control.OnControlCloseEvent -= () => panelContent.Controls.Clear();
+            //control.OnControlCloseEvent += () => panelContent.Controls.Clear();
+            panelContent.Controls.Add(control);
+        }
+
+        private void Control_OnDataPassed(string obj,string obj1)
+        {
+            inputtext = obj;
+            outtext = obj1;
+            this.Close();
+        }
+
+        private void btnCreateRect_Click(object sender, EventArgs e)
+        {
+            //this.canvas.StartDraw(ShapeTypeEnum.Rectangle); 
+            //this.btnCreateCircle.Enabled = false;
+            //this.btnStopDraw.Enabled = true;
+            //this.canvas.Enabled = true;
+        }
+
+
+
+        private void btnStopDraw_Click(object sender, EventArgs e)
+        {
+            //panelGuide.Controls.Clear();
+            StopDrawMode();
+        }
+
+
+
+        private void StartDrawMode()
+        {
+
+        }
+
+
+        private void StopDrawMode()
+        {
+            //this.canvas.StopDraw();
+
+
+            //this.btnStopDraw.Enabled = false;
+            //this.btnCreateCircle.Enabled = true;
+        }
+
+
+
+
+
+        private void Status(string message, int delay = 5000)
+        {
+            //_statusTimer.Stop();
+            //// <20><>ʾ<EFBFBD><CABE>Ϣ
+            //lblStatus.Text = message;
+
+            //// <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
+
+            //_statusTimer.Interval = delay; // <20><><EFBFBD><EFBFBD><EFBFBD>ӳ<EFBFBD>ʱ<EFBFBD><CAB1>
+            //_statusTimer.Tick += (sender, e) =>
+            //{
+            //    _statusTimer.Stop(); // ֹͣ<CDA3><D6B9>ʱ<EFBFBD><CAB1>
+            //    lblStatus.Text = string.Empty; // <20><><EFBFBD><EFBFBD>״̬<D7B4><CCAC>Ϣ
+            //};
+            //_statusTimer.Start(); // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
+        }
+
+
+
+
+        private void Canvas_mouseMoved(PointF pos)
+        {
+            //if (InvokeRequired)
+            //{
+            //    Invoke(Canvas_mouseMoved, pos);
+            //    return;
+            //}
+
+            //lblStatus.Text = $"X:{pos.X}, Y:{pos.Y}";
+
+        }
+
+
+
+
+        private void Canvas_selectionChanged(List<FlyShape> shapes)
+        {
+            if (shapes.Count != 1)
+            {
+                // panelGuide.Controls.Clear();
+                return;
+            }
+            //SwitchGuideForm(shapes[0].ShapeType);
+            Canvas_OnShapeUpdateEvent(shapes[0]);
+
+        }
+
+
+
+        private void SwitchGuideForm(ShapeTypeEnum shapeType)
+        {
+            //if (_currentGuideCtrl == null)
+            //{
+            //    switch (shapeType)
+            //    {
+            //        case ShapeTypeEnum.Point:
+            //            break;
+            //        case ShapeTypeEnum.Line:
+            //            break;
+            //        case ShapeTypeEnum.Rectangle:
+            //            break;
+            //        case ShapeTypeEnum.Circle:
+            //            _currentGuideCtrl = new GuideCircleCtrl();
+            //            _currentGuideCtrl.ImageFile = _currentImageFile;
+            //            _currentGuideCtrl.OnDrawCircle += this.canvas.DrawCircle;
+            //            _currentGuideCtrl.OnClose += () =>
+            //            {
+            //                panelGuide.Controls.Clear();
+            //                StopDrawMode();
+            //            };
+            //            break;
+            //        case ShapeTypeEnum.Polygon:
+            //            break;
+            //        case ShapeTypeEnum.LineStrip:
+            //            break;
+            //        default:
+            //            break;
+            //    }
+            //}
+            //_currentGuideCtrl?.AddToPanel(panelGuide);
+        }
+
+
+
+        private void Canvas_OnShapeMoving(List<FlyShape> shapes)
+        {
+            //if (shapes.Count != 1)
+            //{
+            //    panelGuide.Controls.Clear();
+            //    return;
+            //}
+
+            //_currentGuideCtrl?.UpdateShape(shapes[0]);
+        }
+
+
+
+        private void Canvas_OnShapeUpdateEvent(FlyShape shape)
+        {
+            switch (shape.ShapeType)
+            {
+                case ShapeTypeEnum.Point:
+                    break;
+                case ShapeTypeEnum.Line:
+                    break;
+                case ShapeTypeEnum.Rectangle:
+                    break;
+                case ShapeTypeEnum.Circle:
+                    {
+                        //_currentGuideCtrl?.UpdateShape(shape);
+                    }
+                    break;
+                case ShapeTypeEnum.Polygon:
+                    break;
+                case ShapeTypeEnum.LineStrip:
+                    break;
+                default:
+                    break;
+            }
+        }
+
+
+
+        private void btnTestOutsideDraw_Click(object sender, EventArgs e)
+        {
+            //Random random = new Random((int)DateTime.Now.Ticks);
+
+            //for (int i = 0; i < 10; i++)
+            //{
+            //    // this.canvas.DrawCircle(new PointF(500, 500), 100);
+
+            //    int x = random.Next() % 500;
+            //    int y = random.Next() % 500;
+            //    int r = random.Next() % 200;
+
+            //    Debug.WriteLine($"X:{x}\tY:{y}\tR:{r}");
+
+            //    this.canvas.DrawCircle(new PointF(x, y), r);
+            //}
+        }
+
+        private void btnTestClearDraw_Click(object sender, EventArgs e)
+        {
+            //this.canvas.ClearDraw();
+        }
+
+
+
+        private async void btnTestCircleMeasure_Click(object sender, EventArgs e)
+        {
+            //string dir = Path.Combine(Environment.CurrentDirectory, "hscripts");
+            //string file = "CircleMeasure.hdvp";
+            //string filePath = Path.Combine(dir, file);
+            //if (!File.Exists(filePath))
+            //{
+            //    MessageBox.Show($"<22>ļ<EFBFBD> {filePath} <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+            //    return;
+            //}
+
+            //HObject? hImage = null;
+
+            //try
+            //{
+            //    HDevEngineTool tool = new HDevEngineTool(dir);
+            //    tool.LoadProcedure(Path.GetFileNameWithoutExtension(file));
+
+            //    // string imageFile = Path.Combine(Environment.CurrentDirectory, "hscripts", "image.png");
+
+            //    HOperatorSet.ReadImage(out hImage, _currentImageFile);
+            //    tool.InputImageDic["INPUT_Image"] = hImage;
+            //    tool.InputTupleDic["XCenter"] = 981.625;
+            //    tool.InputTupleDic["YCenter"] = 931.823;
+            //    tool.InputTupleDic["Radius"] = 900.141;
+
+            //    Stopwatch sw = new Stopwatch();
+            //    sw.Start();
+            //    if (!tool.RunProcedure(out string error, out _))
+            //    {
+            //        throw new Exception();
+            //    }
+            //    sw.Stop();
+
+
+
+            //    var flag = tool.GetResultTuple("OUTPUT_Flag").HTupleToDouble();
+            //    List<double> x = tool.GetResultTuple("RXCenter").HTupleToDouble();
+            //    var y = tool.GetResultTuple("RYCenter").HTupleToDouble();
+            //    var r = tool.GetResultTuple("RRadius").HTupleToDouble();
+
+            //    if (flag.Count > 0 && x.Count > 0 && y.Count > 0 && r.Count > 0)
+            //    {
+            //        this.canvas.DrawCircle(new PointF((float)x[0], (float)y[0]), (float)r[0]);
+            //    }
+
+            //    //
+            //    Debug.WriteLine("");
+            //}
+            //catch (Exception)
+            //{
+            //    throw;
+            //}
+            //finally
+            //{
+            //    hImage?.Dispose();
+            //}
+
+
+        }
+
+        private void btnTest_Click(object sender, EventArgs e)
+        {
+            //this.canvas.DrawRectangle(new PointF(300, 300),
+            //    new PointF(800, 500), 33f);
+        }
+
+
+        private void btnRotateTest_Click(object sender, EventArgs e)
+        {
+            //if (this.canvas.Shapes.Count == 0)
+            //{
+            //    return;
+            //}
+
+            //this.canvas.Shapes[0]._currentRotateAngle += 10; 
+            //this.canvas.Invalidate();
+        }
+
+        private void btnMeasureLineline_Click(object sender, EventArgs e)
+        {
+            SwitchMeasureMode(guideLineLineCtrl);
+        }
+
+        private void btnMeasureLine_Click(object sender, EventArgs e)
+        {
+            SwitchMeasureMode(guideLineCtrl);
+        }
+    }
+}

CanFly/UI/UIMain/FrmMainSize.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

CanFly/XKRS.CanFly.csproj

@@ -14,14 +14,9 @@
  
 
 
-
- 
-
-
-
-
 	<ItemGroup>
 		<ProjectReference Include="..\CanFly.Canvas\CanFly.Canvas.csproj" />
+		<ProjectReference Include="..\DH.Commons\DH.Commons.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -29,6 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <PackageReference Include="AntdUI" Version="1.8.9" />
 	  <PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
 	  <PackageReference Include="OpenCvSharp4.Extensions" Version="4.10.0.20241108" />
 	  <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />

DH.Commons/Base/CameraBase.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Drawing.Imaging;
 using AntdUI;
 using DH.Commons.Enums;
+using DVPCameraType;
 using HalconDotNet;
 using OpenCvSharp;
 
@@ -47,10 +48,13 @@ namespace DH.Commons.Base
         // 私有字段 + 带通知的属性（与DetectionLabel风格一致）
         private bool _isEnabled = false;
         private bool _isallPicEnabled = true;//默认全画幅
+        private bool _isRGBEnabled = true;//默认彩色
         private bool _isContinueMode = false;
         private bool _isSavePicEnabled = false;
+        private bool _isZoomCamera = false;
         private string _imageSaveDirectory;
         private EnumCamType _CamType;
+        private dvpStreamFormat _dvpstreamFormat = dvpStreamFormat.S_RGB24;
         private ImageFormat _imageFormat = ImageFormat.Jpeg;
         private bool _isHardwareTrigger = true;
         private string _serialNumber = string.Empty;
@@ -59,7 +63,7 @@ namespace DH.Commons.Base
         private string _computerIP = string.Empty;
         private bool _isDirectHardwareTrigger = false;
         private float _gain =6;
-        private float _rotateImage = 0;
+        private int _rotateImage = 0;
         private float _exposure = 200;
         private float _triggerDelay = 0;
         private decimal _roiX = 0;
@@ -70,6 +74,20 @@ namespace DH.Commons.Base
 
         public volatile int SnapshotCount = 0;
 
+        [Category("相机设置")]
+        [DisplayName("图像格式")]
+        [Description("相机采集图像格式")]
+        public dvpStreamFormat DvpImageFormat
+        {
+            get => _dvpstreamFormat;
+            set
+            {
+                if (_dvpstreamFormat == value) return;
+                _dvpstreamFormat = value;
+                OnPropertyChanged(nameof(DvpImageFormat));
+            }
+        }
+
         [Category("采图模式")]
         [DisplayName("连续模式")]
         [Description("是否连续模式。true：连续模式采图；false：触发模式采图")]
@@ -83,6 +101,16 @@ namespace DH.Commons.Base
                 OnPropertyChanged(nameof(IsContinueMode));
             }
         }
+        public bool IsZoomCamera
+        {
+            get => _isZoomCamera;
+            set
+            {
+                if (_isZoomCamera == value) return;
+                _isZoomCamera = value;
+                OnPropertyChanged(nameof(IsZoomCamera));
+            }
+        }
 
         public virtual bool IsEnabled
         {
@@ -245,7 +273,7 @@ namespace DH.Commons.Base
         [Category("图像旋转")]
         [DisplayName("默认旋转")]
         [Description("默认旋转，相机开启后默认不旋转")]
-        public virtual float RotateImage
+        public virtual int RotateImage
         {
             get => _rotateImage;
             set

DH.Commons/Base/GlobalConfig.cs

@@ -11,6 +11,9 @@ namespace DH.Commons.Base
 {
     public class GlobalConfig : NotifyProperty
     {
+        bool _EnableVibrator=false;
+        bool _EnableBelt = false;
+        int _ClearTime=0;
         string _name;
         private BindingList<PLCItem> _InitProcessList = new BindingList<PLCItem>();
         private BindingList<PLCItem> _StartProcessList = new BindingList<PLCItem>();
@@ -29,7 +32,42 @@ namespace DH.Commons.Base
                 }
             }
         }
-
+        public bool EnableBelt
+        {
+            get => _EnableBelt;
+            set
+            {
+                if (_EnableBelt != value)
+                {
+                    _EnableBelt = value;
+                    OnPropertyChanged(nameof(EnableBelt));
+                }
+            }
+        }
+        public bool EnableVibrator
+        {
+            get => _EnableVibrator;
+            set
+            {
+                if (_EnableVibrator != value)
+                {
+                    _EnableVibrator = value;
+                    OnPropertyChanged(nameof(EnableVibrator));
+                }
+            }
+        }
+        public int ClearTime
+        {
+            get => _ClearTime;
+            set
+            {
+                if (_ClearTime != value)
+                {
+                    _ClearTime = value;
+                    OnPropertyChanged(nameof(ClearTime));
+                }
+            }
+        }
         public BindingList<PLCItem> InitProcessList
         {
             get => _InitProcessList;

DH.Commons/Base/VisualLocalization.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+
+namespace DH.Commons.Base
+{
+    public class VisualLocalization
+    {
+        // 配置属性
+        public string CameraName { get; set; }
+        public string ModelPath { get; set; }
+        public string ImgPath { get; set; }
+        public string Threshold { get; set; }
+        public string Direction { get; set; }
+        public string Speed { get; set; }
+
+        public string MSpeed { get; set; }
+
+        // 配置文件路径
+        private const string ConfigFile = "VisualConfigs.json";
+        private static readonly object _fileLock = new object();
+
+        /// <summary>
+        /// 保存当前配置（存在则更新，不存在则新增）
+        /// </summary>
+        public void Save()
+        {
+            lock (_fileLock)
+            {
+                var list = LoadAll();
+                var existing = list.FirstOrDefault(c => c.CameraName == CameraName);
+
+                if (existing != null)
+                {
+                    // 更新现有配置
+                    existing.ModelPath = ModelPath;
+                    existing.ImgPath = ImgPath;
+                    existing.Threshold = Threshold;
+                    existing.Direction = Direction;
+                    existing.Speed = Speed;
+                    existing.MSpeed = MSpeed;
+                }
+                else
+                {
+                    list.Add(this);
+                }
+
+                SaveAll(list);
+            }
+        }
+
+        /// <summary>
+        /// 获取全部配置列表
+        /// </summary>
+        public static List<VisualLocalization> LoadAll()
+        {
+            lock (_fileLock)
+            {
+                if (!File.Exists(ConfigFile)) return new List<VisualLocalization>();
+
+                var json = File.ReadAllText(ConfigFile);
+                return JsonSerializer.Deserialize<List<VisualLocalization>>(json)
+                    ?? new List<VisualLocalization>();
+            }
+        }
+
+        private static void SaveAll(List<VisualLocalization> list)
+        {
+            var options = new JsonSerializerOptions
+            {
+                WriteIndented = true,
+                IgnoreNullValues = true
+            };
+
+            File.WriteAllText(ConfigFile, JsonSerializer.Serialize(list, options));
+        }
+    }
+}

DH.Commons/DH.Commons.csproj

@@ -14,8 +14,11 @@
 
 
 
+
+ 
   <ItemGroup>
     <PackageReference Include="AntdUI" Version="1.8.9" />
+    <PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="OpenCvSharp4" Version="4.10.0.20241108" />
     <PackageReference Include="OpenCvSharp4.Extensions" Version="4.10.0.20241108" />
@@ -24,6 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="DVPCameraCS64">
+      <HintPath>..\X64\Debug\DVPCameraCS64.dll</HintPath>
+    </Reference>
     <Reference Include="halcondotnet">
       <HintPath>..\x64\Debug\halcondotnet.dll</HintPath>
     </Reference>

DH.Commons/Enums/Enum.cs

@@ -9,8 +9,9 @@ namespace DH.Commons.Enums
 {
     public enum EnumStatus
     {
-        未运行,
+        待机中,
         运行中,
+        清料中,
         警告,
         异常
     }
@@ -115,7 +116,16 @@ namespace DH.Commons.Enums
         NG脉冲,
         状态复位,
         启用定位,
-        定位完成脉冲值
+        定位完成脉冲值,
+        相机步进原点,
+        相机步进位置,
+        相机步进速度,
+        相机步进顺时针,
+        相机步进逆时针,
+        点动相机步进,
+        点动挡杆步进,
+        相机步进实时位置,
+        挡料电机实时位置
 
 
 

DH.Commons/Helper/ConfigHelper.cs

@@ -5,6 +5,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using AntdUI;
 using DH.Commons.Base;
+using DH.Commons.Enums;
 using DH.Commons.Models;
 
 namespace DH.Commons.Helper
@@ -127,6 +128,13 @@ namespace DH.Commons.Helper
                 {
                     foreach (var label in config.DetectionLableList)
                     {
+                        //是否假如判断标签为中文转为为英文
+                        //string pinyinlabel = FileHelper.ConvertHanzitoPinyinWithNumbers(label.LabelName.ToString());
+                        //if (FileHelper.IsAlphaNumericOnly(pinyinlabel))
+                        //{
+
+                        //}
+
                         // 根据实际需求格式化输出
                         writer.WriteLine(label.LabelName.ToString()); // 假设DetectionLable重写了ToString()
 

DH.Commons/Helper/FileHelper.cs

@@ -0,0 +1,507 @@
+using hyjiacan.py4n;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace DH.Commons.Enums
+{
+
+    public static class FileHelper
+    {
+
+        /// <summary>
+        /// 清理两个文件夹中的文件，保留文件名交集部分，其余文件删除。
+        /// </summary>
+        /// <param name="imagesFolder">图片文件夹路径</param>
+        /// <param name="labelsFolder">标签文件夹路径</param>
+        public static void CleanupFolders(string imagesFolder, string labelsFolder)
+        {
+            if (!Directory.Exists(imagesFolder))
+            {
+                Console.WriteLine($"Images folder does not exist: {imagesFolder}");
+                return;
+            }
+
+            if (!Directory.Exists(labelsFolder))
+            {
+                Console.WriteLine($"Labels folder does not exist: {labelsFolder}");
+                return;
+            }
+
+            // 获取文件名（不包含扩展名）
+            var imageFiles = Directory.GetFiles(imagesFolder)
+                                       .Select(Path.GetFileNameWithoutExtension)
+                                       .ToHashSet();
+
+            var labelFiles = Directory.GetFiles(labelsFolder)
+                                       .Select(Path.GetFileNameWithoutExtension)
+                                       .ToHashSet();
+
+            // 计算交集
+            var commonFiles = imageFiles.Intersect(labelFiles);
+
+            // 删除 images 文件夹中不在交集中的文件
+            foreach (var imagePath in Directory.GetFiles(imagesFolder))
+            {
+                string fileNameWithoutExt = Path.GetFileNameWithoutExtension(imagePath);
+                if (!commonFiles.Contains(fileNameWithoutExt))
+                {
+                    File.Delete(imagePath);
+                    Console.WriteLine($"Deleted image file: {imagePath}");
+                }
+            }
+
+            // 删除 labels 文件夹中不在交集中的文件
+            foreach (var labelPath in Directory.GetFiles(labelsFolder))
+            {
+                string fileNameWithoutExt = Path.GetFileNameWithoutExtension(labelPath);
+                if (!commonFiles.Contains(fileNameWithoutExt))
+                {
+                    File.Delete(labelPath);
+                    Console.WriteLine($"Deleted label file: {labelPath}");
+                }
+            }
+
+            Console.WriteLine("Folders cleaned successfully!");
+        }
+    
+    /// <summary>
+    /// 获取文件夹中所有图片文件的个数
+    /// </summary>
+    /// <param name="folderPath">目标文件夹路径</param>
+    /// <param name="includeSubdirectories">是否包含子文件夹，默认不包含</param>
+    /// <returns>图片文件总数</returns>
+    public static int CountImageFiles(string folderPath, bool includeSubdirectories = false)
+        {
+            if (!Directory.Exists(folderPath))
+            {
+                throw new DirectoryNotFoundException($"The folder '{folderPath}' does not exist.");
+            }
+
+            // 支持的图片格式
+            string[] imageExtensions = { "*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif" };
+
+            // 搜索选项
+            SearchOption searchOption = includeSubdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
+
+            int fileCount = 0;
+
+            foreach (var ext in imageExtensions)
+            {
+                fileCount += Directory.GetFiles(folderPath, ext, searchOption).Length;
+            }
+
+            return fileCount;
+        }
+    
+    /// <summary>
+    /// 删除一个目录所有子目录和文件
+    /// </summary>
+    /// <param name="path"></param>
+    public static void DeleteDirectoryAndContents(string path)
+        {
+            // 确保目录存在
+            if (Directory.Exists(path))
+            {
+                // 删除目录中的文件
+                string[] files = Directory.GetFiles(path);
+                foreach (var file in files)
+                {
+                    File.Delete(file);
+                    Console.WriteLine($"文件已删除: {file}");
+                }
+
+                // 删除目录中的子目录
+                string[] directories = Directory.GetDirectories(path);
+                foreach (var directory in directories)
+                {
+                    DeleteDirectoryAndContents(directory); // 递归删除子目录
+                }
+
+                // 删除空目录
+                Directory.Delete(path);
+                Console.WriteLine($"目录已删除: {path}");
+            }
+            else
+            {
+                Console.WriteLine("目录不存在！");
+            }
+        }
+        /// <summary>
+        /// 将一个文件夹中的所有图片文件和 JSON 文件复制到另一个文件夹中
+        /// </summary>
+        /// <param name="sourceDirectory"></param>
+        /// <param name="destinationDirectory"></param>
+        public static void CopyImageAndJsonFiles(string sourceDirectory, string destinationDirectory)
+        {
+            // 确保目标文件夹存在，如果不存在则创建它
+            if (!Directory.Exists(destinationDirectory))
+            {
+                Directory.CreateDirectory(destinationDirectory);
+            }
+
+            // 获取源文件夹中的所有图片文件和 JSON 文件
+            string[] imageFiles = Directory.GetFiles(sourceDirectory, "*.*")
+                                           .Where(file => file.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".gif", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".tiff", StringComparison.OrdinalIgnoreCase) ||
+                                                          file.EndsWith(".webp", StringComparison.OrdinalIgnoreCase))
+                                           .ToArray();
+
+            string[] jsonFiles = Directory.GetFiles(sourceDirectory, "*.json");
+
+            // 合并图片文件和 JSON 文件
+            string[] filesToCopy = imageFiles.Concat(jsonFiles).ToArray();
+
+            foreach (string file in filesToCopy)
+            {
+                try
+                {
+                    // 获取文件名
+                    string fileName = Path.GetFileName(file);
+
+                    // 拼接目标文件的完整路径
+                    string destinationFile = Path.Combine(destinationDirectory, fileName);
+
+                    // 如果目标文件已存在，可以选择覆盖或跳过（这里我们选择跳过）
+                    if (File.Exists(destinationFile))
+                    {
+                        Console.WriteLine($"文件 {fileName} 已存在，跳过复制.");
+                        continue;
+                    }
+
+                    // 复制文件
+                    File.Copy(file, destinationFile);
+                    Console.WriteLine($"文件 {fileName} 已成功复制到 {destinationDirectory}");
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"复制文件 {file} 时出错: {ex.Message}");
+                }
+            }
+        }
+        /// <summary>
+        /// 遍历图片文件夹，检查对应的标签文件夹中是否有同名的 .txt 文件。
+        /// 如果没有，则创建一个空的 .txt 文件。
+        /// </summary>
+        /// <param name="imagesDirectory">图片文件夹路径</param>
+        /// <param name="labelsDirectory">标签文件夹路径</param>
+         public static void ProcessImageFiles(string imagesDirectory, string labelsDirectory)
+        {
+            // 检查 images 目录是否存在
+            if (!Directory.Exists(imagesDirectory))
+            {
+                throw new DirectoryNotFoundException($"目录 {imagesDirectory} 不存在.");
+            }
+
+            // 检查 labels 目录是否存在，如果不存在则创建
+            if (!Directory.Exists(labelsDirectory))
+            {
+                Directory.CreateDirectory(labelsDirectory);
+                Console.WriteLine($"目录 {labelsDirectory} 已创建.");
+            }
+
+            // 获取 images 目录中的所有文件（包括图片文件）
+            string[] imageFiles = Directory.GetFiles(imagesDirectory, "*.*", SearchOption.TopDirectoryOnly);
+            string[] validExtensions = { ".jpg", ".jpeg", ".png", ".bmp", ".gif" }; // 支持的图片格式
+
+            foreach (var imageFile in imageFiles)
+            {
+                // 检查文件扩展名是否为支持的图片格式
+                string extension = Path.GetExtension(imageFile).ToLower();
+                if (Array.Exists(validExtensions, ext => ext == extension))
+                {
+                    // 获取图片文件的文件名（不包括扩展名）
+                    string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(imageFile);
+
+                    // 生成对应的 txt 文件路径
+                    string labelFilePath = Path.Combine(labelsDirectory, fileNameWithoutExtension + ".txt");
+
+                    // 如果该 txt 文件不存在，则创建一个空白 txt 文件
+                    if (!File.Exists(labelFilePath))
+                    {
+                        try
+                        {
+                            File.WriteAllText(labelFilePath, string.Empty);  // 创建空白 txt 文件
+                            Console.WriteLine($"创建空白文件: {labelFilePath}");
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine($"无法创建文件 {labelFilePath}: {ex.Message}");
+                        }
+                    }
+                }
+            }
+        }
+        // 封装的函数：删除没有对应 JSON 文件的图片
+        public static void DeleteUnmatchedImages(string labelsFolderPath, string imagesFolderPath)
+        {
+            try
+            {
+                // 获取 labels 文件夹中的所有 JSON 文件名（去除扩展名）
+                string[] jsonFiles = Directory.GetFiles(labelsFolderPath, "*.txt");
+                HashSet<string> jsonFileNames = new HashSet<string>();
+
+                foreach (string jsonFile in jsonFiles)
+                {
+                    string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(jsonFile);
+                    jsonFileNames.Add(fileNameWithoutExtension);
+                }
+
+                // 获取 images 文件夹中的所有图片文件
+                string[] imageFiles = Directory.GetFiles(imagesFolderPath);
+
+                // 遍历图片文件，检查是否有对应的 JSON 文件
+                foreach (string imageFile in imageFiles)
+                {
+                    string imageFileNameWithoutExtension = Path.GetFileNameWithoutExtension(imageFile);
+
+                    // 如果图片文件名不在 labels 文件夹的 JSON 文件名集合中，则删除该图片
+                    if (!jsonFileNames.Contains(imageFileNameWithoutExtension))
+                    {
+                        try
+                        {
+                            File.Delete(imageFile);  // 删除图片
+                            Console.WriteLine($"已删除图片: {Path.GetFileName(imageFile)}");
+                        }
+                        catch (Exception ex)
+                        {
+                            Console.WriteLine($"删除文件 {Path.GetFileName(imageFile)} 时出错: {ex.Message}");
+                        }
+                    }
+                    else
+                    {
+                        Console.WriteLine($"图片 {Path.GetFileName(imageFile)} 有对应的 JSON 文件，不删除。");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"操作失败: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 将 List<string> 保存到指定文件中，格式为 "项,标签"。
+        /// 标签是根据项的索引生成的。
+        /// </summary>
+        /// <param name="items">要保存的字符串列表</param>
+        /// <param name="filePath">保存文件的路径</param>
+        public static void SaveItemsToFile(List<string> items, string filePath)
+        {
+            // 使用 StreamWriter 写入文件
+            using (StreamWriter writer = new StreamWriter(filePath))
+            {
+                // 遍历 items 列表
+                for (int i = 0; i < items.Count; i++)
+                {
+                    // 写入每一行，格式为 "项, 标签"
+                    writer.WriteLine($"{items[i]},{i}");
+                }
+            }
+        }
+        public static void SaveItemsToFile(HashSet<string> items, string filePath)
+        {
+            // 使用 StreamWriter 写入文件
+            using (StreamWriter writer = new StreamWriter(filePath))
+            {
+                // 遍历 HashSet
+                int i = 0;
+                foreach (string item in items)
+                {
+                    // 写入每一行，格式为 "项, 标签"
+                    writer.WriteLine($"{item},{i}"); // 假设使用 item 的长度作为标签
+                    i++;
+                }
+            }
+        }
+        static List<FileInformation> FileList = new List<FileInformation>();
+
+        /// <summary>
+        /// 递归获取指定文件夹下所有文件
+        /// </summary>
+        /// <param name="dir"></param>
+        /// <returns></returns>
+        public static List<FileInformation> GetAllFiles(DirectoryInfo dir)
+        {
+            FileInfo[] allFile = dir.GetFiles();
+            foreach (FileInfo fi in allFile)
+            {
+                FileList.Add(new FileInformation { FileName = fi.Name, FilePath = fi.FullName });
+            }
+            DirectoryInfo[] allDir = dir.GetDirectories();
+            foreach (DirectoryInfo d in allDir)
+            {
+                GetAllFiles(d);
+            }
+            return FileList;
+        }
+
+        /// <summary>
+        ///  判断字符串是否纯字母
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public static bool IsAlphabetOnly(string input)
+        {
+            return Regex.IsMatch(input, "^[a-zA-Z]+$");
+        }
+        /// <summary>
+        /// 判断字符串是否仅包含大小写字母和数字
+        /// </summary>
+        /// <param name="input">待判断的字符串</param>
+        /// <returns>如果字符串仅包含字母和数字，返回 true；否则返回 false</returns>
+        public static bool IsAlphaNumericOnly(string input)
+        {
+            return Regex.IsMatch(input, "^[a-zA-Z0-9]+$");
+        }
+        public static string ConvertHanzitoPinyinWithNumbers(string input)
+        {
+            // 正则表达式匹配汉字
+            string pattern = @"[\u4e00-\u9fa5]";
+            Regex regex = new Regex(pattern);
+
+            StringBuilder result = new StringBuilder();
+            int lastIndex = 0;
+
+            foreach (Match match in regex.Matches(input))
+            {
+                // 将非汉字部分保留为原样
+                result.Append(input.Substring(lastIndex, match.Index - lastIndex));
+
+                // 获取汉字并转换为拼音
+                string hanzi = match.Value;
+                string pinyin = ConvertHanziToPinyin(hanzi);
+
+                // 将拼音追加到结果中
+                result.Append(pinyin);
+
+                lastIndex = match.Index + match.Length;
+            }
+
+            // 添加最后的非汉字部分
+            result.Append(input.Substring(lastIndex));
+
+            return result.ToString();
+        }
+
+        public static string ConvertHanziToPinyin(string hanzi)
+        {
+            // 设置拼音格式：去掉音调，拼音小写，ü保持为u:
+            PinyinFormat format = PinyinFormat.WITHOUT_TONE | PinyinFormat.LOWERCASE | PinyinFormat.WITH_U_AND_COLON;
+
+            // 获取拼音数组
+            List<PinyinItem> pinyinItems = Pinyin4Net.GetPinyinArray(hanzi, format);
+
+            StringBuilder pinyinBuilder = new StringBuilder();
+
+            foreach (var item in pinyinItems)
+            {
+                // 处理多音字：默认取第一个拼音
+                if (item.Count > 0)
+                {
+                    string pinyin = item[0];
+
+                    // 特殊处理ü的情况
+                    pinyin = pinyin.Replace("u:", "v"); // 将u:转为v，这是常见的拼音表示法
+
+                    pinyinBuilder.Append(pinyin);
+                }
+            }
+
+            return pinyinBuilder.ToString();
+        }
+        /// <summary>
+        /// 汉字拼音转化
+        /// </summary>
+        /// <param name="hanzi"></param>
+        /// <returns></returns>
+        //public static string ConvertHanzitoPinyin(string hanzi)
+        //{
+        //    PinyinFormat format = PinyinFormat.WITHOUT_TONE | PinyinFormat.LOWERCASE | PinyinFormat.WITH_U_UNICODE;
+
+        //    // string hanzi = defectRow.LabelDescription;
+        //    List<PinyinItem> pylist = Pinyin4Net.GetPinyinArray(hanzi, format);
+        //    // 提取所有拼音并合并为一个字符串
+        //    List<string> pinyinStrings = new List<string>();
+        //    foreach (var item in pylist)
+        //    {
+        //        // 将PinyinItem中的每个拼音（List<string>）合并为一个字符串
+        //        string joinedPinyin = string.Join("", item);  // 这里的item就是一个List<string>，其中存储了拼音
+        //        pinyinStrings.Add(joinedPinyin);  // 添加合并后的拼音
+        //    }
+
+        //    // 合并所有拼音为一个字符串
+        //    string allPinyin = string.Join("", pinyinStrings);
+        //    return allPinyin;
+        //}
+        /// <summary>
+        /// 递归获取指定文件夹下所有文件
+        /// </summary>
+        /// <param name="dir"></param>
+        /// <returns></returns>
+        public static List<FileInformation> GetAllFiles(string dir)
+        {
+            DirectoryInfo directoryInfo = new(dir);
+            return GetAllFiles(directoryInfo);
+        }
+        public static string OpenSlectDirDialog(string dirpath = "")
+        {
+            FolderBrowserDialog fbd = new FolderBrowserDialog();
+            fbd.InitialDirectory = dirpath;
+            if (fbd.ShowDialog() == DialogResult.OK)
+            {
+                string targetDirPath = fbd.SelectedPath;
+                if (Directory.Exists(targetDirPath))
+                {
+                    return targetDirPath;
+                }
+                else
+                    return string.Empty;
+                //ImportDirImages(targetDirPath);
+            }
+            else
+                return string.Empty;
+        }
+        public static string OpenSlectfileDialog(string dirpath = "")
+        {
+
+
+
+            // 创建并配置 OpenFileDialog 实例
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Title = "选择文件"; // 对话框标题
+            openFileDialog.Filter = "所有文件 (*.pt)|*.*"; // 允许选择任何类型的文件
+            openFileDialog.InitialDirectory = @"C:\"; // 初始显示目录，可以根据需要修改
+
+            // 显示对话框
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                // 获取选中的文件路径
+                string selectedFilePath = openFileDialog.FileName;
+                Console.WriteLine("您选择的文件路径是: " + selectedFilePath);
+                return selectedFilePath;
+            }
+            else
+            {
+                Console.WriteLine("没有选择任何文件。");
+                return string.Empty;
+                MessageBox.Show("没有选择任何文件。");
+            }
+        }
+
+
+    }
+
+    public class FileInformation
+    {
+        public string FileName { get; set; }
+        public string FilePath { get; set; }
+    }
+}

DH.Commons/Helper/SchemeHelper.cs

@@ -1,117 +1,169 @@
-using System;
+
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace DH.Commons.Helper
 {
     public static class SchemeHelper
     {
-        private const string SchemesKey = "Schemes";
-        private const string CurrentSchemeKey = "CurrentScheme";
-        private const char Separator = '|';
+        private const string DefaultSchemeName = "默认方案";
+        private static readonly string ConfigFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "schemes.json");
+
+        /// <summary>
+        /// 方案配置数据结构
+        /// </summary>
+        private class SchemeConfig
+        {
+            public List<string> Schemes { get; set; } = new List<string>();
+            public string CurrentScheme { get; set; } = DefaultSchemeName;
+        }
 
         /// <summary>
         /// 初始化配置（首次运行时调用）
         /// </summary>
         public static void Initialize()
         {
-            // 如果Schemes不存在，创建空键
-            if (!SystemConfigHelper.KeyExists(SchemesKey))
+            if (!File.Exists(ConfigFilePath))
             {
-                SystemConfigHelper.SetValue(SchemesKey, "");
-            }
-
-            // 如果CurrentScheme不存在，创建空键
-            if (!SystemConfigHelper.KeyExists(CurrentSchemeKey))
+                var defaultConfig = new SchemeConfig
                 {
-                SystemConfigHelper.SetValue(CurrentSchemeKey, "");
+                    Schemes = new List<string> { DefaultSchemeName },
+                    CurrentScheme = DefaultSchemeName
+                };
+                SaveConfig(defaultConfig);
             }
         }
 
         /// <summary>
-        /// 获取所有方案（自动处理空值）
+        /// 获取所有方案
         /// </summary>
         public static List<string> GetAllSchemes()
         {
-            var schemeString = SystemConfigHelper.GetValue(SchemesKey, "");
-            return string.IsNullOrEmpty(schemeString)
-                ? new List<string>()
-                : new List<string>(schemeString.Split(Separator));
+            var config = LoadConfig();
+            return config.Schemes ?? new List<string>();
         }
 
         /// <summary>
-        /// 添加新方案（自动初始化处理）
+        /// 添加新方案
         /// </summary>
         public static void AddScheme(string schemeName)
         {
             if (string.IsNullOrWhiteSpace(schemeName))
                 throw new ArgumentException("方案名称无效");
 
-            var schemes = GetAllSchemes();
+            var config = LoadConfig();
 
-            if (schemes.Contains(schemeName))
+            if (config.Schemes.Contains(schemeName))
                 throw new InvalidOperationException($"方案 {schemeName} 已存在");
 
-            schemes.Add(schemeName);
-            SaveSchemes(schemes);
+            config.Schemes.Add(schemeName);
+            SaveConfig(config);
         }
 
         /// <summary>
-        /// 设置当前方案（空值安全处理）
+        /// 设置当前方案
         /// </summary>
         public static void SetCurrentScheme(string schemeName)
         {
-            var schemes = GetAllSchemes();
+            var config = LoadConfig();
 
-            if (!schemes.Contains(schemeName))
+            if (!config.Schemes.Contains(schemeName))
                 throw new KeyNotFoundException($"方案 {schemeName} 不存在");
 
-            SystemConfigHelper.SetValue(CurrentSchemeKey, schemeName);
+            config.CurrentScheme = schemeName;
+            SaveConfig(config);
         }
 
         /// <summary>
-        /// 获取当前方案（默认值处理）
+        /// 获取当前方案
         /// </summary>
         public static string GetCurrentScheme()
         {
-            var current = SystemConfigHelper.GetValue(CurrentSchemeKey, "");
-            return !string.IsNullOrEmpty(current) ? current : "默认方案";
+            var config = LoadConfig();
+            return !string.IsNullOrEmpty(config.CurrentScheme)
+                ? config.CurrentScheme
+                : DefaultSchemeName;
         }
 
-        private static void SaveSchemes(List<string> schemes)
-        {
-            var schemeString = schemes.Count > 0
-                ? string.Join(Separator.ToString(), schemes)
-                : "";
-            SystemConfigHelper.SetValue(SchemesKey, schemeString);
-        }
-
-
         /// <summary>
-        /// 删除指定方案（自动同步当前方案状态）
+        /// 删除指定方案
         /// </summary>
-        /// <param name="schemeName">要删除的方案名称</param>
-        /// <exception cref="ArgumentException">当方案名称为空时抛出</exception>
-        /// <exception cref="KeyNotFoundException">当方案不存在时抛出</exception>
         public static void DeleteScheme(string schemeName)
         {
             if (string.IsNullOrWhiteSpace(schemeName))
                 throw new ArgumentException("方案名称无效");
 
-            var schemes = GetAllSchemes();
+            var config = LoadConfig();
 
-            if (!schemes.Contains(schemeName))
+            if (!config.Schemes.Contains(schemeName))
                 throw new KeyNotFoundException($"方案 {schemeName} 不存在");
 
-            // 删除前检查是否是当前方案
-            bool isCurrent = GetCurrentScheme() == schemeName;
+            // 如果是当前方案，需要先切换
+            if (config.CurrentScheme == schemeName)
+            {
+                var otherScheme = config.Schemes.FirstOrDefault(s => s != schemeName);
+                if (otherScheme != null)
+                {
+                    config.CurrentScheme = otherScheme;
+                }
+                else
+                {
+                    config.CurrentScheme = DefaultSchemeName;
+                    if (!config.Schemes.Contains(DefaultSchemeName))
+                    {
+                        config.Schemes.Add(DefaultSchemeName);
+                    }
+                }
+            }
 
-            // 执行删除操作
-            schemes.Remove(schemeName);
-            SaveSchemes(schemes);
+            config.Schemes.Remove(schemeName);
+            SaveConfig(config);
+        }
 
+        /// <summary>
+        /// 加载配置文件
+        /// </summary>
+        private static SchemeConfig LoadConfig()
+        {
+            if (!File.Exists(ConfigFilePath))
+            {
+                Initialize();
+            }
+
+            try
+            {
+                string json = File.ReadAllText(ConfigFilePath);
+                return JsonConvert.DeserializeObject<SchemeConfig>(json) ?? new SchemeConfig();
+            }
+            catch
+            {
+                // 如果读取失败，返回默认配置
+                return new SchemeConfig
+                {
+                    Schemes = new List<string> { DefaultSchemeName },
+                    CurrentScheme = DefaultSchemeName
+                };
+            }
+        }
+
+        /// <summary>
+        /// 保存配置文件
+        /// </summary>
+        private static void SaveConfig(SchemeConfig config)
+        {
+            try
+            {
+                string json = JsonConvert.SerializeObject(config, Formatting.Indented);
+                File.WriteAllText(ConfigFilePath, json);
+            }
+            catch (Exception ex)
+            {
+                // 处理保存失败的情况
+                throw new InvalidOperationException("保存方案配置失败", ex);
+            }
         }
     }
 }

DH.Commons/Models/SystemModel.cs

@@ -18,7 +18,7 @@ namespace DH.Commons.Models
         /// <summary>
         /// 当前状态
         /// </summary>
-        public static EnumStatus CurrentStatus =EnumStatus.未运行;
+        public static EnumStatus CurrentStatus =EnumStatus.待机中;
     }
 
     /// <summary>

DH.Devices.Camera/Do3ThinkCamera.cs

@@ -24,10 +24,10 @@ namespace DH.Devices.Camera
         private dvpStatus nRet = dvpStatus.DVP_STATUS_OK;
         private DVPCamera.dvpEventCallback pCallBackFunc;
         private uint m_handle;
-
+        public bool Connected=false;
         public int m_n_dev_count = 0;
         private DVPCamera.dvpStreamCallback ImageCallback;
-        public dvpStreamFormat dvpStreamFormat = dvpStreamFormat.S_RGB24;
+      //  public dvpStreamFormat dvpStreamFormat = dvpStreamFormat.S_RGB24;
         public int m_CamCount = 0;
         public Double m_dfDisplayCount = 0;
 
@@ -63,6 +63,8 @@ namespace DH.Devices.Camera
         {
             try
             {
+                if (CameraName == "Cam1")
+                    Console.WriteLine("");
                 pCallBackFunc = new DVPCamera.dvpEventCallback(cbExceptiondelegate);
                 nRet = DVPCamera.dvpOpenByUserId(CameraName,
                  dvpOpenMode.OPEN_NORMAL,
@@ -74,7 +76,7 @@ namespace DH.Devices.Camera
                     throw new Exception($"Create device failed:{nRet:x8}");
                 }
 
-                nRet = DVPCamera.dvpSetTargetFormat(m_handle, (dvpStreamFormat)dvpStreamFormat);
+                nRet = DVPCamera.dvpSetTargetFormat(m_handle, (dvpStreamFormat)DvpImageFormat);
                 if (dvpStatus.DVP_STATUS_OK != nRet)
                 {
                     throw new Exception($"Set image format failed:{nRet:x8}");
@@ -156,7 +158,10 @@ namespace DH.Devices.Camera
                     }
                     //全画幅
                     if (!IsAllPicEnabled)
+                    {
                         SetPictureRoi((int)ROIX, (int)ROIY, (int)ROIW, (int)ROIH);
+                    }
+                    
 
                     //// 设置 触发延迟
                     if (TriggerDelay > 0)
@@ -180,13 +185,14 @@ namespace DH.Devices.Camera
 
                     //IIConfig.PropertyChanged -= IIConfig_PropertyChanged;
                     //IIConfig.PropertyChanged += IIConfig_PropertyChanged;
-
+                    Connected = true;
 
                 }
                 return true;
             }
             catch
             {
+                Connected = false;
                 return false;
             }
 
@@ -349,14 +355,7 @@ namespace DH.Devices.Camera
         public int ImageCallbackFunc(uint handle, dvpStreamEvent _event, IntPtr pContext, ref dvpFrame refFrame, IntPtr pBuffer)
         {
             Mat cvImage = new Mat();
-            if (this.CameraName.Equals("Cam1"))
-            {
-                Console.WriteLine();
-            }
-            if (this.CameraName.Equals("Cam2"))
-            {
-                Console.WriteLine();
-            }
+
             try
             {
 
@@ -386,11 +385,30 @@ namespace DH.Devices.Camera
                         cvImage = Mat.FromPixelData(nHeight, nWidth, MatType.CV_8UC1, pBuffer);
                         break;
                 }
+
                 Mat smat = cvImage.Clone();
+                Mat rotated = new Mat(); // 显式创建输出对象
+
+                switch (RotateImage)
+                {
+                    case 90:
+                        Cv2.Rotate(smat, rotated, RotateFlags.Rotate90Clockwise);
+                        break;
+                    case 180:
+                        Cv2.Rotate(smat, rotated, RotateFlags.Rotate180);
+                        break;
+                    case 270:
+                        Cv2.Rotate(smat, rotated, RotateFlags.Rotate90Counterclockwise);
+                        break;
+                    default:
+                        rotated = smat.Clone(); // 无旋转时保持原图
+                        break;
+                }
+
                 var imageSet = new MatSet
                 {
 
-                    _mat = smat,
+                    _mat = rotated,
 
                 };
                 InitialImageSet(imageSet);
@@ -556,6 +574,12 @@ namespace DH.Devices.Camera
 
         }
 
+        public void Snapshot()
+        {
+            DVPCamera.dvpTriggerFire(m_handle);
+
+        }
+
         public void LogAsync(LogMsg msg)
         {
             msg.MsgSource = CameraName;

DH.Devices.Motion/SLDMotion.cs

@@ -85,11 +85,15 @@ namespace DH.Devices.Motion
 
         public void NewPieces(int diskIndex, uint pieceNumber)
         {
-            _taskFactory.StartNew(() =>
+            Task.Run(() =>
             {
+                try {
                     Thread.CurrentThread.Priority = ThreadPriority.Highest;
 
                     OnNewPieces?.Invoke(diskIndex, pieceNumber);
+                }
+                catch (Exception ex) { /* 记录异常 */ }
+               
             });
         }
         public void SetResetFlag(bool isReset)

DH.Devices.PLC/XinJEPLCTcpNet.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.Xml.Linq;
 using DH.Commons.Base;
 using DH.Commons.Enums;
+using DH.Commons.Helper;
 using DH.Commons.Models;
 using HslCommunication;
 using HslCommunication.Enthernet;
@@ -37,6 +38,8 @@ namespace DH.Devices.PLC
         public event Action<LogMsg> OnLog;
         private XinJETcpNet TcpNet = new XinJETcpNet();
 
+        private TaskFactory _taskFac = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning);
+
         public override bool PLCConnect()
         {
             try
@@ -76,7 +79,8 @@ namespace DH.Devices.PLC
                 {
                     Connected = false;
                     LogAsync(DateTime.Now, LogLevel.Error, $"PLC初始化失败");
-                    throw new Exception($"{IP}:{Port}PLC连接失败!");
+                    return false;
+                    //throw new Exception($"{IP}:{Port}PLC连接失败!");
                 }
 
 
@@ -85,7 +89,8 @@ namespace DH.Devices.PLC
             {
                 Connected = false;
                 LogAsync(DateTime.Now, LogLevel.Error, $"{IP}:{Port}PLC连接失败!失败原因:{ex.ToString()}");
-                throw new Exception($"{IP}:{Port}PLC连接失败!失败原因:{ex.ToString()}");
+                return false;
+                //throw new Exception($"{IP}:{Port}PLC连接失败!失败原因:{ex.ToString()}");
             }
 
         }
@@ -256,7 +261,8 @@ namespace DH.Devices.PLC
         public override bool ReadBool(string address)
         {
             try
-            {   if (Connected)
+            {
+                if (Connected)
                 {
                     // 读取Bool变量
                     var result = TcpNet.ReadBool(address);
@@ -615,28 +621,74 @@ namespace DH.Devices.PLC
         /// int,int  轴号  捕获位置
         /// </summary>
         public event Action<int, uint> OnNewPieces;
+        private System.Threading.Timer timer;
+        private System.Threading.TimerCallback timerCallback;
 
 
         public void NewPieces(int axisIndex, uint pieceNumber)
         {
-            _taskFactory.StartNew(() =>
+            //_taskFactory.StartNew(() =>
+            //{
+            //    Thread.CurrentThread.Priority = ThreadPriority.Highest;
+
+            //    OnNewPieces?.Invoke(axisIndex, pieceNumber);
+            //});
+            Task.Run(() =>
+            {
+                try
                 {
                     Thread.CurrentThread.Priority = ThreadPriority.Highest;
 
                     OnNewPieces?.Invoke(axisIndex, pieceNumber);
+                }
+                catch (Exception ex) { /* 记录异常 */ }
+
             });
         }
         public async Task HeartbeatAsync1()
         {
             PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "心跳地址");
-            while (Connected)
-            {
+#if false
 
+            Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;
             if (pLCItem == null)
                 return;
+            while (Connected)
+            {
+                try
+                {
+                    LogAsync(DateTime.Now, LogLevel.Information, $"心跳\t");
+
                     WriteBool(pLCItem.Address, true);
-                await Task.Delay(900); // 非阻塞，等待1秒
+                    await Task.Delay(2000); // 非阻塞，等待1秒
                 }
+                catch (Exception ex) { }
+            }
+#else
+
+            timerCallback = (object? state) =>
+            {
+                timer.Change(2000, 2000);
+                try
+                {
+
+                    //WriteBool(pLCItem.Address, true);
+                    WriteBool("M31", true);
+                 
+                }
+                catch (Exception ex)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Error, $"心跳:{ex.Message}");
+                }
+
+            };
+
+
+            timer = new System.Threading.Timer(
+                timerCallback, null, 0, 2000);
+
+            timer.Change(2000, 2000);
+#endif
         }
         /// <summary>
         /// 入料监听
@@ -656,14 +708,14 @@ namespace DH.Devices.PLC
             //while (CurrentState != DeviceState.DSClose && CurrentState != DeviceState.DSExcept && CurrentState != DeviceState.DSUninit)
             while (Connected)
             {
-                Stopwatch sw = new Stopwatch();
+              //  Stopwatch sw = new Stopwatch();
                 uint tmpPieceNumber = 0;
-                sw.Start();
+               // sw.Start();
 
                 // var ret = TcpNet.ReadUInt16("D1016");
                 var ret = TcpNet.ReadUInt32(Count);
 
-                sw.Stop();
+                //sw.Stop();
                 if (ret.IsSuccess)
                 {
                     tmpPieceNumber = ret.Content;
@@ -671,7 +723,7 @@ namespace DH.Devices.PLC
 
                 if (ret.IsSuccess && ret.Content > piecesCount)
                 {
-                    sw.Start();
+                   // sw.Start();
                     // Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")} 板卡{station}产品入列触发{tmpPieceNumber}");
                     //LogAsync(DateTime.Now, LogLevel.Information, $"转盘{0}产品入列 {piecesCountDic[0]} size:{sum}");
                     if (tmpPieceNumber != piecesCount + 1)
@@ -683,8 +735,8 @@ namespace DH.Devices.PLC
                     piecesCount = tmpPieceNumber;
                     //NewPieces(ai, piecesCountDic[station]);
                     NewPieces(1, piecesCount);
-                    sw.Stop();
-                    startTime = DateTime.Now;
+                  // sw.Stop();
+                   // startTime = DateTime.Now;
                     //if (idalarm)
                     //{
                     //    idalarm = false;
@@ -693,7 +745,7 @@ namespace DH.Devices.PLC
 
                 }
 
-                Thread.Sleep(1);
+                Thread.Sleep(2);
             }
         }
 
@@ -719,12 +771,20 @@ namespace DH.Devices.PLC
             //LogAsync(DateTime.Now, LogLevel.Information, $"停止转盘");
             //转盘使能
             TurnEnable(true);
+            RedLight(false);
+            YellowLight(false);
+            //绿灯
+            GreenLight(true);
+
+
             LogAsync(DateTime.Now, LogLevel.Information, $"启用心跳-状态复位-关闭定位-写入流程加载点位配置-计数清零-停止转盘-转盘使能");
             //开启入料监听
             MonitorPieces();
 
+         
         }
 
+      
         public void StartProcess()
         {
             //状态复位
@@ -735,14 +795,115 @@ namespace DH.Devices.PLC
             // LogAsync(DateTime.Now, LogLevel.Information, $"关闭定位");
             //写入流程启动点位配置
             StartProcessAction();
-          //  LogAsync(DateTime.Now, LogLevel.Information, $"写入流程加载点位配置");
-            //计数清零
-            CountToZero();
-            LogAsync(DateTime.Now, LogLevel.Information, $"状态复位-关闭定位-写入流程加载点位配置-计数清零");
-            //转盘启动
-            TurnStart(true);
+            PLCItem? pLCItem = ConfigModel.GlobalList?
+            .FirstOrDefault()?
+            .StartProcessList?
+            .Where(it => it.Name == "挡料电机回原点速度").FirstOrDefault();
+            if (pLCItem == null)
+            {
+                throw new Exception($"未找到挡料电机回原点速度地址，请检查该地址是否存在于点位表！");
+            }
+            PLCItem? pLCItem1 = ConfigModel.GlobalList?
+          .FirstOrDefault()?
+          .StartProcessList?
+          .Where(it => it.Name == "挡料电机位置").FirstOrDefault();
+            if (pLCItem1 == null)
+            {
+                throw new Exception($"未找到挡料电机位置地址，请检查该地址是否存在于点位表！");
+            }
+            FeedingMotor(true, Convert.ToInt32(pLCItem.Value), Convert.ToInt32(pLCItem1.Value));
+
+
+            PLCItem? pLCItemmontor = ConfigModel.GlobalList?
+            .FirstOrDefault()?
+            .StartProcessList?
+            .Where(it => it.Name == "相机步进速度").FirstOrDefault();
+            if (pLCItemmontor == null)
+            {
+                throw new Exception($"未找到相机步进速度地址，请检查该地址是否存在于点位表！");
+            }
+            PLCItem? pLCItemmontor1 = ConfigModel.GlobalList?
+          .FirstOrDefault()?
+          .StartProcessList?
+          .Where(it => it.Name == "相机步进位置").FirstOrDefault();
+            if (pLCItemmontor1 == null)
+            {
+                throw new Exception($"未找到相机步进位置地址，请检查该地址是否存在于点位表！");
             }
 
+            Motor(true, Convert.ToInt32(pLCItemmontor.Value), Convert.ToInt32(pLCItemmontor1.Value));
+            // if (_PLCConfig?.Enable == true)
+            //挡料电机操作
+            //  _PLC.FeedingMotor(_PLCConfig.CunToZeroSpeed, _PLCConfig.CunPos, _PLCConfig.CunSpeed, _PLCConfig.CunDirection);
+
+            //流程开启操作配置
+            // ProcessInitialAction();
+            //  if (_PLC?Enabled == true)
+           
+
+
+            //  LogAsync(DateTime.Now, LogLevel.Information, $"写入流程加载点位配置");
+       
+            bool? enableBelt = ConfigModel.GlobalList?.FirstOrDefault()?.EnableBelt;
+            if (enableBelt == true) 
+            {
+                Belt(true);
+            }
+            Thread.Sleep(1000);
+            bool? enableVibrator = ConfigModel.GlobalList?.FirstOrDefault()?.EnableVibrator;
+            if (enableVibrator == true)
+            {
+                Vibrator(true);
+            }
+            Thread.Sleep(1000);
+            //转盘使能
+            TurnEnable(true);
+            //转盘启动
+            TurnStart(true);
+            Thread.Sleep(1000);
+            //计数清零
+            CountToZero();
+            Thread.Sleep(1000);
+       
+            LogAsync(DateTime.Now, LogLevel.Information, $"状态复位-关闭定位-写入流程加载点位配置-计数清零");
+
+            Thread.Sleep(200);
+        }
+
+        public void StopProcess()
+        {
+            StatusReset();
+            VisionPos(false);
+            CountToZero();
+            bool? enableVibrator = ConfigModel.GlobalList?.FirstOrDefault()?.EnableVibrator;
+            if (enableVibrator == true)
+            {
+                Vibrator(true);
+            }
+            Thread.Sleep(1000);
+            bool? enableBelt = ConfigModel.GlobalList?.FirstOrDefault()?.EnableBelt;
+            if (enableBelt == true)
+            {
+                Belt(false);
+            }
+            Thread.Sleep(1000);
+            StopProcessAction();
+            TurnStart(false);
+         
+       
+          
+        }
+
+        public async Task ExecuteClearDelayAsync()
+        {
+            int? clearTime = ConfigModel.GlobalList?.FirstOrDefault()?.ClearTime;
+            if (clearTime != null)
+            {
+                TurnClear(true);
+                await Task.Delay(clearTime.Value * 1000);
+                TurnClear(false);
+            }
+        }
         public void CloseProcess()
         {
             StatusReset();
@@ -750,7 +911,12 @@ namespace DH.Devices.PLC
             CountToZero();
             TurnStart(false);
             TurnEnable(false);
+            StopProcessAction();
+            TurnClear(false);
             OpenHeartbeat(false);
+            GreenLight(false);
+            YellowLight(false);
+            RedLight(true);
             PLCDisConnect();
             //  LogAsync(DateTime.Now, LogLevel.Information, $"PLC断开连接");
         }
@@ -815,6 +981,32 @@ namespace DH.Devices.PLC
             WriteBool(pLCItem.Address, b);
         }
 
+        /// <summary>
+        /// 转盘方向
+        /// </summary>
+        /// <param name="b"></param>
+        public void TurnDirection(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘方向");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+
+        }
+
+        /// <summary>
+        /// 转盘速度
+        /// </summary>
+        /// <param name="b"></param>
+        public void TurnSpeed(int speed)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "转盘速度");
+            if (pLCItem == null)
+                return;
+            WriteUInt16(pLCItem.Address, (ushort)speed);
+
+        }
+
         /// <summary>
         /// 转盘启停
         /// </summary>
@@ -824,7 +1016,6 @@ namespace DH.Devices.PLC
             if (DiskRunItem == null)
                 return;
             WriteBool(DiskRunItem.Address, b);
-            Thread.Sleep(30);
             piecesCount = 0;
         }
 
@@ -890,101 +1081,199 @@ namespace DH.Devices.PLC
             Thread.Sleep(30);
         }
 
+        public void Belt(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "皮带");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+            Thread.Sleep(30);
+
+        }
+        public void Vibrator(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "振动盘");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+            Thread.Sleep(30);
+
+        }
+        public void Motor(bool direction, int speed, int pos)
+        {
+
+
+            int timeout = 60000;
+            int elapsedTime = 0;
+            int checkInterval = 100;
+            MotorToZero(false);
+            Thread.Sleep(300);
+
+            MotorClockwise(false);
+            Thread.Sleep(300);
+            MotorCounterclockwise(false);
+            Thread.Sleep(300);
+
+            MotorSpeed(speed); // 速度
+            Thread.Sleep(300);
+            // 发送回原点指令
+            MotorToZero(true);
+            Thread.Sleep(1000); // 给设备一些时间响应
+
+
+
+            // 等待回到原点
+            while (true)
+            {
+                if (elapsedTime >= timeout)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Error, $"超时");
+
+                    break;
+                }
+
+                if (ReadMotorRealPos() == 0)
+                {
+                    break;
+                }
+                Thread.Sleep(checkInterval);
+                elapsedTime += checkInterval;
+            }
+
+            MotorToZero(false);
+            Thread.Sleep(200);
+            MotorClockwise(false);
+            Thread.Sleep(200);
+            MotorCounterclockwise(false);
+            // 无论是刚回到原点还是已经在原点，执行目标位置、速度和方向设置
+            // MotorSpeed(speed);
+
+            Thread.Sleep(300);
+            MotorPos(pos);   // 目标位置
+            Thread.Sleep(300);
+            if (direction)
+            {
+                MotorClockwise(true); // 顺时针转动
+
+            }
+            else
+            {
+                MotorCounterclockwise(true); // 逆时针转动
+
+            }
+
+
+            int timeout1 = 60000;
+            int elapsedTime1 = 0;
+            int checkInterval1 = 100;
+
+            while (true)
+            {
+                if (elapsedTime1 >= timeout1)
+                {
+                    break;
+                }
+
+                if (ReadMotorRealPos() == pos)
+                {
+                    break;
+                }
+                Thread.Sleep(checkInterval1);
+                elapsedTime1 += checkInterval1;
+            }
+            Thread.Sleep(1500);
+
+        }
+
         /// <summary>
         /// 挡料电机操作 
         /// true: 顺时针
         /// False: 逆时针
         /// </summary>
         /// <param name="u"></param>
-        public void FeedingMotor( bool direction)
+        public void FeedingMotor(bool direction, int speed, int pos)
         {
 
 
-           // 设置最大等待时间，假设为 3 秒
-            int timeout = 3000;
+            int timeout = 10000;
             int elapsedTime = 0;
-            int checkInterval = 100; // 每次检查等待 100ms
-
-            PLCItem pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机回原点");
-            if (pLCItem == null)
-                return;
-            PLCItem zerospeeditem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机回原点速度");
-            if (zerospeeditem == null)
-                return;
-
-            PLCItem CunSpeed = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机速度");
-            if (CunSpeed == null)
-                return;
-
-            PLCItem CunClockwiseItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机顺时针");
-            if (CunClockwiseItem == null)
-                return;
-
-            PLCItem CunCounterclockwiseItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机逆时针");
-            if (CunCounterclockwiseItem == null)
-                return;
-
-            PLCItem CunPosItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机位置");
-            if (CunPosItem == null)
-                return;
-
-            string CunToZero = pLCItem.Type + pLCItem.Address;
-            string CunToZeroSpeed = zerospeeditem.Type + zerospeeditem.Address;
-            string CunSpeedadress = CunSpeed.Type + CunSpeed.Address;
-            string CunClockwise = CunClockwiseItem.Type + CunClockwiseItem.Address;
-            string CunCounterclockwise = CunCounterclockwiseItem.Type + CunCounterclockwiseItem.Address;
-            string CunPos = CunPosItem.Type + CunPosItem.Address;
-            UInt16 zerospeed = UInt16.Parse(zerospeeditem.Value);
-            UInt16 cunSpeed = UInt16.Parse(CunSpeed.Value);
-            UInt16 u = UInt16.Parse(CunPosItem.Value);
-           // WriteBool(CountToZero, true);
+            int checkInterval = 100;
 
+            BarrierToZero(false);
+            Thread.Sleep(300);
             // 检查是否不在原点，如果不在，则回原点
-            if (!ReadBool(CunToZero))
-            {
-                WriteUInt16(CunToZeroSpeed, zerospeed); // 速度
-                Thread.Sleep(30);
+            BarrierClockwise(false);
+            Thread.Sleep(300);
+            BarrierCounterclockwise(false);
+            Thread.Sleep(300);
+            BarrierToZeroSpeed(speed); // 速度
+            Thread.Sleep(300);
             // 发送回原点指令
-                WriteBool(CunToZero, true);
-                Thread.Sleep(1000); // 给设备一些时间响应
+            BarrierToZero(true);
+            Thread.Sleep(300); // 给设备一些时间响应
 
             // 等待回到原点
-                while (!ReadBool(CunToZero))
+            while (true)
             {
                 if (elapsedTime >= timeout)
                 {
                     break;
                 }
 
+                if (ReadBarrierRealPos() == 0)
+                {
+                    break;
+                }
                 Thread.Sleep(checkInterval);
                 elapsedTime += checkInterval;
             }
-            }
 
+            BarrierToZero(false);
+            Thread.Sleep(300);
+            // 检查是否不在原点，如果不在，则回原点
+            BarrierClockwise(false);
+            Thread.Sleep(300);
+            BarrierCounterclockwise(false);
+            Thread.Sleep(300);
             // 无论是刚回到原点还是已经在原点，执行目标位置、速度和方向设置
+            BarrierSpeed(speed);
+            Thread.Sleep(300);
 
-
-
-            WriteUInt16(CunSpeedadress,cunSpeed);
-            Thread.Sleep(2000);
-            string dir = string.Empty;
             if (direction)
             {
-                WriteBool(CunClockwise, true); // 顺时针转动
-                dir = "顺时针";
+                BarrierClockwise(true); // 顺时针转动
+
             }
             else
             {
-                WriteBool(CunCounterclockwise, true); // 逆时针转动
-                dir = "逆时针";
-            }
-            Thread.Sleep(30);
-            WriteUInt16(CunPos, u);   // 目标位置
-            Thread.Sleep(2000);
-
-
+                BarrierCounterclockwise(true); // 逆时针转动
 
             }
+            Thread.Sleep(300);
+            BarrierPos(pos);   // 目标位置
+            Thread.Sleep(300);
+            int timeout1 = 10000;
+            int elapsedTime1 = 0;
+            int checkInterval1 = 100;
+
+            while (true)
+            {
+                if (elapsedTime1 >= timeout1)
+                {
+                    break;
+                }
+
+                if (ReadBarrierRealPos() == pos)
+                {
+                    break;
+                }
+                Thread.Sleep(checkInterval1);
+                elapsedTime1 += checkInterval1;
+            }
+            Thread.Sleep(300);
+        }
+
+
 
         /// <summary>
         /// 转盘清料
@@ -1013,7 +1302,8 @@ namespace DH.Devices.PLC
             if (b)
             {
                 //开启心跳
-                Task.Run(async () => await HeartbeatAsync1());
+                //Task.Run(async () => await HeartbeatAsync1());
+                _taskFac.StartNew(async () => await HeartbeatAsync1());
             }
         }
 
@@ -1026,6 +1316,241 @@ namespace DH.Devices.PLC
 
         }
 
+        /// <summary>
+        /// 读取定位脉冲
+        /// </summary>
+        /// <returns></returns>
+
+        public int ReadVisionPos()
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "定位完成脉冲值");
+            if (pLCItem == null)
+                return 0;
+            int value = ReadInt32(pLCItem.Address);
+            Thread.Sleep(100);
+            return Math.Abs(value);
+        }
+
+        /// <summary>
+        /// 挡杆回原点
+        /// </summary>
+        public void BarrierToZero(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机回原点");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+        }
+        /// <summary>
+        /// 变焦相机回原点
+        /// </summary>
+        public void ZoomcameraToZero(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "步进电机回原点");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+        }
+
+        /// <summary>
+        /// 读取挡料电机实时位置
+        /// </summary>
+        /// <returns></returns>
+        public int ReadBarrierRealPos()
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机实时位置");
+            if (pLCItem == null)
+            {
+                throw new Exception("未找到挡料电机实时位置点位");
+            }
+
+            return ReadInt16(pLCItem.Address);
+        }
+        /// <summary>
+        /// 读取 挡杆回原点状态
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+
+        public bool ReadBarrierToZero()
+        {
+            //PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机回原点");
+            //if (pLCItem == null)
+            //{
+            //    throw new Exception("未找到挡料电机回原点点位");
+            //}
+            //挡料电机传感器感应点
+            return ReadBool("X11");
+        }
+
+        /// <summary>
+        /// 挡杆回原点速度
+        /// </summary>
+        public void BarrierToZeroSpeed(int speed)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机回原点速度");
+            if (pLCItem == null)
+                return;
+            WriteInt32(pLCItem.Address, speed);
+        }
+
+
+        /// <summary>
+        /// 挡杆位置
+        /// </summary>
+        public void BarrierPos(int value)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机位置");
+            if (pLCItem == null)
+                return;
+            WriteInt16(pLCItem.Address, (short)value);
+        }
+
+
+        /// <summary>
+        /// 挡杆速度
+        /// </summary>
+        public void BarrierSpeed(int value)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机速度");
+            if (pLCItem == null)
+                return;
+            WriteUInt32(pLCItem.Address, (uint)value);
+        }
+
+
+        /// <summary>
+        /// 挡杆顺时针
+        /// </summary>
+        public void BarrierClockwise(bool b)
+        {
+            PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机顺时针");
+            if (DiskRunItem == null)
+                return;
+            WriteBool(DiskRunItem.Address, b);
+            Thread.Sleep(30);
+        }
+
+        /// <summary>
+        /// 挡杆逆时针
+        /// </summary>
+        public void BarrierCounterclockwise(bool b)
+        {
+            PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "挡料电机逆时针");
+            if (DiskRunItem == null)
+                return;
+            WriteBool(DiskRunItem.Address, b);
+            Thread.Sleep(30);
+        }
+
+
+
+        /// <summary>
+        /// 相机步进电机回原点
+        /// </summary>
+        /// <param name="b"></param>
+        public void MotorToZero(bool b)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进原点");
+            if (pLCItem == null)
+                return;
+            WriteBool(pLCItem.Address, b);
+        }
+
+        /// <summary>
+        /// 读取相机步进电机回原点状态
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public bool ReadMotorToZero()
+        {
+            //PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进原点");
+            //if (pLCItem == null)
+            //{
+            //    throw new Exception("未找到挡料电机回原点点位");
+            //}
+            //return ReadBool(pLCItem.Address);
+            return ReadBool("X10");
+        }
+
+
+        /// <summary>
+        /// 相机步进电机位置
+        /// </summary>
+        /// <param></param>
+        public void MotorPos(int value)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进位置");
+            if (pLCItem == null)
+                return;
+            WriteInt32(pLCItem.Address, (ushort)value);
+        }
+
+
+
+
+
+        public int ReadMotorRealPos()
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进实时位置");
+            if (pLCItem == null)
+            {
+                throw new Exception("未找到相机步进实时位置");
+            }
+            return ReadInt32(pLCItem.Address);
+        }
+
+
+
+        /// <summary>
+        /// 相机步进电机速度
+        /// </summary>
+        /// <param name="b"></param>
+        public void MotorSpeed(int speed)
+        {
+            PLCItem? pLCItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进速度");
+            if (pLCItem == null)
+                return;
+            WriteInt32(pLCItem.Address, speed);
+        }
+
+
+        /// <summary>
+        /// 相机步进顺时针
+        /// </summary>
+        public void MotorClockwise(bool b)
+        {
+            PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进顺时针");
+            if (DiskRunItem == null)
+                return;
+            WriteBool(DiskRunItem.Address, b);
+            Thread.Sleep(30);
+        }
+
+        /// <summary>
+        /// 相机步进逆时针
+        /// </summary>
+        public void MotorCounterclockwise(bool b)
+        {
+            PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "相机步进逆时针");
+            if (DiskRunItem == null)
+                return;
+            WriteBool(DiskRunItem.Address, b);
+            Thread.Sleep(30);
+        }
+
+        /// <summary>
+        /// 相机步进点动
+        /// </summary>
+        public void MotorTest(bool b)
+        {
+            PLCItem? DiskRunItem = PLCItemList.FirstOrDefault(u => u.Name == "点动相机步进");
+            if (DiskRunItem == null)
+                return;
+            WriteBool(DiskRunItem.Address, b);
+            Thread.Sleep(30);
+        }
+
         public void LogAsync(LogMsg msg)
         {
             msg.MsgSource = "PLC";

DH.Devices.Vision/SimboDetection.cs

@@ -32,6 +32,10 @@ namespace DH.Devices.Vision
             bool res = false;
             try
             {
+                if (!Path.GetExtension(mLInit.ModelFile).Equals(".trt", StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new Exception("选择的模型不是trt格式"); 
+                }
                 Model = MLGPUEngine.InitModel(mLInit.ModelFile, 1, mLInit.Score_thre, mLInit.GPUId, 3, 8);
 
                 //Model = MLEngine.InitModel(mLInit.ModelFile, 1, 0.45f, 0, 3);

DH.Devices.Vision/SimboVisionDriver.cs

@@ -31,6 +31,8 @@ namespace DH.Devices.Vision
       public  List<SimboStationMLEngineSet> SimboStationMLEngineList = new List<SimboStationMLEngineSet>();
 
         public void Init()
+        {
+            try
             {
                 //InitialQueue();
                 InitialHalconTools();
@@ -40,6 +42,12 @@ namespace DH.Devices.Vision
                 //  ImageSaveHelper.OnImageSaveExceptionRaised += ImageSaveHelper_OnImageSaveExceptionRaised;
                 //  base.Init();
             }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+
+        }
         public  void Stop()
         {
             SimboStationMLEngineList.ToList().ForEach(sm =>
@@ -291,11 +299,18 @@ namespace DH.Devices.Vision
         /// 初始化深度学习工具
         /// </summary>
         private bool InitialSimboMLEnginesAsync()
+        {
+            try
             {
                 //深度学习 模型加载
                 var resultOK = MLLoadModel();
                 return resultOK;
             }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+        }
         /// <summary>
         /// 深度学习 模型加载
         /// </summary>
@@ -358,6 +373,7 @@ namespace DH.Devices.Vision
             {
                 // LogAsync(DateTime.Now, LogLevel.Exception, $"异常：模型并发加载异常:{ex.GetExceptionMessage()}");
                 resultOK = false;
+                throw new Exception(ex.Message);
             }
 
             return resultOK;
@@ -409,7 +425,7 @@ namespace DH.Devices.Vision
                     }
                     MLInit mLInit;
                     string inferenceDevice = "CPU";
-                    if (dc.IsEnableGPU)
+                    if (dc.ModelType== ModelType.目标检测GPU)
                     {
                         inferenceDevice = "GPU";
                         mLInit = new MLInit(dc.ModelPath, isGPU, coreInx, dc.ModelconfThreshold);
@@ -432,7 +448,7 @@ namespace DH.Devices.Vision
             {
                // LogAsync(DateTime.Now, LogLevel.Error, $"模型加载成功；是否GPU:{isGPU} CoreInx:{coreInx} - {dc.Name}" + $" {dc.ModelType.GetEnumDescription()}:{dc.ModelPath}");
 
-                throw new ProcessException($"异常：是否GPU:{isGPU} CoreInx:{coreInx} - {dc.Name}模型加载异常：{ex.GetExceptionMessage()}");
+                throw new Exception($"异常：是否GPU:{isGPU} CoreInx:{coreInx} - {dc.Name}模型加载异常：{ex.Message}");
             }
             return mLEngineSet;
         }

DH.RBAC/DH.RBAC.csproj

@@ -109,9 +109,6 @@
 	  <Compile Include="Views\Sys\User\UserPage.cs" />
 	  <Compile Include="Views\Sys\User\UserPage.Designer.cs" />
 	</ItemGroup>
-	<ItemGroup>
-		<Content Include="favicon.ico" />
-	</ItemGroup>
 	
 	<ItemGroup>
 	  <PackageReference Include="AntdUI" Version="1.8.9" />

DHSoftware/DHSoftware.csproj

@@ -10,6 +10,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Platforms>AnyCPU;x64</Platforms>
 		<OutputType>WinExe</OutputType>
+		<ApplicationIcon>assets\logo.ico</ApplicationIcon>
 	</PropertyGroup>
 
 
@@ -18,7 +19,12 @@
 	
 
 
+
+
+
 	<ItemGroup>
+	  <Content Include="assets\logo.ico" />
+	  <Content Include="assets\screenshots\favicon.ico" />
 	  <Content Include="db\config.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </Content>
@@ -37,6 +43,26 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   <ItemGroup>
     <PackageReference Include="AntdUI" Version="1.8.9" />
@@ -69,8 +95,11 @@
 
 
 	<ItemGroup>
+		<None Include="assets\favicon.ico" />
 		<None Include="db\db.sqlite">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<!-- 仅在首次生成时复制 -->
+			<Condition>!Exists('$(OutputPath)\db\db.sqlite')</Condition>
 		</None>
 	</ItemGroup>
 

DHSoftware/LoginWindow.Designer.cs

@@ -53,6 +53,7 @@
             iptName.PlaceholderText = "请输入用户名";
             iptName.Size = new Size(227, 37);
             iptName.TabIndex = 1;
+            iptName.Text = "user";
             // 
             // iptPwd
             // 
@@ -62,6 +63,7 @@
             iptPwd.PlaceholderText = "请输入密码";
             iptPwd.Size = new Size(227, 37);
             iptPwd.TabIndex = 2;
+            iptPwd.Text = "123";
             iptPwd.UseSystemPasswordChar = true;
             // 
             // button_cancel
@@ -101,7 +103,6 @@
             Name = "LoginWindow";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "登录界面";
-         
             ResumeLayout(false);
         }
 

DHSoftware/MainWindow.Designer.cs

@@ -28,14 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine();
-            AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard();
-            AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem();
+            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
+            AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
+            AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
-            AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem();
-            AntdUI.SegmentedItem segmentedItem8 = new AntdUI.SegmentedItem();
-            AntdUI.SegmentedItem segmentedItem9 = new AntdUI.SegmentedItem();
-            AntdUI.SegmentedItem segmentedItem10 = new AntdUI.SegmentedItem();
+            AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem();
+            AntdUI.SegmentedItem segmentedItem3 = new AntdUI.SegmentedItem();
+            AntdUI.SegmentedItem segmentedItem4 = new AntdUI.SegmentedItem();
+            AntdUI.SegmentedItem segmentedItem5 = new AntdUI.SegmentedItem();
+            AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem();
             titlebar = new AntdUI.PageHeader();
             lbName = new AntdUI.Label();
             tabsStas = new AntdUI.Tabs();
@@ -52,7 +53,6 @@
             dgvCamreaNums = new DataGridView();
             panelNums = new AntdUI.Panel();
             tableLayoutNums = new TableLayoutPanel();
-            dgvProductNums = new DataGridView();
             tableLayoutPanel3 = new TableLayoutPanel();
             lblTotalTime = new Label();
             label1 = new Label();
@@ -62,8 +62,10 @@
             lblOEE_Total = new Label();
             label10 = new Label();
             label7 = new Label();
+            tagMachineStatus = new AntdUI.Tag();
             panel2 = new AntdUI.Panel();
             panel1 = new AntdUI.Panel();
+            segmented2 = new AntdUI.Segmented();
             panel3 = new AntdUI.Panel();
             textBoxBatchNO = new AntdUI.Input();
             btnCreateBatchNO = new AntdUI.Button();
@@ -92,7 +94,6 @@
             ((System.ComponentModel.ISupportInitialize)dgvCamreaNums).BeginInit();
             panelNums.SuspendLayout();
             tableLayoutNums.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dgvProductNums).BeginInit();
             tableLayoutPanel3.SuspendLayout();
             panel1.SuspendLayout();
             panel3.SuspendLayout();
@@ -136,7 +137,7 @@
             tabsStas.Name = "tabsStas";
             tabsStas.Pages.Add(tabPage3);
             tabsStas.Size = new Size(580, 176);
-            tabsStas.Style = styleLine2;
+            tabsStas.Style = styleLine1;
             tabsStas.TabIndex = 3;
             tabsStas.Text = "tabs3";
             // 
@@ -201,7 +202,7 @@
             tabImgDisplay.Location = new Point(0, 0);
             tabImgDisplay.Name = "tabImgDisplay";
             tabImgDisplay.Size = new Size(1024, 400);
-            tabImgDisplay.Style = styleCard2;
+            tabImgDisplay.Style = styleCard1;
             tabImgDisplay.TabIndex = 3;
             tabImgDisplay.Text = "tabs1";
             // 
@@ -294,8 +295,8 @@
             // 
             tableLayoutNums.ColumnCount = 1;
             tableLayoutNums.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
-            tableLayoutNums.Controls.Add(dgvProductNums, 0, 0);
             tableLayoutNums.Controls.Add(tableLayoutPanel3, 0, 1);
+            tableLayoutNums.Controls.Add(tagMachineStatus, 0, 0);
             tableLayoutNums.Dock = DockStyle.Fill;
             tableLayoutNums.Location = new Point(0, 0);
             tableLayoutNums.Name = "tableLayoutNums";
@@ -306,31 +307,6 @@
             tableLayoutNums.Size = new Size(338, 101);
             tableLayoutNums.TabIndex = 8;
             // 
-            // dgvProductNums
-            // 
-            dgvProductNums.AllowUserToAddRows = false;
-            dgvProductNums.AllowUserToDeleteRows = false;
-            dgvProductNums.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dgvProductNums.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells;
-            dgvProductNums.BackgroundColor = SystemColors.Control;
-            dgvProductNums.BorderStyle = BorderStyle.None;
-            dgvProductNums.CellBorderStyle = DataGridViewCellBorderStyle.SunkenHorizontal;
-            dgvProductNums.ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.None;
-            dgvProductNums.ColumnHeadersHeight = 4;
-            dgvProductNums.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dgvProductNums.ColumnHeadersVisible = false;
-            dgvProductNums.Dock = DockStyle.Fill;
-            dgvProductNums.Location = new Point(3, 10);
-            dgvProductNums.Margin = new Padding(3, 10, 3, 0);
-            dgvProductNums.MultiSelect = false;
-            dgvProductNums.Name = "dgvProductNums";
-            dgvProductNums.ReadOnly = true;
-            dgvProductNums.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None;
-            dgvProductNums.RowHeadersVisible = false;
-            dgvProductNums.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dgvProductNums.Size = new Size(332, 40);
-            dgvProductNums.TabIndex = 10;
-            // 
             // tableLayoutPanel3
             // 
             tableLayoutPanel3.AutoSizeMode = AutoSizeMode.GrowAndShrink;
@@ -445,6 +421,16 @@
             label7.Text = "总计数";
             label7.TextAlign = ContentAlignment.MiddleCenter;
             // 
+            // tagMachineStatus
+            // 
+            tagMachineStatus.Font = new Font("Microsoft YaHei UI", 14.25F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tagMachineStatus.Location = new Point(3, 3);
+            tagMachineStatus.Name = "tagMachineStatus";
+            tagMachineStatus.Size = new Size(141, 44);
+            tagMachineStatus.TabIndex = 12;
+            tagMachineStatus.Text = "待机中";
+            tagMachineStatus.Type = AntdUI.TTypeMini.Primary;
+            // 
             // panel2
             // 
             panel2.Location = new Point(511, 86);
@@ -456,6 +442,7 @@
             // panel1
             // 
             panel1.Back = Color.FromArgb(46, 108, 227);
+            panel1.Controls.Add(segmented2);
             panel1.Controls.Add(panel3);
             panel1.Controls.Add(segmented1);
             panel1.Dock = DockStyle.Top;
@@ -467,6 +454,33 @@
             panel1.TabIndex = 0;
             panel1.Text = "panel1";
             // 
+            // segmented2
+            // 
+            segmented2.BackActive = Color.FromArgb(100, 255, 87, 34);
+            segmented2.BackColor = Color.Transparent;
+            segmented2.Dock = DockStyle.Left;
+            segmented2.Font = new Font("Microsoft YaHei UI", 9F);
+            segmented2.ForeColor = Color.White;
+            segmented2.Full = true;
+            segmentedItem1.Badge = null;
+            segmentedItem1.BadgeAlign = AntdUI.TAlignFrom.TR;
+            segmentedItem1.BadgeBack = null;
+            segmentedItem1.BadgeMode = false;
+            segmentedItem1.BadgeOffsetX = 0;
+            segmentedItem1.BadgeOffsetY = 0;
+            segmentedItem1.BadgeSize = 0.6F;
+            segmentedItem1.BadgeSvg = null;
+            segmentedItem1.IconActiveSvg = resources.GetString("segmentedItem1.IconActiveSvg");
+            segmentedItem1.IconSvg = resources.GetString("segmentedItem1.IconSvg");
+            segmentedItem1.Text = "定位";
+            segmented2.Items.Add(segmentedItem1);
+            segmented2.Location = new Point(439, 0);
+            segmented2.Name = "segmented2";
+            segmented2.Size = new Size(96, 83);
+            segmented2.TabIndex = 17;
+            segmented2.Text = "segmented2";
+            segmented2.SelectIndexChanged += segmented2_SelectIndexChanged;
+            // 
             // panel3
             // 
             panel3.Back = Color.FromArgb(46, 108, 227);
@@ -477,13 +491,13 @@
             panel3.Controls.Add(btnLoadProject);
             panel3.Controls.Add(sltProjects);
             panel3.Dock = DockStyle.Right;
-            panel3.Location = new Point(553, 0);
+            panel3.Location = new Point(554, 0);
             panel3.Name = "panel3";
             panel3.Padding = new Padding(30);
             panel3.Radius = 0;
             panel3.ShadowOpacity = 0F;
             panel3.ShadowOpacityHover = 0F;
-            panel3.Size = new Size(471, 83);
+            panel3.Size = new Size(470, 83);
             panel3.TabIndex = 16;
             panel3.Text = "panel3";
             // 
@@ -500,7 +514,7 @@
             btnCreateBatchNO.Name = "btnCreateBatchNO";
             btnCreateBatchNO.Size = new Size(72, 35);
             btnCreateBatchNO.TabIndex = 21;
-            btnCreateBatchNO.Tag = "sys-load";
+            btnCreateBatchNO.Tag = "";
             btnCreateBatchNO.Text = "生成批次";
             btnCreateBatchNO.Click += btnCreateBatchNO_Click;
             // 
@@ -553,6 +567,50 @@
             segmented1.Font = new Font("Microsoft YaHei UI", 9F);
             segmented1.ForeColor = Color.White;
             segmented1.Full = true;
+            segmentedItem2.Badge = null;
+            segmentedItem2.BadgeAlign = AntdUI.TAlignFrom.TR;
+            segmentedItem2.BadgeBack = null;
+            segmentedItem2.BadgeMode = false;
+            segmentedItem2.BadgeOffsetX = 0;
+            segmentedItem2.BadgeOffsetY = 0;
+            segmentedItem2.BadgeSize = 0.6F;
+            segmentedItem2.BadgeSvg = null;
+            segmentedItem2.IconActiveSvg = resources.GetString("segmentedItem2.IconActiveSvg");
+            segmentedItem2.IconSvg = resources.GetString("segmentedItem2.IconSvg");
+            segmentedItem2.Text = "启动";
+            segmentedItem3.Badge = null;
+            segmentedItem3.BadgeAlign = AntdUI.TAlignFrom.TR;
+            segmentedItem3.BadgeBack = null;
+            segmentedItem3.BadgeMode = false;
+            segmentedItem3.BadgeOffsetX = 0;
+            segmentedItem3.BadgeOffsetY = 0;
+            segmentedItem3.BadgeSize = 0.6F;
+            segmentedItem3.BadgeSvg = null;
+            segmentedItem3.IconActiveSvg = resources.GetString("segmentedItem3.IconActiveSvg");
+            segmentedItem3.IconSvg = resources.GetString("segmentedItem3.IconSvg");
+            segmentedItem3.Text = "停止";
+            segmentedItem4.Badge = null;
+            segmentedItem4.BadgeAlign = AntdUI.TAlignFrom.TR;
+            segmentedItem4.BadgeBack = null;
+            segmentedItem4.BadgeMode = false;
+            segmentedItem4.BadgeOffsetX = 0;
+            segmentedItem4.BadgeOffsetY = 0;
+            segmentedItem4.BadgeSize = 0.6F;
+            segmentedItem4.BadgeSvg = null;
+            segmentedItem4.IconActiveSvg = resources.GetString("segmentedItem4.IconActiveSvg");
+            segmentedItem4.IconSvg = resources.GetString("segmentedItem4.IconSvg");
+            segmentedItem4.Text = "复位";
+            segmentedItem5.Badge = null;
+            segmentedItem5.BadgeAlign = AntdUI.TAlignFrom.TR;
+            segmentedItem5.BadgeBack = null;
+            segmentedItem5.BadgeMode = false;
+            segmentedItem5.BadgeOffsetX = 0;
+            segmentedItem5.BadgeOffsetY = 0;
+            segmentedItem5.BadgeSize = 0.6F;
+            segmentedItem5.BadgeSvg = null;
+            segmentedItem5.IconActiveSvg = resources.GetString("segmentedItem5.IconActiveSvg");
+            segmentedItem5.IconSvg = resources.GetString("segmentedItem5.IconSvg");
+            segmentedItem5.Text = "登录";
             segmentedItem6.Badge = null;
             segmentedItem6.BadgeAlign = AntdUI.TAlignFrom.TR;
             segmentedItem6.BadgeBack = null;
@@ -563,60 +621,16 @@
             segmentedItem6.BadgeSvg = null;
             segmentedItem6.IconActiveSvg = resources.GetString("segmentedItem6.IconActiveSvg");
             segmentedItem6.IconSvg = resources.GetString("segmentedItem6.IconSvg");
-            segmentedItem6.Text = "启动";
-            segmentedItem7.Badge = null;
-            segmentedItem7.BadgeAlign = AntdUI.TAlignFrom.TR;
-            segmentedItem7.BadgeBack = null;
-            segmentedItem7.BadgeMode = false;
-            segmentedItem7.BadgeOffsetX = 0;
-            segmentedItem7.BadgeOffsetY = 0;
-            segmentedItem7.BadgeSize = 0.6F;
-            segmentedItem7.BadgeSvg = null;
-            segmentedItem7.IconActiveSvg = resources.GetString("segmentedItem7.IconActiveSvg");
-            segmentedItem7.IconSvg = resources.GetString("segmentedItem7.IconSvg");
-            segmentedItem7.Text = "停止";
-            segmentedItem8.Badge = null;
-            segmentedItem8.BadgeAlign = AntdUI.TAlignFrom.TR;
-            segmentedItem8.BadgeBack = null;
-            segmentedItem8.BadgeMode = false;
-            segmentedItem8.BadgeOffsetX = 0;
-            segmentedItem8.BadgeOffsetY = 0;
-            segmentedItem8.BadgeSize = 0.6F;
-            segmentedItem8.BadgeSvg = null;
-            segmentedItem8.IconActiveSvg = resources.GetString("segmentedItem8.IconActiveSvg");
-            segmentedItem8.IconSvg = resources.GetString("segmentedItem8.IconSvg");
-            segmentedItem8.Text = "复位";
-            segmentedItem9.Badge = null;
-            segmentedItem9.BadgeAlign = AntdUI.TAlignFrom.TR;
-            segmentedItem9.BadgeBack = null;
-            segmentedItem9.BadgeMode = false;
-            segmentedItem9.BadgeOffsetX = 0;
-            segmentedItem9.BadgeOffsetY = 0;
-            segmentedItem9.BadgeSize = 0.6F;
-            segmentedItem9.BadgeSvg = null;
-            segmentedItem9.IconActiveSvg = resources.GetString("segmentedItem9.IconActiveSvg");
-            segmentedItem9.IconSvg = resources.GetString("segmentedItem9.IconSvg");
-            segmentedItem9.Text = "登录";
-            segmentedItem10.Badge = null;
-            segmentedItem10.BadgeAlign = AntdUI.TAlignFrom.TR;
-            segmentedItem10.BadgeBack = null;
-            segmentedItem10.BadgeMode = false;
-            segmentedItem10.BadgeOffsetX = 0;
-            segmentedItem10.BadgeOffsetY = 0;
-            segmentedItem10.BadgeSize = 0.6F;
-            segmentedItem10.BadgeSvg = null;
-            segmentedItem10.IconActiveSvg = resources.GetString("segmentedItem10.IconActiveSvg");
-            segmentedItem10.IconSvg = resources.GetString("segmentedItem10.IconSvg");
-            segmentedItem10.ID = "sys-setbutton";
-            segmentedItem10.Text = "设置";
+            segmentedItem6.ID = "sys-setbutton";
+            segmentedItem6.Text = "设置";
+            segmented1.Items.Add(segmentedItem2);
+            segmented1.Items.Add(segmentedItem3);
+            segmented1.Items.Add(segmentedItem4);
+            segmented1.Items.Add(segmentedItem5);
             segmented1.Items.Add(segmentedItem6);
-            segmented1.Items.Add(segmentedItem7);
-            segmented1.Items.Add(segmentedItem8);
-            segmented1.Items.Add(segmentedItem9);
-            segmented1.Items.Add(segmentedItem10);
             segmented1.Location = new Point(0, 0);
             segmented1.Name = "segmented1";
-            segmented1.Size = new Size(491, 83);
+            segmented1.Size = new Size(439, 83);
             segmented1.TabIndex = 1;
             segmented1.Text = "segmented1";
             segmented1.SelectIndexChanged += segmented1_SelectIndexChanged;
@@ -689,7 +703,6 @@
             ((System.ComponentModel.ISupportInitialize)dgvCamreaNums).EndInit();
             panelNums.ResumeLayout(false);
             tableLayoutNums.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dgvProductNums).EndInit();
             tableLayoutPanel3.ResumeLayout(false);
             tableLayoutPanel3.PerformLayout();
             panel1.ResumeLayout(false);
@@ -748,9 +761,10 @@
        // private Label label7;
        // private AntdUI.Panel pnlLog;
         private AntdUI.Label lbInBackend;
-        private DataGridView dgvProductNums;
         private TableLayoutPanel tableLayoutPanel3;
         private AntdUI.Button btnCreateBatchNO;
         private AntdUI.Input textBoxBatchNO;
+        private AntdUI.Segmented segmented2;
+        public AntdUI.Tag tagMachineStatus;
     }
 }

DHSoftware/MainWindow.cs

@@ -36,8 +36,11 @@ using System.Windows.Forms;
 using XKRS.UI.Device.Winform;
 using static AntdUI.Math3D;
 using static DH.Commons.Enums.EnumHelper;
+using Button = System.Windows.Forms.Button;
 using Camera = DHSoftware.Models.Camera;
+using Label = AntdUI.Label;
 using LogLevel = DH.Commons.Enums.EnumHelper.LogLevel;
+using Point = System.Drawing.Point;
 using ResultState = DH.Commons.Base.ResultState;
 using Timer = System.Threading.Timer;
 
@@ -54,132 +57,9 @@ namespace DHSoftware
         public event Action<DateTime, object, string> OnUpdateResult;
         public event Action<DateTime, object, string> OnUpdateCamResult;
 
-        private string _loginName;
      
-        public string LoginName
-        {
-            get { return _loginName; }
-            set
-            {
-                _loginName = value;
-                UpdateLabel();
-            }
-        }
 
-        private bool _ShowConfig;
 
-        public bool ShowConfig
-        {
-            get { return _ShowConfig; }
-            set
-            {
-                _ShowConfig = value;
-                UpdateConfig();
-            }
-        }
-
-        private bool _addscheme;
-
-        public bool Addscheme
-        {
-            get { return _addscheme; }
-            set
-            {
-                _addscheme = value;
-                UpdateScheme();
-            }
-        }
-
-        private bool _deletescheme;
-
-        public bool Deleteschememe
-        {
-            get { return _deletescheme; }
-            set
-            {
-                _deletescheme = value;
-                UpdateScheme();
-            }
-        }
-
-        private bool _loadscheme;
-
-        public bool Loadscheme
-        {
-            get { return _loadscheme; }
-            set
-            {
-                _loadscheme = value;
-                UpdateScheme();
-            }
-        }
-
-        private void UpdateScheme()
-        {
-            if (this.InvokeRequired)
-            {
-                this.Invoke(new Action(UpdateScheme));
-                return;
-            }
-
-            if (Loadscheme)
-            {
-                btnDeleteProject.Visible = true;
-            }
-            else
-            {
-                btnDeleteProject.Visible = false;
-            }
-            if (Addscheme)
-            {
-                btnAddProject.Visible = true;
-            }
-            else
-            {
-                btnAddProject.Visible = false;
-            }
-            if (Deleteschememe)
-            {
-                btnLoadProject.Visible = true;
-            }
-            else
-            {
-                btnLoadProject.Visible = false;
-            }
-        }
-
-        private void UpdateLabel()
-        {
-            if (lbName.InvokeRequired)
-            {
-                lbName.Invoke(new Action(UpdateLabel));
-                return;
-            }
-            lbName.Text = _loginName;
-        }
-
-        private void UpdateConfig()
-        {
-            if (ShowConfig)
-            {
-                if (segmented1.InvokeRequired)
-                {
-                    segmented1.Invoke(new Action(UpdateConfig));
-                    return;
-                }
-                // 恢复显示时
-                segmented1.Items.Insert(4, itemToHide);
-            }
-            else
-            {
-                if (segmented1.InvokeRequired)
-                {
-                    segmented1.Invoke(new Action(UpdateConfig));
-                    return;
-                }
-                segmented1.Items.Remove(itemToHide);
-            }
-        }
         public List<SysPermission> ButtonPermissionList
         {
             set
@@ -189,7 +69,15 @@ namespace DHSoftware
                 SetPermission(list, this.Controls);
             }
         }
-
+        public  void ResetAllCameraCounts()
+        {
+            CameraSummaries.ForEach(camera =>
+            {
+                camera.OKCount = 0;
+                camera.NGCount = 0;
+                camera.TiggerCount = 0;
+            });
+        }
         private void SetPermission(List<SysPermission> list, Control.ControlCollection controls)
         {
             foreach (Control control in controls)
@@ -211,7 +99,7 @@ namespace DHSoftware
                     continue;
                 }
 
-                if (control is AntdUI.Segmented segmented)
+                if (control is AntdUI.Segmented segmented && control.Name == "segmented1")
                 {
                     HandleSegmentedItems(segmented, list);
                 }
@@ -535,14 +423,9 @@ namespace DHSoftware
         #region CameraSum
         private void InitialCameraSumsView()
         {
-            dgvProductNums.AutoGenerateColumns = false;
-
-            dgvProductNums.DefaultCellStyle.Font = new Font("Tahoma", 12, FontStyle.Regular, GraphicsUnit.World);
-
-            dgvProductNums.DataSource = null;
-            dgvProductNums.DataSource = ProductSummaries;
-
 
+            this.BeginInvoke(new MethodInvoker(delegate ()
+            {
 
                 dgvCamreaNums.Columns.Clear();
 
@@ -595,7 +478,7 @@ namespace DHSoftware
                 });
                 dgvCamreaNums.AutoGenerateColumns = false;
                 dgvCamreaNums.DataSource = new BindingList<CameraSummary>(CameraSummaries);
-        }
+            })); }
         #endregion
 
         /// <summary>
@@ -621,49 +504,7 @@ namespace DHSoftware
             segmented1.Items.Remove(itemToHide);
         }
 
-        public void LoadScheme()
-        {
-            try
-            {
-                //方案配置初始化
-                SchemeHelper.Initialize();
-                //读取方案列表
-                List<string> list = SchemeHelper.GetAllSchemes();
-                string CurrentScheme = "默认方案";
-                //如果是空,新增默认数据
-                if (list == null || list.Count <= 0)
-                {
-                    list = new() { CurrentScheme };
-                    //显示到方案列表
-                    sltProjects.Items.Clear();
   
-                    sltProjects.Items.Add(CurrentScheme);
-                    //保存到方案配置
-                    SchemeHelper.AddScheme(CurrentScheme);
-                    SchemeHelper.SetCurrentScheme(CurrentScheme);
-                    //新构建配置文件
-                    ConfigHelper.InitializeScheme(CurrentScheme);
-
-                    sltProjects.SelectedIndex = 0;
-                }
-                else
-                {
-                    foreach (string s in list)
-                    {
-                        sltProjects.Items.Add(s);
-                    }
-                    CurrentScheme = SchemeHelper.GetCurrentScheme();
-                    sltProjects.SelectedValue = CurrentScheme;
-                }
-                SystemModel.CurrentScheme = CurrentScheme;
-                //加载当前方案配置
-                ConfigHelper.LoadConfig();
-            }
-            catch (Exception ex)
-            {
-                AntdUI.Message.error(this, ex.Message, autoClose: 3);
-            }
-        }
 
         public void ConnectCamera()
         {
@@ -683,14 +524,43 @@ namespace DHSoftware
                         cam.CameraName = cameraBase.CameraName;
                         cam.CameraIP = cameraBase.CameraIP;
                         cam.IsEnabled = cameraBase.IsEnabled;
-                        cam.ImageSaveDirectory = Path.Combine("D://Projects", cameraBase.CameraName);
+                        cam.IsZoomCamera = cameraBase.IsZoomCamera;
+                        cam.DvpImageFormat = cameraBase.DvpImageFormat;
+                        cam.Exposure = cameraBase.Exposure;
+                        cam.Gain = cameraBase.Gain;
+                        cam.RotateImage = cameraBase.RotateImage;
+                        cam.IsAllPicEnabled=cameraBase.IsAllPicEnabled;
+                        cam.ROIX= cameraBase.ROIX;
+                        cam.ROIH= cameraBase.ROIH;
+                        cam.ROIW= cameraBase.ROIW;
+                        cam.ROIY=cameraBase.ROIY;
+                        cam.ImageSaveDirectory = Path.Combine("D://Projects//Images", cameraBase.CameraName);
                         Cameras.Add(cam);
                         if (cameraBase.IsEnabled)
                         {
                             cam.OnLog -= _visionEngine_OnLog;
                             cam.OnLog += _visionEngine_OnLog;
-                            cam.CameraConnect();
                             cam.OnHImageOutput += OnCameraHImageOutput;
+                           
+                            Button CamLabel = new Button();
+                            CamLabel.Name = cameraBase.CameraName;
+                            CamLabel.Text = cameraBase.CameraName; // 关键1：必须有文本
+                            CamLabel.AutoSize = true;
+                            CamLabel.Size = new System.Drawing.Size(20, 20); // 关键2：自动调整大小
+                            CamLabel.Location = new Point(20 + 50 * i, 12); // 关键3：明确位置
+                            if (cam.CameraConnect())
+                                CamLabel.BackColor = Color.Green;  // 关键4：避免透明
+                            else
+                                CamLabel.BackColor = Color.Yellow;  // 关键4：避免透明
+                            CamLabel.ForeColor = Color.Black;  // 关键4：避免透明
+                            CamLabel.Font = new Font("Microsoft YaHei", 9); // 可选：字体
+
+                            // 关键5：确保添加到父控件
+                            if (pageHeader1 != null && !pageHeader1.Controls.Contains(CamLabel))
+                            {
+                                pageHeader1.Controls.Add(CamLabel);
+                            }
+
                         }
 
                     }
@@ -709,6 +579,8 @@ namespace DHSoftware
         }
        
         public void ConnectPLC()
+        {
+            try
             {
                 if (ConfigModel.PLCBaseList.Count > 0)
                 {
@@ -725,13 +597,45 @@ namespace DHSoftware
                             PLC.Port = plcBase.Port;
                             PLC.OnLog -= _visionEngine_OnLog;
                             PLC.OnLog += _visionEngine_OnLog;
+                            if (PLC.Enable)
+                            {
                                 PLC.PLCConnect();
+                                Button CamLabel = new Button();
+                                CamLabel.Name = PLC.PLCName;
+                                CamLabel.Text = PLC.PLCName; // 关键1：必须有文本
+                                CamLabel.AutoSize = true;
+                                CamLabel.Size = new System.Drawing.Size(20, 20); // 关键2：自动调整大小
+                                CamLabel.Location = new Point(20 + 50 * (i + ConfigModel.CameraBaseList.Count), 12); // 关键3：明确位置
+                                if (PLC.Connected)
+                                    CamLabel.BackColor = Color.Green;  // 关键4：避免透明
+                                else
+                                    CamLabel.BackColor = Color.Yellow;  // 关键4：避免透明
+                                CamLabel.ForeColor = Color.Black;  // 关键4：避免透明
+                                                                   //CamLabel.ForeColor = Color.Green;  // 关键4：避免透明
+                                CamLabel.Font = new Font("Microsoft YaHei", 9); // 可选：字体
+
+                                // 关键5：确保添加到父控件
+                                if (pageHeader1 != null && !pageHeader1.Controls.Contains(CamLabel))
+                                {
+                                    pageHeader1.Controls.Add(CamLabel);
+                                }
+
+                            }
+
                         }
                     }
+
+                }
+            }
+            catch (Exception ex) 
+            {
+            
             }
         }
         FrmLog frmLog;
         public void InitModel()
+        {
+            try
             {
                 Dectection.Clear();
                 _cameraRelatedDetectionDict = new();
@@ -750,9 +654,9 @@ namespace DHSoftware
                         detectionConfig.IsEnabled = detection.IsEnabled;
                         detectionConfig.ImageSaveDirectory = "D://Projects//Images";
 
-                    detectionConfig.ShowLocation.X = (i + 1) % 5 + (i + 1) / 5;
-                    //  detectionConfig.ShowLocation.X = detection.ShowLocation.X;
-                    detectionConfig.ShowLocation.Y = (i + 1) / 5 + 1;
+                        // 优化后代码
+                        detectionConfig.ShowLocation.X = (i % 5) + 1;  // X坐标从1开始，每行1-5
+                        detectionConfig.ShowLocation.Y = (i / 5) + 1;  // Y坐标从1开始，每5个换行
                         // detectionConfig.ShowLocation.Y = detection.ShowLocation.Y;
                         DetectionConfigs.Add(detectionConfig);
                     }
@@ -793,6 +697,11 @@ namespace DHSoftware
                 CtrlVisionRunBase ctrlVisionRun = new CtrlVisionRunBase(_visionEngine);
                 ctrlVisionRun.Dock = DockStyle.Fill;
                 tabImgDisplay.Controls.Add(ctrlVisionRun);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
 
         }
 
@@ -896,7 +805,7 @@ namespace DHSoftware
             this.Invoke(new Action(() =>
             {
 
-                dgvProductNums.DataSource = new BindingList<ProductSummary>(ProductSummaries);
+             
 
                 //if (dgvProductNums.Rows.Count > 0)
                 //{
@@ -911,7 +820,36 @@ namespace DHSoftware
                 lblUPH.Text = UPM.ToString();
             }));
         }
+        public void LoadScheme()
+        {
+            try
+            {
+                // 初始化方案配置（会自动创建默认方案）
+                SchemeHelper.Initialize();
 
+                // 读取方案列表
+                var schemes = SchemeHelper.GetAllSchemes();
+                sltProjects.Items.Clear();
+
+                // 绑定方案到下拉列表
+                foreach (var scheme in schemes)
+                {
+                    sltProjects.Items.Add(scheme);
+                }
+
+                // 设置当前选中的方案
+                string currentScheme = SchemeHelper.GetCurrentScheme();
+                sltProjects.SelectedValue = currentScheme;
+                SystemModel.CurrentScheme = currentScheme;
+
+                // 加载当前方案配置
+                ConfigHelper.LoadConfig();
+            }
+            catch (Exception ex)
+            {
+                AntdUI.Message.error(this, ex.Message, autoClose: 3);
+            }
+        }
         private void BtnDeleteProject_Click(object? sender, EventArgs e)
         {
             try
@@ -921,29 +859,21 @@ namespace DHSoftware
                 var result = AntdUI.Modal.open(this, "删除警告！", "确认要删除该方案吗？", TType.Warn);
                 if (result == DialogResult.OK)
                 {
+                    string schemeToDelete = sltProjects.Text;
                     int selectedIndex = sltProjects.SelectedIndex;
 
-                    // 删除当前选中项
-                    SchemeHelper.DeleteScheme(sltProjects.Text);
-                    ConfigHelper.DeleteSchemeConfig(sltProjects.Text);
-                    AntdUI.Message.success(this, $"删除方案{sltProjects.Text}成功!", autoClose: 3);
-                    sltProjects.Items.RemoveAt(selectedIndex);
-                    // 自动选择下一个（如果存在）
-                    if (sltProjects.Items.Count > 0)
-                    {
-                        // 如果删除的不是最后一项，则选中原位置的新项，否则选中最后一项
-                        sltProjects.SelectedIndex = selectedIndex < sltProjects.Items.Count
-                            ? selectedIndex
-                            : sltProjects.Items.Count - 1;
+                    // 删除方案（SchemeHelper会自动处理当前方案的切换）
+                    SchemeHelper.DeleteScheme(schemeToDelete);
+                    ConfigHelper.DeleteSchemeConfig(schemeToDelete);
 
-                        SystemModel.CurrentScheme = sltProjects.Text;
-                        SchemeHelper.SetCurrentScheme(SystemModel.CurrentScheme);
-                        //加载当前方案配置
-                        ConfigHelper.LoadConfig();
-                    }
-                    else
+                    // 刷新UI
+                    LoadScheme();
+
+                    AntdUI.Message.success(this, $"删除方案{schemeToDelete}成功!", autoClose: 3);
+
+                    // 如果没有方案了，提示用户
+                    if (sltProjects.Items.Count == 0)
                     {
-                        sltProjects.SelectedIndex = -1; // 清空选择
                         AntdUI.Modal.open(this, "空方案警告！", "当前方案全部删除，需重启程序！", TType.Warn);
                     }
                 }
@@ -959,18 +889,23 @@ namespace DHSoftware
             try
             {
                 if (sltProjects.Items.Count == 0 || sltProjects.SelectedIndex == -1) return;
-                if (SystemModel.CurrentScheme == sltProjects.Text)
+
+                string selectedScheme = sltProjects.Text;
+
+                if (SystemModel.CurrentScheme == selectedScheme)
                 {
                     AntdUI.Message.warn(this, "当前已是该方案，无需重复载入!", autoClose: 3);
                     return;
                 }
-                //修改当前软件当前方案
-                SystemModel.CurrentScheme = sltProjects.Text;
-                //修改配置当前方案
-                SchemeHelper.SetCurrentScheme(SystemModel.CurrentScheme);
-                //将配置文件替换为当前方案
+
+                // 设置当前方案
+                SchemeHelper.SetCurrentScheme(selectedScheme);
+                SystemModel.CurrentScheme = selectedScheme;
+
+                // 加载配置
                 ConfigHelper.LoadConfig();
-                AntdUI.Message.success(this, $"载入方案{SystemModel.CurrentScheme}成功!", autoClose: 3);
+
+                AntdUI.Message.success(this, $"载入方案{selectedScheme}成功!", autoClose: 3);
             }
             catch (Exception ex)
             {
@@ -987,31 +922,27 @@ namespace DHSoftware
                 {
                     BtnHeight = 0,
                 });
+
                 if (form.submit)
                 {
-                    string SchemeName = form.SchemeName;
+                    string schemeName = form.SchemeName;
+
                     // 保存到方案配置
-                    SchemeHelper.AddScheme(SchemeName);
+                    SchemeHelper.AddScheme(schemeName);
+
+                    // 根据选择初始化配置
                     if (form.NullScheme)
                     {
-                        //新构建配置文件
-                        ConfigHelper.InitializeScheme(SchemeName);
+                        ConfigHelper.InitializeScheme(schemeName);
                     }
                     else
                     {
-                        //派生当前方案
-                        ConfigHelper.DeriveScheme(SchemeName);
+                        ConfigHelper.DeriveScheme(schemeName);
                     }
-                    //刷新方案列表
-                    sltProjects.Items.Clear();
-                    List<string> list = SchemeHelper.GetAllSchemes();
-                    foreach (string s in list)
-                    {
-                        sltProjects.Items.Add(s);
-                    }
-                    string CurrentScheme = SchemeHelper.GetCurrentScheme();
-                    sltProjects.SelectedValue = CurrentScheme;
-                    AntdUI.Message.success(this, $"新增方案{SchemeName}成功!", autoClose: 3);
+
+                    // 刷新UI
+                    LoadScheme();
+                    AntdUI.Message.success(this, $"新增方案{schemeName}成功!", autoClose: 3);
                 }
             }
             catch (Exception ex)
@@ -1025,11 +956,87 @@ namespace DHSoftware
         public Dictionary<string, SimboObjectDetection> Dectection { get; } = new Dictionary<string, SimboObjectDetection>();
         public XinJEPLCTcpNet PLC { get; } = XinJEPLCTcpNet.Instance;
         private SLDMotion sLDMotion = new SLDMotion();
-
+        // 线程控制标志
+        private volatile bool _isRunning = false;
+        private Thread _monitorThread;
         private void MainWindow_Load(object sender, EventArgs e)
         {
+         
+            //开启按钮监听
+            // 启动所有监控线程
+            StartAllMonitors();
         }
 
+        private void StartAllMonitors()
+        {
+            if (PLC.Connected)
+            {
+                if (_monitorThread == null || !_monitorThread.IsAlive)
+                {
+                    //关闭按钮自身功能(比如按按钮转盘自己启动等)
+                    PLC.WriteBool("M40", true);
+                    _isRunning = true;
+                    _monitorThread = new Thread(MonitorPlcButtons);
+                    _monitorThread.IsBackground = true; // 后台线程
+                    _monitorThread.Start();
+                }
+            }
+           
+        }
+
+        private void MonitorPlcButtons(object? obj)
+        {
+            while (_isRunning)
+            {
+                try
+                {
+                    // 读取 PLC 输入点状态
+                    bool startPressed = PLC.ReadBool("X3");
+                    bool resetPressed = PLC.ReadBool("X4");
+                    bool stopPressed = PLC.ReadBool("X5");
+                    bool eStopPressed = PLC.ReadBool("X6");
+
+                    // 处理按钮状态变化
+                    if (startPressed)
+                    {
+                     
+                        HandleStartButton();
+                    }
+                    if (resetPressed)
+                    {
+                        //ResetProcess();
+                    }
+                    if (stopPressed)
+                    {
+                        HandleStopButton();
+                    }
+                    if (eStopPressed)
+                    {
+                        //EmergencyStop(null, null, null);
+                    }
+
+                    Thread.Sleep(150); 
+                }
+                catch (Exception ex)
+                {
+                    _isRunning = false;
+                    // 记录错误并停止线程
+                //    throw new ProcessException($"按钮监听线程:{ex.Message}");
+
+                }
+            }
+        }
+
+        // 停止监听线程
+        private void StopMonitoring()
+        {
+            _isRunning = false;
+            if (_monitorThread != null && _monitorThread.IsAlive)
+            {
+                _monitorThread.Join(1000); // 等待线程退出
+            }
+            PLC.WriteBool("M40", false);
+        }
         private bool _isClosing = false; // 状态标志
 
         private void MainWindow_FormClosing(object sender, FormClosingEventArgs e)
@@ -1056,10 +1063,13 @@ namespace DHSoftware
                 {
                     camera.CameraDisConnect();
                 }
+                StopMonitoring();
                 if (PLC != null)
                 {
                     PLC.CloseProcess();
+            
                 }
+              
                 _visionEngine.Stop();//释放模型
                 CloseWindow.Instance.Close();// 关闭提示窗口
                                              //Application.Exit();
@@ -1106,6 +1116,27 @@ namespace DHSoftware
             }
             segmented1.SelectIndex = -1;
         }
+
+        private void segmented2_SelectIndexChanged(object sender, IntEventArgs e)
+        {
+        
+            int selectedIndex = segmented2.SelectIndex;
+
+           
+            switch (selectedIndex)
+            {
+                case 0:
+                    HandleVisualLocalizationButton();
+                    break;
+
+                default:
+                    break;
+            }
+            segmented2.SelectIndex = -1;
+        }
+
+
+
         public string BatchNO { get; set; }
         public bool CurrentMachine = false;
         public volatile int ProductNum_Total = 0;
@@ -1125,18 +1156,71 @@ namespace DHSoftware
             // DataSavePath = string.IsNullOrEmpty(DataSavePath) ? Path.Combine(X018PLCConfig.ImgDirectory, DateTime.Now.ToString("yyyyMMdd"), BatchNO) : DataSavePath;
 
         }
+       
         private void HandleStartButton()
+        {
+            lock (_stopLock)
+            {
+                if (_isStopProcessing) return;
+                _isStopProcessing = true;
+            }
+            try
+            {
+                if (SystemModel.CurrentStatus == EnumStatus.待机中)
                 {
                     InitialCameraSumsView();
                     LogAsync(DateTime.Now, LogLevel.Information, "流程启动中，请稍候...");
+                    ResetAllCameraCounts();
+                    //开始流程
+
                     StartProcess();
+                    SystemModel.CurrentStatus = EnumStatus.运行中;
+                    this.BeginInvoke(new MethodInvoker(delegate ()
+                    {
+                        tagMachineStatus.Type = TTypeMini.Success;
+                        tagMachineStatus.Text = "运行中";
+                    }));
                     LogAsync(DateTime.Now, LogLevel.Action, "流程启动完成！");
+
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.运行中)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备正在运行，无需启动！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.清料中)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备正在清料，请稍候！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.警告)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备报警，请复位后重试！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.异常)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备异常，请检查！");
+                }
+
+            }
+            finally
+            {
+                lock (_stopLock)
+                {
+                    _isStopProcessing = false;
+                }
             }
 
 
 
-        private void StartProcess()
+        }
+
+
+
+        private async void StartProcess()
         {
+            try
+            {
+      
+
                 BatchNO = textBoxBatchNO.Text;
                 textBoxBatchNO.ReadOnly = true;
                 btnCreateBatchNO.Enabled = false;
@@ -1225,19 +1309,39 @@ namespace DHSoftware
 
                 #endregion 虚拟相机
      
-            var settings = _visionEngine.DetectionConfigs.Where(u => u.IsEnabled && u.IsAddStation).ToList();
+           
+                ///这里会执行完成后，会造成后台线程断断续续，会造成界面UI卡顿
+                //var settings = ConfigModel.DetectionList.Where(u => u.IsEnabled && u.IsAddStation).ToList();
+                //if (settings != null)
+                //{
+                //    settings = settings.Where(s => s.IsEnabled).ToList();
+                //    ProductBaseCount = settings.Count;
+
+                //    for (int i = 0; i < ProductBaseCount * ProductListMulti; i++)
+                //    {
+                //        ConcurrentDictionary<uint, ProductData> products = new ConcurrentDictionary<uint, ProductData>();
+                //        _productLists.Add(products);
+                //    }
+                //}
+
+
+                await Task.Run(() =>
+                {
+                    var settings = ConfigModel.DetectionList.Where(u => u.IsEnabled && u.IsAddStation).ToList();
                     if (settings != null)
                     {
-                settings = settings.Where(s => s.IsEnabled).ToList();
                         ProductBaseCount = settings.Count;
+                        _productLists.Clear(); // 清空旧数据
+
+                        // 预分配列表容量（减少动态扩容开销）
+                        _productLists.Capacity = ProductBaseCount * ProductListMulti;
 
                         for (int i = 0; i < ProductBaseCount * ProductListMulti; i++)
                         {
-                    ConcurrentDictionary<uint, ProductData> products = new ConcurrentDictionary<uint, ProductData>();
-                    _productLists.Add(products);
+                            _productLists.Add(new ConcurrentDictionary<uint, ProductData>());
                         }
                     }
-
+                });
                 //   _MGSCameraList = DeviceCollection
                 //.OfType<MGSCameraDriver>()  // 直接筛选出 MGSCameraDriver 类型的元素
                 //.Where(camera => camera.IConfig != null && camera.IConfig.IsEnabled)  // 进一步筛选 IConfig 不为 null 且 IsEnabled 为 true
@@ -1247,10 +1351,15 @@ namespace DHSoftware
 
 
 
+
+                InitialOEEStatistic();
                 //流程执行时PLC
                 PLC.StartProcess();
-            InitialOEEStatistic();
-
+                CurrentMachine = true;
+            }
+            catch (Exception ex)
+            {
+            }
 
 
         }
@@ -1285,15 +1394,15 @@ namespace DHSoftware
             //转盘2 的物料是不是重新覆盖之前的pDta
             if (axisIndex == 1)
             {
-                ProductData pData = new ProductData("", pieceNumber, ProductBaseCount);
+                ProductData pData = new ProductData(BatchNO, pieceNumber, ProductBaseCount);
                 _productLists[index][pieceNumber] = pData;
-                LogAsync(DateTime.Now, LogLevel.Action, $">> 轴{axisIndex}新产品{pieceNumber}加入队列{index}----板卡计数{PieceCount}");
+                LogAsync(DateTime.Now, LogLevel.Action, $">> 转盘{axisIndex}新产品{pieceNumber}加入队列{index}----计数{PieceCount}");
 
             }
 
-            DateTime dtNow = DateTime.Now;
-            UpdateCT(null, (float)(dtNow - _ctTime).TotalSeconds);
-            _ctTime = dtNow;
+            //DateTime dtNow = DateTime.Now;
+            //UpdateCT(null, (float)(dtNow - _ctTime).TotalSeconds);
+           // _ctTime = dtNow;
         }
 
         public async Task UpdateCT(object objData, float ctTime)
@@ -1676,7 +1785,23 @@ namespace DHSoftware
 
         }
 
-        private void HandleStopButton()
+        private readonly object _stopLock = new object(); // 锁对象
+        private bool _isStopProcessing = false;          // 状态标志
+        private async void HandleStopButton()
+        {   
+            // 通过锁和状态标志实现双重检查
+            lock (_stopLock)
+            {
+                if (_isStopProcessing) return;
+                _isStopProcessing = true;
+            }
+            try
+            {
+                if (SystemModel.CurrentStatus == EnumStatus.待机中)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备待机中，无需停止！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.运行中)
                 {
                     textBoxBatchNO.ReadOnly = false;
                     btnCreateBatchNO.Enabled = true;
@@ -1684,12 +1809,65 @@ namespace DHSoftware
                     // Cameras.Clear();
                     // Dectection.Clear();
                     // Add the code for the "停止" button click here
-            PLC.TurnStart(false);
-            CurrentMachine = true;
-            //sLDMotion.Stop();
+                    PLC.StopProcess();
+                    SystemModel.CurrentStatus = EnumStatus.待机中;
+                    this.BeginInvoke(new MethodInvoker(delegate ()
+                    {
+                        tagMachineStatus.Type = TTypeMini.Primary;
+                        tagMachineStatus.Text = "待机中";
+                    }));
+                    LogAsync(DateTime.Now, LogLevel.Action, $"流程停止！");
+                  await  Task.Run(async () =>
+                    {
+
+                        await ExecuteClearDelayAsync();
+                    });
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.清料中)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备正在清料，请稍候！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.警告)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备报警，请复位后重试！");
+                }
+                else if (SystemModel.CurrentStatus == EnumStatus.异常)
+                {
+                    LogAsync(DateTime.Now, LogLevel.Warning, "设备异常，请检查！");
+                }
+            }
+
+            finally
+            {
+                lock (_stopLock)
+                {
+                    _isStopProcessing = false;
+                }
             }
 
 
+            //sLDMotion.Stop();
+        }
+
+        private async Task ExecuteClearDelayAsync()
+        {
+            LogAsync(DateTime.Now, LogLevel.Action, $"转盘清料开始");
+            SystemModel.CurrentStatus = EnumStatus.清料中;
+            this.BeginInvoke(new MethodInvoker(delegate ()
+            {
+                tagMachineStatus.Type = TTypeMini.Warn;
+                tagMachineStatus.Text = "清料中";
+            }));
+            await PLC.ExecuteClearDelayAsync();
+            LogAsync(DateTime.Now, LogLevel.Action, $"转盘清料完成");
+
+            SystemModel.CurrentStatus = EnumStatus.待机中;
+            this.BeginInvoke(new MethodInvoker(delegate ()
+            {
+                tagMachineStatus.Type = TTypeMini.Primary;
+                tagMachineStatus.Text = "待机中";
+            }));
+        }
 
         public void CalculateOEE()
         {
@@ -1737,10 +1915,15 @@ namespace DHSoftware
             LoginWindow.Instance.parentForm = this;
             LoginWindow.Instance.Show();
         }
-
+        private void HandleVisualLocalizationButton()
+        {
+            VisualLocalizationWindow.Instance.Show();
+        }
         private void btnCreateBatchNO_Click(object sender, EventArgs e)
         {
             textBoxBatchNO.Text = SystemModel.CurrentScheme + "-" + DateTime.Now.ToString("yyyyMMddHHmmss");
         }
+
+       
     }
 }

DHSoftware/MainWindow.resx

@@ -117,287 +117,46 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="segmentedItem1.IconActiveSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512zm0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;path d="M199.555 528.063h293.116v278.095L710.638 300.43 199.555 528.063zm148.53-39.044 252.043 112.252L531.715 616.92V489.019H383.185z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem1.IconSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512zm0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;path d="M199.555 528.063h293.116v278.095L710.638 300.43 199.555 528.063zm148.53-39.044 252.043 112.252L531.715 616.92V489.019H383.185z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem2.IconActiveSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M731.818667 500.280889L386.844444 239.729778a14.677333 14.677333 0 0 0-23.495111 11.719111v521.159111a14.677333 14.677333 0 0 0 23.495111 11.662222l344.860445-260.608a14.677333 14.677333 0 0 0 0.113778-23.381333z" fill="#FFFFFF"/&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512z m0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem2.IconSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M731.818667 500.280889L386.844444 239.729778a14.677333 14.677333 0 0 0-23.495111 11.719111v521.159111a14.677333 14.677333 0 0 0 23.495111 11.662222l344.860445-260.608a14.677333 14.677333 0 0 0 0.113778-23.381333z" fill="#FFFFFF"/&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512z m0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem3.IconActiveSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M365.014704 657.815846H657.084939V365.74561H365.014704V657.815846zm584.140471-146.035118c0-240.906781-197.125482-438.105353-438.105353-438.105353-240.979872 0-438.105353 197.198572-438.105354 438.105353 0 240.979872 197.125482 438.178444 438.105354 438.178444 240.979872 0 438.105353-197.198572 438.105353-438.178444zM511.634547 0.730906c281.399001 0 511.634547 230.235546 511.634547 511.634547s-230.235546 511.634547-511.634547 511.634547-511.634547-230.235546-511.634547-511.634547 230.235546-511.634547 511.634547-511.634547z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem3.IconSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M365.014704 657.815846H657.084939V365.74561H365.014704V657.815846zm584.140471-146.035118c0-240.906781-197.125482-438.105353-438.105353-438.105353-240.979872 0-438.105353 197.198572-438.105354 438.105353 0 240.979872 197.125482 438.178444 438.105354 438.178444 240.979872 0 438.105353-197.198572 438.105353-438.178444zM511.634547 0.730906c281.399001 0 511.634547 230.235546 511.634547 511.634547s-230.235546 511.634547-511.634547 511.634547-511.634547-230.235546-511.634547-511.634547 230.235546-511.634547 511.634547-511.634547z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem4.IconActiveSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M527.36 351.744V292.864L410.624 380.416 527.36 468.48V410.624c72.192 8.192 124.416 73.216 116.224 145.408-8.192 72.192-73.216 124.416-145.408 116.224-66.56-7.168-117.248-64-117.248-131.072-0.512-5.12-0.512-9.728 0-14.848H323.584c-0.512 5.12-0.512 9.728 0 14.848 0 104.96 85.504 189.952 190.464 189.952s189.952-85.504 189.952-190.464c-0.512-99.328-77.312-181.76-176.64-188.928z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem4.IconSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M527.36 351.744V292.864L410.624 380.416 527.36 468.48V410.624c72.192 8.192 124.416 73.216 116.224 145.408-8.192 72.192-73.216 124.416-145.408 116.224-66.56-7.168-117.248-64-117.248-131.072-0.512-5.12-0.512-9.728 0-14.848H323.584c-0.512 5.12-0.512 9.728 0 14.848 0 104.96 85.504 189.952 190.464 189.952s189.952-85.504 189.952-190.464c-0.512-99.328-77.312-181.76-176.64-188.928z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem5.IconActiveSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path transform="scale(0.8) translate(128,128)" d="M960.853333 903.816533a463.633067 463.633067 0 0 0-11.264-39.185066c-1.536-4.539733-3.413333-8.942933-5.051733-13.448534a484.078933 484.078933 0 0 0-9.557333-24.4736c-2.2528-5.188267-4.881067-10.274133-7.338667-15.394133-3.413333-7.099733-6.8608-14.165333-10.6496-21.0944-2.901333-5.3248-6.075733-10.513067-9.181867-15.701333-2.423467-4.061867-4.573867-8.226133-7.133866-12.219734-1.604267-2.4576-3.413333-4.778667-5.0176-7.202133-1.501867-2.218667-2.730667-4.608-4.266667-6.792533-0.4096-0.6144-1.058133-0.887467-1.501867-1.4336a461.482667 461.482667 0 0 0-90.385066-96.768c-13.5168-10.786133-27.7504-20.48-42.257067-29.5936-0.477867-0.341333-0.7168-0.8192-1.194667-1.1264-3.6864-2.286933-7.509333-4.3008-11.264-6.485334-4.266667-2.491733-8.4992-5.051733-12.868266-7.441066-6.826667-3.6864-13.789867-7.099733-20.753067-10.478934-3.618133-1.7408-7.202133-3.618133-10.8544-5.290666a449.194667 449.194667 0 0 0-31.607467-12.731734c-0.7168-0.273067-1.365333-0.6144-2.082133-0.8192-3.140267-1.1264-6.417067-1.911467-9.557333-2.935466-4.164267-1.399467-8.328533-2.833067-12.561067-4.096a259.9936 259.9936 0 0 0 129.194667-225.450667 260.061867 260.061867 0 0 0-76.629334-185.002667 259.9936 259.9936 0 0 0-185.002666-76.629333H512h-0.034133a259.857067 259.857067 0 0 0-185.002667 76.629333 259.925333 259.925333 0 0 0-76.629333 185.002667 259.584 259.584 0 0 0 76.629333 185.002667c15.906133 15.940267 33.655467 29.2864 52.565333 40.448-4.266667 1.262933-8.430933 2.730667-12.663466 4.096-3.140267 1.058133-6.3488 1.8432-9.489067 2.935466-0.7168 0.238933-1.365333 0.580267-2.048 0.8192-10.683733 3.822933-21.265067 8.0896-31.675733 12.765867-3.584 1.604267-7.0656 3.4816-10.615467 5.154133-7.099733 3.413333-14.165333 6.826667-21.0944 10.615467-4.266667 2.321067-8.3968 4.8128-12.561067 7.2704-3.822933 2.218667-7.748267 4.266667-11.502933 6.621867-0.512 0.3072-0.750933 0.8192-1.2288 1.160533-14.506667 9.147733-28.706133 18.807467-42.222933 29.559467a459.6736 459.6736 0 0 0-90.385067 96.768c-0.443733 0.546133-1.092267 0.8192-1.501867 1.4336-1.536 2.184533-2.7648 4.573867-4.266666 6.792533-1.604267 2.423467-3.447467 4.744533-5.0176 7.202133-2.56 3.9936-4.7104 8.157867-7.133867 12.219734-3.106133 5.188267-6.280533 10.376533-9.181867 15.701333-3.7888 6.929067-7.202133 13.994667-10.6496 21.0944-2.4576 5.12-5.051733 10.205867-7.338666 15.394133-3.515733 8.021333-6.519467 16.247467-9.557334 24.4736-1.672533 4.5056-3.549867 8.9088-5.051733 13.448534-4.3008 12.868267-8.0896 25.941333-11.264 39.185066-3.072 12.970667 2.594133 25.770667 13.073067 32.802134a31.3344 31.3344 0 0 0 9.966933 4.608 30.9248 30.9248 0 0 0 34.030933-15.2576 30.446933 30.446933 0 0 0 3.345067-7.7824c2.833067-11.844267 6.178133-23.483733 10.0352-34.9184 0.6144-1.8432 1.399467-3.549867 2.013867-5.358934 3.447467-9.762133 7.133867-19.456 11.332266-28.945066 0.512-1.160533 1.1264-2.2528 1.6384-3.447467 4.7104-10.308267 9.728-20.48 15.291734-30.344533l0.068266-0.1024a402.773333 402.773333 0 0 1 19.694934-31.4368l0.136533-0.375467a397.4144 397.4144 0 0 1 116.599467-111.2064c0.136533-0.1024 0.3072-0.068267 0.443733-0.170667a397.824 397.824 0 0 1 94.993067-42.973866c2.7648-0.8192 5.495467-1.7408 8.2944-2.491734 5.7344-1.604267 11.5712-3.003733 17.373866-4.334933a367.8208 367.8208 0 0 1 47.342934-7.953067c3.8912-0.443733 7.7824-0.9216 11.6736-1.2288 10.410667-0.785067 20.8896-1.3312 31.505066-1.3312s21.060267 0.546133 31.505067 1.3312c3.8912 0.3072 7.816533 0.785067 11.707733 1.2288a361.3696 361.3696 0 0 1 47.240534 7.953067c5.870933 1.3312 11.707733 2.730667 17.5104 4.334933 2.696533 0.750933 5.358933 1.6384 8.021333 2.4576 33.348267 10.103467 65.365333 24.405333 95.197867 43.008 0.136533 0.1024 0.3072 0.068267 0.443733 0.170667a396.151467 396.151467 0 0 1 116.599467 111.2064c0.1024 0.136533 0.1024 0.273067 0.170666 0.375467 13.687467 19.7632 25.3952 40.5504 35.191467 62.1568l1.467733 3.037866c4.3008 9.659733 8.055467 19.592533 11.605334 29.5936 0.546133 1.604267 1.2288 3.106133 1.774933 4.7104 3.822933 11.4688 7.236267 23.176533 10.0352 35.0208a31.061333 31.061333 0 0 0 60.450133-14.336zm-249.275733-560.2304A199.850667 199.850667 0 0 1 512 543.197867a199.850667 199.850667 0 0 1-199.5776-199.611734A199.816533 199.816533 0 0 1 512 144.008533a199.816533 199.816533 0 0 1 199.5776 199.5776z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
+  <data name="segmentedItem5.IconSvg" xml:space="preserve">
+    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path transform="scale(0.8) translate(128,128)" d="M960.853333 903.816533a463.633067 463.633067 0 0 0-11.264-39.185066c-1.536-4.539733-3.413333-8.942933-5.051733-13.448534a484.078933 484.078933 0 0 0-9.557333-24.4736c-2.2528-5.188267-4.881067-10.274133-7.338667-15.394133-3.413333-7.099733-6.8608-14.165333-10.6496-21.0944-2.901333-5.3248-6.075733-10.513067-9.181867-15.701333-2.423467-4.061867-4.573867-8.226133-7.133866-12.219734-1.604267-2.4576-3.413333-4.778667-5.0176-7.202133-1.501867-2.218667-2.730667-4.608-4.266667-6.792533-0.4096-0.6144-1.058133-0.887467-1.501867-1.4336a461.482667 461.482667 0 0 0-90.385066-96.768c-13.5168-10.786133-27.7504-20.48-42.257067-29.5936-0.477867-0.341333-0.7168-0.8192-1.194667-1.1264-3.6864-2.286933-7.509333-4.3008-11.264-6.485334-4.266667-2.491733-8.4992-5.051733-12.868266-7.441066-6.826667-3.6864-13.789867-7.099733-20.753067-10.478934-3.618133-1.7408-7.202133-3.618133-10.8544-5.290666a449.194667 449.194667 0 0 0-31.607467-12.731734c-0.7168-0.273067-1.365333-0.6144-2.082133-0.8192-3.140267-1.1264-6.417067-1.911467-9.557333-2.935466-4.164267-1.399467-8.328533-2.833067-12.561067-4.096a259.9936 259.9936 0 0 0 129.194667-225.450667 260.061867 260.061867 0 0 0-76.629334-185.002667 259.9936 259.9936 0 0 0-185.002666-76.629333H512h-0.034133a259.857067 259.857067 0 0 0-185.002667 76.629333 259.925333 259.925333 0 0 0-76.629333 185.002667 259.584 259.584 0 0 0 76.629333 185.002667c15.906133 15.940267 33.655467 29.2864 52.565333 40.448-4.266667 1.262933-8.430933 2.730667-12.663466 4.096-3.140267 1.058133-6.3488 1.8432-9.489067 2.935466-0.7168 0.238933-1.365333 0.580267-2.048 0.8192-10.683733 3.822933-21.265067 8.0896-31.675733 12.765867-3.584 1.604267-7.0656 3.4816-10.615467 5.154133-7.099733 3.413333-14.165333 6.826667-21.0944 10.615467-4.266667 2.321067-8.3968 4.8128-12.561067 7.2704-3.822933 2.218667-7.748267 4.266667-11.502933 6.621867-0.512 0.3072-0.750933 0.8192-1.2288 1.160533-14.506667 9.147733-28.706133 18.807467-42.222933 29.559467a459.6736 459.6736 0 0 0-90.385067 96.768c-0.443733 0.546133-1.092267 0.8192-1.501867 1.4336-1.536 2.184533-2.7648 4.573867-4.266666 6.792533-1.604267 2.423467-3.447467 4.744533-5.0176 7.202133-2.56 3.9936-4.7104 8.157867-7.133867 12.219734-3.106133 5.188267-6.280533 10.376533-9.181867 15.701333-3.7888 6.929067-7.202133 13.994667-10.6496 21.0944-2.4576 5.12-5.051733 10.205867-7.338666 15.394133-3.515733 8.021333-6.519467 16.247467-9.557334 24.4736-1.672533 4.5056-3.549867 8.9088-5.051733 13.448534-4.3008 12.868267-8.0896 25.941333-11.264 39.185066-3.072 12.970667 2.594133 25.770667 13.073067 32.802134a31.3344 31.3344 0 0 0 9.966933 4.608 30.9248 30.9248 0 0 0 34.030933-15.2576 30.446933 30.446933 0 0 0 3.345067-7.7824c2.833067-11.844267 6.178133-23.483733 10.0352-34.9184 0.6144-1.8432 1.399467-3.549867 2.013867-5.358934 3.447467-9.762133 7.133867-19.456 11.332266-28.945066 0.512-1.160533 1.1264-2.2528 1.6384-3.447467 4.7104-10.308267 9.728-20.48 15.291734-30.344533l0.068266-0.1024a402.773333 402.773333 0 0 1 19.694934-31.4368l0.136533-0.375467a397.4144 397.4144 0 0 1 116.599467-111.2064c0.136533-0.1024 0.3072-0.068267 0.443733-0.170667a397.824 397.824 0 0 1 94.993067-42.973866c2.7648-0.8192 5.495467-1.7408 8.2944-2.491734 5.7344-1.604267 11.5712-3.003733 17.373866-4.334933a367.8208 367.8208 0 0 1 47.342934-7.953067c3.8912-0.443733 7.7824-0.9216 11.6736-1.2288 10.410667-0.785067 20.8896-1.3312 31.505066-1.3312s21.060267 0.546133 31.505067 1.3312c3.8912 0.3072 7.816533 0.785067 11.707733 1.2288a361.3696 361.3696 0 0 1 47.240534 7.953067c5.870933 1.3312 11.707733 2.730667 17.5104 4.334933 2.696533 0.750933 5.358933 1.6384 8.021333 2.4576 33.348267 10.103467 65.365333 24.405333 95.197867 43.008 0.136533 0.1024 0.3072 0.068267 0.443733 0.170667a396.151467 396.151467 0 0 1 116.599467 111.2064c0.1024 0.136533 0.1024 0.273067 0.170666 0.375467 13.687467 19.7632 25.3952 40.5504 35.191467 62.1568l1.467733 3.037866c4.3008 9.659733 8.055467 19.592533 11.605334 29.5936 0.546133 1.604267 1.2288 3.106133 1.774933 4.7104 3.822933 11.4688 7.236267 23.176533 10.0352 35.0208a31.061333 31.061333 0 0 0 60.450133-14.336zm-249.275733-560.2304A199.850667 199.850667 0 0 1 512 543.197867a199.850667 199.850667 0 0 1-199.5776-199.611734A199.816533 199.816533 0 0 1 512 144.008533a199.816533 199.816533 0 0 1 199.5776 199.5776z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
+  </data>
   <data name="segmentedItem6.IconActiveSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M731.818667 500.280889L386.844444 239.729778a14.677333 14.677333 0 0 0-23.495111 11.719111v521.159111a14.677333 14.677333 0 0 0 23.495111 11.662222l344.860445-260.608a14.677333 14.677333 0 0 0 0.113778-23.381333z" fill="#FFFFFF"/&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512z m0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem6.IconSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M731.818667 500.280889L386.844444 239.729778a14.677333 14.677333 0 0 0-23.495111 11.719111v521.159111a14.677333 14.677333 0 0 0 23.495111 11.662222l344.860445-260.608a14.677333 14.677333 0 0 0 0.113778-23.381333z" fill="#FFFFFF"/&gt;&lt;path d="M512 1024a512 512 0 1 1 512-512 512.568889 512.568889 0 0 1-512 512z m0-946.915556A434.915556 434.915556 0 1 0 946.915556 512 435.427556 435.427556 0 0 0 512 77.084444z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem7.IconActiveSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M365.014704 657.815846H657.084939V365.74561H365.014704V657.815846zm584.140471-146.035118c0-240.906781-197.125482-438.105353-438.105353-438.105353-240.979872 0-438.105353 197.198572-438.105354 438.105353 0 240.979872 197.125482 438.178444 438.105354 438.178444 240.979872 0 438.105353-197.198572 438.105353-438.178444zM511.634547 0.730906c281.399001 0 511.634547 230.235546 511.634547 511.634547s-230.235546 511.634547-511.634547 511.634547-511.634547-230.235546-511.634547-511.634547 230.235546-511.634547 511.634547-511.634547z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem7.IconSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M365.014704 657.815846H657.084939V365.74561H365.014704V657.815846zm584.140471-146.035118c0-240.906781-197.125482-438.105353-438.105353-438.105353-240.979872 0-438.105353 197.198572-438.105354 438.105353 0 240.979872 197.125482 438.178444 438.105354 438.178444 240.979872 0 438.105353-197.198572 438.105353-438.178444zM511.634547 0.730906c281.399001 0 511.634547 230.235546 511.634547 511.634547s-230.235546 511.634547-511.634547 511.634547-511.634547-230.235546-511.634547-511.634547 230.235546-511.634547 511.634547-511.634547z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem8.IconActiveSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M527.36 351.744V292.864L410.624 380.416 527.36 468.48V410.624c72.192 8.192 124.416 73.216 116.224 145.408-8.192 72.192-73.216 124.416-145.408 116.224-66.56-7.168-117.248-64-117.248-131.072-0.512-5.12-0.512-9.728 0-14.848H323.584c-0.512 5.12-0.512 9.728 0 14.848 0 104.96 85.504 189.952 190.464 189.952s189.952-85.504 189.952-190.464c-0.512-99.328-77.312-181.76-176.64-188.928z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem8.IconSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M527.36 351.744V292.864L410.624 380.416 527.36 468.48V410.624c72.192 8.192 124.416 73.216 116.224 145.408-8.192 72.192-73.216 124.416-145.408 116.224-66.56-7.168-117.248-64-117.248-131.072-0.512-5.12-0.512-9.728 0-14.848H323.584c-0.512 5.12-0.512 9.728 0 14.848 0 104.96 85.504 189.952 190.464 189.952s189.952-85.504 189.952-190.464c-0.512-99.328-77.312-181.76-176.64-188.928z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem9.IconActiveSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path transform="scale(0.8) translate(128,128)" d="M960.853333 903.816533a463.633067 463.633067 0 0 0-11.264-39.185066c-1.536-4.539733-3.413333-8.942933-5.051733-13.448534a484.078933 484.078933 0 0 0-9.557333-24.4736c-2.2528-5.188267-4.881067-10.274133-7.338667-15.394133-3.413333-7.099733-6.8608-14.165333-10.6496-21.0944-2.901333-5.3248-6.075733-10.513067-9.181867-15.701333-2.423467-4.061867-4.573867-8.226133-7.133866-12.219734-1.604267-2.4576-3.413333-4.778667-5.0176-7.202133-1.501867-2.218667-2.730667-4.608-4.266667-6.792533-0.4096-0.6144-1.058133-0.887467-1.501867-1.4336a461.482667 461.482667 0 0 0-90.385066-96.768c-13.5168-10.786133-27.7504-20.48-42.257067-29.5936-0.477867-0.341333-0.7168-0.8192-1.194667-1.1264-3.6864-2.286933-7.509333-4.3008-11.264-6.485334-4.266667-2.491733-8.4992-5.051733-12.868266-7.441066-6.826667-3.6864-13.789867-7.099733-20.753067-10.478934-3.618133-1.7408-7.202133-3.618133-10.8544-5.290666a449.194667 449.194667 0 0 0-31.607467-12.731734c-0.7168-0.273067-1.365333-0.6144-2.082133-0.8192-3.140267-1.1264-6.417067-1.911467-9.557333-2.935466-4.164267-1.399467-8.328533-2.833067-12.561067-4.096a259.9936 259.9936 0 0 0 129.194667-225.450667 260.061867 260.061867 0 0 0-76.629334-185.002667 259.9936 259.9936 0 0 0-185.002666-76.629333H512h-0.034133a259.857067 259.857067 0 0 0-185.002667 76.629333 259.925333 259.925333 0 0 0-76.629333 185.002667 259.584 259.584 0 0 0 76.629333 185.002667c15.906133 15.940267 33.655467 29.2864 52.565333 40.448-4.266667 1.262933-8.430933 2.730667-12.663466 4.096-3.140267 1.058133-6.3488 1.8432-9.489067 2.935466-0.7168 0.238933-1.365333 0.580267-2.048 0.8192-10.683733 3.822933-21.265067 8.0896-31.675733 12.765867-3.584 1.604267-7.0656 3.4816-10.615467 5.154133-7.099733 3.413333-14.165333 6.826667-21.0944 10.615467-4.266667 2.321067-8.3968 4.8128-12.561067 7.2704-3.822933 2.218667-7.748267 4.266667-11.502933 6.621867-0.512 0.3072-0.750933 0.8192-1.2288 1.160533-14.506667 9.147733-28.706133 18.807467-42.222933 29.559467a459.6736 459.6736 0 0 0-90.385067 96.768c-0.443733 0.546133-1.092267 0.8192-1.501867 1.4336-1.536 2.184533-2.7648 4.573867-4.266666 6.792533-1.604267 2.423467-3.447467 4.744533-5.0176 7.202133-2.56 3.9936-4.7104 8.157867-7.133867 12.219734-3.106133 5.188267-6.280533 10.376533-9.181867 15.701333-3.7888 6.929067-7.202133 13.994667-10.6496 21.0944-2.4576 5.12-5.051733 10.205867-7.338666 15.394133-3.515733 8.021333-6.519467 16.247467-9.557334 24.4736-1.672533 4.5056-3.549867 8.9088-5.051733 13.448534-4.3008 12.868267-8.0896 25.941333-11.264 39.185066-3.072 12.970667 2.594133 25.770667 13.073067 32.802134a31.3344 31.3344 0 0 0 9.966933 4.608 30.9248 30.9248 0 0 0 34.030933-15.2576 30.446933 30.446933 0 0 0 3.345067-7.7824c2.833067-11.844267 6.178133-23.483733 10.0352-34.9184 0.6144-1.8432 1.399467-3.549867 2.013867-5.358934 3.447467-9.762133 7.133867-19.456 11.332266-28.945066 0.512-1.160533 1.1264-2.2528 1.6384-3.447467 4.7104-10.308267 9.728-20.48 15.291734-30.344533l0.068266-0.1024a402.773333 402.773333 0 0 1 19.694934-31.4368l0.136533-0.375467a397.4144 397.4144 0 0 1 116.599467-111.2064c0.136533-0.1024 0.3072-0.068267 0.443733-0.170667a397.824 397.824 0 0 1 94.993067-42.973866c2.7648-0.8192 5.495467-1.7408 8.2944-2.491734 5.7344-1.604267 11.5712-3.003733 17.373866-4.334933a367.8208 367.8208 0 0 1 47.342934-7.953067c3.8912-0.443733 7.7824-0.9216 11.6736-1.2288 10.410667-0.785067 20.8896-1.3312 31.505066-1.3312s21.060267 0.546133 31.505067 1.3312c3.8912 0.3072 7.816533 0.785067 11.707733 1.2288a361.3696 361.3696 0 0 1 47.240534 7.953067c5.870933 1.3312 11.707733 2.730667 17.5104 4.334933 2.696533 0.750933 5.358933 1.6384 8.021333 2.4576 33.348267 10.103467 65.365333 24.405333 95.197867 43.008 0.136533 0.1024 0.3072 0.068267 0.443733 0.170667a396.151467 396.151467 0 0 1 116.599467 111.2064c0.1024 0.136533 0.1024 0.273067 0.170666 0.375467 13.687467 19.7632 25.3952 40.5504 35.191467 62.1568l1.467733 3.037866c4.3008 9.659733 8.055467 19.592533 11.605334 29.5936 0.546133 1.604267 1.2288 3.106133 1.774933 4.7104 3.822933 11.4688 7.236267 23.176533 10.0352 35.0208a31.061333 31.061333 0 0 0 60.450133-14.336zm-249.275733-560.2304A199.850667 199.850667 0 0 1 512 543.197867a199.850667 199.850667 0 0 1-199.5776-199.611734A199.816533 199.816533 0 0 1 512 144.008533a199.816533 199.816533 0 0 1 199.5776 199.5776z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem9.IconSvg" xml:space="preserve">
-    <value>&lt;svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path transform="scale(0.8) translate(128,128)" d="M960.853333 903.816533a463.633067 463.633067 0 0 0-11.264-39.185066c-1.536-4.539733-3.413333-8.942933-5.051733-13.448534a484.078933 484.078933 0 0 0-9.557333-24.4736c-2.2528-5.188267-4.881067-10.274133-7.338667-15.394133-3.413333-7.099733-6.8608-14.165333-10.6496-21.0944-2.901333-5.3248-6.075733-10.513067-9.181867-15.701333-2.423467-4.061867-4.573867-8.226133-7.133866-12.219734-1.604267-2.4576-3.413333-4.778667-5.0176-7.202133-1.501867-2.218667-2.730667-4.608-4.266667-6.792533-0.4096-0.6144-1.058133-0.887467-1.501867-1.4336a461.482667 461.482667 0 0 0-90.385066-96.768c-13.5168-10.786133-27.7504-20.48-42.257067-29.5936-0.477867-0.341333-0.7168-0.8192-1.194667-1.1264-3.6864-2.286933-7.509333-4.3008-11.264-6.485334-4.266667-2.491733-8.4992-5.051733-12.868266-7.441066-6.826667-3.6864-13.789867-7.099733-20.753067-10.478934-3.618133-1.7408-7.202133-3.618133-10.8544-5.290666a449.194667 449.194667 0 0 0-31.607467-12.731734c-0.7168-0.273067-1.365333-0.6144-2.082133-0.8192-3.140267-1.1264-6.417067-1.911467-9.557333-2.935466-4.164267-1.399467-8.328533-2.833067-12.561067-4.096a259.9936 259.9936 0 0 0 129.194667-225.450667 260.061867 260.061867 0 0 0-76.629334-185.002667 259.9936 259.9936 0 0 0-185.002666-76.629333H512h-0.034133a259.857067 259.857067 0 0 0-185.002667 76.629333 259.925333 259.925333 0 0 0-76.629333 185.002667 259.584 259.584 0 0 0 76.629333 185.002667c15.906133 15.940267 33.655467 29.2864 52.565333 40.448-4.266667 1.262933-8.430933 2.730667-12.663466 4.096-3.140267 1.058133-6.3488 1.8432-9.489067 2.935466-0.7168 0.238933-1.365333 0.580267-2.048 0.8192-10.683733 3.822933-21.265067 8.0896-31.675733 12.765867-3.584 1.604267-7.0656 3.4816-10.615467 5.154133-7.099733 3.413333-14.165333 6.826667-21.0944 10.615467-4.266667 2.321067-8.3968 4.8128-12.561067 7.2704-3.822933 2.218667-7.748267 4.266667-11.502933 6.621867-0.512 0.3072-0.750933 0.8192-1.2288 1.160533-14.506667 9.147733-28.706133 18.807467-42.222933 29.559467a459.6736 459.6736 0 0 0-90.385067 96.768c-0.443733 0.546133-1.092267 0.8192-1.501867 1.4336-1.536 2.184533-2.7648 4.573867-4.266666 6.792533-1.604267 2.423467-3.447467 4.744533-5.0176 7.202133-2.56 3.9936-4.7104 8.157867-7.133867 12.219734-3.106133 5.188267-6.280533 10.376533-9.181867 15.701333-3.7888 6.929067-7.202133 13.994667-10.6496 21.0944-2.4576 5.12-5.051733 10.205867-7.338666 15.394133-3.515733 8.021333-6.519467 16.247467-9.557334 24.4736-1.672533 4.5056-3.549867 8.9088-5.051733 13.448534-4.3008 12.868267-8.0896 25.941333-11.264 39.185066-3.072 12.970667 2.594133 25.770667 13.073067 32.802134a31.3344 31.3344 0 0 0 9.966933 4.608 30.9248 30.9248 0 0 0 34.030933-15.2576 30.446933 30.446933 0 0 0 3.345067-7.7824c2.833067-11.844267 6.178133-23.483733 10.0352-34.9184 0.6144-1.8432 1.399467-3.549867 2.013867-5.358934 3.447467-9.762133 7.133867-19.456 11.332266-28.945066 0.512-1.160533 1.1264-2.2528 1.6384-3.447467 4.7104-10.308267 9.728-20.48 15.291734-30.344533l0.068266-0.1024a402.773333 402.773333 0 0 1 19.694934-31.4368l0.136533-0.375467a397.4144 397.4144 0 0 1 116.599467-111.2064c0.136533-0.1024 0.3072-0.068267 0.443733-0.170667a397.824 397.824 0 0 1 94.993067-42.973866c2.7648-0.8192 5.495467-1.7408 8.2944-2.491734 5.7344-1.604267 11.5712-3.003733 17.373866-4.334933a367.8208 367.8208 0 0 1 47.342934-7.953067c3.8912-0.443733 7.7824-0.9216 11.6736-1.2288 10.410667-0.785067 20.8896-1.3312 31.505066-1.3312s21.060267 0.546133 31.505067 1.3312c3.8912 0.3072 7.816533 0.785067 11.707733 1.2288a361.3696 361.3696 0 0 1 47.240534 7.953067c5.870933 1.3312 11.707733 2.730667 17.5104 4.334933 2.696533 0.750933 5.358933 1.6384 8.021333 2.4576 33.348267 10.103467 65.365333 24.405333 95.197867 43.008 0.136533 0.1024 0.3072 0.068267 0.443733 0.170667a396.151467 396.151467 0 0 1 116.599467 111.2064c0.1024 0.136533 0.1024 0.273067 0.170666 0.375467 13.687467 19.7632 25.3952 40.5504 35.191467 62.1568l1.467733 3.037866c4.3008 9.659733 8.055467 19.592533 11.605334 29.5936 0.546133 1.604267 1.2288 3.106133 1.774933 4.7104 3.822933 11.4688 7.236267 23.176533 10.0352 35.0208a31.061333 31.061333 0 0 0 60.450133-14.336zm-249.275733-560.2304A199.850667 199.850667 0 0 1 512 543.197867a199.850667 199.850667 0 0 1-199.5776-199.611734A199.816533 199.816533 0 0 1 512 144.008533a199.816533 199.816533 0 0 1 199.5776 199.5776z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
-  </data>
-  <data name="segmentedItem10.IconActiveSvg" xml:space="preserve">
     <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M437.314 840.84l-18.967-5.795c-43.935-13.425-84.182-35.551-119.623-65.767l-15.203-12.962 11.199-16.544c17.376-25.668 17.938-59.158 1.433-85.319-14.356-22.787-39.028-36.385-66.006-36.385-4.102 0-8.229 0.328-12.267 0.974l-19.752 3.158-5.301-19.288c-8.196-29.823-12.353-59.896-12.353-89.381 0-19.675 1.863-39.491 5.694-60.582l3.652-20.105 20.349 1.862c2.343 0.214 4.726 0.323 7.081 0.323 29.007 0 55.436-15.908 68.974-41.516 14.941-28.2 11.264-62.223-9.356-86.694l-13.166-15.625L278.1 276.7c38.694-38.954 86.677-68.095 138.76-84.273l19.741-6.132 7.631 19.211c11.88 29.908 40.312 49.234 72.432 49.234 32.097 0 60.521-19.328 72.413-49.241l7.632-19.197 19.73 6.122c43.968 13.642 84.295 36.164 119.862 66.938l15.414 13.337-11.883 16.561c-18.636 25.975-19.684 60.166-2.671 87.105 14.369 22.78 39.055 36.373 66.04 36.372 4.344 0 8.71-0.366 12.978-1.087l20.143-3.403 5.176 19.762c7.539 28.792 11.362 57.566 11.362 85.522 0 21.328-2.143 43.048-6.365 64.554l-3.859 19.65-19.952-1.709a77.999 77.999 0 0 0-6.612-0.281c-28.998 0-55.44 15.917-69.009 41.542-14.47 27.405-11.311 60.816 8.063 85.095l12.496 15.661-14.222 14.111c-38.674 38.378-86.551 67.041-138.455 82.892l-18.968 5.792-7.988-18.152c-12.462-28.318-40.459-46.617-71.325-46.617-30.883 0-58.893 18.299-71.36 46.619l-7.99 18.152zm-95.455-94.18c22.324 16.82 46.59 30.174 72.469 39.881 22.445-34.023 60.731-55.125 102.336-55.125 41.59 0 79.862 21.1 102.303 55.12 32.745-12.298 63.249-30.557 89.663-53.667-19.709-35.774-20.525-79.555-1.04-116.455 19.699-37.203 56.634-61.386 98.053-64.883 1.705-12.731 2.565-25.453 2.565-38 0-18.339-1.923-37.155-5.729-56.144-42.123-0.241-80.616-21.581-103.077-57.189-22.944-36.331-25.024-81.029-6.697-118.768-22.165-16.932-46.203-30.4-71.788-40.221-8.847 14.328-20.577 26.719-34.618 36.447-20.522 14.219-44.602 21.735-69.635 21.735-25.044 0-49.131-7.516-69.657-21.734-14.042-9.727-25.773-22.116-34.618-36.441-32.551 12.503-62.856 30.935-89.106 54.196 21.198 36.233 22.547 80.974 2.407 118.987-19.71 37.285-56.808 61.499-98.402 64.875-1.45 11.713-2.161 23.035-2.161 34.255 0 19.715 2.166 39.792 6.449 59.894 41.851 0.474 80.029 21.785 102.35 57.214 22.218 35.217 24.782 78.871 7.933 116.023z" fill="#FFFFFF"/&gt;&lt;path d="M516.664 633.864c-66.246 0-120.141-53.897-120.141-120.147 0-66.249 53.895-120.146 120.141-120.146 66.237 0 120.127 53.897 120.127 120.146 0 66.25-53.89 120.147-120.127 120.147zm0-195.641c-41.625 0-75.488 33.866-75.488 75.494s33.863 75.495 75.488 75.495c41.617 0 75.475-33.867 75.475-75.495s-33.858-75.494-75.475-75.494z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
   </data>
-  <data name="segmentedItem10.IconSvg" xml:space="preserve">
+  <data name="segmentedItem6.IconSvg" xml:space="preserve">
     <value>&lt;svg viewBox="0 0 1027 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"&gt;&lt;path d="M512 0C229.376 0 0 229.376 0 512s229.376 512 512 512 512-229.376 512-512S794.624 0 512 0zm0 963.584c-249.344 0-451.584-202.24-451.584-451.584S262.656 60.416 512 60.416s451.584 202.24 451.584 451.584-202.24 451.584-451.584 451.584z" fill="#FFFFFF"/&gt;&lt;path d="M437.314 840.84l-18.967-5.795c-43.935-13.425-84.182-35.551-119.623-65.767l-15.203-12.962 11.199-16.544c17.376-25.668 17.938-59.158 1.433-85.319-14.356-22.787-39.028-36.385-66.006-36.385-4.102 0-8.229 0.328-12.267 0.974l-19.752 3.158-5.301-19.288c-8.196-29.823-12.353-59.896-12.353-89.381 0-19.675 1.863-39.491 5.694-60.582l3.652-20.105 20.349 1.862c2.343 0.214 4.726 0.323 7.081 0.323 29.007 0 55.436-15.908 68.974-41.516 14.941-28.2 11.264-62.223-9.356-86.694l-13.166-15.625L278.1 276.7c38.694-38.954 86.677-68.095 138.76-84.273l19.741-6.132 7.631 19.211c11.88 29.908 40.312 49.234 72.432 49.234 32.097 0 60.521-19.328 72.413-49.241l7.632-19.197 19.73 6.122c43.968 13.642 84.295 36.164 119.862 66.938l15.414 13.337-11.883 16.561c-18.636 25.975-19.684 60.166-2.671 87.105 14.369 22.78 39.055 36.373 66.04 36.372 4.344 0 8.71-0.366 12.978-1.087l20.143-3.403 5.176 19.762c7.539 28.792 11.362 57.566 11.362 85.522 0 21.328-2.143 43.048-6.365 64.554l-3.859 19.65-19.952-1.709a77.999 77.999 0 0 0-6.612-0.281c-28.998 0-55.44 15.917-69.009 41.542-14.47 27.405-11.311 60.816 8.063 85.095l12.496 15.661-14.222 14.111c-38.674 38.378-86.551 67.041-138.455 82.892l-18.968 5.792-7.988-18.152c-12.462-28.318-40.459-46.617-71.325-46.617-30.883 0-58.893 18.299-71.36 46.619l-7.99 18.152zm-95.455-94.18c22.324 16.82 46.59 30.174 72.469 39.881 22.445-34.023 60.731-55.125 102.336-55.125 41.59 0 79.862 21.1 102.303 55.12 32.745-12.298 63.249-30.557 89.663-53.667-19.709-35.774-20.525-79.555-1.04-116.455 19.699-37.203 56.634-61.386 98.053-64.883 1.705-12.731 2.565-25.453 2.565-38 0-18.339-1.923-37.155-5.729-56.144-42.123-0.241-80.616-21.581-103.077-57.189-22.944-36.331-25.024-81.029-6.697-118.768-22.165-16.932-46.203-30.4-71.788-40.221-8.847 14.328-20.577 26.719-34.618 36.447-20.522 14.219-44.602 21.735-69.635 21.735-25.044 0-49.131-7.516-69.657-21.734-14.042-9.727-25.773-22.116-34.618-36.441-32.551 12.503-62.856 30.935-89.106 54.196 21.198 36.233 22.547 80.974 2.407 118.987-19.71 37.285-56.808 61.499-98.402 64.875-1.45 11.713-2.161 23.035-2.161 34.255 0 19.715 2.166 39.792 6.449 59.894 41.851 0.474 80.029 21.785 102.35 57.214 22.218 35.217 24.782 78.871 7.933 116.023z" fill="#FFFFFF"/&gt;&lt;path d="M516.664 633.864c-66.246 0-120.141-53.897-120.141-120.147 0-66.249 53.895-120.146 120.141-120.146 66.237 0 120.127 53.897 120.127 120.146 0 66.25-53.89 120.147-120.127 120.147zm0-195.641c-41.625 0-75.488 33.866-75.488 75.494s33.863 75.495 75.488 75.495c41.617 0 75.475-33.867 75.475-75.495s-33.858-75.494-75.475-75.494z" fill="#FFFFFF"/&gt;&lt;/svg&gt;</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px77vKcf7bym
-        H9i7px+WuqogMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/rumH766px1OuaIjFv//AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+9px/2vacfvbymIGe1nyAYAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/wvKcexbyn
-        Htq7px71vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/a8px/Fu6cgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        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
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HFu08AAAAAAAAAAAAA
-        AAAAAAAAAAAAALymIRe7px/DvKcf/7ynH/+8px//vKcf/7ynH/y7pR+Dv4AABAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HF
-        u08AAAAAAAAAAAAAAAAAAAAAAAAAAMyZMwW7px+LvKcf/rynH/+8px//vKcf/7ynH/+8px6ru6oiDwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDE
-        u/9AxLv/QMS7/0DEvOdAxLvcQMS73EDEu9xAxLvcQMS73EDEu9x0uHrruKkk/rynH/+8px//vKcf/7yn
-        H/+lrTz2TcGp30DEu9xAxLvcQMS73EDEu9xAxLvcQMS73EDEut9AxLv2QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9ivI//s6kr/7yn
-        H/+8px//vKcf/7ynH/+rqzT/T8Co/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9cvZj/sKot/7ynH/+8px//vKcf/7ynH/+xqi7/UcCm/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9bvZj/sKou/7ynH/+8px//vKcf/7ynH/+xqi3/UcCl/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/z/E
-        u7E/w7qNP8O6jT/Duo0/w7qNP8O6jT/Duo1wuH2wtqgm+LynH/+8px//vKcf/7ynH/+0qSntWb6cmj/D
-        uo0/w7qNP8O6jT/Duo0/w7qNP8O6jT/Eu5Y/xLvhQMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDE
-        u/9AxLv/QMS7/0HEvlIzzMwFM8zMBTPMzAUzzMwFM8zMBTPMzAW4qCRku6cf9bynH/+8px//vKcf/7yn
-        H/+8pyDKp6c1HTPMzAUzzMwFM8zMBTPMzAUzzMwFM8zMBUDKvxhAxbu8QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HFu08AAAAAAAAAAAAAAAAAAAAAAAAAAL+/AAS7ph6HvKcf/ryn
-        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
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAD/gAACwqoYFbqoHUa9pR+DvaYewbyoH+G9qB/yvKcf/rynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/rumH5q7qiIegIAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+7px/tu6gftbunH8i9px/nu6cf/bynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7yoH/i8px/OvqcdTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px/6vKgfx7ymH3K7qhoeAAAAAQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKgf/ryoH828pR9buqcdGv+AAAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px/8vKgf8LynH927px+muaYfQv//AAEAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px70u6cf1rymH6+9px+DvKceVL+nICD/gAACAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H+y8px/3u6Yf+bymH++8px7kvacf172nH8C8px6jvqcffb2qH1G3piEuuacaHb+fIBC/vwAEAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS83wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -406,7 +165,159 @@
         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
-        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
+        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
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFpLAAA8KwAAuqYXAIx5
+        DAClkRAApZUSAJKFDQAAAAAAbVgHAEw4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA/////AD/
+        AAD8B//4AH8AAPwB//gAPwAA/AB/8AA/AAD8AH/wAD8AAPwAP/AAPwAA/AAf8AA/AAD8AB/wAD8AAPwA
+        D/AAPwAA/AAP8AA/AAD8AA/wAD8AAPwAD/AAPwAA/AAP8AA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/
+        AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwA
+        AAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAD+AA/AAD8AAf4AD8AAPwAB/gAPwAA/AAP+AA/
+        AAD8AA/4AD8AAPwAD/gAPwAA/AAP+AA/AAD8AA/8AD8AAPwAD/4APwAA/AAP/4A/AAD+AA//8D8AAP4A
+        H////wAA/wA/////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA////////
+        AAA=
 </value>
   </data>
 </root>

DHSoftware/Program.cs

@@ -67,6 +67,8 @@ namespace DHSoftware
             catch (Exception ex)
             {
                 SystemModel.CurrentStatus = EnumStatus.异常;
+                MainWindow.Instance.tagMachineStatus.Type = TTypeMini.Error;
+                MainWindow.Instance.tagMachineStatus.Text = "异常";
                 Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
             }
 
@@ -99,6 +101,8 @@ namespace DHSoftware
             catch (Exception ex)
             {
                 SystemModel.CurrentStatus = EnumStatus.异常;
+                MainWindow.Instance.tagMachineStatus.Type = TTypeMini.Error;
+                MainWindow.Instance.tagMachineStatus.Text = "异常";
                 Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
             }
             UpdateStep(80, "正在加载算法模型", true);
@@ -109,6 +113,8 @@ namespace DHSoftware
             catch (Exception ex)
             {
                 SystemModel.CurrentStatus = EnumStatus.异常;
+                MainWindow.Instance.tagMachineStatus.Type = TTypeMini.Error;
+                MainWindow.Instance.tagMachineStatus.Text = "异常";
                 Modal.open(WelcomeWindow.Instance, "错误！", ex.ToString(), TType.Error);
             }
             UpdateStep(100, "程序初始化完成", true);

DHSoftware/Views/AddCameraControl.cs

@@ -13,6 +13,7 @@ namespace DHSoftware.Views
           
             InitializeComponent();
             lbTitleName.Text = TitleName;
+   
             // 绑定事件
             BindEventHandler();
         }
@@ -21,6 +22,12 @@ namespace DHSoftware.Views
         {
             button_ok.Click += Button_ok_Click;
             button_cancel.Click += Button_cancel_Click;
+            Load += AddCameraControl_Load;
+        }
+
+        private void AddCameraControl_Load(object? sender, EventArgs e)
+        {
+            input_name.Text = CubicleName;
         }
 
         private void Button_cancel_Click(object sender, EventArgs e)

DHSoftware/Views/AddCubicleControl.cs

@@ -28,6 +28,13 @@ namespace DHSoftware.Views
         {
             button_ok.Click += Button_ok_Click;
             button_cancel.Click += Button_cancel_Click;
+            Load += AddCubicleControl_Load;
+        }
+
+        private void AddCubicleControl_Load(object? sender, EventArgs e)
+        {
+            input_name.Text = CubicleName;
+            sltdetectionType.SelectedIndex =(int)DetectionType;
         }
 
         private void Button_cancel_Click(object sender, EventArgs e)

DHSoftware/Views/CameraControl.Designer.cs

@@ -28,227 +28,65 @@
         /// </summary>
         private void InitializeComponent()
         {
-            swhEnable = new AntdUI.Switch();
+            panel3 = new AntdUI.Panel();
+            button3 = new AntdUI.Button();
+            button2 = new AntdUI.Button();
+            button1 = new AntdUI.Button();
+            btnSizeAdd = new AntdUI.Button();
+            panel4 = new AntdUI.Panel();
+            pictureBox1 = new PictureBox();
+            panel2 = new AntdUI.Panel();
             label18 = new AntdUI.Label();
+            swhEnable = new AntdUI.Switch();
             label1 = new AntdUI.Label();
             label2 = new AntdUI.Label();
             label3 = new AntdUI.Label();
-            iptExposure = new AntdUI.InputNumber();
-            iptGain = new AntdUI.InputNumber();
-            iptRevolve = new AntdUI.InputNumber();
+            iptExposure = new AntdUI.Input();
+            iptGain = new AntdUI.Input();
+            iptRevolve = new AntdUI.Select();
             label4 = new AntdUI.Label();
             sltAcquisitionMode = new AntdUI.Select();
             label5 = new AntdUI.Label();
             sltTriggerMode = new AntdUI.Select();
             label7 = new AntdUI.Label();
-            iptROIW = new AntdUI.InputNumber();
-            iptROIY = new AntdUI.InputNumber();
-            iptROIX = new AntdUI.InputNumber();
-            iptROIH = new AntdUI.InputNumber();
-            pictureBox1 = new PictureBox();
-            btnSizeAdd = new AntdUI.Button();
-            button1 = new AntdUI.Button();
-            button2 = new AntdUI.Button();
-            button3 = new AntdUI.Button();
-            sthPic = new AntdUI.Switch();
+            iptROIX = new AntdUI.Input();
+            iptROIY = new AntdUI.Input();
+            iptROIW = new AntdUI.Input();
+            iptROIH = new AntdUI.Input();
             label6 = new AntdUI.Label();
+            sthPic = new AntdUI.Switch();
             label8 = new AntdUI.Label();
             label9 = new AntdUI.Label();
             label10 = new AntdUI.Label();
             label11 = new AntdUI.Label();
-            sthAllPic = new AntdUI.Switch();
             label12 = new AntdUI.Label();
-            sltCamType = new AntdUI.Select();
+            sthAllPic = new AntdUI.Switch();
             label13 = new AntdUI.Label();
+            sltCamType = new AntdUI.Select();
+            label14 = new AntdUI.Label();
+            switch1 = new AntdUI.Switch();
+            panel1 = new AntdUI.Panel();
+            sltPicType = new AntdUI.Select();
+            label15 = new AntdUI.Label();
+            panel3.SuspendLayout();
+            panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
+            panel2.SuspendLayout();
+            panel1.SuspendLayout();
             SuspendLayout();
             // 
-            // swhEnable
+            // panel3
             // 
-            swhEnable.CheckedText = "启用";
-            swhEnable.Location = new Point(93, 13);
-            swhEnable.Name = "swhEnable";
-            swhEnable.Size = new Size(94, 33);
-            swhEnable.TabIndex = 13;
-            swhEnable.UnCheckedText = "关闭";
-            // 
-            // label18
-            // 
-            label18.Location = new Point(28, 23);
-            label18.Name = "label18";
-            label18.Size = new Size(59, 23);
-            label18.TabIndex = 12;
-            label18.Text = "状      态";
-            // 
-            // label1
-            // 
-            label1.Location = new Point(28, 140);
-            label1.Name = "label1";
-            label1.Size = new Size(59, 36);
-            label1.TabIndex = 14;
-            label1.Text = "曝      光";
-            // 
-            // label2
-            // 
-            label2.Location = new Point(28, 183);
-            label2.Name = "label2";
-            label2.Size = new Size(59, 36);
-            label2.TabIndex = 15;
-            label2.Text = "增      益";
-            // 
-            // label3
-            // 
-            label3.Location = new Point(28, 226);
-            label3.Name = "label3";
-            label3.Size = new Size(59, 36);
-            label3.TabIndex = 16;
-            label3.Text = "旋转角度";
-            // 
-            // iptExposure
-            // 
-            iptExposure.Location = new Point(93, 140);
-            iptExposure.Name = "iptExposure";
-            iptExposure.Size = new Size(94, 36);
-            iptExposure.TabIndex = 17;
-            iptExposure.Tag = "";
-            iptExposure.Text = "0";
-            // 
-            // iptGain
-            // 
-            iptGain.Location = new Point(93, 183);
-            iptGain.Name = "iptGain";
-            iptGain.Size = new Size(94, 36);
-            iptGain.TabIndex = 18;
-            iptGain.Text = "0";
-            // 
-            // iptRevolve
-            // 
-            iptRevolve.Location = new Point(93, 226);
-            iptRevolve.Name = "iptRevolve";
-            iptRevolve.Size = new Size(94, 36);
-            iptRevolve.TabIndex = 19;
-            iptRevolve.Text = "0";
-            // 
-            // label4
-            // 
-            label4.Location = new Point(28, 269);
-            label4.Name = "label4";
-            label4.Size = new Size(59, 36);
-            label4.TabIndex = 20;
-            label4.Text = "采图模式";
-            // 
-            // sltAcquisitionMode
-            // 
-            sltAcquisitionMode.List = true;
-            sltAcquisitionMode.Location = new Point(93, 269);
-            sltAcquisitionMode.Name = "sltAcquisitionMode";
-            sltAcquisitionMode.Size = new Size(94, 36);
-            sltAcquisitionMode.TabIndex = 21;
-            // 
-            // label5
-            // 
-            label5.Location = new Point(28, 314);
-            label5.Name = "label5";
-            label5.Size = new Size(59, 36);
-            label5.TabIndex = 22;
-            label5.Text = "触发模式";
-            // 
-            // sltTriggerMode
-            // 
-            sltTriggerMode.List = true;
-            sltTriggerMode.Location = new Point(93, 314);
-            sltTriggerMode.Name = "sltTriggerMode";
-            sltTriggerMode.Size = new Size(94, 36);
-            sltTriggerMode.TabIndex = 26;
-            // 
-            // label7
-            // 
-            label7.Location = new Point(19, 476);
-            label7.Name = "label7";
-            label7.Size = new Size(29, 23);
-            label7.TabIndex = 28;
-            label7.Text = "ROI";
-            // 
-            // iptROIW
-            // 
-            iptROIW.Location = new Point(93, 494);
-            iptROIW.Name = "iptROIW";
-            iptROIW.Size = new Size(94, 37);
-            iptROIW.TabIndex = 31;
-            iptROIW.Text = "0";
-            // 
-            // iptROIY
-            // 
-            iptROIY.Location = new Point(93, 451);
-            iptROIY.Name = "iptROIY";
-            iptROIY.Size = new Size(94, 37);
-            iptROIY.TabIndex = 30;
-            iptROIY.Text = "0";
-            // 
-            // iptROIX
-            // 
-            iptROIX.Location = new Point(93, 408);
-            iptROIX.Name = "iptROIX";
-            iptROIX.Size = new Size(94, 37);
-            iptROIX.TabIndex = 29;
-            iptROIX.Tag = "";
-            iptROIX.Text = "0";
-            // 
-            // iptROIH
-            // 
-            iptROIH.Location = new Point(93, 537);
-            iptROIH.Name = "iptROIH";
-            iptROIH.Size = new Size(94, 37);
-            iptROIH.TabIndex = 32;
-            iptROIH.Text = "0";
-            // 
-            // pictureBox1
-            // 
-            pictureBox1.BorderStyle = BorderStyle.FixedSingle;
-            pictureBox1.Location = new Point(219, 23);
-            pictureBox1.Name = "pictureBox1";
-            pictureBox1.Size = new Size(659, 489);
-            pictureBox1.TabIndex = 33;
-            pictureBox1.TabStop = false;
-            // 
-            // btnSizeAdd
-            // 
-            btnSizeAdd.BorderWidth = 2F;
-            btnSizeAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            btnSizeAdd.Ghost = true;
-            btnSizeAdd.IconRatio = 0F;
-            btnSizeAdd.IconSvg = "";
-            btnSizeAdd.Location = new Point(282, 532);
-            btnSizeAdd.Name = "btnSizeAdd";
-            btnSizeAdd.Size = new Size(80, 38);
-            btnSizeAdd.TabIndex = 34;
-            btnSizeAdd.Text = "连接相机";
-            // 
-            // button1
-            // 
-            button1.BorderWidth = 2F;
-            button1.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            button1.Ghost = true;
-            button1.IconRatio = 0F;
-            button1.IconSvg = "";
-            button1.Location = new Point(440, 532);
-            button1.Name = "button1";
-            button1.Size = new Size(80, 38);
-            button1.TabIndex = 35;
-            button1.Text = "断开相机";
-            // 
-            // button2
-            // 
-            button2.BorderWidth = 2F;
-            button2.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            button2.Ghost = true;
-            button2.IconRatio = 0F;
-            button2.IconSvg = "";
-            button2.Location = new Point(595, 532);
-            button2.Name = "button2";
-            button2.Size = new Size(80, 38);
-            button2.TabIndex = 36;
-            button2.Text = "单次触发";
+            panel3.Controls.Add(button3);
+            panel3.Controls.Add(button2);
+            panel3.Controls.Add(button1);
+            panel3.Controls.Add(btnSizeAdd);
+            panel3.Dock = DockStyle.Bottom;
+            panel3.Location = new Point(0, 585);
+            panel3.Name = "panel3";
+            panel3.Size = new Size(691, 59);
+            panel3.TabIndex = 39;
+            panel3.Text = "panel3";
             // 
             // button3
             // 
@@ -257,169 +95,434 @@
             button3.Ghost = true;
             button3.IconRatio = 0F;
             button3.IconSvg = "";
-            button3.Location = new Point(743, 532);
+            button3.Location = new Point(536, 13);
             button3.Name = "button3";
             button3.Size = new Size(80, 38);
-            button3.TabIndex = 37;
+            button3.TabIndex = 46;
             button3.Text = "连续触发";
             // 
+            // button2
+            // 
+            button2.BorderWidth = 2F;
+            button2.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            button2.Ghost = true;
+            button2.IconRatio = 0F;
+            button2.IconSvg = "";
+            button2.Location = new Point(388, 13);
+            button2.Name = "button2";
+            button2.Size = new Size(80, 38);
+            button2.TabIndex = 45;
+            button2.Text = "单次触发";
+            // 
+            // button1
+            // 
+            button1.BorderWidth = 2F;
+            button1.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            button1.Ghost = true;
+            button1.IconRatio = 0F;
+            button1.IconSvg = "";
+            button1.Location = new Point(233, 13);
+            button1.Name = "button1";
+            button1.Size = new Size(80, 38);
+            button1.TabIndex = 44;
+            button1.Text = "断开相机";
+            // 
+            // btnSizeAdd
+            // 
+            btnSizeAdd.BorderWidth = 2F;
+            btnSizeAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSizeAdd.Ghost = true;
+            btnSizeAdd.IconRatio = 0F;
+            btnSizeAdd.IconSvg = "";
+            btnSizeAdd.Location = new Point(75, 13);
+            btnSizeAdd.Name = "btnSizeAdd";
+            btnSizeAdd.Size = new Size(80, 38);
+            btnSizeAdd.TabIndex = 43;
+            btnSizeAdd.Text = "连接相机";
+            // 
+            // panel4
+            // 
+            panel4.Controls.Add(pictureBox1);
+            panel4.Dock = DockStyle.Fill;
+            panel4.Location = new Point(0, 0);
+            panel4.Name = "panel4";
+            panel4.Size = new Size(691, 585);
+            panel4.TabIndex = 40;
+            panel4.Text = "panel4";
+            // 
+            // pictureBox1
+            // 
+            pictureBox1.BorderStyle = BorderStyle.FixedSingle;
+            pictureBox1.Dock = DockStyle.Fill;
+            pictureBox1.Location = new Point(0, 0);
+            pictureBox1.Name = "pictureBox1";
+            pictureBox1.Size = new Size(691, 585);
+            pictureBox1.TabIndex = 39;
+            pictureBox1.TabStop = false;
+            // 
+            // panel2
+            // 
+            panel2.Controls.Add(panel4);
+            panel2.Controls.Add(panel3);
+            panel2.Dock = DockStyle.Fill;
+            panel2.Location = new Point(218, 0);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(691, 644);
+            panel2.TabIndex = 49;
+            panel2.Text = "panel2";
+            // 
+            // label18
+            // 
+            label18.Location = new Point(21, 19);
+            label18.Name = "label18";
+            label18.Size = new Size(59, 23);
+            label18.TabIndex = 48;
+            label18.Text = "状      态";
+            // 
+            // swhEnable
+            // 
+            swhEnable.CheckedText = "启用";
+            swhEnable.Location = new Point(86, 9);
+            swhEnable.Name = "swhEnable";
+            swhEnable.Size = new Size(111, 33);
+            swhEnable.TabIndex = 49;
+            swhEnable.UnCheckedText = "关闭";
+            // 
+            // label1
+            // 
+            label1.Location = new Point(21, 136);
+            label1.Name = "label1";
+            label1.Size = new Size(59, 36);
+            label1.TabIndex = 50;
+            label1.Text = "曝      光";
+            // 
+            // label2
+            // 
+            label2.Location = new Point(21, 179);
+            label2.Name = "label2";
+            label2.Size = new Size(59, 36);
+            label2.TabIndex = 51;
+            label2.Text = "增      益";
+            // 
+            // label3
+            // 
+            label3.Location = new Point(21, 222);
+            label3.Name = "label3";
+            label3.Size = new Size(59, 36);
+            label3.TabIndex = 52;
+            label3.Text = "旋转角度";
+            // 
+            // iptExposure
+            // 
+            iptExposure.Location = new Point(86, 136);
+            iptExposure.Name = "iptExposure";
+            iptExposure.Size = new Size(111, 36);
+            iptExposure.TabIndex = 53;
+            iptExposure.Tag = "";
+            iptExposure.Text = "0";
+            // 
+            // iptGain
+            // 
+            iptGain.Location = new Point(86, 179);
+            iptGain.Name = "iptGain";
+            iptGain.Size = new Size(111, 36);
+            iptGain.TabIndex = 54;
+            iptGain.Text = "0";
+            // 
+            // iptRevolve
+            // 
+            iptRevolve.Items.AddRange(new object[] { "0", "90", "180", "270" });
+            iptRevolve.List = true;
+            iptRevolve.Location = new Point(86, 222);
+            iptRevolve.Name = "iptRevolve";
+            iptRevolve.Size = new Size(111, 36);
+            iptRevolve.TabIndex = 55;
+            // 
+            // label4
+            // 
+            label4.Location = new Point(21, 265);
+            label4.Name = "label4";
+            label4.Size = new Size(59, 36);
+            label4.TabIndex = 56;
+            label4.Text = "采图模式";
+            // 
+            // sltAcquisitionMode
+            // 
+            sltAcquisitionMode.List = true;
+            sltAcquisitionMode.Location = new Point(86, 265);
+            sltAcquisitionMode.Name = "sltAcquisitionMode";
+            sltAcquisitionMode.Size = new Size(111, 36);
+            sltAcquisitionMode.TabIndex = 57;
+            // 
+            // label5
+            // 
+            label5.Location = new Point(21, 310);
+            label5.Name = "label5";
+            label5.Size = new Size(59, 36);
+            label5.TabIndex = 58;
+            label5.Text = "触发模式";
+            // 
+            // sltTriggerMode
+            // 
+            sltTriggerMode.List = true;
+            sltTriggerMode.Location = new Point(86, 310);
+            sltTriggerMode.Name = "sltTriggerMode";
+            sltTriggerMode.Size = new Size(111, 36);
+            sltTriggerMode.TabIndex = 59;
+            // 
+            // label7
+            // 
+            label7.Location = new Point(3, 538);
+            label7.Name = "label7";
+            label7.Size = new Size(29, 23);
+            label7.TabIndex = 60;
+            label7.Text = "ROI";
+            // 
+            // iptROIX
+            // 
+            iptROIX.Location = new Point(86, 470);
+            iptROIX.Name = "iptROIX";
+            iptROIX.Size = new Size(111, 37);
+            iptROIX.TabIndex = 61;
+            iptROIX.Tag = "";
+            iptROIX.Text = "0";
+            // 
+            // iptROIY
+            // 
+            iptROIY.Location = new Point(86, 513);
+            iptROIY.Name = "iptROIY";
+            iptROIY.Size = new Size(111, 37);
+            iptROIY.TabIndex = 62;
+            iptROIY.Text = "0";
+            // 
+            // iptROIW
+            // 
+            iptROIW.Location = new Point(86, 556);
+            iptROIW.Name = "iptROIW";
+            iptROIW.Size = new Size(111, 37);
+            iptROIW.TabIndex = 63;
+            iptROIW.Text = "0";
+            // 
+            // iptROIH
+            // 
+            iptROIH.Location = new Point(86, 599);
+            iptROIH.Name = "iptROIH";
+            iptROIH.Size = new Size(111, 37);
+            iptROIH.TabIndex = 64;
+            iptROIH.Text = "0";
+            // 
+            // label6
+            // 
+            label6.Location = new Point(21, 66);
+            label6.Name = "label6";
+            label6.Size = new Size(59, 23);
+            label6.TabIndex = 65;
+            label6.Text = "相  机  图";
+            // 
             // sthPic
             // 
             sthPic.CheckedText = "启用";
-            sthPic.Location = new Point(93, 60);
+            sthPic.Location = new Point(86, 56);
             sthPic.Name = "sthPic";
-            sthPic.Size = new Size(94, 33);
-            sthPic.TabIndex = 39;
+            sthPic.Size = new Size(111, 33);
+            sthPic.TabIndex = 66;
             sthPic.UnCheckedText = "关闭";
             // 
-            // label6
-            // 
-            label6.Location = new Point(28, 70);
-            label6.Name = "label6";
-            label6.Size = new Size(59, 23);
-            label6.TabIndex = 38;
-            label6.Text = "相  机  图";
-            // 
             // label8
             // 
-            label8.Location = new Point(58, 408);
+            label8.Location = new Point(36, 470);
             label8.Name = "label8";
             label8.Size = new Size(29, 37);
-            label8.TabIndex = 40;
+            label8.TabIndex = 67;
             label8.Text = "X:";
             // 
             // label9
             // 
-            label9.Location = new Point(58, 451);
+            label9.Location = new Point(36, 513);
             label9.Name = "label9";
             label9.Size = new Size(29, 37);
-            label9.TabIndex = 41;
+            label9.TabIndex = 68;
             label9.Text = "Y:";
             // 
             // label10
             // 
-            label10.Location = new Point(43, 494);
+            label10.Location = new Point(28, 556);
             label10.Name = "label10";
             label10.Size = new Size(44, 37);
-            label10.TabIndex = 42;
+            label10.TabIndex = 69;
             label10.Text = "宽度：";
             // 
             // label11
             // 
-            label11.Location = new Point(43, 538);
+            label11.Location = new Point(28, 600);
             label11.Name = "label11";
             label11.Size = new Size(44, 36);
-            label11.TabIndex = 43;
+            label11.TabIndex = 70;
             label11.Text = "高度：";
             // 
+            // label12
+            // 
+            label12.Location = new Point(21, 402);
+            label12.Name = "label12";
+            label12.Size = new Size(59, 23);
+            label12.TabIndex = 71;
+            label12.Text = "全 画 幅";
+            // 
             // sthAllPic
             // 
             sthAllPic.CheckedText = "启用";
-            sthAllPic.Location = new Point(93, 356);
+            sthAllPic.Location = new Point(86, 392);
             sthAllPic.Name = "sthAllPic";
-            sthAllPic.Size = new Size(94, 33);
-            sthAllPic.TabIndex = 45;
+            sthAllPic.Size = new Size(111, 33);
+            sthAllPic.TabIndex = 72;
             sthAllPic.UnCheckedText = "关闭";
             // 
-            // label12
+            // label13
             // 
-            label12.Location = new Point(28, 366);
-            label12.Name = "label12";
-            label12.Size = new Size(59, 23);
-            label12.TabIndex = 44;
-            label12.Text = "全 画 幅";
+            label13.Location = new Point(21, 95);
+            label13.Name = "label13";
+            label13.Size = new Size(59, 36);
+            label13.TabIndex = 73;
+            label13.Text = "相机类型";
             // 
             // sltCamType
             // 
             sltCamType.List = true;
-            sltCamType.Location = new Point(93, 97);
+            sltCamType.Location = new Point(86, 93);
             sltCamType.Name = "sltCamType";
-            sltCamType.Size = new Size(94, 36);
-            sltCamType.TabIndex = 47;
+            sltCamType.Size = new Size(111, 36);
+            sltCamType.TabIndex = 74;
             // 
-            // label13
+            // label14
             // 
-            label13.Location = new Point(28, 99);
-            label13.Name = "label13";
-            label13.Size = new Size(59, 36);
-            label13.TabIndex = 46;
-            label13.Text = "相机类型";
+            label14.Location = new Point(21, 441);
+            label14.Name = "label14";
+            label14.Size = new Size(59, 23);
+            label14.TabIndex = 75;
+            label14.Text = "变焦相机";
+            // 
+            // switch1
+            // 
+            switch1.CheckedText = "启用";
+            switch1.Location = new Point(86, 431);
+            switch1.Name = "switch1";
+            switch1.Size = new Size(111, 33);
+            switch1.TabIndex = 76;
+            switch1.UnCheckedText = "关闭";
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(sltPicType);
+            panel1.Controls.Add(label15);
+            panel1.Controls.Add(switch1);
+            panel1.Controls.Add(label14);
+            panel1.Controls.Add(sltCamType);
+            panel1.Controls.Add(label13);
+            panel1.Controls.Add(sthAllPic);
+            panel1.Controls.Add(label12);
+            panel1.Controls.Add(label11);
+            panel1.Controls.Add(label10);
+            panel1.Controls.Add(label9);
+            panel1.Controls.Add(label8);
+            panel1.Controls.Add(sthPic);
+            panel1.Controls.Add(label6);
+            panel1.Controls.Add(iptROIH);
+            panel1.Controls.Add(iptROIW);
+            panel1.Controls.Add(iptROIY);
+            panel1.Controls.Add(iptROIX);
+            panel1.Controls.Add(label7);
+            panel1.Controls.Add(sltTriggerMode);
+            panel1.Controls.Add(label5);
+            panel1.Controls.Add(sltAcquisitionMode);
+            panel1.Controls.Add(label4);
+            panel1.Controls.Add(iptRevolve);
+            panel1.Controls.Add(iptGain);
+            panel1.Controls.Add(iptExposure);
+            panel1.Controls.Add(label3);
+            panel1.Controls.Add(label2);
+            panel1.Controls.Add(label1);
+            panel1.Controls.Add(swhEnable);
+            panel1.Controls.Add(label18);
+            panel1.Dock = DockStyle.Left;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(218, 644);
+            panel1.TabIndex = 48;
+            panel1.Text = "panel1";
+            // 
+            // sltPicType
+            // 
+            sltPicType.List = true;
+            sltPicType.Location = new Point(86, 352);
+            sltPicType.Name = "sltPicType";
+            sltPicType.Size = new Size(111, 36);
+            sltPicType.TabIndex = 78;
+            // 
+            // label15
+            // 
+            label15.Location = new Point(21, 352);
+            label15.Name = "label15";
+            label15.Size = new Size(59, 36);
+            label15.TabIndex = 77;
+            label15.Text = "图片格式";
             // 
             // CameraControl
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(sltCamType);
-            Controls.Add(label13);
-            Controls.Add(sthAllPic);
-            Controls.Add(label12);
-            Controls.Add(label11);
-            Controls.Add(label10);
-            Controls.Add(label9);
-            Controls.Add(label8);
-            Controls.Add(sthPic);
-            Controls.Add(label6);
-            Controls.Add(button3);
-            Controls.Add(button2);
-            Controls.Add(button1);
-            Controls.Add(btnSizeAdd);
-            Controls.Add(pictureBox1);
-            Controls.Add(iptROIH);
-            Controls.Add(iptROIW);
-            Controls.Add(iptROIY);
-            Controls.Add(iptROIX);
-            Controls.Add(label7);
-            Controls.Add(sltTriggerMode);
-            Controls.Add(label5);
-            Controls.Add(sltAcquisitionMode);
-            Controls.Add(label4);
-            Controls.Add(iptRevolve);
-            Controls.Add(iptGain);
-            Controls.Add(iptExposure);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(swhEnable);
-            Controls.Add(label18);
+            Controls.Add(panel2);
+            Controls.Add(panel1);
             Name = "CameraControl";
-            Size = new Size(909, 601);
+            Size = new Size(909, 644);
+            panel3.ResumeLayout(false);
+            panel4.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
+            panel2.ResumeLayout(false);
+            panel1.ResumeLayout(false);
             ResumeLayout(false);
         }
 
         #endregion
 
-        private AntdUI.Switch swhEnable;
+        private AntdUI.Panel panel3;
+        private AntdUI.Button button3;
+        private AntdUI.Button button2;
+        private AntdUI.Button button1;
+        private AntdUI.Button btnSizeAdd;
+        private AntdUI.Panel panel4;
+        private PictureBox pictureBox1;
+        private AntdUI.Panel panel2;
         private AntdUI.Label label18;
+        private AntdUI.Switch swhEnable;
         private AntdUI.Label label1;
         private AntdUI.Label label2;
         private AntdUI.Label label3;
-        private AntdUI.InputNumber iptExposure;
-        private AntdUI.InputNumber iptGain;
-        private AntdUI.InputNumber iptRevolve;
+        private AntdUI.Input iptExposure;
+        private AntdUI.Input iptGain;
+        private AntdUI.Select iptRevolve;
         private AntdUI.Label label4;
         private AntdUI.Select sltAcquisitionMode;
         private AntdUI.Label label5;
         private AntdUI.Select sltTriggerMode;
         private AntdUI.Label label7;
-        private AntdUI.InputNumber iptROIW;
-        private AntdUI.InputNumber iptROIY;
-        private AntdUI.InputNumber iptROIX;
-        private AntdUI.InputNumber iptROIH;
-        private PictureBox pictureBox1;
-        private AntdUI.Button btnSizeAdd;
-        private AntdUI.Button button1;
-        private AntdUI.Button button2;
-        private AntdUI.Button button3;
-        private AntdUI.Switch sthPic;
+        private AntdUI.Input iptROIX;
+        private AntdUI.Input iptROIY;
+        private AntdUI.Input iptROIW;
+        private AntdUI.Input iptROIH;
         private AntdUI.Label label6;
+        private AntdUI.Switch sthPic;
         private AntdUI.Label label8;
         private AntdUI.Label label9;
         private AntdUI.Label label10;
         private AntdUI.Label label11;
-        private AntdUI.Switch sthAllPic;
         private AntdUI.Label label12;
-        private AntdUI.Select sltCamType;
+        private AntdUI.Switch sthAllPic;
         private AntdUI.Label label13;
+        private AntdUI.Select sltCamType;
+        private AntdUI.Label label14;
+        private AntdUI.Switch switch1;
+        private AntdUI.Panel panel1;
+        private AntdUI.Select sltPicType;
+        private AntdUI.Label label15;
     }
 }

DHSoftware/Views/CameraControl.cs

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using AntdUI;
 using DH.Commons.Base;
 using DH.Commons.Enums;
+using DVPCameraType;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using Window = AntdUI.Window;
 
@@ -26,9 +27,36 @@ namespace DHSoftware.Views
             InitializeComponent();
 
             sltCamType.TextChanged += SltCamTpye_TextChanged;
+            sltPicType.TextChanged += SltPicTpye_TextChanged;
             InitData();
             BindData();
         }
+        private void SltPicTpye_TextChanged(object? sender, EventArgs e)
+        {
+            if (sender is Select slt && !string.IsNullOrEmpty(slt.Text))
+            {
+                // 将文本转换为枚举值
+                if (Enum.TryParse<dvpStreamFormat>(slt.Text, out var plcType))
+                {
+                    switch (plcType)
+                    {
+                        case dvpStreamFormat.S_RGB24:
+                        case dvpStreamFormat.S_MONO8:
+
+                            break;
+
+
+
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+
+                }
+            }
+        }
         private void SltCamTpye_TextChanged(object? sender, EventArgs e)
         {
             if (sender is Select slt && !string.IsNullOrEmpty(slt.Text))
@@ -77,6 +105,7 @@ namespace DHSoftware.Views
         {
 
             sltCamType.DataBindings.Add("Text", CameraBase, "CamType", true, DataSourceUpdateMode.OnPropertyChanged, "");
+            sltPicType.DataBindings.Add("Text", CameraBase, "DvpImageFormat", true, DataSourceUpdateMode.OnPropertyChanged, "");
             sthPic.DataBindings.Add(nameof(sthPic.Checked), CameraBase, nameof(CameraBase.IsSavePicEnabled),
                 true, DataSourceUpdateMode.OnPropertyChanged);
             sthAllPic.DataBindings.Add(nameof(sthAllPic.Checked), CameraBase, nameof(CameraBase.IsAllPicEnabled),
@@ -84,24 +113,23 @@ namespace DHSoftware.Views
             // 启用状态绑定
             swhEnable.DataBindings.Add(nameof(swhEnable.Checked), CameraBase, nameof(CameraBase.IsEnabled),
                 true, DataSourceUpdateMode.OnPropertyChanged);
-
+            switch1.DataBindings.Add(nameof(switch1.Checked), CameraBase, nameof(CameraBase.IsZoomCamera),
+            true, DataSourceUpdateMode.OnPropertyChanged);
             // 曝光时间绑定（假设iptExposure是NumericUpDown）
-            iptExposure.DataBindings.Add(nameof(iptExposure.Value), CameraBase, nameof(CameraBase.Exposure),
-                true, DataSourceUpdateMode.OnPropertyChanged, 0M, "N2");
         
+            iptExposure.DataBindings.Add(nameof(iptExposure.Text), CameraBase, nameof(CameraBase.Exposure));
             // 增益绑定
-            iptGain.DataBindings.Add(nameof(iptGain.Value), CameraBase, nameof(CameraBase.Gain),
-                true, DataSourceUpdateMode.OnPropertyChanged, 0M, "N2");
 
+            iptGain.DataBindings.Add(nameof(iptGain.Text), CameraBase, nameof(CameraBase.Gain));
             // 旋转角度绑定
-            iptRevolve.DataBindings.Add(nameof(iptRevolve.Value), CameraBase, nameof(CameraBase.RotateImage),
-                true, DataSourceUpdateMode.OnPropertyChanged, 0M, "N2");
+            iptRevolve.DataBindings.Add(nameof(iptRevolve.Text), CameraBase, nameof(CameraBase.RotateImage));
+      
 
             // ROI坐标绑定
-            iptROIX.DataBindings.Add(nameof(iptROIX.Value), CameraBase, nameof(CameraBase.ROIX));
-            iptROIY.DataBindings.Add(nameof(iptROIY.Value), CameraBase, nameof(CameraBase.ROIY));
-            iptROIW.DataBindings.Add(nameof(iptROIW.Value), CameraBase, nameof(CameraBase.ROIW));
-            iptROIH.DataBindings.Add(nameof(iptROIH.Value), CameraBase, nameof(CameraBase.ROIH));
+            iptROIX.DataBindings.Add(nameof(iptROIX.Text), CameraBase, nameof(CameraBase.ROIX));
+            iptROIY.DataBindings.Add(nameof(iptROIY.Text), CameraBase, nameof(CameraBase.ROIY));
+            iptROIW.DataBindings.Add(nameof(iptROIW.Text), CameraBase, nameof(CameraBase.ROIW));
+            iptROIH.DataBindings.Add(nameof(iptROIH.Text), CameraBase, nameof(CameraBase.ROIH));
 
             // 采集模式下拉框处理
             sltAcquisitionMode.SelectedIndexChanged += (s, e) =>
@@ -118,16 +146,23 @@ namespace DHSoftware.Views
 
         private void InitData()
         {
+            iptRevolve.Text = Convert.ToInt32(CameraBase.RotateImage).ToString();
             // 获取枚举字段名列表（原描述改为字段名）
             sltCamType.Items.Clear();
             foreach (EnumCamType value in Enum.GetValues(typeof(EnumCamType)))
             {
                 sltCamType.Items.Add(value.ToString());
             }
+            sltPicType.Items.Clear();
+            foreach (dvpStreamFormat value in Enum.GetValues(typeof(dvpStreamFormat)))
+            {
+                sltPicType.Items.Add(value.ToString());
+            }
             // 初始化下拉框选项
             sltAcquisitionMode.Items.AddRange(new[] { "连续模式", "触发模式" });
             sltTriggerMode.Items.AddRange(new[] { "软触发", "硬触发" });
            
+
             // 设置初始选择
             sltAcquisitionMode.SelectedIndex = CameraBase.IsContinueMode ? 0 : 1;
             sltTriggerMode.SelectedIndex = CameraBase.IsHardwareTrigger ? 1 : 0;

DHSoftware/Views/DefectRowEdit.cs

@@ -8,7 +8,7 @@ namespace AntdUIDemo.Views.Table
 {
     public partial class DefectRowEdit : UserControl
     {
-        DetectConfigControl detectConfigControl;
+        //DetectConfigControl detectConfigControl;
         private AntdUI.Window window;
         private DefectRow user;
         public bool submit;

DHSoftware/Views/DetectConfigControl.Designer.cs

@@ -1,297 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class DetectConfigControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            panel3 = new Panel();
-            label6 = new AntdUI.Label();
-            cbxDetectType = new AntdUI.Select();
-            label1 = new AntdUI.Label();
-            tbDetectName = new AntdUI.Input();
-            btnPreOpen = new AntdUI.Button();
-            tbModelpath = new AntdUI.Input();
-            button3 = new AntdUI.Button();
-            switchEnable = new AntdUI.Switch();
-            label8 = new AntdUI.Label();
-            label10 = new AntdUI.Label();
-            sthPic = new AntdUI.Switch();
-            sthSaveNGPic = new AntdUI.Switch();
-            label7 = new AntdUI.Label();
-            label9 = new AntdUI.Label();
-            swSaveOKPic = new AntdUI.Switch();
-            panel2 = new Panel();
-            label2 = new AntdUI.Label();
-            buttonDEL = new AntdUI.Button();
-            table_base = new AntdUI.Table();
-            buttonADD = new AntdUI.Button();
-            panel1.SuspendLayout();
-            panel3.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.BorderStyle = BorderStyle.FixedSingle;
-            panel1.Controls.Add(panel3);
-            panel1.Controls.Add(panel2);
-            panel1.Dock = DockStyle.Fill;
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(600, 445);
-            panel1.TabIndex = 0;
-            // 
-            // panel3
-            // 
-            panel3.Controls.Add(label6);
-            panel3.Controls.Add(cbxDetectType);
-            panel3.Controls.Add(label1);
-            panel3.Controls.Add(tbDetectName);
-            panel3.Controls.Add(btnPreOpen);
-            panel3.Controls.Add(tbModelpath);
-            panel3.Controls.Add(button3);
-            panel3.Controls.Add(switchEnable);
-            panel3.Controls.Add(label8);
-            panel3.Controls.Add(label10);
-            panel3.Controls.Add(sthPic);
-            panel3.Controls.Add(sthSaveNGPic);
-            panel3.Controls.Add(label7);
-            panel3.Controls.Add(label9);
-            panel3.Controls.Add(swSaveOKPic);
-            panel3.Dock = DockStyle.Fill;
-            panel3.Location = new Point(0, 0);
-            panel3.Name = "panel3";
-            panel3.Size = new Size(598, 206);
-            panel3.TabIndex = 41;
-            // 
-            // label6
-            // 
-            label6.Location = new Point(3, 15);
-            label6.Name = "label6";
-            label6.Size = new Size(58, 23);
-            label6.TabIndex = 25;
-            label6.Text = "检测名称";
-            // 
-            // cbxDetectType
-            // 
-            cbxDetectType.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            cbxDetectType.Location = new Point(341, 7);
-            cbxDetectType.Name = "cbxDetectType";
-            cbxDetectType.Size = new Size(226, 31);
-            cbxDetectType.TabIndex = 40;
-            // 
-            // label1
-            // 
-            label1.Location = new Point(3, 44);
-            label1.Name = "label1";
-            label1.Size = new Size(73, 23);
-            label1.TabIndex = 9;
-            label1.Text = "模型路径";
-            // 
-            // tbDetectName
-            // 
-            tbDetectName.Location = new Point(82, 7);
-            tbDetectName.Name = "tbDetectName";
-            tbDetectName.Size = new Size(249, 31);
-            tbDetectName.TabIndex = 39;
-            // 
-            // btnPreOpen
-            // 
-            btnPreOpen.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            btnPreOpen.Location = new Point(507, 36);
-            btnPreOpen.MinimumSize = new Size(20, 0);
-            btnPreOpen.Name = "btnPreOpen";
-            btnPreOpen.Size = new Size(60, 31);
-            btnPreOpen.TabIndex = 22;
-            btnPreOpen.Text = "...";
-            // 
-            // tbModelpath
-            // 
-            tbModelpath.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbModelpath.Location = new Point(82, 36);
-            tbModelpath.Name = "tbModelpath";
-            tbModelpath.Size = new Size(415, 31);
-            tbModelpath.TabIndex = 38;
-            // 
-            // button3
-            // 
-            button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button3.Location = new Point(385, 73);
-            button3.Name = "button3";
-            button3.Size = new Size(182, 34);
-            button3.TabIndex = 37;
-            button3.Text = "查看文件夹";
-            // 
-            // switchEnable
-            // 
-            switchEnable.Location = new Point(82, 84);
-            switchEnable.Name = "switchEnable";
-            switchEnable.Size = new Size(60, 23);
-            switchEnable.TabIndex = 27;
-            switchEnable.Text = "switch1";
-            // 
-            // label8
-            // 
-            label8.Location = new Point(3, 84);
-            label8.Name = "label8";
-            label8.Size = new Size(58, 23);
-            label8.TabIndex = 28;
-            label8.Text = "模型启用";
-            // 
-            // label10
-            // 
-            label10.Location = new Point(176, 113);
-            label10.Name = "label10";
-            label10.Size = new Size(73, 23);
-            label10.TabIndex = 34;
-            label10.Text = "保存NG原图";
-            // 
-            // sthPic
-            // 
-            sthPic.Location = new Point(263, 84);
-            sthPic.Name = "sthPic";
-            sthPic.Size = new Size(60, 23);
-            sthPic.TabIndex = 29;
-            sthPic.Text = "switch2";
-            // 
-            // sthSaveNGPic
-            // 
-            sthSaveNGPic.Location = new Point(263, 113);
-            sthSaveNGPic.Name = "sthSaveNGPic";
-            sthSaveNGPic.Size = new Size(60, 23);
-            sthSaveNGPic.TabIndex = 33;
-            sthSaveNGPic.Text = "switch4";
-            // 
-            // label7
-            // 
-            label7.Location = new Point(184, 84);
-            label7.Name = "label7";
-            label7.Size = new Size(58, 23);
-            label7.TabIndex = 30;
-            label7.Text = "数据保存";
-            // 
-            // label9
-            // 
-            label9.Location = new Point(3, 113);
-            label9.Name = "label9";
-            label9.Size = new Size(73, 23);
-            label9.TabIndex = 32;
-            label9.Text = "保存OK原图";
-            // 
-            // swSaveOKPic
-            // 
-            swSaveOKPic.Location = new Point(82, 113);
-            swSaveOKPic.Name = "swSaveOKPic";
-            swSaveOKPic.Size = new Size(60, 23);
-            swSaveOKPic.TabIndex = 31;
-            swSaveOKPic.Text = "switch3";
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(buttonDEL);
-            panel2.Controls.Add(table_base);
-            panel2.Controls.Add(buttonADD);
-            panel2.Dock = DockStyle.Bottom;
-            panel2.Location = new Point(0, 206);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(598, 237);
-            panel2.TabIndex = 35;
-            // 
-            // label2
-            // 
-            label2.Location = new Point(3, 3);
-            label2.Name = "label2";
-            label2.Size = new Size(58, 23);
-            label2.TabIndex = 29;
-            label2.Text = "模型参数";
-            // 
-            // buttonDEL
-            // 
-            buttonDEL.Location = new Point(93, 28);
-            buttonDEL.Name = "buttonDEL";
-            buttonDEL.Size = new Size(84, 34);
-            buttonDEL.TabIndex = 24;
-            buttonDEL.Text = "删除";
-            // 
-            // table_base
-            // 
-            table_base.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            table_base.Location = new Point(0, 68);
-            table_base.Name = "table_base";
-            table_base.Size = new Size(598, 169);
-            table_base.TabIndex = 22;
-            table_base.Text = "table1";
-            // 
-            // buttonADD
-            // 
-            buttonADD.Location = new Point(3, 28);
-            buttonADD.Name = "buttonADD";
-            buttonADD.Size = new Size(84, 34);
-            buttonADD.TabIndex = 23;
-            buttonADD.Text = "新增";
-            // 
-            // DetectConfigControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Name = "DetectConfigControl";
-            Size = new Size(600, 445);
-            panel1.ResumeLayout(false);
-            panel3.ResumeLayout(false);
-            panel2.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private AntdUI.Label label1;
-        private AntdUI.Label label6;
-        private AntdUI.Button btnPreOpen;
-        private AntdUI.Label label7;
-        private AntdUI.Switch sthPic;
-        private AntdUI.Label label8;
-        private AntdUI.Switch switchEnable;
-        private AntdUI.Label label10;
-        private AntdUI.Switch sthSaveNGPic;
-        private AntdUI.Label label9;
-        private AntdUI.Switch swSaveOKPic;
-        private Panel panel2;
-        private AntdUI.Button buttonDEL;
-        private AntdUI.Table table_base;
-        private AntdUI.Button buttonADD;
-        private AntdUI.Button button3;
-        private AntdUI.Input tbDetectName;
-        private AntdUI.Input tbModelpath;
-        private AntdUI.Label label2;
-        private AntdUI.Select cbxDetectType;
-        private Panel panel3;
-    }
-}

DHSoftware/Views/DetectConfigControl.cs

@@ -1,403 +0,0 @@
-using AntdUI;
-using AntdUIDemo.Views.Table;
-using DH.Commons.Enums;
-using DH.Devices.Vision;
-using DHSoftware.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Drawing;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DH.Devices.Vision;
-using DH.Commons.Base;
-
-namespace DHSoftware.Views
-{
-    public partial class DetectConfigControl : UserControl
-    {
-
-        private DetectionConfig _currentConfig = new DetectionConfig();
-        private readonly string _configName;
-        List<KeyValuePair<string, int>> MLModelTypes = GetFilteredEnumDescriptionsAndValues<ModelType>();
-
-        public static List<KeyValuePair<string, int>> GetFilteredEnumDescriptionsAndValues<T>() where T : Enum
-        {
-            return Enum.GetValues(typeof(T))
-                .Cast<T>()
-                .Select(e =>
-                {
-                    // 获取枚举的 Description 属性，如果没有，则使用枚举的名称
-                    var description = e.GetType()
-                        .GetField(e.ToString())
-                        ?.GetCustomAttribute<DescriptionAttribute>()
-                        ?.Description ?? e.ToString();
-
-                    // 返回枚举的描述和对应的整数值
-                    return new KeyValuePair<string, int>(description, Convert.ToInt32(e));
-                })
-                .ToList();
-        }
-
-        List<KeyValuePair<string, int>> resultStates = GetFilteredEnumDescriptionsAndValues<ResultState>();
-        // 获取枚举的描述和对应的值，只筛选出 OK 和 NG
-        public static List<KeyValuePair<string, int>> GetFilteredEnumDescriptionsAndValuesres<T>() where T : Enum
-        {
-            return Enum.GetValues(typeof(T))
-                .Cast<T>()
-                .Where(e => e.Equals(ResultState.OK) || e.Equals(ResultState.DetectNG)) // 只保留 OK 和 NG
-                .Select(e =>
-                {
-                    // 通过反射获取 DescriptionAttribute 描述，如果没有描述，则使用枚举项名称
-                    var description = e.GetType()
-                        .GetField(e.ToString())
-                        ?.GetCustomAttribute<DescriptionAttribute>()
-                        ?.Description ?? e.ToString(); // 如果没有 DescriptionAttribute，则使用枚举名称
-
-                    // 返回描述和值的键值对
-                    return new KeyValuePair<string, int>(description, Convert.ToInt32(e));
-                })
-                .ToList();
-        }
-
-
-        DetectionConfig Detection = new DetectionConfig();
-        AntList<DefectRow> antList;
-        public AntdUI.Window _window;
-        DefectRow curUser;
-        public DetectConfigControl()
-        {
-            InitializeComponent();
-            InitTableColumns();
-            //InitData();
-            BindEventHandler();
-            foreach (var item in MLModelTypes)
-            {
-                cbxDetectType.Items.Add(item.Key);
-            }
-            cbxDetectType.SelectedIndex = (int)Detection.ModelType - 1;
-            tbDetectName.Text = Detection.Name;
-          
-        }
-
-        private void InitTableColumns()
-        {
-            table_base.Columns = new ColumnCollection() {
-                new ColumnCheck("Selected"){Fixed = true},
-                new Column("LabelDescription", "标签名", ColumnAlign.Center)
-                {
-                    Width="120",
-                    //设置树节点，名称需和User里的User[]名称保持一致
-                    KeyTree = "Users"
-                },
-                  new ColumnSwitch("IsEnable", "是否启用", ColumnAlign.Center){
-                    //支持点击回调
-                    //Call= (value,record, i_row, i_col) =>{
-                    //    //执行耗时操作
-                    //    Thread.Sleep(10);
-                    //   // AntdUI.Message.info(window, value.ToString(),autoClose:1);
-                    //    return value;
-                    //}
-                },
-                new Column("ScoreMinValue", "最小得分",ColumnAlign.Center),
-                new Column("ScoreMaxValue", "最大得分",ColumnAlign.Center),
-
-                new Column("AreaMinValue", "最小面积",ColumnAlign.Center),
-                new Column("AreaMaxValue", "最大面积",ColumnAlign.Center),
-                //new Column("CellBadge", "徽标",ColumnAlign.Center),
-                //new Column("CellText", "富文本")
-                //{
-                //    ColAlign = ColumnAlign.Center,//支持表头位置单独设置
-                //},
-                //new Column("CellProgress", "进度条",ColumnAlign.Center),
-                //new Column("CellDivider", "分割线",ColumnAlign.Center),
-                //new Column("CellLinks", "链接", ColumnAlign.Center)
-                //{
-                //    Fixed = true,//冻结列
-                //},
-            };
-        }
-
-        private void InitData()
-        {
-            antList = new AntList<DefectRow>();
-
-            for (int i = 0; i < 10; i++)
-            {
-                antList.Add(new DefectRow
-                {
-                    LabelDescription = "张三",
-
-                });
-            }
-
-           
-            table_base.Binding(antList);
-
-            //设置行禁用
-          //  table_base.SetRowEnable(0, false, true);
-        }
-
-
-        private void BindEventHandler()
-        {
-            buttonADD.Click += ButtonADD_Click;
-            buttonDEL.Click += ButtonDEL_Click;
-
-           
-            table_base.CellClick += Table_base_CellClick;
-            table_base.CellButtonClick += Table_base_CellButtonClick;
-        }
-
-      
-        private AntdUI.Table.CellStyleInfo Table_base_SetRowStyle(object sender, TableSetRowStyleEventArgs e)
-        {
-            if (e.RowIndex % 2 == 0)
-            {
-                return new AntdUI.Table.CellStyleInfo
-                {
-                    BackColor = AntdUI.Style.Db.ErrorBg,
-                };
-            }
-            return null;
-        }
-
-        private void ButtonADD_Click(object sender, EventArgs e)
-        {
-            DefectRow useradd = new DefectRow()
-            {
-                LabelDescription="xinquexian",
-                IsEnable=true,
-                ScoreMinValue=0.3,
-                ScoreMaxValue=1,
-                AreaMinValue=1,
-                AreaMaxValue=999999999,
-               
-            };
-            var form = new DefectRowEdit(_window, useradd) { Size = new Size(700, 500) };
-            AntdUI.Modal.open(new AntdUI.Modal.Config(_window, "", form, TType.None)
-            {
-                BtnHeight = 0,
-            });
-            if (form.submit)
-            {
-                antList.Add(useradd);
-            }
-
-        }
-
-        private void Table_base_CellClick(object sender, TableClickEventArgs e)
-        {
-            var record = e.Record;
-            if (record is DefectRow user)
-            {
-                curUser = user;
-                //判断是否右键
-                if (e.Button == MouseButtons.Right)
-                {
-                    if (antList.Count == 0) return;
-                    AntdUI.ContextMenuStrip.open(new AntdUI.ContextMenuStrip.Config(table_base,
-                    (item) =>
-                    {
-                        if (item.Text == "开启")
-                        {
-                            user.IsEnable = true;
-                        }
-                        else if (item.Text == "关闭")
-                        {
-                            user.IsEnable = false;
-                        }
-                        else if (item.Text == "编辑")
-                        {
-                            var form = new DefectRowEdit(_window, user) { Size = new Size(500, 300) };
-                            AntdUI.Drawer.open(new AntdUI.Drawer.Config(_window, form)
-                            {
-                                OnLoad = () =>
-                                {
-                                    AntdUI.Message.info(_window, "进入编辑", autoClose: 1);
-                                },
-                                OnClose = () =>
-                                {
-                                    AntdUI.Message.info(_window, "结束编辑", autoClose: 1);
-                                }
-                            });
-                        }
-                        else if (item.Text == "删除")
-                        {
-                            var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-                            if (result == DialogResult.OK)
-                            {
-                                //父元素没有勾选或者子元素也没有勾选，则删除当前行
-                                bool delCurrent = !antList.Any(x => x.Selected /*|| (x.?.Any(u => u.Selected) ?? false)*/);
-
-                                if (delCurrent)
-                                {
-                                    //删除当前行，先判断是否父元素，再判断是否子元素,只支持一层子元素，需实现嵌套查询
-                                    for (int i = 0; i < antList.Count; i++)
-                                    {
-                                        if (antList[i] == user)
-                                        {
-                                            antList.RemoveAt(i);
-                                        }
-                                        //else
-                                        //{
-                                        //    antList[i].Users = antList[i].Users?.Where(x => x != user).ToArray();
-                                        //}
-                                    }
-                                }
-                                else
-                                {
-                                    // 使用反转for循环删除主列表中选中的项
-                                    for (int i = antList.Count - 1; i >= 0; i--)
-                                    {
-                                        // 1.删除选中的主列表项
-                                        if (antList[i].Selected)
-                                        {
-                                            antList.RemoveAt(i);
-                                        }
-                                        //else
-                                        //{
-                                        //    // 删除子列表中选中的项
-                                        //    antList[i].Users = antList[i].Users?.Where(childUser => !childUser.Selected).ToArray();
-                                        //}
-                                    }
-                                }
-
-                            }
-                        }
-                        else if (item.Text == "查看图片")
-                        {
-                            //查看其他来源的高清图片
-                            Preview.open(new Preview.Config(_window, Properties.Resources.head2));
-                        }
-                        else
-                            AntdUI.Message.info(_window, item.Text, autoClose: 1);
-                    },
-                        new IContextMenuStripItem[] {
-                            //根据行数据动态修改右键菜单
-                            user.IsEnable?  new ContextMenuStripItem("关闭")
-                            {
-                                IconSvg = "CloseOutlined"
-                            }:new ContextMenuStripItem("开启")
-                            {
-                                IconSvg = "CheckOutlined"
-                            },
-                            new AntdUI.ContextMenuStripItem("编辑"){
-                                IconSvg = "EditOutlined",
-                            },
-                            new AntdUI.ContextMenuStripItem("删除"){
-                                IconSvg = "DeleteOutlined"
-                            },
-                            new ContextMenuStripItem("查看图片")
-                            {
-                                IconSvg = "FundViewOutlined"
-                            },
-                            new ContextMenuStripItemDivider(),
-                            new AntdUI.ContextMenuStripItem("详情"){
-                                Sub = new IContextMenuStripItem[]{ new AntdUI.ContextMenuStripItem("打印", "Ctrl + P") { },
-                                        new AntdUI.ContextMenuStripItem("另存为", "Ctrl + S") { } },
-                                IconSvg = "<svg t=\"1725101601993\" class=\"icon\" viewBox=\"0 0 1024 1024\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" p-id=\"1414\" width=\"200\" height=\"200\"><path d=\"M450.23 831.7c-164.87 0-316.85-108.51-366.94-269.68-30.4-97.82-20.9-201.62 26.76-292.29s127.79-157.35 225.6-187.75c97.83-30.42 201.61-20.9 292.29 26.76 90.67 47.67 157.35 127.79 187.75 225.61 35.78 115.12 16.24 237.58-53.6 335.99a383.494 383.494 0 0 1-43 50.66c-15.04 14.89-39.34 14.78-54.23-0.29-14.9-15.05-14.77-39.34 0.29-54.23a307.844 307.844 0 0 0 34.39-40.52c55.9-78.76 71.54-176.75 42.92-268.84-50.21-161.54-222.49-252.1-384.03-201.9-78.26 24.32-142.35 77.67-180.48 150.2-38.14 72.53-45.74 155.57-21.42 233.83 44.58 143.44 190.03 234.7 338.26 212.42 20.98-3.14 40.48 11.26 43.64 32.2 3.16 20.95-11.26 40.48-32.2 43.64a377.753 377.753 0 0 1-56 4.19z\" p-id=\"1415\"></path><path d=\"M919.84 959.5c-9.81 0-19.63-3.74-27.11-11.24L666.75 722.29c-14.98-14.97-14.98-39.25 0-54.23 14.97-14.98 39.26-14.98 54.23 0l225.97 225.97c14.98 14.97 14.98 39.25 0 54.23-7.48 7.5-17.3 11.24-27.11 11.24z\" p-id=\"1416\"></path></svg>",
-                            }
-                        }));
-                }
-                else
-                {
-
-                }
-            }
-        }
-
-        //表格内部按钮事件
-        private void Table_base_CellButtonClick(object sender, TableButtonEventArgs e)
-        {
-            var buttontext = e.Btn.Text;
-
-            if (e.Record is DefectRow user)
-            {
-                curUser = user;
-                switch (buttontext)
-                {
-                    //暂不支持进入整行编辑，只支持指定单元格编辑，推荐使用弹窗或抽屉编辑整行数据
-                    case "编辑":
-                        var form = new DefectRowEdit(_window, user) { Size = new Size(500, 300) };
-                        AntdUI.Drawer.open(new AntdUI.Drawer.Config(_window, form)
-                        {
-                            OnLoad = () =>
-                            {
-                                AntdUI.Message.info(_window, "进入编辑", autoClose: 1);
-                            },
-                            OnClose = () =>
-                            {
-                                AntdUI.Message.info(_window, "结束编辑", autoClose: 1);
-                            }
-                        });
-                        break;
-                    case "删除":
-                        var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-                        if (result == DialogResult.OK)
-                            antList.Remove(user);
-                        break;
-                    case "AntdUI":
-                        //超链接内容
-                       // AntdUI.Message.info(_window, user.CellLinks.FirstOrDefault().Id, autoClose: 1);
-                        break;
-                    case "查看图片":
-                        //使用clone可以防止table中的image被修改
-                       // Preview.open(new Preview.Config(window, (Image)curUser.CellImages[0].Image.Clone()));
-                        break;
-                }
-            }
-        }
-
-        private void ButtonDEL_Click(object sender, EventArgs e)
-        {
-            if (antList.Count == 0 || !antList.Any(x => x.Selected))
-            {
-                bool isSubSelected = false;
-                //// 判断子元素是否勾选
-                //for (int i = 0; i < antList.Count; i++)
-                //{
-                //    if (antList[i].Users != null && antList[i].Users.Any(x => x.Selected))
-                //    {
-                //        isSubSelected = true;
-                //        break;
-                //    }
-                //}
-                if (!isSubSelected)
-                {
-                    AntdUI.Message.warn(_window, "请选择要删除的行！", autoClose: 3);
-                    return;
-                }
-            }
-
-            var result = Modal.open(_window, "删除警告！", "确认要删除选择的数据吗？", TType.Warn);
-            if (result == DialogResult.OK)
-            {
-                // 使用反转for循环删除主列表中选中的项
-                for (int i = antList.Count - 1; i >= 0; i--)
-                {
-                    // 删除选中的主列表项
-                    if (antList[i].Selected)
-                    {
-                        antList.RemoveAt(i);
-                    }
-                    else
-                    {
-                        // 删除子列表中选中的项
-                       // antList[i].Users = antList[i].Users?.Where(user => !user.Selected).ToArray();
-                    }
-                }
-                // 提示删除完成
-                // AntdUI.Message.success(this.w, "删除成功！", autoClose: 3);
-                MessageBox.Show("删除成功！");
-            }
-        }
-
-
-    }
-}

DHSoftware/Views/DetectControl.Designer.cs

@@ -95,6 +95,7 @@
             tabs1.Pages.Add(tabPage1);
             tabs1.Pages.Add(tabPage2);
             tabs1.Pages.Add(tabPage3);
+            tabs1.SelectedIndex = 1;
             tabs1.Size = new Size(915, 609);
             tabs1.Style = styleLine1;
             tabs1.TabIndex = 1;
@@ -115,7 +116,7 @@
             tabPage1.Controls.Add(label2);
             tabPage1.Controls.Add(iptPrePath);
             tabPage1.Controls.Add(label1);
-            tabPage1.Location = new Point(3, 31);
+            tabPage1.Location = new Point(-909, -575);
             tabPage1.Name = "tabPage1";
             tabPage1.Size = new Size(909, 575);
             tabPage1.TabIndex = 0;
@@ -285,7 +286,7 @@
             tabPage2.Controls.Add(label7);
             tabPage2.Controls.Add(iptDetectPath);
             tabPage2.Controls.Add(label8);
-            tabPage2.Location = new Point(-909, -575);
+            tabPage2.Location = new Point(3, 31);
             tabPage2.Name = "tabPage2";
             tabPage2.Size = new Size(909, 575);
             tabPage2.TabIndex = 1;

DHSoftware/Views/DetectControl.cs

@@ -644,16 +644,6 @@ namespace DHSoftware.Views
                 }
             }
         }
-
-
-
-
-
-     
-
-       
-
-    
     }
 
 }

DHSoftware/Views/FrmLog.Designer.cs

@@ -55,7 +55,7 @@
             this.tsmiClearLog.Name = "tsmiClearLog";
             this.tsmiClearLog.Size = new System.Drawing.Size(124, 22);
             this.tsmiClearLog.Text = "清空日志";
-            this.tsmiClearLog.Click += new System.EventHandler(this.tsmiClearLog_Click);
+           // this.tsmiClearLog.Click += new System.EventHandler(this.tsmiClearLog_Click);
             // 
             // menuStrip1
             // 

DHSoftware/Views/FrmLog.cs

@@ -30,8 +30,11 @@ namespace DHSoftware.Views
         #region 常量配置
         private const string SOURCE_PROCESS = "流程";
         private const int LOG_NUM_LIMIT = 2000;
-        private const int BATCH_SIZE = 50;
-        private const int PROCESS_INTERVAL = 100;
+      //  private const int BATCH_SIZE = 50;
+        // 调整常量配置
+        private const int BATCH_SIZE = 100;  // 从50提升到100
+        private const int PROCESS_INTERVAL = 200; // 从100ms调整到200ms
+       // private const int PROCESS_INTERVAL = 100;
         private const int FIRST_COL_WIDTH = 120;
         #endregion
 
@@ -252,12 +255,18 @@ namespace DHSoftware.Views
         }
 
         private void AutoScrollIfNeeded()
+        {
+            try
             {
                 if (lvLog.Items.Count > 0 /*&& chkAutoScroll.Checked*/)
                 {
                     lvLog.EnsureVisible(lvLog.Items.Count - 1);
                 }
             }
+            catch (Exception ex) {
+            }
+            
+        }
 
         private void UpdateLayout()
         {

DHSoftware/Views/GlobalControl.Designer.cs

@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
+            AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine();
             tabs1 = new AntdUI.Tabs();
             tabPage6 = new AntdUI.TabPage();
             tabPage1 = new AntdUI.TabPage();
@@ -56,7 +56,16 @@
             panel5 = new AntdUI.Panel();
             btnStopResetDelete = new AntdUI.Button();
             btnStopResetAdd = new AntdUI.Button();
+            panel6 = new AntdUI.Panel();
+            panel7 = new AntdUI.Panel();
+            uiLabel1 = new Sunny.UI.UILabel();
+            swhEnableVibrator = new AntdUI.Switch();
+            swhEnableBelt = new AntdUI.Switch();
+            uiLabel2 = new Sunny.UI.UILabel();
+            uiLabel3 = new Sunny.UI.UILabel();
+            iptClearTime = new AntdUI.Input();
             tabs1.SuspendLayout();
+            tabPage6.SuspendLayout();
             tabPage1.SuspendLayout();
             panel1.SuspendLayout();
             tabPage2.SuspendLayout();
@@ -67,6 +76,7 @@
             panel4.SuspendLayout();
             tabPage5.SuspendLayout();
             panel5.SuspendLayout();
+            panel6.SuspendLayout();
             SuspendLayout();
             // 
             // tabs1
@@ -81,13 +91,14 @@
             tabs1.Pages.Add(tabPage4);
             tabs1.Pages.Add(tabPage5);
             tabs1.Size = new Size(898, 530);
-            tabs1.Style = styleLine1;
+            tabs1.Style = styleLine2;
             tabs1.TabIndex = 26;
             tabs1.Text = "tabs1";
-            tabs1.SelectedIndex = 1;
             // 
             // tabPage6
             // 
+            tabPage6.Controls.Add(panel7);
+            tabPage6.Controls.Add(panel6);
             tabPage6.Location = new Point(3, 28);
             tabPage6.Name = "tabPage6";
             tabPage6.Size = new Size(892, 499);
@@ -372,6 +383,86 @@
             btnStopResetAdd.Type = AntdUI.TTypeMini.Primary;
             btnStopResetAdd.WaveSize = 0;
             // 
+            // panel6
+            // 
+            panel6.Controls.Add(iptClearTime);
+            panel6.Controls.Add(uiLabel3);
+            panel6.Controls.Add(swhEnableBelt);
+            panel6.Controls.Add(uiLabel2);
+            panel6.Controls.Add(swhEnableVibrator);
+            panel6.Controls.Add(uiLabel1);
+            panel6.Dock = DockStyle.Left;
+            panel6.Location = new Point(0, 0);
+            panel6.Name = "panel6";
+            panel6.Size = new Size(427, 499);
+            panel6.TabIndex = 0;
+            panel6.Text = "panel6";
+            // 
+            // panel7
+            // 
+            panel7.Dock = DockStyle.Fill;
+            panel7.Location = new Point(427, 0);
+            panel7.Name = "panel7";
+            panel7.Size = new Size(465, 499);
+            panel7.TabIndex = 1;
+            panel7.Text = "panel7";
+            // 
+            // uiLabel1
+            // 
+            uiLabel1.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel1.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel1.Location = new Point(28, 36);
+            uiLabel1.Name = "uiLabel1";
+            uiLabel1.Size = new Size(63, 23);
+            uiLabel1.TabIndex = 0;
+            uiLabel1.Text = "振动盘";
+            // 
+            // swhEnableVibrator
+            // 
+            swhEnableVibrator.CheckedText = "启用";
+            swhEnableVibrator.Location = new Point(97, 26);
+            swhEnableVibrator.Name = "swhEnableVibrator";
+            swhEnableVibrator.Size = new Size(94, 33);
+            swhEnableVibrator.TabIndex = 50;
+            swhEnableVibrator.UnCheckedText = "关闭";
+            // 
+            // swhEnableBelt
+            // 
+            swhEnableBelt.CheckedText = "启用";
+            swhEnableBelt.Location = new Point(97, 82);
+            swhEnableBelt.Name = "swhEnableBelt";
+            swhEnableBelt.Size = new Size(94, 33);
+            swhEnableBelt.TabIndex = 52;
+            swhEnableBelt.UnCheckedText = "关闭";
+            // 
+            // uiLabel2
+            // 
+            uiLabel2.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel2.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel2.Location = new Point(28, 92);
+            uiLabel2.Name = "uiLabel2";
+            uiLabel2.Size = new Size(63, 23);
+            uiLabel2.TabIndex = 51;
+            uiLabel2.Text = "皮带";
+            // 
+            // uiLabel3
+            // 
+            uiLabel3.Font = new Font("宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            uiLabel3.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel3.Location = new Point(17, 142);
+            uiLabel3.Name = "uiLabel3";
+            uiLabel3.Size = new Size(74, 23);
+            uiLabel3.TabIndex = 53;
+            uiLabel3.Text = "清料时间";
+            // 
+            // iptClearTime
+            // 
+            iptClearTime.Location = new Point(97, 131);
+            iptClearTime.Name = "iptClearTime";
+            iptClearTime.Size = new Size(94, 43);
+            iptClearTime.TabIndex = 54;
+            iptClearTime.Text = "0";
+            // 
             // GlobalControl
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
@@ -380,6 +471,7 @@
             Name = "GlobalControl";
             Size = new Size(898, 530);
             tabs1.ResumeLayout(false);
+            tabPage6.ResumeLayout(false);
             tabPage1.ResumeLayout(false);
             panel1.ResumeLayout(false);
             tabPage2.ResumeLayout(false);
@@ -390,6 +482,7 @@
             panel4.ResumeLayout(false);
             tabPage5.ResumeLayout(false);
             panel5.ResumeLayout(false);
+            panel6.ResumeLayout(false);
             ResumeLayout(false);
         }
 
@@ -421,5 +514,13 @@
         private AntdUI.Button btnAdd;
         private AntdUI.Button btnDelete;
         private AntdUI.TabPage tabPage6;
+        private AntdUI.Panel panel7;
+        private AntdUI.Panel panel6;
+        private Sunny.UI.UILabel uiLabel1;
+        private AntdUI.Switch swhEnableBelt;
+        private Sunny.UI.UILabel uiLabel2;
+        private AntdUI.Switch swhEnableVibrator;
+        private Sunny.UI.UILabel uiLabel3;
+        private AntdUI.Input iptClearTime;
     }
 }

DHSoftware/Views/GlobalControl.cs

@@ -691,7 +691,10 @@ namespace DHSoftware.Views
         private void InitData()
         {
 
-            
+            // 启用状态绑定
+            swhEnableVibrator.DataBindings.Add("Checked", global, "EnableVibrator", true, DataSourceUpdateMode.OnPropertyChanged);
+            swhEnableBelt.DataBindings.Add("Checked", global, "EnableBelt", true, DataSourceUpdateMode.OnPropertyChanged);
+            iptClearTime.DataBindings.Add("Text", global, "ClearTime", true, DataSourceUpdateMode.OnPropertyChanged);
 
             TableInitProcess.Columns = new ColumnCollection() {
               new ColumnCheck("Selected"){Fixed = true},

DHSoftware/Views/ImageViewerControl.Designer.cs

@@ -11,14 +11,6 @@
         /// 清理所有正在使用的资源。
         /// </summary>
         /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
       
         #region 组件设计器生成的代码
 

DHSoftware/Views/ImageViewerControl.cs

@@ -16,54 +16,61 @@ namespace DHSoftware.Views
         private Bitmap _currentImage;
         private float _scale = 1.0f;
         private PointF _offset = PointF.Empty;
-        private RectangleF _roiRect;
-        private PointF _roiStart;
-        private bool _isDrawing;
         private Point _dragStart;
         private bool _isDragging;
-        private Pen _roiPen = new Pen(Color.Red, 2);
+        private readonly object _imageLock = new object();
         #endregion
 
-        #region 公开属性
         #region 公开属性
         public Bitmap Image
         {
-            get => _currentImage;
+            get
+            {
+                lock (_imageLock)
+                {
+                    return _currentImage?.Clone() as Bitmap;
+                }
+            }
             set
             {
-                // 记录旧状态
-                var oldSize = _currentImage?.Size ?? Size.Empty;
-                var oldScale = _scale;
-                var oldOffset = _offset;
+                Bitmap newImage = value?.Clone() as Bitmap;
+                Bitmap oldImageToDispose = null;
 
-                _currentImage?.Dispose();
-                _currentImage = value;
+                lock (_imageLock)
+                {
+                    // 交换图像引用
+                    oldImageToDispose = _currentImage;
+                    _currentImage = newImage;
 
                     if (_currentImage != null)
                     {
-                    if (_currentImage.Size != oldSize)
+                        if (oldImageToDispose?.Size != _currentImage.Size)
                         {
-                        // 尺寸不同时：重置ROI、自动适配
-                        _roiRect = RectangleF.Empty;
                             AutoFit();
                         }
                         else
                         {
-                        // 尺寸相同时：保留缩放和偏移
-                        _scale = oldScale;
-                        _offset = oldOffset;
                             ClampOffset();
                         }
                     }
+                }
 
-                pictureBox.Invalidate();
+                // 在锁外安全释放旧图像
+                if (oldImageToDispose != null)
+                {
+                    // 使用BeginInvoke确保在UI线程释放资源
+                    BeginInvoke(new Action(() =>
+                    {
+                        oldImageToDispose.Dispose();
+                        oldImageToDispose = null;
+                    }));
+                }
+
+                SafeInvalidate();
             }
         }
         #endregion
 
-        public RectangleF CurrentROI => _roiRect;
-        #endregion
-
         public ImageViewerControl()
         {
             InitializeComponents();
@@ -73,15 +80,13 @@ namespace DHSoftware.Views
         #region 初始化
         private void InitializeComponents()
         {
-            // 主显示区域
             pictureBox = new PictureBox
             {
                 Dock = DockStyle.Fill,
                 BackColor = Color.DarkGray,
-                Cursor = Cursors.Cross
+                Cursor = Cursors.Hand
             };
 
-            // 状态栏
             statusLabel = new Label
             {
                 Dock = DockStyle.Bottom,
@@ -91,7 +96,6 @@ namespace DHSoftware.Views
                 Font = new Font("Consolas", 10)
             };
 
-            // 事件绑定
             pictureBox.MouseDown += PictureBox_MouseDown;
             pictureBox.MouseMove += PictureBox_MouseMove;
             pictureBox.MouseUp += PictureBox_MouseUp;
@@ -106,8 +110,8 @@ namespace DHSoftware.Views
         {
             typeof(PictureBox).GetMethod("SetStyle",
                 System.Reflection.BindingFlags.NonPublic |
-                System.Reflection.BindingFlags.Instance)
-                ?.Invoke(pictureBox, new object[] {
+                System.Reflection.BindingFlags.Instance)?
+                .Invoke(pictureBox, new object[] {
                     ControlStyles.OptimizedDoubleBuffer |
                     ControlStyles.AllPaintingInWmPaint,
                     true
@@ -117,6 +121,8 @@ namespace DHSoftware.Views
 
         #region 核心功能
         private void AutoFit()
+        {
+            lock (_imageLock)
             {
                 if (_currentImage == null) return;
 
@@ -131,176 +137,210 @@ namespace DHSoftware.Views
 
                 _offset.X = marginWidth + (Width - marginWidth * 2 - _currentImage.Width * _scale) / 2;
                 _offset.Y = marginHeight + (Height - marginHeight * 2 - _currentImage.Height * _scale) / 2;
+
+                ClampOffset();
+            }
         }
 
         private void PictureBox_Paint(object sender, PaintEventArgs e)
+        {
+            Bitmap drawImage = null;
+            RectangleF destRect;
+            float scale;
+            PointF offset;
+
+            // 创建临时绘图参数
+            lock (_imageLock)
             {
                 if (_currentImage == null) return;
 
-            // 绘制图像
-            var destRect = new RectangleF(
-                _offset.X,
-                _offset.Y,
-                _currentImage.Width * _scale,
-                _currentImage.Height * _scale);
+                // 创建绘图副本
+                drawImage = _currentImage.Clone() as Bitmap;
+                scale = _scale;
+                offset = _offset;
 
-            e.Graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
-            e.Graphics.DrawImage(_currentImage, destRect);
-
-            // 绘制ROI
-            if (!_roiRect.IsEmpty)
-            {
-                var displayRect = new RectangleF(
-                    _roiRect.X * _scale + _offset.X,
-                    _roiRect.Y * _scale + _offset.Y,
-                    _roiRect.Width * _scale,
-                    _roiRect.Height * _scale);
-
-                using (var pen = new Pen(_roiPen.Color, _roiPen.Width / _scale))
-                {
-                    e.Graphics.DrawRectangle(pen,
-                        displayRect.X,
-                        displayRect.Y,
-                        displayRect.Width,
-                        displayRect.Height);
+                destRect = new RectangleF(
+                    offset.X,
+                    offset.Y,
+                    drawImage.Width * scale,
+                    drawImage.Height * scale);
             }
+
+            try
+            {
+                e.Graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                e.Graphics.DrawImage(drawImage, destRect);
+            }
+            finally
+            {
+                drawImage?.Dispose();
             }
         }
         #endregion
 
-        #region 鼠标事件
+        #region 鼠标交互（左键拖动）
         private void PictureBox_MouseDown(object sender, MouseEventArgs e)
         {
-            if (e.Button == MouseButtons.Left && _currentImage != null)
+            if (InvokeRequired) return;
+
+            lock (_imageLock)
             {
-                _roiStart = ClampCoordinates(ConvertToImageCoords(e.Location));
-                _isDrawing = true;
-            }
-            else if (e.Button == MouseButtons.Right)
+                if (_currentImage == null) return;
+
+                if (e.Button == MouseButtons.Left)
                 {
                     _dragStart = e.Location;
                     _isDragging = true;
                 }
             }
+        }
 
         private void PictureBox_MouseMove(object sender, MouseEventArgs e)
         {
+            if (InvokeRequired) return;
+
+            lock (_imageLock)
+            {
+                if (_currentImage == null) return;
+
                 if (_isDragging)
                 {
                     _offset.X += e.X - _dragStart.X;
                     _offset.Y += e.Y - _dragStart.Y;
                     _dragStart = e.Location;
                     ClampOffset();
-                pictureBox.Invalidate();
-            }
-            else if (_isDrawing && _currentImage != null)
-            {
-                PointF current = ClampCoordinates(ConvertToImageCoords(e.Location));
-                _roiRect = new RectangleF(
-                    Math.Min(_roiStart.X, current.X),
-                    Math.Min(_roiStart.Y, current.Y),
-                    Math.Abs(_roiStart.X - current.X),
-                    Math.Abs(_roiStart.Y - current.Y)
-                );
-                pictureBox.Invalidate();
+                    SafeInvalidate();
                 }
 
                 UpdateStatus(e.Location);
             }
+        }
 
         private void PictureBox_MouseUp(object sender, MouseEventArgs e)
+        {
+            lock (_imageLock)
             {
                 _isDragging = false;
-            _isDrawing = false;
+            }
         }
 
         private void PictureBox_MouseWheel(object sender, MouseEventArgs e)
+        {
+            if (InvokeRequired) return;
+
+            lock (_imageLock)
             {
                 if (_currentImage == null) return;
 
-            PointF mousePos = e.Location;
-            PointF imgPosBefore = ConvertToImageCoords(mousePos);
-
-            if (imgPosBefore.X < 0 || imgPosBefore.X > _currentImage.Width ||
-                imgPosBefore.Y < 0 || imgPosBefore.Y > _currentImage.Height) return;
+                PointF imgPos = ConvertToImageCoords(e.Location);
+                if (imgPos.X < 0 || imgPos.X > _currentImage.Width ||
+                    imgPos.Y < 0 || imgPos.Y > _currentImage.Height)
+                    return;
 
                 float zoom = e.Delta > 0 ? 1.1f : 0.9f;
                 float newScale = Math.Clamp(_scale * zoom, 0.1f, 10f);
 
-            _offset.X = mousePos.X - imgPosBefore.X * newScale;
-            _offset.Y = mousePos.Y - imgPosBefore.Y * newScale;
+                _offset.X = e.Location.X - imgPos.X * newScale;
+                _offset.Y = e.Location.Y - imgPos.Y * newScale;
 
                 _scale = newScale;
                 ClampOffset();
-            pictureBox.Invalidate();
+                SafeInvalidate();
+            }
         }
         #endregion
 
         #region 辅助方法
-        private PointF ConvertToImageCoords(PointF mousePos)
+        private PointF ConvertToImageCoords(Point mousePos)
         {
+            lock (_imageLock)
+            {
+                if (_currentImage == null) return PointF.Empty;
                 return new PointF(
                     (mousePos.X - _offset.X) / _scale,
                     (mousePos.Y - _offset.Y) / _scale);
             }
-
-        private PointF ClampCoordinates(PointF point)
-        {
-            return new PointF(
-                Math.Max(0, Math.Min(_currentImage.Width, point.X)),
-                Math.Max(0, Math.Min(_currentImage.Height, point.Y)));
         }
 
         private void ClampOffset()
+        {
+            lock (_imageLock)
             {
                 if (_currentImage == null) return;
 
                 float imgWidth = _currentImage.Width * _scale;
                 float imgHeight = _currentImage.Height * _scale;
 
-            if (imgWidth <= Width)
-            {
-                _offset.X = Math.Clamp(_offset.X, 0, Width - imgWidth);
-            }
-            else
-            {
-                _offset.X = Math.Clamp(_offset.X, Width - imgWidth, 0);
-            }
+                _offset.X = Math.Clamp(_offset.X,
+                    imgWidth > Width ? Width - imgWidth : 0,
+                    imgWidth > Width ? 0 : Width - imgWidth);
 
-            if (imgHeight <= Height)
-            {
-                _offset.Y = Math.Clamp(_offset.Y, 0, Height - imgHeight);
-            }
-            else
-            {
-                _offset.Y = Math.Clamp(_offset.Y, Height - imgHeight, 0);
+                _offset.Y = Math.Clamp(_offset.Y,
+                    imgHeight > Height ? Height - imgHeight : 0,
+                    imgHeight > Height ? 0 : Height - imgHeight);
             }
         }
 
         private void UpdateStatus(Point mousePos)
         {
-            if (_currentImage == null) return;
+            if (InvokeRequired)
+            {
+                BeginInvoke(new Action<Point>(UpdateStatus), mousePos);
+                return;
+            }
+
+            lock (_imageLock)
+            {
+                if (_currentImage == null)
+                {
+                    statusLabel.Text = "无有效图像";
+                    return;
+                }
 
                 PointF imgPos = ConvertToImageCoords(mousePos);
                 bool inImage = imgPos.X >= 0 && imgPos.X <= _currentImage.Width &&
                               imgPos.Y >= 0 && imgPos.Y <= _currentImage.Height;
 
-            string roiInfo = _roiRect.IsEmpty ?
-                "未选择区域" :
-                $"选区: X={_roiRect.X:0} Y={_roiRect.Y:0} {_roiRect.Width:0}x{_roiRect.Height:0}";
-
                 statusLabel.Text = inImage ?
-                $"坐标: ({imgPos.X:0}, {imgPos.Y:0}) | 缩放: {_scale * 100:0}% | {roiInfo}" :
-                $"图像尺寸: {_currentImage.Width}x{_currentImage.Height} | 缩放: {_scale * 100:0}% | {roiInfo}";
+                    $"坐标: ({imgPos.X:F1}, {imgPos.Y:F1}) | 缩放: {_scale * 100:0}%" :
+                    $"图像尺寸: {_currentImage.Width}x{_currentImage.Height} | 缩放: {_scale * 100:0}%";
+            }
         }
 
-        public void ClearROI()
+        private void SafeInvalidate()
         {
-            _roiRect = RectangleF.Empty;
-            pictureBox.Invalidate(); // 触发重绘
-            UpdateStatus(Point.Empty); // 更新状态栏
+            if (InvokeRequired)
+            {
+                BeginInvoke(new Action(pictureBox.Invalidate));
+            }
+            else
+            {
+                pictureBox.Invalidate();
+            }
+        }
+        #endregion
+
+        public Bitmap GetCurrentSnapshot()
+        {
+            lock (_imageLock)
+            {
+                // 返回深拷贝防止原始图像被修改
+                return _currentImage?.Clone() as Bitmap;
+            }
         }
 
-        #endregion
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            lock (_imageLock)
+            {
+                _currentImage?.Dispose();
+                _currentImage = null;
+            }
+            base.Dispose(disposing);
+        }
     }
 }

DHSoftware/Views/PreTreatUserControl.Designer.cs

@@ -1,213 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class PreTreatUserControl
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            btnPreOpen = new AntdUI.Button();
-            tbxPrePath = new TextBox();
-            label1 = new AntdUI.Label();
-            panel1 = new Panel();
-            btnOParmDel = new Panel();
-            label3 = new Label();
-            btnDelOParm = new AntdUI.Button();
-            tbOutputParm = new AntdUI.Table();
-            btnAddOParm = new AntdUI.Button();
-            panel2 = new Panel();
-            label2 = new Label();
-            btnDelIParm = new AntdUI.Button();
-            tbInputParm = new AntdUI.Table();
-            btnAddIParm = new AntdUI.Button();
-            panel1.SuspendLayout();
-            btnOParmDel.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // btnPreOpen
-            // 
-            btnPreOpen.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            btnPreOpen.Location = new Point(570, 17);
-            btnPreOpen.Name = "btnPreOpen";
-            btnPreOpen.Size = new Size(28, 23);
-            btnPreOpen.TabIndex = 21;
-            btnPreOpen.Text = "...";
-            btnPreOpen.Click += btnPreOpen_Click;
-            // 
-            // tbxPrePath
-            // 
-            tbxPrePath.Location = new Point(91, 17);
-            tbxPrePath.Name = "tbxPrePath";
-            tbxPrePath.Size = new Size(473, 23);
-            tbxPrePath.TabIndex = 20;
-            // 
-            // label1
-            // 
-            label1.Location = new Point(12, 17);
-            label1.Name = "label1";
-            label1.Size = new Size(73, 23);
-            label1.TabIndex = 19;
-            label1.Text = "预处理路径";
-            // 
-            // panel1
-            // 
-            panel1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            panel1.BorderStyle = BorderStyle.FixedSingle;
-            panel1.Controls.Add(btnOParmDel);
-            panel1.Controls.Add(panel2);
-            panel1.Controls.Add(label1);
-            panel1.Controls.Add(btnPreOpen);
-            panel1.Controls.Add(tbxPrePath);
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(633, 243);
-            panel1.TabIndex = 22;
-            // 
-            // btnOParmDel
-            // 
-            btnOParmDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            btnOParmDel.Controls.Add(label3);
-            btnOParmDel.Controls.Add(btnDelOParm);
-            btnOParmDel.Controls.Add(tbOutputParm);
-            btnOParmDel.Controls.Add(btnAddOParm);
-            btnOParmDel.Location = new Point(352, 44);
-            btnOParmDel.Name = "btnOParmDel";
-            btnOParmDel.Size = new Size(246, 194);
-            btnOParmDel.TabIndex = 26;
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(3, 2);
-            label3.Name = "label3";
-            label3.Size = new Size(56, 17);
-            label3.TabIndex = 25;
-            label3.Text = "输出参数";
-            // 
-            // btnDelOParm
-            // 
-            btnDelOParm.Location = new Point(93, 25);
-            btnDelOParm.Name = "btnDelOParm";
-            btnDelOParm.Size = new Size(84, 34);
-            btnDelOParm.TabIndex = 24;
-            btnDelOParm.Text = "删除";
-            // 
-            // tbOutputParm
-            // 
-            tbOutputParm.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbOutputParm.Location = new Point(3, 65);
-            tbOutputParm.Name = "tbOutputParm";
-            tbOutputParm.Size = new Size(240, 126);
-            tbOutputParm.TabIndex = 22;
-            tbOutputParm.Text = "table2";
-            // 
-            // btnAddOParm
-            // 
-            btnAddOParm.Location = new Point(3, 25);
-            btnAddOParm.Name = "btnAddOParm";
-            btnAddOParm.Size = new Size(84, 34);
-            btnAddOParm.TabIndex = 23;
-            btnAddOParm.Text = "新增";
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(btnDelIParm);
-            panel2.Controls.Add(tbInputParm);
-            panel2.Controls.Add(btnAddIParm);
-            panel2.Location = new Point(12, 45);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(264, 194);
-            panel2.TabIndex = 25;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(3, 5);
-            label2.Name = "label2";
-            label2.Size = new Size(56, 17);
-            label2.TabIndex = 25;
-            label2.Text = "输入参数";
-            // 
-            // btnDelIParm
-            // 
-            btnDelIParm.Location = new Point(93, 25);
-            btnDelIParm.Name = "btnDelIParm";
-            btnDelIParm.Size = new Size(84, 34);
-            btnDelIParm.TabIndex = 24;
-            btnDelIParm.Text = "删除";
-            // 
-            // tbInputParm
-            // 
-            tbInputParm.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            tbInputParm.Location = new Point(3, 65);
-            tbInputParm.Name = "tbInputParm";
-            tbInputParm.Size = new Size(258, 126);
-            tbInputParm.TabIndex = 22;
-            tbInputParm.Text = "table1";
-            // 
-            // btnAddIParm
-            // 
-            btnAddIParm.Location = new Point(3, 25);
-            btnAddIParm.Name = "btnAddIParm";
-            btnAddIParm.Size = new Size(84, 34);
-            btnAddIParm.TabIndex = 23;
-            btnAddIParm.Text = "新增";
-            // 
-            // PreTreatUserControl
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Name = "PreTreatUserControl";
-            Size = new Size(635, 243);
-            panel1.ResumeLayout(false);
-            panel1.PerformLayout();
-            btnOParmDel.ResumeLayout(false);
-            btnOParmDel.PerformLayout();
-            panel2.ResumeLayout(false);
-            panel2.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Button btnPreOpen;
-        private TextBox tbxPrePath;
-        private AntdUI.Label label1;
-        private Panel panel1;
-        private AntdUI.Button btnDelIParm;
-        private AntdUI.Button btnAddIParm;
-        private AntdUI.Table tbInputParm;
-        private Panel panel2;
-        private Panel btnOParmDel;
-        private Label label3;
-        private AntdUI.Button btnDelOParm;
-        private AntdUI.Table tbOutputParm;
-        private AntdUI.Button btnAddOParm;
-        private Label label2;
-    }
-}

DHSoftware/Views/PreTreatUserControl.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DHSoftware.Views
-{
-    public partial class PreTreatUserControl : UserControl
-    {
-        public PreTreatUserControl()
-        {
-            InitializeComponent();
-        }
-
-        private void btnPreOpen_Click(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

DHSoftware/Views/SavePositionControl.Designer.cs

@@ -0,0 +1,189 @@
+namespace DHSoftware.Views
+{
+    partial class SavePositionControl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            panel1 = new AntdUI.Panel();
+            sltName = new AntdUI.Select();
+            label1 = new AntdUI.Label();
+            iptPosition = new AntdUI.Input();
+            label3 = new AntdUI.Label();
+            divider1 = new AntdUI.Divider();
+            stackPanel1 = new AntdUI.StackPanel();
+            button_cancel = new AntdUI.Button();
+            button_ok = new AntdUI.Button();
+            divider2 = new AntdUI.Divider();
+            lbTitleName = new AntdUI.Label();
+            panel1.SuspendLayout();
+            stackPanel1.SuspendLayout();
+            SuspendLayout();
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(sltName);
+            panel1.Controls.Add(label1);
+            panel1.Controls.Add(iptPosition);
+            panel1.Controls.Add(label3);
+            panel1.Controls.Add(divider1);
+            panel1.Controls.Add(stackPanel1);
+            panel1.Controls.Add(divider2);
+            panel1.Controls.Add(lbTitleName);
+            panel1.Dock = DockStyle.Fill;
+            panel1.Location = new Point(0, 0);
+            panel1.Name = "panel1";
+            panel1.Padding = new Padding(12);
+            panel1.Shadow = 6;
+            panel1.Size = new Size(500, 243);
+            panel1.TabIndex = 0;
+            panel1.Text = "panel1";
+            // 
+            // sltName
+            // 
+            sltName.Dock = DockStyle.Top;
+            sltName.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            sltName.Location = new Point(18, 196);
+            sltName.MaxCount = 20;
+            sltName.Name = "sltName";
+            sltName.Radius = 3;
+            sltName.Size = new Size(464, 38);
+            sltName.TabIndex = 24;
+            // 
+            // label1
+            // 
+            label1.Dock = DockStyle.Top;
+            label1.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label1.Location = new Point(18, 172);
+            label1.Name = "label1";
+            label1.Size = new Size(464, 24);
+            label1.TabIndex = 23;
+            label1.Text = "工位名称";
+            // 
+            // iptPosition
+            // 
+            iptPosition.Dock = DockStyle.Top;
+            iptPosition.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            iptPosition.Location = new Point(18, 134);
+            iptPosition.Name = "iptPosition";
+            iptPosition.Radius = 3;
+            iptPosition.Size = new Size(464, 38);
+            iptPosition.TabIndex = 22;
+            // 
+            // label3
+            // 
+            label3.Dock = DockStyle.Top;
+            label3.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            label3.Location = new Point(18, 110);
+            label3.Name = "label3";
+            label3.Size = new Size(464, 24);
+            label3.TabIndex = 21;
+            label3.Text = "当前位置";
+            // 
+            // divider1
+            // 
+            divider1.Dock = DockStyle.Top;
+            divider1.Location = new Point(18, 98);
+            divider1.Name = "divider1";
+            divider1.Size = new Size(464, 12);
+            divider1.TabIndex = 20;
+            // 
+            // stackPanel1
+            // 
+            stackPanel1.Controls.Add(button_cancel);
+            stackPanel1.Controls.Add(button_ok);
+            stackPanel1.Dock = DockStyle.Top;
+            stackPanel1.Location = new Point(18, 54);
+            stackPanel1.Name = "stackPanel1";
+            stackPanel1.RightToLeft = RightToLeft.No;
+            stackPanel1.Size = new Size(464, 44);
+            stackPanel1.TabIndex = 19;
+            stackPanel1.Text = "stackPanel1";
+            // 
+            // button_cancel
+            // 
+            button_cancel.BorderWidth = 1F;
+            button_cancel.Font = new Font("Microsoft YaHei UI", 9F);
+            button_cancel.Ghost = true;
+            button_cancel.Location = new Point(84, 3);
+            button_cancel.Name = "button_cancel";
+            button_cancel.Size = new Size(75, 38);
+            button_cancel.TabIndex = 1;
+            button_cancel.Text = "取消";
+            // 
+            // button_ok
+            // 
+            button_ok.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            button_ok.Location = new Point(3, 3);
+            button_ok.Name = "button_ok";
+            button_ok.Size = new Size(75, 38);
+            button_ok.TabIndex = 0;
+            button_ok.Text = "确定";
+            button_ok.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // divider2
+            // 
+            divider2.Dock = DockStyle.Top;
+            divider2.Location = new Point(18, 42);
+            divider2.Name = "divider2";
+            divider2.Size = new Size(464, 12);
+            divider2.TabIndex = 18;
+            // 
+            // lbTitleName
+            // 
+            lbTitleName.Dock = DockStyle.Top;
+            lbTitleName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            lbTitleName.Location = new Point(18, 18);
+            lbTitleName.Name = "lbTitleName";
+            lbTitleName.Size = new Size(464, 24);
+            lbTitleName.TabIndex = 17;
+            lbTitleName.Text = "保存当前位置操作";
+            // 
+            // SavePositionControl
+            // 
+            Controls.Add(panel1);
+            Name = "SavePositionControl";
+            Size = new Size(500, 243);
+            panel1.ResumeLayout(false);
+            stackPanel1.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private AntdUI.Panel panel1;
+        private AntdUI.Label lbTitleName;
+        private AntdUI.Input iptPosition;
+        private AntdUI.Label label3;
+        private AntdUI.Divider divider1;
+        private AntdUI.StackPanel stackPanel1;
+        private AntdUI.Button button_cancel;
+        private AntdUI.Button button_ok;
+        private AntdUI.Divider divider2;
+        private AntdUI.Select sltName;
+        private AntdUI.Label label1;
+    }
+}

DHSoftware/Views/SavePositionControl.cs

@@ -0,0 +1,116 @@
+
+
+using System.Text.RegularExpressions;
+using DH.Commons.Base;
+using DH.Commons.Enums;
+using DH.Commons.Helper;
+using DH.Commons.Models;
+
+namespace DHSoftware.Views
+{
+    public partial class SavePositionControl : UserControl
+    {
+        private AntdUI.Window window;
+        public bool submit;
+        public int Position;
+
+
+        public SavePositionControl(AntdUI.Window _window,int _position)
+        {
+            this.window = _window;
+            InitializeComponent();
+            Position=_position;
+            sltName.Items.Clear();
+            var targetFields = GetSpecificIOFields();
+            foreach(var item in targetFields)
+              {
+                    sltName.Items.Add(item);
+              }
+            iptPosition.Text= Position.ToString();
+            // 绑定事件
+            BindEventHandler();
+        }
+
+        private void BindEventHandler()
+        {
+            button_ok.Click += Button_ok_Click;
+            button_cancel.Click += Button_cancel_Click;
+        }
+
+        private void Button_cancel_Click(object sender, EventArgs e)
+        {
+            submit = false;
+            this.Dispose();
+        }
+
+        private void Button_ok_Click(object sender, EventArgs e)
+        {
+            iptPosition.Status = AntdUI.TType.None;
+           
+            if (String.IsNullOrEmpty(sltName.Text))
+            {
+                sltName.Status = AntdUI.TType.Error;
+                AntdUI.Message.warn(window, "请选择工位！", autoClose: 3);
+                return;
+            }
+
+            //根据工位查找点位
+            PLCItem? pLCItem = ConfigModel.PLCBaseList?
+           .FirstOrDefault()?
+           .PLCItemList?
+           .Where(it=>it.Name==sltName.Text).FirstOrDefault();
+            if (pLCItem == null) 
+            {
+                AntdUI.Message.warn(window, $"未找到{sltName.Text}地址，请检查该地址是否存在于点位表！", autoClose: 3);
+                return;
+            }
+
+            PLCItem? pLCItem1 = ConfigModel.GlobalList?
+            .FirstOrDefault()?
+            .StartProcessList?
+            .Where(it=>it.Name ==sltName.Text).FirstOrDefault();
+
+            if (pLCItem1 == null)
+            {
+                pLCItem1=new PLCItem();
+                pLCItem1.Name = pLCItem.Name;
+                pLCItem1.Address = pLCItem.Address;
+                pLCItem1.Value = iptPosition.Text;
+                pLCItem1.Type = pLCItem.Type;
+                pLCItem1.StartExecute = true;
+                ConfigModel.GlobalList?
+               .FirstOrDefault()?
+               .StartProcessList?.Add(pLCItem1);
+            }
+            else
+            {
+                pLCItem1.Value = iptPosition.Text;
+            }
+
+            ConfigHelper.SaveConfig();
+            AntdUI.Message.success(window, "保存成功！", autoClose: 3);
+            submit = true;
+            this.Dispose();
+        }
+
+        public static List<string> GetSpecificIOFields()
+        {
+            return Enum.GetNames(typeof(EnumPLCOutputIO))
+                .Where(name =>
+                    Regex.IsMatch(name, @"^工位[1-9]|10$") ||  // 匹配工位1-10
+                    name == "OK脉冲" ||
+                    name == "NG脉冲")
+                .OrderBy(name =>
+                {
+                    // 对工位进行数字排序
+                    if (name.StartsWith("工位"))
+                    {
+                        return int.Parse(name.Substring(2));
+                    }
+                    return 99; // OK/NG放在最后
+                })
+                .ToList();
+        }
+    }
+}
+

DHSoftware/Views/SettingWindow.cs

@@ -7,6 +7,7 @@ using DH.Commons.Base;
 using DH.RBAC.Model.Sys;
 using System.Reflection;
 using ScrollBar = AntdUI.ScrollBar;
+using DH.Commons.Enums;
 
 namespace DHSoftware.Views
 {
@@ -59,6 +60,19 @@ namespace DHSoftware.Views
                 switch (clickedItem.PARENTITEM.Text)
                 {
                     case "相机设置":
+                        bool b = false;
+                        if (ButtonPermissionList.Count > 0)
+                        {
+                            foreach (var item in ButtonPermissionList)
+                            {
+                                if (item.EnCode == "sys-cameraset")
+                                {
+                                    b = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!b) { AntdUI.Message.warn(this, $"对不起，无权限访问相机设置！", autoClose: 3); return; }
                         foreach (var tab in tabs1.Pages)
                         {
                             if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -99,6 +113,19 @@ namespace DHSoftware.Views
                         break;
 
                     case "工位设置":
+                        bool b1 = false;
+                        if (ButtonPermissionList.Count > 0)
+                        {
+                            foreach (var item in ButtonPermissionList)
+                            {
+                                if (item.EnCode == "sys-stationset")
+                                {
+                                    b1 = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!b1) { AntdUI.Message.warn(this, $"对不起，无权限访问工位设置！", autoClose: 3); return; }
                         // 检查是否已存在同名 TabPage
                         foreach (var tab in tabs1.Pages)
                         {
@@ -146,6 +173,19 @@ namespace DHSoftware.Views
                         break;
 
                     case "运控设置":
+                        bool b2 = false;
+                        if (ButtonPermissionList.Count > 0)
+                        {
+                            foreach (var item in ButtonPermissionList)
+                            {
+                                if (item.EnCode == "sys-motionset")
+                                {
+                                    b2 = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!b2) { AntdUI.Message.warn(this, $"对不起，无权限访问运控设置！", autoClose: 3); return; }
                         foreach (var tab in tabs1.Pages)
                         {
                             if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -185,6 +225,19 @@ namespace DHSoftware.Views
                         }
                         break;
                     case "其他设置":
+                        bool b3 = false;
+                        if (ButtonPermissionList.Count > 0)
+                        {
+                            foreach (var item in ButtonPermissionList)
+                            {
+                                if (item.EnCode == "sys-globalset")
+                                {
+                                    b3 = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!b3) { AntdUI.Message.warn(this, $"对不起，无权限访问其他设置！", autoClose: 3); return; }
                         foreach (var tab in tabs1.Pages)
                         {
                             if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -329,15 +382,30 @@ namespace DHSoftware.Views
             }
             return null;
         }
+        private List<SysPermission> _buttonPermissionList = new List<SysPermission>();
+        private readonly object _permissionLock = new object();
+
+        /// <summary>
+        /// 按钮权限列表（线程安全）
+        /// </summary>
         public List<SysPermission> ButtonPermissionList
         {
+            get
+            {
+                lock (_permissionLock)
+                {
+                    return new List<SysPermission>(_buttonPermissionList); // 返回副本避免外部修改
+                }
+            }
             set
             {
-                List<SysPermission> list = value;
-                SetPermission(list, this.Controls);
+                lock (_permissionLock)
+                {
+                    _buttonPermissionList = value ?? new List<SysPermission>();
+                    SetPermission(_buttonPermissionList, this.Controls); // 应用权限到控件
+                }
             }
         }
-
         private void SetPermission(List<SysPermission> list, Control.ControlCollection controls)
         {
             foreach (Control control in controls)
@@ -453,7 +521,19 @@ namespace DHSoftware.Views
         {
             if (e.Button == MouseButtons.Right)
             {
-
+                bool b = false;
+                if (ButtonPermissionList.Count > 0)
+                {
+                    foreach(var item in ButtonPermissionList)
+                    {
+                        if (item.EnCode == "sys-setright")
+                        {
+                            b= true;
+                            break;
+                        }
+                    }
+                }
+                if (!b) { return; }
                 var menu = sender as Menu;
                 if (menu == null) return;
 
@@ -491,6 +571,7 @@ namespace DHSoftware.Views
                                         if (result == DialogResult.OK)
                                         {
                                             menu1.Remove(clickedItem);
+                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
                                             foreach (var tab in tabs1.Pages)
                                             {
                                                 if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -503,7 +584,7 @@ namespace DHSoftware.Views
                                                     return;
                                                 }
                                             }
-                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
+                                          
                                         }
                                         break;
 
@@ -515,7 +596,8 @@ namespace DHSoftware.Views
                                         {
                                             Size = new Size(300, 200),
                                             // 传递当前名称到表单
-                                            CubicleName = originalName
+                                            CubicleName = originalName,
+
                                         };
 
                                         AntdUI.Modal.open(new AntdUI.Modal.Config(this, "", form, TType.None)
@@ -577,6 +659,7 @@ namespace DHSoftware.Views
                                         if (result == DialogResult.OK)
                                         {
                                             menu1.Remove(clickedItem);
+                                            ConfigModel.CameraBaseList.RemoveAll(c => c.CameraName == clickedItem.Text);
                                             foreach (var tab in tabs1.Pages)
                                             {
                                                 if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{clickedItem.Text}")
@@ -595,12 +678,14 @@ namespace DHSoftware.Views
                                     case "重命名":
                                         // 保存原始名称用于查找
                                         string originalName = clickedItem.Text;
-
+                                        EnumDetectionType enumDetectionType= ConfigModel.DetectionList.FirstOrDefault(c =>
+                                                c.Name.Equals(originalName, StringComparison.OrdinalIgnoreCase)).DetectionType;
                                         var form = new AddCubicleControl(this, "重命名工位操作")
                                         {
-                                            Size = new Size(300, 200),
+                                            Size = new Size(300, 500),
                                             // 传递当前名称到表单
-                                            CubicleName = originalName
+                                            CubicleName = originalName,
+                                            DetectionType = enumDetectionType
                                         };
 
                                         AntdUI.Modal.open(new AntdUI.Modal.Config(this, "", form, TType.None)
@@ -624,6 +709,7 @@ namespace DHSoftware.Views
                                             var detection = ConfigModel.DetectionList.FirstOrDefault(c =>
                                                 c.Name.Equals(originalName, StringComparison.OrdinalIgnoreCase));
                                             detection.Name = newName;
+                                            detection.DetectionType = form.DetectionType;
                                             foreach (var tab in tabs1.Pages)
                                             {
                                                 if (tab is AntdUI.TabPage existingTab && existingTab.Text == $"{clickedItem.PARENTITEM.Text}-{originalName}")

DHSoftware/Views/SizeControl.Designer.cs

@@ -28,24 +28,32 @@
         /// </summary>
         private void InitializeComponent()
         {
-            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SizeControl));
+            AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine();
             tabPage3 = new AntdUI.TabPage();
             tabPage4 = new AntdUI.TabPage();
-            tabs1 = new AntdUI.Tabs();
+            panel3 = new AntdUI.Panel();
+            SizeTable = new AntdUI.Table();
+            panel2 = new AntdUI.Panel();
+            flowCameraPanel = new AntdUI.FlowPanel();
+            btnCorrelatedCamera = new AntdUI.Button();
+            label11 = new AntdUI.Label();
             panel1 = new AntdUI.Panel();
             btnSizeDel = new AntdUI.Button();
             btnSizeAdd = new AntdUI.Button();
-            SizeTable = new AntdUI.Table();
+            tabs1 = new AntdUI.Tabs();
             tabPage3.SuspendLayout();
             tabPage4.SuspendLayout();
-            tabs1.SuspendLayout();
+            panel3.SuspendLayout();
+            panel2.SuspendLayout();
             panel1.SuspendLayout();
+            tabs1.SuspendLayout();
             SuspendLayout();
             // 
             // tabPage3
             // 
             tabPage3.Controls.Add(tabPage4);
+            tabPage3.Dock = DockStyle.None;
             tabPage3.Location = new Point(3, 31);
             tabPage3.Name = "tabPage3";
             tabPage3.Size = new Size(909, 575);
@@ -54,7 +62,8 @@
             // 
             // tabPage4
             // 
-            tabPage4.Controls.Add(SizeTable);
+            tabPage4.Controls.Add(panel3);
+            tabPage4.Controls.Add(panel2);
             tabPage4.Controls.Add(panel1);
             tabPage4.Location = new Point(8, 8);
             tabPage4.Name = "tabPage4";
@@ -62,18 +71,71 @@
             tabPage4.TabIndex = 1;
             tabPage4.Text = "预处理";
             // 
-            // tabs1
+            // panel3
             // 
-            tabs1.Centered = true;
-            tabs1.Dock = DockStyle.Fill;
-            tabs1.Font = new Font("Microsoft YaHei UI", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            tabs1.Location = new Point(0, 0);
-            tabs1.Name = "tabs1";
-            tabs1.Pages.Add(tabPage3);
-            tabs1.Size = new Size(915, 609);
-            tabs1.Style = styleLine1;
-            tabs1.TabIndex = 1;
-            tabs1.Text = "tabs1";
+            panel3.Controls.Add(SizeTable);
+            panel3.Dock = DockStyle.Fill;
+            panel3.Location = new Point(0, 87);
+            panel3.Name = "panel3";
+            panel3.Size = new Size(909, 488);
+            panel3.TabIndex = 11;
+            panel3.Text = "panel3";
+            // 
+            // SizeTable
+            // 
+            SizeTable.Dock = DockStyle.Fill;
+            SizeTable.EmptyHeader = true;
+            SizeTable.Location = new Point(0, 0);
+            SizeTable.Name = "SizeTable";
+            SizeTable.Size = new Size(909, 488);
+            SizeTable.TabIndex = 10;
+            SizeTable.Text = "table1";
+            // 
+            // panel2
+            // 
+            panel2.Controls.Add(flowCameraPanel);
+            panel2.Controls.Add(btnCorrelatedCamera);
+            panel2.Controls.Add(label11);
+            panel2.Dock = DockStyle.Top;
+            panel2.Location = new Point(0, 42);
+            panel2.Margin = new Padding(3, 3, 10, 3);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(909, 45);
+            panel2.TabIndex = 8;
+            panel2.Text = "panel2";
+            // 
+            // flowCameraPanel
+            // 
+            flowCameraPanel.AutoScroll = true;
+            flowCameraPanel.BackColor = SystemColors.Window;
+            flowCameraPanel.Dock = DockStyle.Left;
+            flowCameraPanel.Location = new Point(74, 0);
+            flowCameraPanel.Name = "flowCameraPanel";
+            flowCameraPanel.Size = new Size(645, 45);
+            flowCameraPanel.TabIndex = 36;
+            flowCameraPanel.Text = "flowPanel1";
+            // 
+            // btnCorrelatedCamera
+            // 
+            btnCorrelatedCamera.BorderWidth = 2F;
+            btnCorrelatedCamera.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnCorrelatedCamera.Ghost = true;
+            btnCorrelatedCamera.IconRatio = 0.8F;
+            btnCorrelatedCamera.IconSvg = resources.GetString("btnCorrelatedCamera.IconSvg");
+            btnCorrelatedCamera.Location = new Point(750, 2);
+            btnCorrelatedCamera.Name = "btnCorrelatedCamera";
+            btnCorrelatedCamera.Size = new Size(110, 40);
+            btnCorrelatedCamera.TabIndex = 34;
+            btnCorrelatedCamera.Text = "关联";
+            // 
+            // label11
+            // 
+            label11.Dock = DockStyle.Left;
+            label11.Location = new Point(0, 0);
+            label11.Name = "label11";
+            label11.Size = new Size(74, 45);
+            label11.TabIndex = 35;
+            label11.Text = "关联相机";
             // 
             // panel1
             // 
@@ -114,15 +176,18 @@
             btnSizeAdd.TabIndex = 11;
             btnSizeAdd.Text = "新增";
             // 
-            // SizeTable
+            // tabs1
             // 
-            SizeTable.Dock = DockStyle.Fill;
-            SizeTable.EmptyHeader = true;
-            SizeTable.Location = new Point(0, 42);
-            SizeTable.Name = "SizeTable";
-            SizeTable.Size = new Size(909, 533);
-            SizeTable.TabIndex = 10;
-            SizeTable.Text = "table1";
+            tabs1.Centered = true;
+            tabs1.Dock = DockStyle.Fill;
+            tabs1.Font = new Font("Microsoft YaHei UI", 10.5F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            tabs1.Location = new Point(0, 0);
+            tabs1.Name = "tabs1";
+            tabs1.Pages.Add(tabPage3);
+            tabs1.Size = new Size(915, 609);
+            tabs1.Style = styleLine1;
+            tabs1.TabIndex = 1;
+            tabs1.Text = "tabs1";
             // 
             // SizeControl
             // 
@@ -133,8 +198,10 @@
             Size = new Size(915, 609);
             tabPage3.ResumeLayout(false);
             tabPage4.ResumeLayout(false);
-            tabs1.ResumeLayout(false);
+            panel3.ResumeLayout(false);
+            panel2.ResumeLayout(false);
             panel1.ResumeLayout(false);
+            tabs1.ResumeLayout(false);
             ResumeLayout(false);
         }
 
@@ -147,5 +214,10 @@
         private AntdUI.Panel panel1;
         private AntdUI.Button btnSizeDel;
         private AntdUI.Button btnSizeAdd;
+        private AntdUI.FlowPanel flowCameraPanel;
+        private AntdUI.Label label11;
+        private AntdUI.Button btnCorrelatedCamera;
+        private AntdUI.Panel panel2;
+        private AntdUI.Panel panel3;
     }
 }

DHSoftware/Views/SizeControl.cs

@@ -32,7 +32,51 @@ namespace DHSoftware.Views
             btnSizeAdd.Click += BtnSizeAdd_Click;
             btnSizeDel.Click += BtnSizeDelete_Click;
             SizeTable.CellButtonClick += SizeTable_CellButtonClick;
+            btnCorrelatedCamera.Click += BtnCorrelatedCamera_Click;
+        }
+        private void BtnCorrelatedCamera_Click(object? sender, EventArgs e)
+        {
 
+            var form = new CorrelatedCameraEdit(window, detectionConfig.CameraCollects) { Size = new Size(500, 400) };
+            AntdUI.Modal.open(new AntdUI.Modal.Config(window, "", form, TType.None)
+            {
+                BtnHeight = 0,
+            });
+            if (form.submit)
+            {
+                flowCameraPanel.Controls.Clear();
+                if (detectionConfig.CameraCollects.Count > 0)
+                {
+                    foreach (var item in detectionConfig.CameraCollects)
+                    {
+                        var control = new AntdUI.Tag()
+                        {
+                            Font = new System.Drawing.Font("Microsoft YaHei UI", 9F),
+                            Size = new Size(90, 42),
+                            Text = item.CameraSourceId,
+                            CloseIcon = true
+                        };
+                        control.CloseChanged += (sender, e) =>
+                        {
+                            var tag = sender as Tag;
+                            foreach (var item in detectionConfig.CameraCollects)
+                            {
+                                if (item.CameraSourceId.Equals(tag.Text))
+                                {
+                                    detectionConfig.CameraCollects.Remove(item);
+                                    break;
+                                }
+                            }
+                            return true;
+
+                        };
+                        // 通过主窗口设置DPI控制添加控件保持缩放比例
+                        window.AutoDpi(control);
+                        flowCameraPanel.Controls.Add(control);
+                        control.BringToFront();
+                    }
+                }
+            }
         }
 
 
@@ -75,7 +119,7 @@ namespace DHSoftware.Views
                             case "3":
                             case "4":
                             case "5":
-                                FrmMain3 frmMain3 = new FrmMain3(sizeType);
+                                FrmMainSize frmMain3 = new FrmMainSize(sizeType, detectionConfig);
                                 frmMain3.ShowDialog();
                                 if (!string.IsNullOrEmpty(frmMain3.inputtext))
                                 {

DHSoftware/Views/SizeControl.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="btnCorrelatedCamera.IconSvg" xml:space="preserve">
+    <value>&lt;svg t="1741939836774" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21349" width="200" height="200"&gt;&lt;path d="M1003.153333 404.96a52.933333 52.933333 0 0 0-42.38-20.96H896V266.666667a53.393333 53.393333 0 0 0-53.333333-53.333334H461.253333a10.573333 10.573333 0 0 1-7.54-3.126666L344.46 100.953333A52.986667 52.986667 0 0 0 306.746667 85.333333H53.333333a53.393333 53.393333 0 0 0-53.333333 53.333334v704a53.393333 53.393333 0 0 0 53.333333 53.333333h796.893334a53.453333 53.453333 0 0 0 51.453333-39.333333l110.546667-405.333334a52.953333 52.953333 0 0 0-9.073334-46.373333zM53.333333 128h253.413334a10.573333 10.573333 0 0 1 7.54 3.126667l109.253333 109.253333A52.986667 52.986667 0 0 0 461.253333 256H842.666667a10.666667 10.666667 0 0 1 10.666666 10.666667v117.333333H173.773333a53.453333 53.453333 0 0 0-51.453333 39.333333L42.666667 715.366667V138.666667a10.666667 10.666667 0 0 1 10.666666-10.666667zm917.726667 312.14l-110.546667 405.333333a10.666667 10.666667 0 0 1-10.286666 7.86H63.226667a10.666667 10.666667 0 0 1-10.286667-13.473333l110.546667-405.333333A10.666667 10.666667 0 0 1 173.773333 426.666667h787a10.666667 10.666667 0 0 1 10.286667 13.473333z" fill="#5C5C66" p-id="21350"/&gt;&lt;/svg&gt;</value>
+  </data>
   <data name="btnSizeDel.IconSvg" xml:space="preserve">
     <value>&lt;svg t="1741939836774" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="21349" width="200" height="200"&gt;&lt;path d="M1003.153333 404.96a52.933333 52.933333 0 0 0-42.38-20.96H896V266.666667a53.393333 53.393333 0 0 0-53.333333-53.333334H461.253333a10.573333 10.573333 0 0 1-7.54-3.126666L344.46 100.953333A52.986667 52.986667 0 0 0 306.746667 85.333333H53.333333a53.393333 53.393333 0 0 0-53.333333 53.333334v704a53.393333 53.393333 0 0 0 53.333333 53.333333h796.893334a53.453333 53.453333 0 0 0 51.453333-39.333333l110.546667-405.333334a52.953333 52.953333 0 0 0-9.073334-46.373333zM53.333333 128h253.413334a10.573333 10.573333 0 0 1 7.54 3.126667l109.253333 109.253333A52.986667 52.986667 0 0 0 461.253333 256H842.666667a10.666667 10.666667 0 0 1 10.666666 10.666667v117.333333H173.773333a53.453333 53.453333 0 0 0-51.453333 39.333333L42.666667 715.366667V138.666667a10.666667 10.666667 0 0 1 10.666666-10.666667zm917.726667 312.14l-110.546667 405.333333a10.666667 10.666667 0 0 1-10.286666 7.86H63.226667a10.666667 10.666667 0 0 1-10.286667-13.473333l110.546667-405.333333A10.666667 10.666667 0 0 1 173.773333 426.666667h787a10.666667 10.666667 0 0 1 10.286667 13.473333z" fill="#5C5C66" p-id="21350"/&gt;&lt;/svg&gt;</value>
   </data>

DHSoftware/Views/UserConfigFrm.Designer.cs

@@ -1,167 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class UserConfigFrm
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard();
-            pnlMenu = new AntdUI.Panel();
-            panel3 = new AntdUI.Panel();
-            btnSave = new AntdUI.Button();
-            btnAdd = new AntdUI.Button();
-            menu = new AntdUI.Menu();
-            panel2 = new AntdUI.Panel();
-            divider1 = new AntdUI.Divider();
-            tabs = new AntdUI.Tabs();
-            pnlMenu.SuspendLayout();
-            panel3.SuspendLayout();
-            panel2.SuspendLayout();
-            SuspendLayout();
-            // 
-            // pnlMenu
-            // 
-            pnlMenu.Controls.Add(panel3);
-            pnlMenu.Controls.Add(menu);
-            pnlMenu.Dock = DockStyle.Left;
-            pnlMenu.Location = new Point(0, 0);
-            pnlMenu.Name = "pnlMenu";
-            pnlMenu.Size = new Size(135, 542);
-            pnlMenu.TabIndex = 0;
-            pnlMenu.Text = "panel1";
-            // 
-            // panel3
-            // 
-            panel3.Back = SystemColors.Window;
-            panel3.BackColor = SystemColors.Window;
-            panel3.Controls.Add(btnSave);
-            panel3.Controls.Add(btnAdd);
-            panel3.Dock = DockStyle.Bottom;
-            panel3.Location = new Point(0, 516);
-            panel3.Name = "panel3";
-            panel3.Size = new Size(135, 26);
-            panel3.TabIndex = 2;
-            panel3.Text = "panel3";
-            // 
-            // btnSave
-            // 
-            btnSave.BackActive = SystemColors.Control;
-            btnSave.BackColor = SystemColors.Control;
-            btnSave.Dock = DockStyle.Left;
-            btnSave.ForeColor = Color.Black;
-            btnSave.IconRatio = 1F;
-            btnSave.IconSvg = "AppstoreAddOutlined";
-            btnSave.Location = new Point(35, 0);
-            btnSave.Name = "btnSave";
-            btnSave.Size = new Size(35, 26);
-            btnSave.TabIndex = 2;
-            // 
-            // btnAdd
-            // 
-            btnAdd.BackActive = SystemColors.Control;
-            btnAdd.BackColor = SystemColors.Control;
-            btnAdd.Dock = DockStyle.Left;
-            btnAdd.ForeColor = Color.Black;
-            btnAdd.IconRatio = 1F;
-            btnAdd.IconSvg = "AppstoreAddOutlined";
-            btnAdd.Location = new Point(0, 0);
-            btnAdd.Name = "btnAdd";
-            btnAdd.Size = new Size(35, 26);
-            btnAdd.TabIndex = 1;
-            btnAdd.Click += btnAdd_Click;
-            // 
-            // menu
-            // 
-            menu.Dock = DockStyle.Fill;
-            menu.Location = new Point(0, 0);
-            menu.Name = "menu";
-            menu.Size = new Size(135, 542);
-            menu.TabIndex = 0;
-            menu.Text = "menu1";
-            menu.SelectChanged += Menu_SelectChanged;
-            menu.MouseDown += Menu_MouseDown;
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(divider1);
-            panel2.Controls.Add(tabs);
-            panel2.Dock = DockStyle.Fill;
-            panel2.Location = new Point(135, 0);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(745, 542);
-            panel2.TabIndex = 1;
-            panel2.Text = "panel2";
-            // 
-            // divider1
-            // 
-            divider1.BackColor = SystemColors.ActiveCaption;
-            divider1.Dock = DockStyle.Left;
-            divider1.Location = new Point(0, 0);
-            divider1.Name = "divider1";
-            divider1.Size = new Size(10, 542);
-            divider1.TabIndex = 1;
-            divider1.Text = "";
-            divider1.Vertical = true;
-            // 
-            // tabs
-            // 
-            tabs.Dock = DockStyle.Fill;
-            tabs.Location = new Point(0, 0);
-            tabs.Name = "tabs";
-            tabs.Size = new Size(745, 542);
-            tabs.Style = styleCard1;
-            tabs.TabIndex = 0;
-            tabs.Text = "tabs1";
-            tabs.Type = AntdUI.TabType.Card;
-            tabs.SelectedIndexChanged += tabs_SelectedIndexChanged;
-            // 
-            // UserConfigFrm
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            AutoSize = true;
-            Controls.Add(panel2);
-            Controls.Add(pnlMenu);
-            Name = "UserConfigFrm";
-            Size = new Size(880, 542);
-            pnlMenu.ResumeLayout(false);
-            panel3.ResumeLayout(false);
-            panel2.ResumeLayout(false);
-            ResumeLayout(false);
-        }
-
-        #endregion
-        private AntdUI.Tabs tabs;
-        private AntdUI.Panel pnlMenu;
-        private AntdUI.Panel panel2;
-        private AntdUI.Menu menu;
-        private AntdUI.Panel panel3;
-        private AntdUI.Button btnSave;
-        private AntdUI.Button btnAdd;
-        private AntdUI.Divider divider1;
-       // private AntdUI.Tabs tabs;
-    }
-}

DHSoftware/Views/UserConfigFrm.cs

@@ -1,257 +0,0 @@
-using AntdUI;
-using AntdUIDemo.Models;
-using DH.Commons.Base;
-using DH.Devices.Vision;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-using Window = AntdUI.Window;
-
-namespace DHSoftware.Views
-{
-    public partial class UserConfigFrm : UserControl
-    {
-        public List<CameraBase> cameras = new List<CameraBase>();
-        public List<DetectionConfig> detections = new List<DetectionConfig>();
-        private UserControl currControl;
-        private bool isUpdatingTabs = false;//用于阻止Tabs更新
-        public Window Window;
-        public UserConfigFrm()
-        {
-            InitializeComponent();
-
-            LoadMenu();
-            menu.Width = (int)(100 * Config.Dpi);
-
-        }
-        private void LoadMenu(string filter = "")
-        {
-            menu.Items.Clear();
-
-            string lang = AntdUI.Localization.CurrentLanguage;
-            var menuItems = DataUtil.Menu_decetion;
-            //var menuIcons = DataUtil.MenuIcons_zhcn;
-            //if (lang.StartsWith("en"))
-            //{
-            //    menuItems = DataUtil.MenuItems_enus;
-            //    menuIcons = DataUtil.MenuIcons_enus;
-            //}
-
-            foreach (var rootItem in menuItems)
-            {
-                var rootKey = rootItem.Key.ToLower();
-                var rootMenu = new AntdUI.MenuItem
-                {
-                    Text = rootItem.Key,
-                    //IconSvg = menuIcons.TryGetValue(rootItem.Key, out var icon) ? icon : "UnorderedListOutlined",
-                };
-                bool rootVisible = false; // 用于标记是否显示根节点
-
-                foreach (var item in rootItem.Value)
-                {
-                    var childText = item.Text.ToLower();
-
-                    // 如果子节点包含搜索文本
-                    if (childText.Contains(filter))
-                    {
-                        var menuItem = new AntdUI.MenuItem
-                        {
-                            Text = item.Text,
-                            IconSvg = item.IconSvg,
-                            Tag = item.Tag,
-                        };
-                        rootMenu.Sub.Add(menuItem);
-                        rootVisible = true; // 如果有子节点包含，则显示根节点
-                    }
-                }
-
-                // 如果根节点包含搜索文本，或有可见的子节点，则显示根节点
-                if (rootKey.Contains(filter) || rootVisible)
-                {
-                    menu.Items.Add(rootMenu);
-                }
-            }
-        }
-        private void SelectMenu()
-        {
-            if (isUpdatingTabs) return;
-            var text = tabs.SelectedTab?.Text; // 使用安全导航操作符，防止 SelectedTab 为 null
-            if (string.IsNullOrEmpty(text)) // 检查 text 是否为 null 或空
-            {
-                return; // 如果 text 为空，直接退出方法
-            }
-            //首页
-            if (text == AntdUI.Localization.Get("home", "主页"))
-            {
-                return;
-            }
-            var rootIndex = 0;
-            var subIndex = 0;
-            var menuItemsCopy = menu.Items.ToList(); // 创建副本
-            for (int i = 0; i < menuItemsCopy.Count; i++)
-            {
-                for (int j = 0; j < menuItemsCopy[i].Sub.Count; j++)
-                {
-                    if (menuItemsCopy[i].Sub[j].Tag.ToString() == text)
-                    {
-                        rootIndex = i;
-                        subIndex = j;
-                        break;
-                    }
-                }
-            }
-            menu.SelectIndex(rootIndex, subIndex, true);
-        }
-        private void Menu_MouseDown(object sender, MouseEventArgs e)
-        {
-            if (e.Button == MouseButtons.Right)
-            {
-                // 转换坐标到控件内部坐标系（考虑滚动条）
-                Point clickPoint = new Point(e.X, e.Y + menu.ScrollBar.Value);
-
-                // 递归查找命中的菜单项
-                MenuItem clickedItem = FindClickedItem(menu.Items, clickPoint);
-
-                if (clickedItem != null)
-                {
-                    // 显示节点名称弹窗
-                    //MessageBox.Show($"右键点击的节点: {clickedItem.Text}");
-
-                    var menulist = new AntdUI.IContextMenuStripItem[]
-                    {
-                    new AntdUI.ContextMenuStripItem("关联相机", "")
-                        {
-                            IconSvg = "VideoCameraAddOutlined"
-                        }
-                    };
-                    AntdUI.ContextMenuStrip.open(menu, it =>
-                    {
-                        if (it.Text == "关联相机")
-                        {
-                            //using (var dlg = new AddCameraWindow(cameras))
-                            //{
-                            //    if (dlg.ShowDialog() == DialogResult.OK)
-                            //    {
-                            //        var newItem = new MenuItem(dlg.CubicleName);
-                            //        newItem.IconSvg = "VideoCameraOutlined";
-                            //        //// 防止重复添加
-                            //        //if (!menu1.Items.Cast<MenuItem>().Any(m => m.Text == newItem.Text))
-                            //        //{
-                            //        clickedItem.Sub.Add(newItem);
-                            //        //}
-                            //        //else
-                            //        //{
-                            //        //    AntdUI.Notification.warn(this, "新增失败", $"{dlg.CubicleName}已存在！", autoClose: 3, align: TAlignFrom.TR);
-                            //        //}
-                            //    }
-                            //}
-                        }
-                    }, menulist);
-                }
-            }
-        }
-
-        private MenuItem FindClickedItem(MenuItemCollection items, Point clickPoint)
-        {
-            foreach (MenuItem item in items)
-            {
-                // 检查当前项是否可见且包含点击坐标
-                if (item.Visible && item.Rect.Contains(clickPoint))
-                {
-                    return item;
-                }
-
-
-            }
-            return null;
-        }
-
-        private void Menu_SelectChanged(object sender, MenuSelectEventArgs e)
-        {
-            string name = (string)e.Value.Tag;
-
-            //// 清理上一个浮动按钮窗体
-            //if (currControl is FloatButtonDemo floatButtonDemo)
-            //{
-            //    floatButtonDemo.CloseFloatButtonForm();
-            //}
-
-            // 检查是否已存在同名 TabPage
-            foreach (var tab in tabs.Pages)
-            {
-                if (tab is AntdUI.TabPage existingTab && existingTab.Text == name)
-                {
-                    isUpdatingTabs = true;
-                    tabs.SelectedTab = existingTab;
-                    isUpdatingTabs = false;
-                    currControl = existingTab.Controls.Count > 0 ? existingTab.Controls[0] as UserControl : null;
-                    return;
-                }
-            }
-            int width = tabs.Width;
-            int height = tabs.Height;
-            // 创建新 TabPage
-            UserDetetion control = new UserDetetion(Window,width, height);
-           // control._windows = Window;
-            switch (name)
-            {
-                case "工位1":
-                    //  control  = 
-                    break;
-            }
-
-            if (control != null)
-            {
-                control.Dock = DockStyle.Fill;
-                // AutoDpi(control); // 如果有 DPI 适配逻辑
-
-                var tabPage = new AntdUI.TabPage
-                {
-                    Dock = DockStyle.Fill,
-                    Text = name,
-                };
-                tabPage.Controls.Add(control);
-                tabs.Pages.Add(tabPage);
-
-                isUpdatingTabs = true;
-                tabs.SelectedTab = tabPage;
-                isUpdatingTabs = false;
-                currControl = control;
-            }
-        }
-
-
-        private void tabs_SelectedIndexChanged(object sender, IntEventArgs e)
-        {
-            SelectMenu();
-        }
-
-        private void btnAdd_Click(object sender, EventArgs e)
-        {
-            //using (var dlg = new AddCubicleWindow())
-            //{
-            //    if (dlg.ShowDialog() == DialogResult.OK)
-            //    {
-            //        var newItem = new MenuItem(dlg.CubicleName);
-            //        //newItem.IconSvg = "AppstoreOutlined";
-            //        // 防止重复添加
-            //        if (!menu.Items.Cast<MenuItem>().Any(m => m.Text == newItem.Text))
-            //        {
-            //            menu.Items.Add(newItem);
-            //        }
-            //        else
-            //        {
-            //           // AntdUI.Notification.warn(this, "新增工位失败", $"{dlg.CubicleName}已存在！", autoClose: 3, align: TAlignFrom.TR);
-            //        }
-            //    }
-            //}
-        }
-    }
-}

DHSoftware/Views/UserDetetion.Designer.cs

@@ -1,70 +0,0 @@
-namespace DHSoftware.Views
-{
-    partial class UserDetetion
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            collapse1 = new AntdUI.Collapse();
-            panel1 = new Panel();
-            SuspendLayout();
-            // 
-            // collapse1
-            // 
-            collapse1.Dock = DockStyle.Fill;
-            collapse1.Location = new Point(0, 0);
-            collapse1.Name = "collapse1";
-            collapse1.Size = new Size(842, 568);
-            collapse1.TabIndex = 0;
-            collapse1.Text = "collapse1";
-            // 
-            // panel1
-            // 
-            panel1.BackColor = SystemColors.GradientActiveCaption;
-            panel1.Dock = DockStyle.Left;
-            panel1.Location = new Point(0, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(2, 568);
-            panel1.TabIndex = 0;
-            // 
-            // UserDetetion
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(panel1);
-            Controls.Add(collapse1);
-            Name = "UserDetetion";
-            Size = new Size(842, 568);
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private AntdUI.Collapse collapse1;
-        private Panel panel1;
-        //private AntdUI.Button button1;
-    }
-}

DHSoftware/Views/UserDetetion.cs

@@ -1,226 +0,0 @@
-using AntdUI;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Button = AntdUI.Button;
-
-namespace DHSoftware.Views
-{
-    public partial class UserDetetion : UserControl
-    {
-        private StackPanel panel, panel2, panel3, panel4;
-        public Window _windows;
-        //根据检测配置 将对应的相机配置、中处理预处理、尺寸测量
-        public UserDetetion(Window windows,int parentWidth, int parentHeight)
-        {
-            InitializeComponent();
-            _windows = windows;
-            AntdUI.CollapseItem group1 = new CollapseItem();
-            group1.Height = parentHeight / 4;
-            group1.Text = "相机配置";
-            AntdUI.CollapseItem group2 = new CollapseItem();
-            group2.Text = "预处理";
-            group2.Height = parentHeight/4;
-
-            AntdUI.CollapseItem group3 = new CollapseItem();
-            group3.Text = "中处理";
-            group3.Height = parentHeight - 300;
-
-            AntdUI.CollapseItem group4 = new CollapseItem();
-            group4.Text = "尺寸测量";
-            group4.Height = parentHeight / 4;
-
-
-            // 初始化内容面板
-            panel = CreateScrollPanel();
-            panel2 = CreateScrollPanel();
-            panel3 = CreateScrollPanel();
-            panel4 = CreateScrollPanel();
-
-            // 添加预处理控件
-            var ptuc = new PreTreatUserControl { AutoScroll = true, Dock = DockStyle.Top };
-            var detect = new DetectConfigControl { AutoScroll = true , Dock = DockStyle.Fill };
-            detect._window = this._windows;
-
-            // 添加尺寸测量控件
-            //var sizeFrm = new SizeControl();
-         
-
-            CameraConfigControl camConfigFrm = new CameraConfigControl();
-            camConfigFrm.Dock = DockStyle.Fill;
-
-
-
-            //PreTreatUserControl ptuc = new PreTreatUserControl();
-            //ptuc.AutoScroll = true;
-            //panel2.Controls.Add(ptuc);
-            //DetectConfigControl detect = new DetectConfigControl();
-            //// detect.Dock = DockStyle.Fill;
-            //detect.AutoScroll = true;
-            //panel2.Controls.Add(detect);
-
-
-            //SizeConfigControl Sizefc = new SizeConfigControl();
-            //Sizefc.Dock = DockStyle.Fill;
-            //panel3.Controls.Add(Sizefc);
-
-
-
-            Button btnAddCam = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "添加相机配置",
-                //Dock=DockStyle.Bottom
-            };
-            Button btnDelCam = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "删除相机配置",
-                // Dock = DockStyle.Bottom
-            };
-
-
-            Button btnAddModel = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "添加模型配置",
-                //Dock=DockStyle.Bottom
-            };
-            Button btnDelModel = new Button
-            {
-                Width = 100,
-                Height = 30,
-                Text = "删除模型配置",
-                // Dock = DockStyle.Bottom
-            };
-
-            FlowLayoutPanel flow = new FlowLayoutPanel();
-            flow.Dock = DockStyle.Bottom;
-            flow.Controls.Add(btnAddCam);
-            flow.Controls.Add(btnDelCam);
-
-            FlowLayoutPanel flowmodel = new FlowLayoutPanel();
-            flowmodel.Dock = DockStyle.Bottom;
-            flowmodel.Controls.Add(btnAddModel);
-            flowmodel.Controls.Add(btnDelModel);
-            btnAddCam.Click += btnAddCam_Click;
-            btnDelCam.Click += btnDelCam_Click;
-            btnAddModel.Click += btnAddModel_Click;
-            btnDelModel.Click += btnDelModel_Click;
-
-            panel.Controls.Add(flow);
-            panel.Controls.Add(camConfigFrm);
-          
-            panel2.Controls.Add(ptuc);
-            panel3.Controls.Add(flowmodel);
-            panel3.Controls.Add(detect);
-            //panel4.Controls.Add(sizeFrm);
-            group1.Controls.Add(panel);
-            group2.Controls.Add(panel2);
-            group3.Controls.Add(panel3);
-            group4.Controls.Add(panel4);
-
-
-            //collapse1.Items.Add(group1);
-            collapse1.Items.Add(group1);
-            collapse1.Items.Add(group2);
-            collapse1.Items.Add(group3);
-            collapse1.Items.Add(group4);
-
-
-        }
-       
-        // 统一事件处理
-        private void CameraOperation_Click(object sender, EventArgs e)
-        {
-            if (sender is Button btn)
-            {
-                switch (btn.Tag?.ToString())
-                {
-                    case "Add":
-                        AddCameraConfig();
-                        break;
-                    case "Delete":
-                        DeleteCameraConfig();
-                        break;
-                }
-            }
-        }
-
-        // 实际业务方法
-        private void AddCameraConfig()
-        {
-            var newCamConfig = new CameraConfigControl { Dock = DockStyle.Top };
-            panel.Controls.Add(newCamConfig);
-            panel.ScrollControlIntoView(newCamConfig);
-        }
-
-        private void DeleteCameraConfig()
-        {
-            if (panel.Controls.Count > 1)
-            {
-                panel.Controls.RemoveAt(panel.Controls.Count - 2);
-            }
-        }
-        // 创建带滚动条的面板
-        private StackPanel CreateScrollPanel()
-        {
-            return new StackPanel
-            {
-                Dock = DockStyle.Fill,
-                Vertical = true,
-                AutoScroll = true,
-                Padding = new Padding(5)  // 添加内边距避免内容贴边
-            };
-        }
-
-        private void btnAddCam_Click(object sender, EventArgs e)
-        {
-            CameraConfigControl camConfigFrm2 = new CameraConfigControl();
-            camConfigFrm2.Dock = DockStyle.Fill;
-
-            panel.Controls.Add(camConfigFrm2);
-        }
-        private void btnDelCam_Click(object sender, EventArgs e)
-        {
-            // 遍历 panel 的 Controls，找到最后一个 CameraConfigControl 并移除
-            for (int i = panel.Controls.Count - 1; i >= 0; i--)
-            {
-                if (panel.Controls[i] is CameraConfigControl)
-                {
-                    panel.Controls.RemoveAt(i);
-                    break;  // 只删除一个
-                }
-            }
-        }
-        private void btnAddModel_Click(object sender, EventArgs e)
-        {
-            DetectConfigControl DetectFrm = new DetectConfigControl();
-            DetectFrm._window = this._windows;
-            DetectFrm.Dock = DockStyle.Fill;
-
-            panel3.Controls.Add(DetectFrm);
-        }
-        private void btnDelModel_Click(object sender, EventArgs e)
-        {
-            // 遍历 panel 的 Controls，找到最后一个 CameraConfigControl 并移除
-            for (int i = panel3.Controls.Count - 1; i >= 0; i--)
-            {
-                if (panel3.Controls[i] is DetectConfigControl)
-                {
-                    panel3.Controls.RemoveAt(i);
-                    break;  // 只删除一个
-                }
-            }
-        }
-    }
-}

DHSoftware/Views/VisualLocalizationWindow.Designer.cs

@@ -0,0 +1,591 @@
+namespace DHSoftware.Views
+{
+    partial class VisualLocalizationWindow
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            titlebar = new AntdUI.PageHeader();
+            panel1 = new AntdUI.Panel();
+            iptThreshold = new AntdUI.InputNumber();
+            label6 = new AntdUI.Label();
+            btnSelectBackImg = new AntdUI.Button();
+            btnSelectModel = new AntdUI.Button();
+            iptBackImg = new AntdUI.Input();
+            label3 = new AntdUI.Label();
+            iptModel = new AntdUI.Input();
+            label2 = new AntdUI.Label();
+            sltCameraName = new AntdUI.Select();
+            label1 = new AntdUI.Label();
+            panel2 = new AntdUI.Panel();
+            iptSpeed = new AntdUI.InputNumber();
+            label7 = new AntdUI.Label();
+            btnSaveImg = new AntdUI.Button();
+            btnSavePos = new AntdUI.Button();
+            btnReverse = new AntdUI.Button();
+            btnForward = new AntdUI.Button();
+            btnLocalization = new AntdUI.Button();
+            btnAcquisition = new AntdUI.Button();
+            iptPosition = new AntdUI.InputNumber();
+            label5 = new AntdUI.Label();
+            sltDirection = new AntdUI.Select();
+            label4 = new AntdUI.Label();
+            panelMotor = new AntdUI.Panel();
+            btnSaveMotorPos = new AntdUI.Button();
+            iptMotorPos = new AntdUI.InputNumber();
+            label9 = new AntdUI.Label();
+            btnMotorZero = new AntdUI.Button();
+            btnMotorReverse = new AntdUI.Button();
+            btnMotorForward = new AntdUI.Button();
+            iptMotorSpeed = new AntdUI.InputNumber();
+            label8 = new AntdUI.Label();
+            panel3 = new AntdUI.Panel();
+            btnSaveBarrierPos = new AntdUI.Button();
+            iptBarrierPos = new AntdUI.InputNumber();
+            label10 = new AntdUI.Label();
+            btnBarrierZero = new AntdUI.Button();
+            btnBarrier = new AntdUI.Button();
+            iptBarrierSpeed = new AntdUI.InputNumber();
+            label11 = new AntdUI.Label();
+            imageViewerControl1 = new ImageViewerControl();
+            panel1.SuspendLayout();
+            panel2.SuspendLayout();
+            panelMotor.SuspendLayout();
+            panel3.SuspendLayout();
+            SuspendLayout();
+            // 
+            // titlebar
+            // 
+            titlebar.BackColor = Color.FromArgb(46, 108, 227);
+            titlebar.DividerShow = true;
+            titlebar.DividerThickness = 0F;
+            titlebar.Dock = DockStyle.Top;
+            titlebar.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            titlebar.ForeColor = Color.White;
+            titlebar.Location = new Point(0, 0);
+            titlebar.Mode = AntdUI.TAMode.Dark;
+            titlebar.Name = "titlebar";
+            titlebar.ShowButton = true;
+            titlebar.ShowIcon = true;
+            titlebar.Size = new Size(1210, 37);
+            titlebar.SubText = "视觉定位系统";
+            titlebar.TabIndex = 1;
+            titlebar.Text = "山东迭慧智能科技有限公司";
+            // 
+            // panel1
+            // 
+            panel1.Controls.Add(iptThreshold);
+            panel1.Controls.Add(label6);
+            panel1.Controls.Add(btnSelectBackImg);
+            panel1.Controls.Add(btnSelectModel);
+            panel1.Controls.Add(iptBackImg);
+            panel1.Controls.Add(label3);
+            panel1.Controls.Add(iptModel);
+            panel1.Controls.Add(label2);
+            panel1.Controls.Add(sltCameraName);
+            panel1.Controls.Add(label1);
+            panel1.Dock = DockStyle.Top;
+            panel1.Location = new Point(0, 37);
+            panel1.Name = "panel1";
+            panel1.Size = new Size(1210, 56);
+            panel1.TabIndex = 2;
+            panel1.Text = "panel1";
+            // 
+            // iptThreshold
+            // 
+            iptThreshold.Location = new Point(1094, 6);
+            iptThreshold.Name = "iptThreshold";
+            iptThreshold.Size = new Size(107, 43);
+            iptThreshold.TabIndex = 15;
+            iptThreshold.Text = "0";
+            // 
+            // label6
+            // 
+            label6.BackColor = SystemColors.Window;
+            label6.Location = new Point(1044, 18);
+            label6.Name = "label6";
+            label6.Size = new Size(57, 23);
+            label6.TabIndex = 14;
+            label6.Text = "定位阈值";
+            // 
+            // btnSelectBackImg
+            // 
+            btnSelectBackImg.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSelectBackImg.Location = new Point(963, 11);
+            btnSelectBackImg.Name = "btnSelectBackImg";
+            btnSelectBackImg.Size = new Size(75, 38);
+            btnSelectBackImg.TabIndex = 13;
+            btnSelectBackImg.Text = "打开";
+            btnSelectBackImg.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnSelectModel
+            // 
+            btnSelectModel.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSelectModel.Location = new Point(525, 9);
+            btnSelectModel.Name = "btnSelectModel";
+            btnSelectModel.Size = new Size(75, 38);
+            btnSelectModel.TabIndex = 12;
+            btnSelectModel.Text = "打开";
+            btnSelectModel.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptBackImg
+            // 
+            iptBackImg.Location = new Point(694, 6);
+            iptBackImg.Name = "iptBackImg";
+            iptBackImg.PlaceholderText = "请选择背景图片";
+            iptBackImg.Size = new Size(263, 43);
+            iptBackImg.TabIndex = 10;
+            // 
+            // label3
+            // 
+            label3.BackColor = SystemColors.Window;
+            label3.Location = new Point(606, 18);
+            label3.Name = "label3";
+            label3.Size = new Size(82, 23);
+            label3.TabIndex = 9;
+            label3.Text = "背景图片路径";
+            // 
+            // iptModel
+            // 
+            iptModel.Location = new Point(256, 6);
+            iptModel.Name = "iptModel";
+            iptModel.PlaceholderText = "请选择算法";
+            iptModel.Size = new Size(263, 43);
+            iptModel.TabIndex = 3;
+            // 
+            // label2
+            // 
+            label2.BackColor = SystemColors.Window;
+            label2.Location = new Point(193, 18);
+            label2.Name = "label2";
+            label2.Size = new Size(57, 23);
+            label2.TabIndex = 2;
+            label2.Text = "算法路径";
+            // 
+            // sltCameraName
+            // 
+            sltCameraName.List = true;
+            sltCameraName.Location = new Point(72, 7);
+            sltCameraName.MaxCount = 10;
+            sltCameraName.Name = "sltCameraName";
+            sltCameraName.PlaceholderText = "请选择相机";
+            sltCameraName.Size = new Size(115, 43);
+            sltCameraName.TabIndex = 1;
+            // 
+            // label1
+            // 
+            label1.BackColor = SystemColors.Window;
+            label1.Location = new Point(9, 18);
+            label1.Name = "label1";
+            label1.Size = new Size(57, 23);
+            label1.TabIndex = 0;
+            label1.Text = "相机名称";
+            // 
+            // panel2
+            // 
+            panel2.Controls.Add(iptSpeed);
+            panel2.Controls.Add(label7);
+            panel2.Controls.Add(btnSaveImg);
+            panel2.Controls.Add(btnSavePos);
+            panel2.Controls.Add(btnReverse);
+            panel2.Controls.Add(btnForward);
+            panel2.Controls.Add(btnLocalization);
+            panel2.Controls.Add(btnAcquisition);
+            panel2.Controls.Add(iptPosition);
+            panel2.Controls.Add(label5);
+            panel2.Controls.Add(sltDirection);
+            panel2.Controls.Add(label4);
+            panel2.Dock = DockStyle.Top;
+            panel2.Location = new Point(0, 93);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(1210, 56);
+            panel2.TabIndex = 3;
+            panel2.Text = "panel2";
+            // 
+            // iptSpeed
+            // 
+            iptSpeed.Location = new Point(256, 6);
+            iptSpeed.Name = "iptSpeed";
+            iptSpeed.Size = new Size(107, 43);
+            iptSpeed.TabIndex = 20;
+            iptSpeed.Text = "0";
+            // 
+            // label7
+            // 
+            label7.BackColor = SystemColors.Window;
+            label7.Location = new Point(193, 18);
+            label7.Name = "label7";
+            label7.Size = new Size(57, 23);
+            label7.TabIndex = 19;
+            label7.Text = "转盘速度";
+            // 
+            // btnSaveImg
+            // 
+            btnSaveImg.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSaveImg.Location = new Point(1126, 11);
+            btnSaveImg.Name = "btnSaveImg";
+            btnSaveImg.Size = new Size(75, 38);
+            btnSaveImg.TabIndex = 18;
+            btnSaveImg.Text = "保存图像";
+            btnSaveImg.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnSavePos
+            // 
+            btnSavePos.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSavePos.Location = new Point(1013, 11);
+            btnSavePos.Name = "btnSavePos";
+            btnSavePos.Size = new Size(75, 38);
+            btnSavePos.TabIndex = 17;
+            btnSavePos.Text = "保存定位";
+            btnSavePos.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnReverse
+            // 
+            btnReverse.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnReverse.Location = new Point(904, 11);
+            btnReverse.Name = "btnReverse";
+            btnReverse.Size = new Size(75, 38);
+            btnReverse.TabIndex = 16;
+            btnReverse.Text = "转盘反转";
+            btnReverse.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnForward
+            // 
+            btnForward.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnForward.Location = new Point(804, 11);
+            btnForward.Name = "btnForward";
+            btnForward.Size = new Size(75, 38);
+            btnForward.TabIndex = 15;
+            btnForward.Text = "转盘正转";
+            btnForward.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnLocalization
+            // 
+            btnLocalization.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnLocalization.Location = new Point(704, 11);
+            btnLocalization.Name = "btnLocalization";
+            btnLocalization.Size = new Size(75, 38);
+            btnLocalization.TabIndex = 14;
+            btnLocalization.Text = "开始定位";
+            btnLocalization.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnAcquisition
+            // 
+            btnAcquisition.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnAcquisition.Location = new Point(606, 11);
+            btnAcquisition.Name = "btnAcquisition";
+            btnAcquisition.Size = new Size(75, 38);
+            btnAcquisition.TabIndex = 13;
+            btnAcquisition.Text = "开始采集";
+            btnAcquisition.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptPosition
+            // 
+            iptPosition.Location = new Point(425, 6);
+            iptPosition.Name = "iptPosition";
+            iptPosition.ReadOnly = true;
+            iptPosition.Size = new Size(175, 43);
+            iptPosition.TabIndex = 7;
+            iptPosition.Text = "0";
+            // 
+            // label5
+            // 
+            label5.BackColor = SystemColors.Window;
+            label5.Location = new Point(369, 18);
+            label5.Name = "label5";
+            label5.Size = new Size(59, 23);
+            label5.TabIndex = 6;
+            label5.Text = "当前位置";
+            // 
+            // sltDirection
+            // 
+            sltDirection.Items.AddRange(new object[] { "正方向", "反方向" });
+            sltDirection.List = true;
+            sltDirection.Location = new Point(72, 6);
+            sltDirection.MaxCount = 10;
+            sltDirection.Name = "sltDirection";
+            sltDirection.PlaceholderText = "请选择方向";
+            sltDirection.Size = new Size(115, 43);
+            sltDirection.TabIndex = 5;
+            // 
+            // label4
+            // 
+            label4.BackColor = SystemColors.Window;
+            label4.Location = new Point(9, 18);
+            label4.Name = "label4";
+            label4.Size = new Size(57, 23);
+            label4.TabIndex = 4;
+            label4.Text = "转盘方向";
+            // 
+            // panelMotor
+            // 
+            panelMotor.Controls.Add(btnSaveMotorPos);
+            panelMotor.Controls.Add(iptMotorPos);
+            panelMotor.Controls.Add(label9);
+            panelMotor.Controls.Add(btnMotorZero);
+            panelMotor.Controls.Add(btnMotorReverse);
+            panelMotor.Controls.Add(btnMotorForward);
+            panelMotor.Controls.Add(iptMotorSpeed);
+            panelMotor.Controls.Add(label8);
+            panelMotor.Dock = DockStyle.Top;
+            panelMotor.Location = new Point(0, 149);
+            panelMotor.Name = "panelMotor";
+            panelMotor.Size = new Size(1210, 46);
+            panelMotor.TabIndex = 4;
+            panelMotor.Text = "panel3";
+            // 
+            // btnSaveMotorPos
+            // 
+            btnSaveMotorPos.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSaveMotorPos.Location = new Point(751, 5);
+            btnSaveMotorPos.Name = "btnSaveMotorPos";
+            btnSaveMotorPos.Size = new Size(109, 38);
+            btnSaveMotorPos.TabIndex = 21;
+            btnSaveMotorPos.Text = "保存相机电机位置";
+            btnSaveMotorPos.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptMotorPos
+            // 
+            iptMotorPos.Location = new Point(284, 0);
+            iptMotorPos.Name = "iptMotorPos";
+            iptMotorPos.ReadOnly = true;
+            iptMotorPos.Size = new Size(175, 43);
+            iptMotorPos.TabIndex = 20;
+            iptMotorPos.Text = "0";
+            // 
+            // label9
+            // 
+            label9.BackColor = SystemColors.Window;
+            label9.Location = new Point(203, 10);
+            label9.Name = "label9";
+            label9.Size = new Size(81, 23);
+            label9.TabIndex = 19;
+            label9.Text = "变焦电机位置";
+            // 
+            // btnMotorZero
+            // 
+            btnMotorZero.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnMotorZero.Location = new Point(465, 5);
+            btnMotorZero.Name = "btnMotorZero";
+            btnMotorZero.Size = new Size(75, 38);
+            btnMotorZero.TabIndex = 18;
+            btnMotorZero.Text = "电机回原点";
+            btnMotorZero.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnMotorReverse
+            // 
+            btnMotorReverse.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnMotorReverse.Location = new Point(659, 5);
+            btnMotorReverse.Name = "btnMotorReverse";
+            btnMotorReverse.Size = new Size(75, 38);
+            btnMotorReverse.TabIndex = 17;
+            btnMotorReverse.Text = "电机反转";
+            btnMotorReverse.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnMotorForward
+            // 
+            btnMotorForward.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnMotorForward.Location = new Point(563, 5);
+            btnMotorForward.Name = "btnMotorForward";
+            btnMotorForward.Size = new Size(75, 38);
+            btnMotorForward.TabIndex = 16;
+            btnMotorForward.Text = "电机正转";
+            btnMotorForward.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptMotorSpeed
+            // 
+            iptMotorSpeed.Location = new Point(90, 0);
+            iptMotorSpeed.Name = "iptMotorSpeed";
+            iptMotorSpeed.Size = new Size(107, 43);
+            iptMotorSpeed.TabIndex = 8;
+            iptMotorSpeed.Text = "0";
+            // 
+            // label8
+            // 
+            label8.BackColor = SystemColors.Window;
+            label8.Location = new Point(9, 10);
+            label8.Name = "label8";
+            label8.Size = new Size(81, 23);
+            label8.TabIndex = 1;
+            label8.Text = "变焦电机速度";
+            // 
+            // panel3
+            // 
+            panel3.Controls.Add(btnSaveBarrierPos);
+            panel3.Controls.Add(iptBarrierPos);
+            panel3.Controls.Add(label10);
+            panel3.Controls.Add(btnBarrierZero);
+            panel3.Controls.Add(btnBarrier);
+            panel3.Controls.Add(iptBarrierSpeed);
+            panel3.Controls.Add(label11);
+            panel3.Dock = DockStyle.Top;
+            panel3.Location = new Point(0, 195);
+            panel3.Name = "panel3";
+            panel3.Size = new Size(1210, 46);
+            panel3.TabIndex = 6;
+            panel3.Text = "panel3";
+            // 
+            // btnSaveBarrierPos
+            // 
+            btnSaveBarrierPos.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnSaveBarrierPos.Location = new Point(681, 5);
+            btnSaveBarrierPos.Name = "btnSaveBarrierPos";
+            btnSaveBarrierPos.Size = new Size(109, 38);
+            btnSaveBarrierPos.TabIndex = 21;
+            btnSaveBarrierPos.Text = "保存挡料电机位置";
+            btnSaveBarrierPos.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptBarrierPos
+            // 
+            iptBarrierPos.Location = new Point(284, 0);
+            iptBarrierPos.Name = "iptBarrierPos";
+            iptBarrierPos.Size = new Size(175, 43);
+            iptBarrierPos.TabIndex = 20;
+            iptBarrierPos.Text = "0";
+            // 
+            // label10
+            // 
+            label10.BackColor = SystemColors.Window;
+            label10.Location = new Point(203, 10);
+            label10.Name = "label10";
+            label10.Size = new Size(81, 23);
+            label10.TabIndex = 19;
+            label10.Text = "挡料电机位置";
+            // 
+            // btnBarrierZero
+            // 
+            btnBarrierZero.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnBarrierZero.Location = new Point(465, 5);
+            btnBarrierZero.Name = "btnBarrierZero";
+            btnBarrierZero.Size = new Size(75, 38);
+            btnBarrierZero.TabIndex = 18;
+            btnBarrierZero.Text = "电机回原点";
+            btnBarrierZero.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // btnBarrier
+            // 
+            btnBarrier.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            btnBarrier.Location = new Point(563, 5);
+            btnBarrier.Name = "btnBarrier";
+            btnBarrier.Size = new Size(101, 38);
+            btnBarrier.TabIndex = 16;
+            btnBarrier.Text = "挡料电机转动";
+            btnBarrier.Type = AntdUI.TTypeMini.Primary;
+            // 
+            // iptBarrierSpeed
+            // 
+            iptBarrierSpeed.Location = new Point(90, 0);
+            iptBarrierSpeed.Name = "iptBarrierSpeed";
+            iptBarrierSpeed.Size = new Size(107, 43);
+            iptBarrierSpeed.TabIndex = 8;
+            iptBarrierSpeed.Text = "0";
+            // 
+            // label11
+            // 
+            label11.BackColor = SystemColors.Window;
+            label11.Location = new Point(9, 10);
+            label11.Name = "label11";
+            label11.Size = new Size(81, 23);
+            label11.TabIndex = 1;
+            label11.Text = "挡料电机速度";
+            // 
+            // imageViewerControl1
+            // 
+            imageViewerControl1.Dock = DockStyle.Fill;
+            imageViewerControl1.Image = null;
+            imageViewerControl1.Location = new Point(0, 241);
+            imageViewerControl1.Name = "imageViewerControl1";
+            imageViewerControl1.Size = new Size(1210, 464);
+            imageViewerControl1.TabIndex = 7;
+            // 
+            // VisualLocalizationWindow
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1210, 705);
+            Controls.Add(imageViewerControl1);
+            Controls.Add(panel3);
+            Controls.Add(panelMotor);
+            Controls.Add(panel2);
+            Controls.Add(panel1);
+            Controls.Add(titlebar);
+            Name = "VisualLocalizationWindow";
+            Text = "CCD光学筛选定位系统";
+            WindowState = FormWindowState.Maximized;
+            panel1.ResumeLayout(false);
+            panel2.ResumeLayout(false);
+            panelMotor.ResumeLayout(false);
+            panel3.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private AntdUI.PageHeader titlebar;
+        private AntdUI.Panel panel1;
+        private AntdUI.Select sltCameraName;
+        private AntdUI.Label label1;
+        private AntdUI.Input iptModel;
+        private AntdUI.Label label2;
+        private AntdUI.Input iptBackImg;
+        private AntdUI.Label label3;
+        private AntdUI.Panel panel2;
+        private AntdUI.Label label4;
+        private AntdUI.Select sltDirection;
+        private AntdUI.InputNumber iptPosition;
+        private AntdUI.Label label5;
+        private AntdUI.Button btnSelectBackImg;
+        private AntdUI.Button btnSelectModel;
+        private AntdUI.Button btnAcquisition;
+        private AntdUI.Button btnLocalization;
+        private AntdUI.Button btnReverse;
+        private AntdUI.Button btnForward;
+        private AntdUI.Button btnSaveImg;
+        private AntdUI.Button btnSavePos;
+        private AntdUI.InputNumber iptThreshold;
+        private AntdUI.Label label6;
+        private AntdUI.InputNumber iptSpeed;
+        private AntdUI.Label label7;
+        private AntdUI.Panel panelMotor;
+        private AntdUI.InputNumber iptMotorSpeed;
+        private AntdUI.Label label8;
+        private AntdUI.Button btnMotorReverse;
+        private AntdUI.Button btnMotorForward;
+        private AntdUI.InputNumber iptMotorPos;
+        private AntdUI.Label label9;
+        private AntdUI.Button btnMotorZero;
+        private AntdUI.Button btnSaveMotorPos;
+        private AntdUI.Panel panel3;
+        private AntdUI.Button btnSaveBarrierPos;
+        private AntdUI.InputNumber iptBarrierPos;
+        private AntdUI.Label label10;
+        private AntdUI.Button btnBarrierZero;
+        private AntdUI.Button btnBarrier;
+        private AntdUI.InputNumber iptBarrierSpeed;
+        private AntdUI.Label label11;
+        private ImageViewerControl imageViewerControl1;
+    }
+}

DHSoftware/Views/WelcomeWindow.resx

@@ -120,254 +120,7 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px77vKcf7bym
-        H9i7px+WuqogMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/rumH766px1OuaIjFv//AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+9px/2vacfvbymIGe1nyAYAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/wvKcexbyn
-        Htq7px71vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/a8px/Fu6cgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        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
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HFu08AAAAAAAAAAAAA
-        AAAAAAAAAAAAALymIRe7px/DvKcf/7ynH/+8px//vKcf/7ynH/y7pR+Dv4AABAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HF
-        u08AAAAAAAAAAAAAAAAAAAAAAAAAAMyZMwW7px+LvKcf/rynH/+8px//vKcf/7ynH/+8px6ru6oiDwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDE
-        u/9AxLv/QMS7/0DEvOdAxLvcQMS73EDEu9xAxLvcQMS73EDEu9x0uHrruKkk/rynH/+8px//vKcf/7yn
-        H/+lrTz2TcGp30DEu9xAxLvcQMS73EDEu9xAxLvcQMS73EDEut9AxLv2QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9ivI//s6kr/7yn
-        H/+8px//vKcf/7ynH/+rqzT/T8Co/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9cvZj/sKot/7ynH/+8px//vKcf/7ynH/+xqi7/UcCm/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9bvZj/sKou/7ynH/+8px//vKcf/7ynH/+xqi3/UcCl/0DEu/9AxLv/QMS7/0DE
-        u/9AxLv/QMS7/0DEu/9AxLv/QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px/NuqcdGgAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDEu/9AxLv/QMS7/z/E
-        u7E/w7qNP8O6jT/Duo0/w7qNP8O6jT/Duo1wuH2wtqgm+LynH/+8px//vKcf/7ynH/+0qSntWb6cmj/D
-        uo0/w7qNP8O6jT/Duo0/w7qNP8O6jT/Eu5Y/xLvhQMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE+w7t4QMS7/EDE
-        u/9AxLv/QMS7/0HEvlIzzMwFM8zMBTPMzAUzzMwFM8zMBTPMzAW4qCRku6cf9bynH/+8px//vKcf/7yn
-        H/+8pyDKp6c1HTPMzAUzzMwFM8zMBTPMzAUzzMwFM8zMBUDKvxhAxbu8QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+8px/NuqcdGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAE+w7t4QMS7/EDEu/9AxLv/QMS7/0HFu08AAAAAAAAAAAAAAAAAAAAAAAAAAL+/AAS7ph6HvKcf/ryn
-        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
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px/NuqcdGgAAAAD/gAACwqoYFbqoHUa9pR+DvaYewbyoH+G9qB/yvKcf/rynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/rumH5q7qiIegIAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H/+8px//vKcf/7ynH/+7px/tu6gftbunH8i9px/nu6cf/bynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7yoH/i8px/OvqcdTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px/6vKgfx7ymH3K7qhoeAAAAAQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/
-        vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px//vKgf/ryoH828pR9buqcdGv+AAAIAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px/8vKgf8LynH927px+muaYfQv//AAEAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837ynH/+8px//vKcf/7yn
-        H/+8px//vKcf/7ynH/+8px//vKcf/7ynH/+8px70u6cf1rymH6+9px+DvKceVL+nICD/gAACAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DEu/9AxLv/QMS837yn
-        H+y8px/3u6Yf+bymH++8px7kvacf172nH8C8px6jvqcffb2qH1G3piEuuacaHb+fIBC/vwAEAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEC/vxQ/w7u7QMS7/0DE
-        u/9AxLv/QMS83wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -376,7 +129,159 @@
         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
-        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
+        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
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFpLAAA8KwAAuqYXAIx5
+        DAClkRAApZUSAJKFDQAAAAAAbVgHAEw4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA/////AD/
+        AAD8B//4AH8AAPwB//gAPwAA/AB/8AA/AAD8AH/wAD8AAPwAP/AAPwAA/AAf8AA/AAD8AB/wAD8AAPwA
+        D/AAPwAA/AAP8AA/AAD8AA/wAD8AAPwAD/AAPwAA/AAP8AA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/
+        AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwA
+        AAAAPwAA/AAAAAA/AAD8AAAAAD8AAPwAAAAAPwAA/AAD+AA/AAD8AAf4AD8AAPwAB/gAPwAA/AAP+AA/
+        AAD8AA/4AD8AAPwAD/gAPwAA/AAP+AA/AAD8AA/8AD8AAPwAD/4APwAA/AAP/4A/AAD+AA//8D8AAP4A
+        H////wAA/wA/////AAD///////8AAP///////wAA////////AAD///////8AAP///////wAA////////
+        AAA=
 </value>
   </data>
 </root>