From 42424a819db96fe93dbbe0d10de059477a9c4793 Mon Sep 17 00:00:00 2001 From: wells.liu <wells.liu@broconcentric.com> Date: 星期一, 06 七月 2020 09:57:07 +0800 Subject: [PATCH] 板卡 操作界面 --- src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs | 11 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs | 214 ++++++--------- src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs | 21 + src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs | 343 ++++++++++++++++++++++++++ src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 9 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.resx | 120 +++++++++ src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs | 11 7 files changed, 589 insertions(+), 140 deletions(-) diff --git a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj index 68c7b28..304fa04 100644 --- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj +++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj @@ -89,6 +89,12 @@ <Compile Include="CtrlCameraRunBase.Designer.cs"> <DependentUpon>CtrlCameraRunBase.cs</DependentUpon> </Compile> + <Compile Include="MotionCard\CtrlMotionCardAxisOperation.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="MotionCard\CtrlMotionCardAxisOperation.Designer.cs"> + <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon> + </Compile> <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs"> <SubType>UserControl</SubType> </Compile> @@ -130,6 +136,9 @@ <EmbeddedResource Include="CtrlCameraRunBase.resx"> <DependentUpon>CtrlCameraRunBase.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisOperation.resx"> + <DependentUpon>CtrlMotionCardAxisOperation.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx"> <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon> </EmbeddedResource> diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs new file mode 100644 index 0000000..94e9245 --- /dev/null +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs @@ -0,0 +1,343 @@ +锘縩amespace Bro.UI.Device.Winform.MotionCard +{ + partial class CtrlMotionCardAxisOperation + { + /// <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 缁勪欢璁捐鍣ㄧ敓鎴愮殑浠g爜 + + /// <summary> + /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈淇敼 + /// 浣跨敤浠g爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广�� + /// </summary> + private void InitializeComponent() + { + this.groupBoxAxisStatus = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.buttonClearStatus = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.groupBoxAxisStatus.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxAxisStatus + // + this.groupBoxAxisStatus.Controls.Add(this.tableLayoutPanel1); + this.groupBoxAxisStatus.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBoxAxisStatus.Location = new System.Drawing.Point(0, 0); + this.groupBoxAxisStatus.Name = "groupBoxAxisStatus"; + this.groupBoxAxisStatus.Size = new System.Drawing.Size(547, 148); + this.groupBoxAxisStatus.TabIndex = 5; + this.groupBoxAxisStatus.TabStop = false; + this.groupBoxAxisStatus.Text = "杞存搷浣�"; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 17); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(541, 128); + this.tableLayoutPanel1.TabIndex = 0; + // + // panel1 + // + this.panel1.Controls.Add(this.button1); + this.panel1.Controls.Add(this.textBox3); + this.panel1.Controls.Add(this.buttonClearStatus); + this.panel1.Controls.Add(this.textBox2); + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.textBox1); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.label2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(535, 58); + this.panel1.TabIndex = 2; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(0, 21); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(77, 19); + this.label2.TabIndex = 2; + this.label2.Text = "Jog妯″紡"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel2 + // + this.panel2.Controls.Add(this.button3); + this.panel2.Controls.Add(this.button2); + this.panel2.Controls.Add(this.label1); + this.panel2.Controls.Add(this.textBox5); + this.panel2.Controls.Add(this.textBox4); + this.panel2.Controls.Add(this.textBox7); + this.panel2.Controls.Add(this.textBox6); + this.panel2.Controls.Add(this.label7); + this.panel2.Controls.Add(this.label6); + this.panel2.Controls.Add(this.label9); + this.panel2.Controls.Add(this.label8); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(3, 67); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(535, 58); + this.panel2.TabIndex = 3; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(0, 21); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 19); + this.label1.TabIndex = 2; + this.label1.Text = "P2P妯″紡"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(154, 4); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(116, 21); + this.textBox1.TabIndex = 5; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(92, 7); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.TabIndex = 4; + this.label3.Text = "閫熷害锛�"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(92, 38); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 4; + this.label4.Text = "鍔犻�熷害锛�"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(154, 35); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(116, 21); + this.textBox2.TabIndex = 5; + // + // buttonClearStatus + // + this.buttonClearStatus.Location = new System.Drawing.Point(462, 3); + this.buttonClearStatus.Name = "buttonClearStatus"; + this.buttonClearStatus.Size = new System.Drawing.Size(70, 25); + this.buttonClearStatus.TabIndex = 6; + this.buttonClearStatus.Text = "姝e悜"; + this.buttonClearStatus.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(462, 33); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(70, 25); + this.button1.TabIndex = 6; + this.button1.Text = "璐熷悜"; + this.button1.UseVisualStyleBackColor = true; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(278, 7); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.TabIndex = 4; + this.label5.Text = "鍑忛�熷害锛�"; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(340, 4); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(116, 21); + this.textBox3.TabIndex = 5; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(92, 7); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(65, 12); + this.label6.TabIndex = 4; + this.label6.Text = "瑙勫垝浣嶇疆锛�"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(154, 4); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(116, 21); + this.textBox4.TabIndex = 5; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(92, 37); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(41, 12); + this.label7.TabIndex = 4; + this.label7.Text = "閫熷害锛�"; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(154, 34); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(116, 21); + this.textBox5.TabIndex = 5; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(278, 7); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.TabIndex = 4; + this.label8.Text = "鍔犻�熷害锛�"; + // + // textBox6 + // + this.textBox6.Location = new System.Drawing.Point(340, 4); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(116, 21); + this.textBox6.TabIndex = 5; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(278, 37); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(53, 12); + this.label9.TabIndex = 4; + this.label9.Text = "鍑忛�熷害锛�"; + // + // textBox7 + // + this.textBox7.Location = new System.Drawing.Point(340, 34); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(116, 21); + this.textBox7.TabIndex = 5; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(462, 3); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(70, 25); + this.button2.TabIndex = 6; + this.button2.Text = "寮�濮�"; + this.button2.UseVisualStyleBackColor = true; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(462, 31); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(70, 25); + this.button3.TabIndex = 6; + this.button3.Text = "鍋滄"; + this.button3.UseVisualStyleBackColor = true; + // + // CtrlMotionCardAxisOperation + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.groupBoxAxisStatus); + this.Name = "CtrlMotionCardAxisOperation"; + this.Size = new System.Drawing.Size(547, 148); + this.groupBoxAxisStatus.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBoxAxisStatus; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button buttonClearStatus; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + } +} diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs new file mode 100644 index 0000000..f429d01 --- /dev/null +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs @@ -0,0 +1,21 @@ +锘縰sing System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Bro.UI.Device.Winform.MotionCard +{ + public partial class CtrlMotionCardAxisOperation : UserControl + { + public CtrlMotionCardAxisOperation() + { + InitializeComponent(); + } + + } +} diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.resx b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.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> \ No newline at end of file diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs index d9e4122..40faa13 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs @@ -39,7 +39,6 @@ this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); @@ -59,7 +58,6 @@ this.groupBoxAxisStatus.Controls.Add(this.textBox3); this.groupBoxAxisStatus.Controls.Add(this.textBox2); this.groupBoxAxisStatus.Controls.Add(this.textBox1); - this.groupBoxAxisStatus.Controls.Add(this.label7); this.groupBoxAxisStatus.Controls.Add(this.label5); this.groupBoxAxisStatus.Controls.Add(this.label4); this.groupBoxAxisStatus.Controls.Add(this.label3); @@ -158,14 +156,6 @@ this.textBox1.Size = new System.Drawing.Size(116, 21); this.textBox1.TabIndex = 3; // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(7, 214); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(0, 12); - this.label7.TabIndex = 2; - // // label5 // this.label5.AutoSize = true; @@ -228,7 +218,6 @@ private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs index 99ab3ff..bd4de03 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.Designer.cs @@ -30,13 +30,10 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlMotionCardOperationBase)); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.groupBoxPara = new System.Windows.Forms.GroupBox(); - this.propGrid = new System.Windows.Forms.PropertyGrid(); - this.groupBoxMoveModel = new System.Windows.Forms.GroupBox(); - this.radioGoHome = new System.Windows.Forms.RadioButton(); - this.radioJog = new System.Windows.Forms.RadioButton(); - this.radioP2P = new System.Windows.Forms.RadioButton(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.groupBoxCommBtn = new System.Windows.Forms.GroupBox(); this.btnStart = new System.Windows.Forms.Button(); this.buttonClearStatus = new System.Windows.Forms.Button(); @@ -44,114 +41,75 @@ this.buttonServoEnable = new System.Windows.Forms.Button(); this.buttonSmoothStop = new System.Windows.Forms.Button(); this.buttonPositionReset = new System.Windows.Forms.Button(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.groupBoxPara = new System.Windows.Forms.GroupBox(); + this.propGrid = new System.Windows.Forms.PropertyGrid(); this.tableLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.groupBoxPara.SuspendLayout(); - this.groupBoxMoveModel.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); this.groupBoxCommBtn.SuspendLayout(); + this.groupBoxPara.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 // - this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.tabControl1, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(982, 720); + this.tableLayoutPanel1.Size = new System.Drawing.Size(500, 720); this.tableLayoutPanel1.TabIndex = 0; // - // tableLayoutPanel2 + // tabControl1 // - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Controls.Add(this.groupBoxPara, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.groupBoxMoveModel, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.groupBoxCommBtn, 0, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 3; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(386, 714); - this.tableLayoutPanel2.TabIndex = 0; + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControl1.Location = new System.Drawing.Point(3, 3); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(494, 714); + this.tabControl1.TabIndex = 12; // - // groupBoxPara + // tabPage1 // - this.groupBoxPara.Controls.Add(this.propGrid); - this.groupBoxPara.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBoxPara.Location = new System.Drawing.Point(3, 153); - this.groupBoxPara.Name = "groupBoxPara"; - this.groupBoxPara.Size = new System.Drawing.Size(380, 558); - this.groupBoxPara.TabIndex = 6; - this.groupBoxPara.TabStop = false; - this.groupBoxPara.Text = "鍙傛暟"; + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(486, 688); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "蹇嵎鎿嶄綔"; + this.tabPage1.UseVisualStyleBackColor = true; // - // propGrid + // tabPage2 // - this.propGrid.Dock = System.Windows.Forms.DockStyle.Fill; - this.propGrid.Location = new System.Drawing.Point(3, 17); - this.propGrid.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.propGrid.Name = "propGrid"; - this.propGrid.Size = new System.Drawing.Size(374, 538); - this.propGrid.TabIndex = 1; + this.tabPage2.Controls.Add(this.tableLayoutPanel3); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(486, 688); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "閫氱敤鎿嶄綔"; + this.tabPage2.UseVisualStyleBackColor = true; // - // groupBoxMoveModel + // tableLayoutPanel3 // - this.groupBoxMoveModel.Controls.Add(this.radioGoHome); - this.groupBoxMoveModel.Controls.Add(this.radioJog); - this.groupBoxMoveModel.Controls.Add(this.radioP2P); - this.groupBoxMoveModel.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBoxMoveModel.Location = new System.Drawing.Point(3, 103); - this.groupBoxMoveModel.Name = "groupBoxMoveModel"; - this.groupBoxMoveModel.Size = new System.Drawing.Size(380, 44); - this.groupBoxMoveModel.TabIndex = 5; - this.groupBoxMoveModel.TabStop = false; - this.groupBoxMoveModel.Text = "杩愬姩绫诲瀷"; - // - // radioGoHome - // - this.radioGoHome.AutoSize = true; - this.radioGoHome.Location = new System.Drawing.Point(156, 22); - this.radioGoHome.Name = "radioGoHome"; - this.radioGoHome.Size = new System.Drawing.Size(59, 16); - this.radioGoHome.TabIndex = 5; - this.radioGoHome.TabStop = true; - this.radioGoHome.Text = "GoHome"; - this.radioGoHome.UseVisualStyleBackColor = true; - // - // radioJog - // - this.radioJog.AutoSize = true; - this.radioJog.Location = new System.Drawing.Point(82, 22); - this.radioJog.Name = "radioJog"; - this.radioJog.Size = new System.Drawing.Size(41, 16); - this.radioJog.TabIndex = 5; - this.radioJog.TabStop = true; - this.radioJog.Text = "Jog"; - this.radioJog.UseVisualStyleBackColor = true; - // - // radioP2P - // - this.radioP2P.AutoSize = true; - this.radioP2P.Checked = true; - this.radioP2P.Location = new System.Drawing.Point(9, 22); - this.radioP2P.Name = "radioP2P"; - this.radioP2P.Size = new System.Drawing.Size(41, 16); - this.radioP2P.TabIndex = 5; - this.radioP2P.TabStop = true; - this.radioP2P.Text = "P2P"; - this.radioP2P.UseVisualStyleBackColor = true; - this.radioP2P.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + this.tableLayoutPanel3.ColumnCount = 1; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Controls.Add(this.groupBoxPara, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.groupBoxCommBtn, 0, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 2; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 120F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(480, 682); + this.tableLayoutPanel3.TabIndex = 0; // // groupBoxCommBtn // @@ -164,8 +122,8 @@ this.groupBoxCommBtn.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBoxCommBtn.Location = new System.Drawing.Point(3, 3); this.groupBoxCommBtn.Name = "groupBoxCommBtn"; - this.groupBoxCommBtn.Size = new System.Drawing.Size(380, 94); - this.groupBoxCommBtn.TabIndex = 0; + this.groupBoxCommBtn.Size = new System.Drawing.Size(474, 114); + this.groupBoxCommBtn.TabIndex = 1; this.groupBoxCommBtn.TabStop = false; this.groupBoxCommBtn.Text = "鍏叡鎿嶄綔"; // @@ -178,14 +136,13 @@ this.btnStart.Font = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Image = ((System.Drawing.Image)(resources.GetObject("btnStart.Image"))); this.btnStart.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.btnStart.Location = new System.Drawing.Point(248, 23); + this.btnStart.Location = new System.Drawing.Point(309, 23); this.btnStart.Name = "btnStart"; - this.btnStart.Size = new System.Drawing.Size(126, 54); + this.btnStart.Size = new System.Drawing.Size(159, 54); this.btnStart.TabIndex = 5; this.btnStart.Text = " 鍚� 鍔�"; this.btnStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.btnStart.UseVisualStyleBackColor = true; - this.btnStart.Click += new System.EventHandler(this.btnStart_Click); // // buttonClearStatus // @@ -195,7 +152,6 @@ this.buttonClearStatus.TabIndex = 4; this.buttonClearStatus.Text = "娓呴櫎鐘舵��"; this.buttonClearStatus.UseVisualStyleBackColor = true; - this.buttonClearStatus.Click += new System.EventHandler(this.buttonClearStatus_Click); // // buttonEmergencyStop // @@ -205,7 +161,6 @@ this.buttonEmergencyStop.TabIndex = 4; this.buttonEmergencyStop.Text = "绱ф�ュ仠姝�"; this.buttonEmergencyStop.UseVisualStyleBackColor = true; - this.buttonEmergencyStop.Click += new System.EventHandler(this.buttonEmergencyStop_Click); // // buttonServoEnable // @@ -215,7 +170,6 @@ this.buttonServoEnable.TabIndex = 4; this.buttonServoEnable.Text = "浼烘湇浣胯兘"; this.buttonServoEnable.UseVisualStyleBackColor = true; - this.buttonServoEnable.Click += new System.EventHandler(this.buttonServoEnable_Click); // // buttonSmoothStop // @@ -225,7 +179,6 @@ this.buttonSmoothStop.TabIndex = 4; this.buttonSmoothStop.Text = "骞虫粦鍋滄"; this.buttonSmoothStop.UseVisualStyleBackColor = true; - this.buttonSmoothStop.Click += new System.EventHandler(this.buttonSmoothStop_Click); // // buttonPositionReset // @@ -235,21 +188,26 @@ this.buttonPositionReset.TabIndex = 4; this.buttonPositionReset.Text = "浣嶇疆娓呴浂"; this.buttonPositionReset.UseVisualStyleBackColor = true; - this.buttonPositionReset.Click += new System.EventHandler(this.buttonPositionReset_Click); // - // tableLayoutPanel3 + // groupBoxPara // - this.tableLayoutPanel3.ColumnCount = 1; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(395, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(584, 714); - this.tableLayoutPanel3.TabIndex = 1; + this.groupBoxPara.Controls.Add(this.propGrid); + this.groupBoxPara.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBoxPara.Location = new System.Drawing.Point(3, 123); + this.groupBoxPara.Name = "groupBoxPara"; + this.groupBoxPara.Size = new System.Drawing.Size(474, 556); + this.groupBoxPara.TabIndex = 13; + this.groupBoxPara.TabStop = false; + this.groupBoxPara.Text = "鍙傛暟"; + // + // propGrid + // + this.propGrid.Dock = System.Windows.Forms.DockStyle.Fill; + this.propGrid.Location = new System.Drawing.Point(3, 17); + this.propGrid.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.propGrid.Name = "propGrid"; + this.propGrid.Size = new System.Drawing.Size(468, 536); + this.propGrid.TabIndex = 1; // // CtrlMotionCardOperationBase // @@ -257,14 +215,14 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.tableLayoutPanel1); this.Name = "CtrlMotionCardOperationBase"; - this.Size = new System.Drawing.Size(982, 720); + this.Size = new System.Drawing.Size(500, 720); this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.groupBoxPara.ResumeLayout(false); - this.groupBoxMoveModel.ResumeLayout(false); - this.groupBoxMoveModel.PerformLayout(); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); this.groupBoxCommBtn.ResumeLayout(false); this.groupBoxCommBtn.PerformLayout(); + this.groupBoxPara.ResumeLayout(false); this.ResumeLayout(false); } @@ -272,20 +230,18 @@ #endregion private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private System.Windows.Forms.GroupBox groupBoxCommBtn; - private System.Windows.Forms.GroupBox groupBoxPara; - private System.Windows.Forms.GroupBox groupBoxMoveModel; + private System.Windows.Forms.Button btnStart; private System.Windows.Forms.Button buttonClearStatus; private System.Windows.Forms.Button buttonEmergencyStop; private System.Windows.Forms.Button buttonServoEnable; private System.Windows.Forms.Button buttonSmoothStop; private System.Windows.Forms.Button buttonPositionReset; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; - private System.Windows.Forms.RadioButton radioGoHome; - private System.Windows.Forms.RadioButton radioJog; - private System.Windows.Forms.RadioButton radioP2P; + private System.Windows.Forms.GroupBox groupBoxPara; private System.Windows.Forms.PropertyGrid propGrid; - private System.Windows.Forms.Button btnStart; } } diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs index 5dd77d9..04377e7 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs @@ -31,6 +31,7 @@ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.listBoxMsg = new System.Windows.Forms.ListBox(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.SuspendLayout(); @@ -40,6 +41,7 @@ this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -73,6 +75,14 @@ this.listBoxMsg.Size = new System.Drawing.Size(603, 85); this.listBoxMsg.TabIndex = 1; // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(609, 194); + this.flowLayoutPanel1.TabIndex = 11; + // // CtrlMotionCardRunBase // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -90,5 +100,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.ListBox listBoxMsg; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; } } -- Gitblit v1.8.0