From 865819f7f2d66cebb6bba68899159b9a24be3ee5 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 17:52:50 +0800
Subject: [PATCH] 板卡运行界面修改
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs | 38 +++++++-----------
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 3 +
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs | 19 ++++-----
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs | 12 +++---
4 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
index 77966fd..df1f1b2 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.cs
@@ -44,12 +44,12 @@
textBoxCurVel.Text = _axisMovingStatus.CurVelocity.ToString();
int axis_sts = _axisMovingStatus.AxisStatus;
- ioIndicatorCtrl1.IsOn = (axis_sts & 0x2) == 0;//椹卞姩鎶ヨ
- ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) == 1;//浼烘湇浣胯兘 1涓哄紑鍚�
- ioIndicatorCtrl6.IsOn = (axis_sts & 0x20) == 0;//姝ｉ檺浣�
- ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) == 0;//璐熼檺浣�
- ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) == 0;//杩愬姩鐘舵��
- ioIndicatorCtrl10.IsOn = (axis_sts & 0x10) == 0;//杩愬姩鍑洪敊
+ ioIndicatorCtrl1.IsOn = (axis_sts & 0x2) != 0;//椹卞姩鎶ヨ
+ ioIndicatorCtrl2.IsOn = (axis_sts & 0x200) != 0;//浼烘湇浣胯兘 1涓哄紑鍚�
+ ioIndicatorCtrl6.IsOn = (axis_sts & 0x20) != 0;//姝ｉ檺浣�
+ ioIndicatorCtrl8.IsOn = (axis_sts & 0x40) != 0;//璐熼檺浣�
+ ioIndicatorCtrl9.IsOn = (axis_sts & 0x400) != 0;//杩愬姩鐘舵��
+ ioIndicatorCtrl10.IsOn = (axis_sts & 0x10) != 0;//杩愬姩鍑洪敊
}
}
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
index d0f94b7..2317ed1 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
@@ -29,7 +29,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBoxIOOut = new System.Windows.Forms.GroupBox();
this.ioOut3 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioOut2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
@@ -65,25 +64,11 @@
this.ioIn4 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn0 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.timerIOStatus = new System.Windows.Forms.Timer(this.components);
- this.tableLayoutPanel1.SuspendLayout();
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.groupBoxIOOut.SuspendLayout();
this.groupBoxIOIn.SuspendLayout();
+ this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
- //
- // 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.groupBoxIOOut, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.groupBoxIOIn, 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 = 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.Size = new System.Drawing.Size(440, 288);
- this.tableLayoutPanel1.TabIndex = 0;
//
// groupBoxIOOut
//
@@ -103,7 +88,6 @@
this.groupBoxIOOut.Controls.Add(this.ioOut5);
this.groupBoxIOOut.Controls.Add(this.ioOut4);
this.groupBoxIOOut.Controls.Add(this.ioOut0);
- this.groupBoxIOOut.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxIOOut.Location = new System.Drawing.Point(3, 147);
this.groupBoxIOOut.Name = "groupBoxIOOut";
this.groupBoxIOOut.Size = new System.Drawing.Size(434, 138);
@@ -273,7 +257,6 @@
this.groupBoxIOIn.Controls.Add(this.ioIn5);
this.groupBoxIOIn.Controls.Add(this.ioIn4);
this.groupBoxIOIn.Controls.Add(this.ioIn0);
- this.groupBoxIOIn.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBoxIOIn.Location = new System.Drawing.Point(3, 3);
this.groupBoxIOIn.Name = "groupBoxIOIn";
this.groupBoxIOIn.Size = new System.Drawing.Size(434, 138);
@@ -431,23 +414,31 @@
this.timerIOStatus.Interval = 200;
this.timerIOStatus.Tick += new System.EventHandler(this.RefreshIOStatus);
//
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Controls.Add(this.groupBoxIOIn);
+ this.flowLayoutPanel1.Controls.Add(this.groupBoxIOOut);
+ this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(440, 288);
+ this.flowLayoutPanel1.TabIndex = 1;
+ //
// CtrlMotionCardIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.tableLayoutPanel1);
+ this.Controls.Add(this.flowLayoutPanel1);
this.Name = "CtrlMotionCardIOStatus";
this.Size = new System.Drawing.Size(440, 288);
- this.tableLayoutPanel1.ResumeLayout(false);
this.groupBoxIOOut.ResumeLayout(false);
this.groupBoxIOIn.ResumeLayout(false);
+ this.flowLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
-
- private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.GroupBox groupBoxIOIn;
private Model.Winform.IOIndicatorCtrl ioIn3;
private Model.Winform.IOIndicatorCtrl ioIn2;
@@ -483,5 +474,6 @@
private Model.Winform.IOIndicatorCtrl ioOut4;
private Model.Winform.IOIndicatorCtrl ioOut0;
private System.Windows.Forms.Timer timerIOStatus;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
}
}
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
index 9fcfc48..7de86cb 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
@@ -31,7 +31,7 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.buttonMotionCardOperation = new System.Windows.Forms.Button();
- this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
@@ -41,7 +41,7 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.buttonMotionCardOperation, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 2);
+ this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@@ -72,14 +72,13 @@
this.buttonMotionCardOperation.UseVisualStyleBackColor = true;
this.buttonMotionCardOperation.Click += new System.EventHandler(this.buttonMotionCardOperation_Click);
//
- // flowLayoutPanel2
+ // panel1
//
- this.flowLayoutPanel2.AutoScroll = true;
- this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 311);
- this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Size = new System.Drawing.Size(609, 273);
- this.flowLayoutPanel2.TabIndex = 13;
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(3, 311);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(609, 273);
+ this.panel1.TabIndex = 13;
//
// CtrlMotionCardRunBase
//
@@ -97,6 +96,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Button buttonMotionCardOperation;
- private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
+ private System.Windows.Forms.Panel panel1;
}
}
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 279648c..35a5ac4 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -49,7 +49,8 @@
}
CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device);
- flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
+ ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
+ panel1.Controls.Add(ctrlMotionCardIOStatus);
}
--
Gitblit v1.8.0