From d9807295fad0ca4781cdacd4c16f1e6f0765d5cc Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 07 九月 2020 12:09:28 +0800
Subject: [PATCH] io 界面滚动
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs | 348 ++++++++++++++++++++++++------------------------
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 6
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs | 19 +-
3 files changed, 187 insertions(+), 186 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
index 2317ed1..e3d01aa 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
@@ -30,23 +30,9 @@
{
this.components = new System.ComponentModel.Container();
this.groupBoxIOOut = new System.Windows.Forms.GroupBox();
- this.ioOut3 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut15 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut14 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut13 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut12 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut8 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut7 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut6 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut11 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut10 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut9 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut5 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut4 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.ioOut0 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.groupBoxIOIn = new System.Windows.Forms.GroupBox();
+ this.timerIOStatus = new System.Windows.Forms.Timer(this.components);
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.ioIn3 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
@@ -63,8 +49,22 @@
this.ioIn5 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
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.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+ this.ioOut3 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut2 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut15 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut14 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut13 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut12 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut8 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut7 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut6 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut11 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut10 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut9 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut5 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut4 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
+ this.ioOut0 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.groupBoxIOOut.SuspendLayout();
this.groupBoxIOIn.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
@@ -95,150 +95,6 @@
this.groupBoxIOOut.TabStop = false;
this.groupBoxIOOut.Text = "鏁板瓧閲忚緭鍑�";
//
- // ioOut3
- //
- this.ioOut3.Desc = "OUT 3";
- this.ioOut3.IsOn = null;
- this.ioOut3.Location = new System.Drawing.Point(335, 18);
- this.ioOut3.Name = "ioOut3";
- this.ioOut3.Size = new System.Drawing.Size(90, 24);
- this.ioOut3.TabIndex = 4;
- //
- // ioOut2
- //
- this.ioOut2.Desc = "OUT 2";
- this.ioOut2.IsOn = null;
- this.ioOut2.Location = new System.Drawing.Point(209, 18);
- this.ioOut2.Name = "ioOut2";
- this.ioOut2.Size = new System.Drawing.Size(90, 24);
- this.ioOut2.TabIndex = 4;
- //
- // ioOut1
- //
- this.ioOut1.Desc = "OUT 1";
- this.ioOut1.IsOn = null;
- this.ioOut1.Location = new System.Drawing.Point(102, 18);
- this.ioOut1.Name = "ioOut1";
- this.ioOut1.Size = new System.Drawing.Size(90, 24);
- this.ioOut1.TabIndex = 4;
- //
- // ioOut15
- //
- this.ioOut15.Desc = "OUT 15";
- this.ioOut15.IsOn = null;
- this.ioOut15.Location = new System.Drawing.Point(335, 107);
- this.ioOut15.Name = "ioOut15";
- this.ioOut15.Size = new System.Drawing.Size(90, 24);
- this.ioOut15.TabIndex = 4;
- //
- // ioOut14
- //
- this.ioOut14.Desc = "OUT 14";
- this.ioOut14.IsOn = null;
- this.ioOut14.Location = new System.Drawing.Point(209, 107);
- this.ioOut14.Name = "ioOut14";
- this.ioOut14.Size = new System.Drawing.Size(90, 24);
- this.ioOut14.TabIndex = 4;
- //
- // ioOut13
- //
- this.ioOut13.Desc = "OUT 13";
- this.ioOut13.IsOn = null;
- this.ioOut13.Location = new System.Drawing.Point(102, 107);
- this.ioOut13.Name = "ioOut13";
- this.ioOut13.Size = new System.Drawing.Size(90, 24);
- this.ioOut13.TabIndex = 4;
- //
- // ioOut12
- //
- this.ioOut12.Desc = "OUT 12";
- this.ioOut12.IsOn = null;
- this.ioOut12.Location = new System.Drawing.Point(9, 106);
- this.ioOut12.Name = "ioOut12";
- this.ioOut12.Size = new System.Drawing.Size(90, 24);
- this.ioOut12.TabIndex = 4;
- //
- // ioOut8
- //
- this.ioOut8.Desc = "OUT 8";
- this.ioOut8.IsOn = null;
- this.ioOut8.Location = new System.Drawing.Point(9, 77);
- this.ioOut8.Name = "ioOut8";
- this.ioOut8.Size = new System.Drawing.Size(90, 24);
- this.ioOut8.TabIndex = 4;
- //
- // ioOut7
- //
- this.ioOut7.Desc = "OUT 7";
- this.ioOut7.IsOn = null;
- this.ioOut7.Location = new System.Drawing.Point(335, 48);
- this.ioOut7.Name = "ioOut7";
- this.ioOut7.Size = new System.Drawing.Size(90, 24);
- this.ioOut7.TabIndex = 4;
- //
- // ioOut6
- //
- this.ioOut6.Desc = "OUT 6";
- this.ioOut6.IsOn = null;
- this.ioOut6.Location = new System.Drawing.Point(209, 48);
- this.ioOut6.Name = "ioOut6";
- this.ioOut6.Size = new System.Drawing.Size(90, 24);
- this.ioOut6.TabIndex = 4;
- //
- // ioOut11
- //
- this.ioOut11.Desc = "OUT 11";
- this.ioOut11.IsOn = null;
- this.ioOut11.Location = new System.Drawing.Point(335, 77);
- this.ioOut11.Name = "ioOut11";
- this.ioOut11.Size = new System.Drawing.Size(90, 24);
- this.ioOut11.TabIndex = 4;
- //
- // ioOut10
- //
- this.ioOut10.Desc = "OUT 10";
- this.ioOut10.IsOn = null;
- this.ioOut10.Location = new System.Drawing.Point(209, 77);
- this.ioOut10.Name = "ioOut10";
- this.ioOut10.Size = new System.Drawing.Size(90, 24);
- this.ioOut10.TabIndex = 4;
- //
- // ioOut9
- //
- this.ioOut9.Desc = "OUT 9";
- this.ioOut9.IsOn = null;
- this.ioOut9.Location = new System.Drawing.Point(102, 77);
- this.ioOut9.Name = "ioOut9";
- this.ioOut9.Size = new System.Drawing.Size(90, 24);
- this.ioOut9.TabIndex = 4;
- //
- // ioOut5
- //
- this.ioOut5.Desc = "OUT 5";
- this.ioOut5.IsOn = null;
- this.ioOut5.Location = new System.Drawing.Point(102, 48);
- this.ioOut5.Name = "ioOut5";
- this.ioOut5.Size = new System.Drawing.Size(90, 24);
- this.ioOut5.TabIndex = 4;
- //
- // ioOut4
- //
- this.ioOut4.Desc = "OUT 4";
- this.ioOut4.IsOn = null;
- this.ioOut4.Location = new System.Drawing.Point(9, 48);
- this.ioOut4.Name = "ioOut4";
- this.ioOut4.Size = new System.Drawing.Size(90, 24);
- this.ioOut4.TabIndex = 4;
- //
- // ioOut0
- //
- this.ioOut0.Desc = "OUT 0";
- this.ioOut0.IsOn = null;
- this.ioOut0.Location = new System.Drawing.Point(9, 18);
- this.ioOut0.Name = "ioOut0";
- this.ioOut0.Size = new System.Drawing.Size(90, 24);
- this.ioOut0.TabIndex = 4;
- //
// groupBoxIOIn
//
this.groupBoxIOIn.Controls.Add(this.ioIn3);
@@ -263,6 +119,22 @@
this.groupBoxIOIn.TabIndex = 7;
this.groupBoxIOIn.TabStop = false;
this.groupBoxIOIn.Text = "鏁板瓧閲忚緭鍏�";
+ //
+ // timerIOStatus
+ //
+ this.timerIOStatus.Enabled = true;
+ 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;
//
// ioIn3
//
@@ -408,21 +280,149 @@
this.ioIn0.Size = new System.Drawing.Size(90, 24);
this.ioIn0.TabIndex = 4;
//
- // timerIOStatus
+ // ioOut3
//
- this.timerIOStatus.Enabled = true;
- this.timerIOStatus.Interval = 200;
- this.timerIOStatus.Tick += new System.EventHandler(this.RefreshIOStatus);
+ this.ioOut3.Desc = "OUT 3";
+ this.ioOut3.IsOn = null;
+ this.ioOut3.Location = new System.Drawing.Point(335, 18);
+ this.ioOut3.Name = "ioOut3";
+ this.ioOut3.Size = new System.Drawing.Size(90, 24);
+ this.ioOut3.TabIndex = 4;
//
- // flowLayoutPanel1
+ // ioOut2
//
- 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;
+ this.ioOut2.Desc = "OUT 2";
+ this.ioOut2.IsOn = null;
+ this.ioOut2.Location = new System.Drawing.Point(209, 18);
+ this.ioOut2.Name = "ioOut2";
+ this.ioOut2.Size = new System.Drawing.Size(90, 24);
+ this.ioOut2.TabIndex = 4;
+ //
+ // ioOut1
+ //
+ this.ioOut1.Desc = "OUT 1";
+ this.ioOut1.IsOn = null;
+ this.ioOut1.Location = new System.Drawing.Point(102, 18);
+ this.ioOut1.Name = "ioOut1";
+ this.ioOut1.Size = new System.Drawing.Size(90, 24);
+ this.ioOut1.TabIndex = 4;
+ //
+ // ioOut15
+ //
+ this.ioOut15.Desc = "OUT 15";
+ this.ioOut15.IsOn = null;
+ this.ioOut15.Location = new System.Drawing.Point(335, 107);
+ this.ioOut15.Name = "ioOut15";
+ this.ioOut15.Size = new System.Drawing.Size(90, 24);
+ this.ioOut15.TabIndex = 4;
+ //
+ // ioOut14
+ //
+ this.ioOut14.Desc = "OUT 14";
+ this.ioOut14.IsOn = null;
+ this.ioOut14.Location = new System.Drawing.Point(209, 107);
+ this.ioOut14.Name = "ioOut14";
+ this.ioOut14.Size = new System.Drawing.Size(90, 24);
+ this.ioOut14.TabIndex = 4;
+ //
+ // ioOut13
+ //
+ this.ioOut13.Desc = "OUT 13";
+ this.ioOut13.IsOn = null;
+ this.ioOut13.Location = new System.Drawing.Point(102, 107);
+ this.ioOut13.Name = "ioOut13";
+ this.ioOut13.Size = new System.Drawing.Size(90, 24);
+ this.ioOut13.TabIndex = 4;
+ //
+ // ioOut12
+ //
+ this.ioOut12.Desc = "OUT 12";
+ this.ioOut12.IsOn = null;
+ this.ioOut12.Location = new System.Drawing.Point(9, 106);
+ this.ioOut12.Name = "ioOut12";
+ this.ioOut12.Size = new System.Drawing.Size(90, 24);
+ this.ioOut12.TabIndex = 4;
+ //
+ // ioOut8
+ //
+ this.ioOut8.Desc = "OUT 8";
+ this.ioOut8.IsOn = null;
+ this.ioOut8.Location = new System.Drawing.Point(9, 77);
+ this.ioOut8.Name = "ioOut8";
+ this.ioOut8.Size = new System.Drawing.Size(90, 24);
+ this.ioOut8.TabIndex = 4;
+ //
+ // ioOut7
+ //
+ this.ioOut7.Desc = "OUT 7";
+ this.ioOut7.IsOn = null;
+ this.ioOut7.Location = new System.Drawing.Point(335, 48);
+ this.ioOut7.Name = "ioOut7";
+ this.ioOut7.Size = new System.Drawing.Size(90, 24);
+ this.ioOut7.TabIndex = 4;
+ //
+ // ioOut6
+ //
+ this.ioOut6.Desc = "OUT 6";
+ this.ioOut6.IsOn = null;
+ this.ioOut6.Location = new System.Drawing.Point(209, 48);
+ this.ioOut6.Name = "ioOut6";
+ this.ioOut6.Size = new System.Drawing.Size(90, 24);
+ this.ioOut6.TabIndex = 4;
+ //
+ // ioOut11
+ //
+ this.ioOut11.Desc = "OUT 11";
+ this.ioOut11.IsOn = null;
+ this.ioOut11.Location = new System.Drawing.Point(335, 77);
+ this.ioOut11.Name = "ioOut11";
+ this.ioOut11.Size = new System.Drawing.Size(90, 24);
+ this.ioOut11.TabIndex = 4;
+ //
+ // ioOut10
+ //
+ this.ioOut10.Desc = "OUT 10";
+ this.ioOut10.IsOn = null;
+ this.ioOut10.Location = new System.Drawing.Point(209, 77);
+ this.ioOut10.Name = "ioOut10";
+ this.ioOut10.Size = new System.Drawing.Size(90, 24);
+ this.ioOut10.TabIndex = 4;
+ //
+ // ioOut9
+ //
+ this.ioOut9.Desc = "OUT 9";
+ this.ioOut9.IsOn = null;
+ this.ioOut9.Location = new System.Drawing.Point(102, 77);
+ this.ioOut9.Name = "ioOut9";
+ this.ioOut9.Size = new System.Drawing.Size(90, 24);
+ this.ioOut9.TabIndex = 4;
+ //
+ // ioOut5
+ //
+ this.ioOut5.Desc = "OUT 5";
+ this.ioOut5.IsOn = null;
+ this.ioOut5.Location = new System.Drawing.Point(102, 48);
+ this.ioOut5.Name = "ioOut5";
+ this.ioOut5.Size = new System.Drawing.Size(90, 24);
+ this.ioOut5.TabIndex = 4;
+ //
+ // ioOut4
+ //
+ this.ioOut4.Desc = "OUT 4";
+ this.ioOut4.IsOn = null;
+ this.ioOut4.Location = new System.Drawing.Point(9, 48);
+ this.ioOut4.Name = "ioOut4";
+ this.ioOut4.Size = new System.Drawing.Size(90, 24);
+ this.ioOut4.TabIndex = 4;
+ //
+ // ioOut0
+ //
+ this.ioOut0.Desc = "OUT 0";
+ this.ioOut0.IsOn = null;
+ this.ioOut0.Location = new System.Drawing.Point(9, 18);
+ this.ioOut0.Name = "ioOut0";
+ this.ioOut0.Size = new System.Drawing.Size(90, 24);
+ this.ioOut0.TabIndex = 4;
//
// CtrlMotionCardIOStatus
//
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.Designer.cs
index 7de86cb..fbf3a5e 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.panel1 = new System.Windows.Forms.Panel();
+ this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
@@ -39,9 +39,9 @@
//
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.buttonMotionCardOperation, 0, 0);
- 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,13 +72,14 @@
this.buttonMotionCardOperation.UseVisualStyleBackColor = true;
this.buttonMotionCardOperation.Click += new System.EventHandler(this.buttonMotionCardOperation_Click);
//
- // panel1
+ // flowLayoutPanel2
//
- 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;
+ 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;
//
// CtrlMotionCardRunBase
//
@@ -96,6 +97,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Button buttonMotionCardOperation;
- private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
}
}
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 35a5ac4..6da479f 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -44,13 +44,13 @@
{
foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
{
- CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(Device,axisConfig.AxisIndex, axisConfig.AxisName);
+ CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(Device, axisConfig.AxisIndex, axisConfig.AxisName);
flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
}
CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device);
- ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
- panel1.Controls.Add(ctrlMotionCardIOStatus);
+ //ctrlMotionCardIOStatus.Dock = DockStyle.Fill; //flowLayoutPanel鍐呴儴鎺т欢 涓嶈dock fill
+ flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
}
--
Gitblit v1.8.0