From 4bc5ee48e537d56190c943330f0093562912fb4f Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 12:25:33 +0800
Subject: [PATCH] io索引问题
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 2
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs | 32 ++++++++--------
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs | 56 ++++++++++++++--------------
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs | 4 +-
4 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 3bf8ec1..a25b5bf 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -856,7 +856,7 @@
/// 鎸変綅璁剧疆鏁板瓧 IO 杈撳嚭鐘舵��
/// </summary>
/// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param>
- /// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
+ /// <param name="value">false琛ㄧず鍏筹紝true琛ㄧず寮�锛屾澘鍗¤璁剧疆鍙栧弽</param>
public override void WriteOutput(short index, IOValue value)
{
short outNum = (short)(index % 100 + 1);
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
index b5ff08a..842650f 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisStatus.Designer.cs
@@ -67,7 +67,7 @@
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(580, 148);
+ this.groupBoxAxisStatus.Size = new System.Drawing.Size(440, 148);
this.groupBoxAxisStatus.TabIndex = 5;
this.groupBoxAxisStatus.TabStop = false;
this.groupBoxAxisStatus.Text = "杞寸姸鎬�";
@@ -76,7 +76,7 @@
//
this.ioIndicatorCtrl2.Desc = "浼烘湇浣胯兘";
this.ioIndicatorCtrl2.IsOn = null;
- this.ioIndicatorCtrl2.Location = new System.Drawing.Point(479, 17);
+ this.ioIndicatorCtrl2.Location = new System.Drawing.Point(344, 22);
this.ioIndicatorCtrl2.Name = "ioIndicatorCtrl2";
this.ioIndicatorCtrl2.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl2.TabIndex = 4;
@@ -85,7 +85,7 @@
//
this.ioIndicatorCtrl10.Desc = "杩愬姩鍑洪敊";
this.ioIndicatorCtrl10.IsOn = null;
- this.ioIndicatorCtrl10.Location = new System.Drawing.Point(328, 77);
+ this.ioIndicatorCtrl10.Location = new System.Drawing.Point(223, 82);
this.ioIndicatorCtrl10.Name = "ioIndicatorCtrl10";
this.ioIndicatorCtrl10.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl10.TabIndex = 4;
@@ -94,7 +94,7 @@
//
this.ioIndicatorCtrl9.Desc = "杩愬姩鐘舵��";
this.ioIndicatorCtrl9.IsOn = null;
- this.ioIndicatorCtrl9.Location = new System.Drawing.Point(328, 107);
+ this.ioIndicatorCtrl9.Location = new System.Drawing.Point(223, 112);
this.ioIndicatorCtrl9.Name = "ioIndicatorCtrl9";
this.ioIndicatorCtrl9.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl9.TabIndex = 4;
@@ -103,7 +103,7 @@
//
this.ioIndicatorCtrl8.Desc = "璐熼檺浣�";
this.ioIndicatorCtrl8.IsOn = null;
- this.ioIndicatorCtrl8.Location = new System.Drawing.Point(479, 47);
+ this.ioIndicatorCtrl8.Location = new System.Drawing.Point(344, 52);
this.ioIndicatorCtrl8.Name = "ioIndicatorCtrl8";
this.ioIndicatorCtrl8.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl8.TabIndex = 4;
@@ -112,7 +112,7 @@
//
this.ioIndicatorCtrl6.Desc = "姝ｉ檺浣�";
this.ioIndicatorCtrl6.IsOn = null;
- this.ioIndicatorCtrl6.Location = new System.Drawing.Point(328, 47);
+ this.ioIndicatorCtrl6.Location = new System.Drawing.Point(223, 52);
this.ioIndicatorCtrl6.Name = "ioIndicatorCtrl6";
this.ioIndicatorCtrl6.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl6.TabIndex = 4;
@@ -121,14 +121,14 @@
//
this.ioIndicatorCtrl1.Desc = "椹卞姩鎶ヨ";
this.ioIndicatorCtrl1.IsOn = null;
- this.ioIndicatorCtrl1.Location = new System.Drawing.Point(328, 17);
+ this.ioIndicatorCtrl1.Location = new System.Drawing.Point(223, 22);
this.ioIndicatorCtrl1.Name = "ioIndicatorCtrl1";
this.ioIndicatorCtrl1.Size = new System.Drawing.Size(90, 24);
this.ioIndicatorCtrl1.TabIndex = 4;
//
// textBoxCurVel
//
- this.textBoxCurVel.Location = new System.Drawing.Point(85, 113);
+ this.textBoxCurVel.Location = new System.Drawing.Point(76, 113);
this.textBoxCurVel.Name = "textBoxCurVel";
this.textBoxCurVel.ReadOnly = true;
this.textBoxCurVel.Size = new System.Drawing.Size(116, 21);
@@ -136,7 +136,7 @@
//
// textBoxPrfVel
//
- this.textBoxPrfVel.Location = new System.Drawing.Point(85, 84);
+ this.textBoxPrfVel.Location = new System.Drawing.Point(76, 84);
this.textBoxPrfVel.Name = "textBoxPrfVel";
this.textBoxPrfVel.ReadOnly = true;
this.textBoxPrfVel.Size = new System.Drawing.Size(116, 21);
@@ -144,7 +144,7 @@
//
// textBoxCurPosition
//
- this.textBoxCurPosition.Location = new System.Drawing.Point(85, 55);
+ this.textBoxCurPosition.Location = new System.Drawing.Point(76, 55);
this.textBoxCurPosition.Name = "textBoxCurPosition";
this.textBoxCurPosition.ReadOnly = true;
this.textBoxCurPosition.Size = new System.Drawing.Size(116, 21);
@@ -152,7 +152,7 @@
//
// textBoxPrfPositon
//
- this.textBoxPrfPositon.Location = new System.Drawing.Point(85, 23);
+ this.textBoxPrfPositon.Location = new System.Drawing.Point(76, 23);
this.textBoxPrfPositon.Name = "textBoxPrfPositon";
this.textBoxPrfPositon.ReadOnly = true;
this.textBoxPrfPositon.Size = new System.Drawing.Size(116, 21);
@@ -161,7 +161,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(23, 116);
+ this.label5.Location = new System.Drawing.Point(14, 116);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(65, 12);
this.label5.TabIndex = 2;
@@ -170,7 +170,7 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(23, 87);
+ this.label4.Location = new System.Drawing.Point(14, 87);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(65, 12);
this.label4.TabIndex = 2;
@@ -179,7 +179,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(23, 58);
+ this.label3.Location = new System.Drawing.Point(14, 58);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 12);
this.label3.TabIndex = 2;
@@ -188,7 +188,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(23, 26);
+ this.label2.Location = new System.Drawing.Point(14, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 2;
@@ -206,7 +206,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBoxAxisStatus);
this.Name = "CtrlMotionCardAxisStatus";
- this.Size = new System.Drawing.Size(580, 148);
+ this.Size = new System.Drawing.Size(440, 148);
this.groupBoxAxisStatus.ResumeLayout(false);
this.groupBoxAxisStatus.PerformLayout();
this.ResumeLayout(false);
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
index 69bd90d..d0f94b7 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
@@ -82,7 +82,7 @@
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(580, 288);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(440, 288);
this.tableLayoutPanel1.TabIndex = 0;
//
// groupBoxIOOut
@@ -106,7 +106,7 @@
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(574, 138);
+ this.groupBoxIOOut.Size = new System.Drawing.Size(434, 138);
this.groupBoxIOOut.TabIndex = 8;
this.groupBoxIOOut.TabStop = false;
this.groupBoxIOOut.Text = "鏁板瓧閲忚緭鍑�";
@@ -115,7 +115,7 @@
//
this.ioOut3.Desc = "OUT 3";
this.ioOut3.IsOn = null;
- this.ioOut3.Location = new System.Drawing.Point(477, 18);
+ 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;
@@ -124,7 +124,7 @@
//
this.ioOut2.Desc = "OUT 2";
this.ioOut2.IsOn = null;
- this.ioOut2.Location = new System.Drawing.Point(306, 18);
+ 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;
@@ -133,7 +133,7 @@
//
this.ioOut1.Desc = "OUT 1";
this.ioOut1.IsOn = null;
- this.ioOut1.Location = new System.Drawing.Point(145, 18);
+ 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;
@@ -142,7 +142,7 @@
//
this.ioOut15.Desc = "OUT 15";
this.ioOut15.IsOn = null;
- this.ioOut15.Location = new System.Drawing.Point(477, 107);
+ 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;
@@ -151,7 +151,7 @@
//
this.ioOut14.Desc = "OUT 14";
this.ioOut14.IsOn = null;
- this.ioOut14.Location = new System.Drawing.Point(306, 107);
+ 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;
@@ -160,7 +160,7 @@
//
this.ioOut13.Desc = "OUT 13";
this.ioOut13.IsOn = null;
- this.ioOut13.Location = new System.Drawing.Point(145, 107);
+ 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;
@@ -187,7 +187,7 @@
//
this.ioOut7.Desc = "OUT 7";
this.ioOut7.IsOn = null;
- this.ioOut7.Location = new System.Drawing.Point(477, 48);
+ 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;
@@ -196,7 +196,7 @@
//
this.ioOut6.Desc = "OUT 6";
this.ioOut6.IsOn = null;
- this.ioOut6.Location = new System.Drawing.Point(306, 48);
+ 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;
@@ -205,7 +205,7 @@
//
this.ioOut11.Desc = "OUT 11";
this.ioOut11.IsOn = null;
- this.ioOut11.Location = new System.Drawing.Point(477, 77);
+ 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;
@@ -214,7 +214,7 @@
//
this.ioOut10.Desc = "OUT 10";
this.ioOut10.IsOn = null;
- this.ioOut10.Location = new System.Drawing.Point(306, 77);
+ 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;
@@ -223,7 +223,7 @@
//
this.ioOut9.Desc = "OUT 9";
this.ioOut9.IsOn = null;
- this.ioOut9.Location = new System.Drawing.Point(145, 77);
+ 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;
@@ -232,7 +232,7 @@
//
this.ioOut5.Desc = "OUT 5";
this.ioOut5.IsOn = null;
- this.ioOut5.Location = new System.Drawing.Point(145, 48);
+ 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;
@@ -276,7 +276,7 @@
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(574, 138);
+ this.groupBoxIOIn.Size = new System.Drawing.Size(434, 138);
this.groupBoxIOIn.TabIndex = 7;
this.groupBoxIOIn.TabStop = false;
this.groupBoxIOIn.Text = "鏁板瓧閲忚緭鍏�";
@@ -285,7 +285,7 @@
//
this.ioIn3.Desc = "IN 3";
this.ioIn3.IsOn = null;
- this.ioIn3.Location = new System.Drawing.Point(477, 18);
+ this.ioIn3.Location = new System.Drawing.Point(335, 18);
this.ioIn3.Name = "ioIn3";
this.ioIn3.Size = new System.Drawing.Size(90, 24);
this.ioIn3.TabIndex = 4;
@@ -294,7 +294,7 @@
//
this.ioIn2.Desc = "IN 2";
this.ioIn2.IsOn = null;
- this.ioIn2.Location = new System.Drawing.Point(306, 18);
+ this.ioIn2.Location = new System.Drawing.Point(209, 18);
this.ioIn2.Name = "ioIn2";
this.ioIn2.Size = new System.Drawing.Size(90, 24);
this.ioIn2.TabIndex = 4;
@@ -303,7 +303,7 @@
//
this.ioIn1.Desc = "IN 1";
this.ioIn1.IsOn = null;
- this.ioIn1.Location = new System.Drawing.Point(145, 18);
+ this.ioIn1.Location = new System.Drawing.Point(102, 18);
this.ioIn1.Name = "ioIn1";
this.ioIn1.Size = new System.Drawing.Size(90, 24);
this.ioIn1.TabIndex = 4;
@@ -312,7 +312,7 @@
//
this.ioIn15.Desc = "IN 15";
this.ioIn15.IsOn = null;
- this.ioIn15.Location = new System.Drawing.Point(477, 107);
+ this.ioIn15.Location = new System.Drawing.Point(335, 107);
this.ioIn15.Name = "ioIn15";
this.ioIn15.Size = new System.Drawing.Size(90, 24);
this.ioIn15.TabIndex = 4;
@@ -321,7 +321,7 @@
//
this.ioIn14.Desc = "IN 14";
this.ioIn14.IsOn = null;
- this.ioIn14.Location = new System.Drawing.Point(306, 107);
+ this.ioIn14.Location = new System.Drawing.Point(209, 107);
this.ioIn14.Name = "ioIn14";
this.ioIn14.Size = new System.Drawing.Size(90, 24);
this.ioIn14.TabIndex = 4;
@@ -330,7 +330,7 @@
//
this.ioIn13.Desc = "IN 13";
this.ioIn13.IsOn = null;
- this.ioIn13.Location = new System.Drawing.Point(145, 107);
+ this.ioIn13.Location = new System.Drawing.Point(102, 107);
this.ioIn13.Name = "ioIn13";
this.ioIn13.Size = new System.Drawing.Size(90, 24);
this.ioIn13.TabIndex = 4;
@@ -357,7 +357,7 @@
//
this.ioIn7.Desc = "IN 7";
this.ioIn7.IsOn = null;
- this.ioIn7.Location = new System.Drawing.Point(477, 48);
+ this.ioIn7.Location = new System.Drawing.Point(335, 48);
this.ioIn7.Name = "ioIn7";
this.ioIn7.Size = new System.Drawing.Size(90, 24);
this.ioIn7.TabIndex = 4;
@@ -366,7 +366,7 @@
//
this.ioIn6.Desc = "IN 6";
this.ioIn6.IsOn = null;
- this.ioIn6.Location = new System.Drawing.Point(306, 48);
+ this.ioIn6.Location = new System.Drawing.Point(209, 48);
this.ioIn6.Name = "ioIn6";
this.ioIn6.Size = new System.Drawing.Size(90, 24);
this.ioIn6.TabIndex = 4;
@@ -375,7 +375,7 @@
//
this.ioIn11.Desc = "IN 11";
this.ioIn11.IsOn = null;
- this.ioIn11.Location = new System.Drawing.Point(477, 77);
+ this.ioIn11.Location = new System.Drawing.Point(335, 77);
this.ioIn11.Name = "ioIn11";
this.ioIn11.Size = new System.Drawing.Size(90, 24);
this.ioIn11.TabIndex = 4;
@@ -384,7 +384,7 @@
//
this.ioIn10.Desc = "IN 10";
this.ioIn10.IsOn = null;
- this.ioIn10.Location = new System.Drawing.Point(306, 77);
+ this.ioIn10.Location = new System.Drawing.Point(209, 77);
this.ioIn10.Name = "ioIn10";
this.ioIn10.Size = new System.Drawing.Size(90, 24);
this.ioIn10.TabIndex = 4;
@@ -393,7 +393,7 @@
//
this.ioIn9.Desc = "IN 9";
this.ioIn9.IsOn = null;
- this.ioIn9.Location = new System.Drawing.Point(145, 77);
+ this.ioIn9.Location = new System.Drawing.Point(102, 77);
this.ioIn9.Name = "ioIn9";
this.ioIn9.Size = new System.Drawing.Size(90, 24);
this.ioIn9.TabIndex = 4;
@@ -402,7 +402,7 @@
//
this.ioIn5.Desc = "IN 5";
this.ioIn5.IsOn = null;
- this.ioIn5.Location = new System.Drawing.Point(145, 48);
+ this.ioIn5.Location = new System.Drawing.Point(102, 48);
this.ioIn5.Name = "ioIn5";
this.ioIn5.Size = new System.Drawing.Size(90, 24);
this.ioIn5.TabIndex = 4;
@@ -437,7 +437,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "CtrlMotionCardIOStatus";
- this.Size = new System.Drawing.Size(580, 288);
+ this.Size = new System.Drawing.Size(440, 288);
this.tableLayoutPanel1.ResumeLayout(false);
this.groupBoxIOOut.ResumeLayout(false);
this.groupBoxIOIn.ResumeLayout(false);
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
index 528ef6b..cef3b62 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
@@ -52,8 +52,8 @@
private void IoOut_DoubleClick(string name, bool isOn)
{
- var index = Convert.ToInt16(name.Substring(6));
- MotionCard.WriteOutput(index, isOn ? IOValue.TRUE : IOValue.FALSE);
+ var index = Convert.ToInt16(name.Substring(5));
+ MotionCard.WriteOutput(index, isOn ? IOValue.FALSE : IOValue.TRUE);
}
private void RefreshIOStatus(object sender, EventArgs e)
--
Gitblit v1.8.0