diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI.vb b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
index a1222f2..d6a94f0 100644
--- a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
+++ b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI.vb
@@ -951,9 +951,10 @@ Namespace CNC
'''
''' Restituisce posizione assi (tutti)
'''
- '''
+ ''' Tipo posizione richeista (1..6)
+ ''' Vettore posizioni richieste
'''
- Public Overridable Function getAllAxisPos(ByRef AxisPos As OPENcontrol.GETINTDATA()) As Boolean
+ Public Overridable Function getAllAxisPos(tipoPos As Int16, ByRef AxisPos As OPENcontrol.GETINTDATA()) As Boolean
Return True
End Function
diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
index b990ccd..36f8aa5 100644
--- a/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
+++ b/MTC_Adapter/CMSCncLib/CNC/CNC.OSAI/CNC.OSAI_SOAP.vb
@@ -1095,7 +1095,7 @@ Retry: nRetry += 1
End Function
- Public Overloads Overrides Function getAllAxisPos(ByRef AxisPos As OPENcontrol.GETINTDATA()) As Boolean
+ Public Overloads Overrides Function getAllAxisPos(tipoPos As Int16, ByRef AxisPos As OPENcontrol.GETINTDATA()) As Boolean
' RIFERIMENTO:
' CndexLinkUser.pdf | pag 146, 266
@@ -1111,7 +1111,7 @@ Retry: nRetry += 1
myGetAxesPosition.ProcNum = ProcessId
myGetAxesPosition.AxisName = "0"
myGetAxesPosition.NumAxis = AxisPos.Length
- myGetAxesPosition.Select = 1
+ myGetAxesPosition.Select = tipoPos
myGetAxesPositionR = OPENws.GetAxesPosition(myGetAxesPosition)
If O_CheckRetError(myGetAxesPositionR.retval, myGetAxesPositionR.ErrClass, myGetAxesPositionR.ErrNum, "ReadCurrentAnomalyMsg() O_ReadCurrentAnomalyMsg CNC.OSAI_OPEN", szReturn) Then
diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
index ce4a88c..e691cce 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
@@ -1629,8 +1629,10 @@ namespace MTC_Adapter
inizio = DateTime.Now;
// inizializzo x numero assi...
- CMSCncLib.OPENcontrol.GETINTDATA[] posAssi= new CMSCncLib.OPENcontrol.GETINTDATA[currAdpConf.nAxis];
- OSAI_ref.getAllAxisPos(ref posAssi);
+ CMSCncLib.OPENcontrol.GETINTDATA[] posAssiTgt = new CMSCncLib.OPENcontrol.GETINTDATA[currAdpConf.nAxis];
+ CMSCncLib.OPENcontrol.GETINTDATA[] posAssi = new CMSCncLib.OPENcontrol.GETINTDATA[currAdpConf.nAxis];
+ OSAI_ref.getAllAxisPos(1, ref posAssiTgt);
+ OSAI_ref.getAllAxisPos(2, ref posAssi);
if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_POS", DateTime.Now.Subtract(inizio).Ticks);
// NON c'รจ LOAD assi...
@@ -1639,9 +1641,10 @@ namespace MTC_Adapter
CMSCncLib.Focas1.ODBSVLOAD loadAssi = OSAI_ref.getAllAxisLoad();
if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_LOAD", DateTime.Now.Subtract(inizio).Ticks);
#endif
-
+
// nuova posizione (per calcoli)
double newPos = 0;
+ double newPosTgt = 0;
double distPerc = 0;
int newDir = 0;
string tipoAsse = "";
@@ -1653,159 +1656,18 @@ namespace MTC_Adapter
// per sicurezza try-catch
try
{
- // in base a indice scelgo valore posizione e load
-#if false
- switch (i)
- {
- case 0:
- valPos = posAssi.p1;
- valLoad = loadAssi.svload1;
- break;
- case 1:
- valPos = posAssi.p2;
- valLoad = loadAssi.svload2;
- break;
- case 2:
- valPos = posAssi.p3;
- valLoad = loadAssi.svload3;
- break;
- case 3:
- valPos = posAssi.p4;
- valLoad = loadAssi.svload4;
- break;
- case 4:
- valPos = posAssi.p5;
- valLoad = loadAssi.svload5;
- break;
- case 5:
- valPos = posAssi.p6;
- valLoad = loadAssi.svload6;
- break;
- case 6:
- valPos = posAssi.p7;
- valLoad = loadAssi.svload7;
- break;
- case 7:
- valPos = posAssi.p8;
- valLoad = loadAssi.svload8;
- break;
- case 8:
- valPos = posAssi.p9;
- valLoad = loadAssi.svload9;
- break;
- case 9:
- valPos = posAssi.p10;
- valLoad = loadAssi.svload10;
- break;
- case 10:
- valPos = posAssi.p11;
- valLoad = loadAssi.svload11;
- break;
- case 11:
- valPos = posAssi.p12;
- valLoad = loadAssi.svload12;
- break;
- case 12:
- valPos = posAssi.p13;
- valLoad = loadAssi.svload13;
- break;
- case 13:
- valPos = posAssi.p14;
- valLoad = loadAssi.svload14;
- break;
- case 14:
- valPos = posAssi.p15;
- valLoad = loadAssi.svload15;
- break;
- case 15:
- valPos = posAssi.p16;
- valLoad = loadAssi.svload16;
- break;
- case 16:
- valPos = posAssi.p17;
- valLoad = loadAssi.svload17;
- break;
- case 17:
- valPos = posAssi.p18;
- valLoad = loadAssi.svload18;
- break;
- case 18:
- valPos = posAssi.p19;
- valLoad = loadAssi.svload19;
- break;
- case 19:
- valPos = posAssi.p20;
- valLoad = loadAssi.svload20;
- break;
- case 20:
- valPos = posAssi.p21;
- valLoad = loadAssi.svload21;
- break;
- case 21:
- valPos = posAssi.p22;
- valLoad = loadAssi.svload22;
- break;
- case 22:
- valPos = posAssi.p23;
- valLoad = loadAssi.svload23;
- break;
- case 23:
- valPos = posAssi.p24;
- valLoad = loadAssi.svload24;
- break;
- case 24:
- valPos = posAssi.p25;
- valLoad = loadAssi.svload25;
- break;
- case 25:
- valPos = posAssi.p26;
- valLoad = loadAssi.svload26;
- break;
- case 26:
- valPos = posAssi.p27;
- valLoad = loadAssi.svload27;
- break;
- case 27:
- valPos = posAssi.p28;
- valLoad = loadAssi.svload28;
- break;
- case 28:
- valPos = posAssi.p29;
- valLoad = loadAssi.svload29;
- break;
- case 29:
- valPos = posAssi.p30;
- valLoad = loadAssi.svload30;
- break;
- case 30:
- valPos = posAssi.p31;
- valLoad = loadAssi.svload31;
- break;
- case 31:
- valPos = posAssi.p32;
- valLoad = loadAssi.svload32;
- break;
- default:
- // 2017.03.01 suggerimento Fabio: in CMS_FANUC in advanced compiler options mettere FS30D=1,SIEMENS=1 x leggere + assi?!?
- valPos = posAssi.p1;
- valLoad = loadAssi.svload1;
- break;
- }
-#endif
-
//string axName = System.Text.Encoding.ASCII.GetString(posAssi[i].AxisName);
- axName = Convert.ToChar(posAssi[i].AxisName);
+ axName = Convert.ToChar(posAssiTgt[i].AxisName);
newPos = posAssi[i].position;
- // popolo valori...
+ newPosTgt = posAssiTgt[i].position;
+ // popolo valori... tranne LOAD
#if false
vettAxis[i].mAxLoad.Value = (double)(valLoad.data) / Math.Pow(10, valLoad.dec);
newPos = (double)(valPos.abs.data) / Math.Pow(10, valPos.abs.dec);
#endif
vettAxis[i].mAxPosAct.Value = newPos;
-#if false
- vettAxis[i].mAxPosTgt.Value = newPos + (double)(valPos.dist.data) / Math.Pow(10, valPos.dist.dec);
-#endif
+ vettAxis[i].mAxPosTgt.Value = newPosTgt;
vettAxis[i].mAxFeedAct.Value = FeedRate;
@@ -1839,7 +1701,7 @@ namespace MTC_Adapter
if (utils.CRB("verbose"))
{
- sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, ToGo:{2:N3}{3} | {4}", axName, newPos, "", "...", direzione));
+ sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, Prg:{2:N3} | {3}", axName, newPos, newPosTgt, direzione));
}
// salvo valori vettore prec...
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
index 32862e8..4e4afa5 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
@@ -243,9 +243,10 @@
// PlcErr_02
//
this.PlcErr_02.AutoSize = true;
- this.PlcErr_02.Location = new System.Drawing.Point(96, 43);
+ this.PlcErr_02.Location = new System.Drawing.Point(128, 53);
+ this.PlcErr_02.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PlcErr_02.Name = "PlcErr_02";
- this.PlcErr_02.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_02.Size = new System.Drawing.Size(92, 21);
this.PlcErr_02.TabIndex = 6;
this.PlcErr_02.Text = "PlcErr_05";
this.PlcErr_02.UseVisualStyleBackColor = true;
@@ -261,9 +262,11 @@
this.groupBox4.Controls.Add(this.label7);
this.groupBox4.Controls.Add(this.messageText);
this.groupBox4.Controls.Add(this.messageCode);
- this.groupBox4.Location = new System.Drawing.Point(4, 418);
+ this.groupBox4.Location = new System.Drawing.Point(5, 514);
+ this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(379, 52);
+ this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox4.Size = new System.Drawing.Size(505, 64);
this.groupBox4.TabIndex = 44;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Message";
@@ -271,123 +274,136 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(118, 26);
+ this.label8.Location = new System.Drawing.Point(157, 32);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(30, 15);
+ this.label8.Size = new System.Drawing.Size(35, 17);
this.label8.TabIndex = 19;
this.label8.Text = "Text";
//
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(4, 26);
+ this.label7.Location = new System.Drawing.Point(5, 32);
+ this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(36, 15);
+ this.label7.Size = new System.Drawing.Size(41, 17);
this.label7.TabIndex = 18;
this.label7.Text = "Code";
//
// messageText
//
- this.messageText.Location = new System.Drawing.Point(151, 23);
+ this.messageText.Location = new System.Drawing.Point(201, 28);
+ this.messageText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.messageText.Name = "messageText";
- this.messageText.Size = new System.Drawing.Size(215, 20);
+ this.messageText.Size = new System.Drawing.Size(285, 22);
this.messageText.TabIndex = 14;
this.messageText.Leave += new System.EventHandler(this.message_Leave);
//
// messageCode
//
- this.messageCode.Location = new System.Drawing.Point(50, 23);
+ this.messageCode.Location = new System.Drawing.Point(67, 28);
+ this.messageCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.messageCode.Name = "messageCode";
- this.messageCode.Size = new System.Drawing.Size(62, 20);
+ this.messageCode.Size = new System.Drawing.Size(81, 22);
this.messageCode.TabIndex = 13;
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(12, 367);
+ this.label6.Location = new System.Drawing.Point(16, 452);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(0, 15);
+ this.label6.Size = new System.Drawing.Size(0, 17);
this.label6.TabIndex = 43;
//
// AxFeedOverValue
//
- this.AxFeedOverValue.Location = new System.Drawing.Point(265, 163);
+ this.AxFeedOverValue.Location = new System.Drawing.Point(353, 201);
+ this.AxFeedOverValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxFeedOverValue.Name = "AxFeedOverValue";
- this.AxFeedOverValue.Size = new System.Drawing.Size(100, 20);
+ this.AxFeedOverValue.Size = new System.Drawing.Size(132, 22);
this.AxFeedOverValue.TabIndex = 26;
//
// AxFeedActValue
//
- this.AxFeedActValue.Location = new System.Drawing.Point(265, 142);
+ this.AxFeedActValue.Location = new System.Drawing.Point(353, 175);
+ this.AxFeedActValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxFeedActValue.Name = "AxFeedActValue";
- this.AxFeedActValue.Size = new System.Drawing.Size(100, 20);
+ this.AxFeedActValue.Size = new System.Drawing.Size(132, 22);
this.AxFeedActValue.TabIndex = 25;
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(12, 166);
+ this.label9.Location = new System.Drawing.Point(16, 204);
+ this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(63, 15);
+ this.label9.Size = new System.Drawing.Size(75, 17);
this.label9.TabIndex = 24;
this.label9.Text = "Feed Over";
//
// AxFeedOver
//
- this.AxFeedOver.Location = new System.Drawing.Point(81, 163);
+ this.AxFeedOver.Location = new System.Drawing.Point(108, 201);
this.AxFeedOver.Maximum = 150;
this.AxFeedOver.Name = "AxFeedOver";
- this.AxFeedOver.Size = new System.Drawing.Size(168, 18);
+ this.AxFeedOver.Size = new System.Drawing.Size(224, 18);
this.AxFeedOver.TabIndex = 23;
this.AxFeedOver.Scroll += new System.Windows.Forms.ScrollEventHandler(this.cSpeed_Scroll);
//
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(12, 145);
+ this.label10.Location = new System.Drawing.Point(16, 178);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(54, 15);
+ this.label10.Size = new System.Drawing.Size(64, 17);
this.label10.TabIndex = 22;
this.label10.Text = "Feed Act";
//
// AxFeedAct
//
- this.AxFeedAct.Location = new System.Drawing.Point(81, 142);
+ this.AxFeedAct.Location = new System.Drawing.Point(108, 175);
this.AxFeedAct.Name = "AxFeedAct";
- this.AxFeedAct.Size = new System.Drawing.Size(168, 18);
+ this.AxFeedAct.Size = new System.Drawing.Size(224, 18);
this.AxFeedAct.TabIndex = 20;
this.AxFeedAct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.cLoad_Scroll);
//
// partID
//
- this.partID.Location = new System.Drawing.Point(80, 45);
+ this.partID.Location = new System.Drawing.Point(107, 55);
+ this.partID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.partID.Name = "partID";
- this.partID.Size = new System.Drawing.Size(100, 20);
+ this.partID.Size = new System.Drawing.Size(132, 22);
this.partID.TabIndex = 49;
//
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(31, 48);
+ this.label13.Location = new System.Drawing.Point(41, 59);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(44, 15);
+ this.label13.Size = new System.Drawing.Size(51, 17);
this.label13.TabIndex = 48;
this.label13.Text = "Part ID";
//
// functionalMode
//
this.functionalMode.FormattingEnabled = true;
- this.functionalMode.Location = new System.Drawing.Point(80, 71);
+ this.functionalMode.Location = new System.Drawing.Point(107, 87);
+ this.functionalMode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.functionalMode.Name = "functionalMode";
- this.functionalMode.Size = new System.Drawing.Size(293, 21);
+ this.functionalMode.Size = new System.Drawing.Size(389, 24);
this.functionalMode.TabIndex = 47;
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(15, 74);
+ this.label12.Location = new System.Drawing.Point(20, 91);
+ this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(58, 15);
+ this.label12.Size = new System.Drawing.Size(69, 17);
this.label12.TabIndex = 46;
this.label12.Text = "Halt Type";
//
@@ -405,10 +421,11 @@
this.I,
this.J,
this.K});
- this.PosAct.Location = new System.Drawing.Point(80, 115);
+ this.PosAct.Location = new System.Drawing.Point(107, 142);
+ this.PosAct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PosAct.Name = "PosAct";
this.PosAct.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.PosAct.Size = new System.Drawing.Size(292, 41);
+ this.PosAct.Size = new System.Drawing.Size(389, 50);
this.PosAct.TabIndex = 32;
//
// X
@@ -416,49 +433,50 @@
this.X.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.X.HeaderText = "X";
this.X.Name = "X";
- this.X.Width = 44;
+ this.X.Width = 46;
//
// Y
//
this.Y.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.Y.HeaderText = "Y";
this.Y.Name = "Y";
- this.Y.Width = 43;
+ this.Y.Width = 46;
//
// Z
//
this.Z.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.Z.HeaderText = "Z";
this.Z.Name = "Z";
- this.Z.Width = 43;
+ this.Z.Width = 46;
//
// I
//
this.I.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.I.HeaderText = "I";
this.I.Name = "I";
- this.I.Width = 39;
+ this.I.Width = 40;
//
// J
//
this.J.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.J.HeaderText = "J";
this.J.Name = "J";
- this.J.Width = 42;
+ this.J.Width = 44;
//
// K
//
this.K.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.K.HeaderText = "K";
this.K.Name = "K";
- this.K.Width = 44;
+ this.K.Width = 46;
//
// PlcErr_03
//
this.PlcErr_03.AutoSize = true;
- this.PlcErr_03.Location = new System.Drawing.Point(96, 66);
+ this.PlcErr_03.Location = new System.Drawing.Point(128, 81);
+ this.PlcErr_03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PlcErr_03.Name = "PlcErr_03";
- this.PlcErr_03.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_03.Size = new System.Drawing.Size(92, 21);
this.PlcErr_03.TabIndex = 5;
this.PlcErr_03.Text = "PlcErr_06";
this.PlcErr_03.UseVisualStyleBackColor = true;
@@ -467,9 +485,10 @@
// PlcErr_01
//
this.PlcErr_01.AutoSize = true;
- this.PlcErr_01.Location = new System.Drawing.Point(96, 20);
+ this.PlcErr_01.Location = new System.Drawing.Point(128, 25);
+ this.PlcErr_01.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PlcErr_01.Name = "PlcErr_01";
- this.PlcErr_01.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_01.Size = new System.Drawing.Size(92, 21);
this.PlcErr_01.TabIndex = 4;
this.PlcErr_01.Text = "PlcErr_04";
this.PlcErr_01.UseVisualStyleBackColor = true;
@@ -489,9 +508,11 @@
this.groupBox3.Controls.Add(this.ErrRT_01);
this.groupBox3.Controls.Add(this.SysErr_02);
this.groupBox3.Controls.Add(this.SysErr_01);
- this.groupBox3.Location = new System.Drawing.Point(3, 504);
+ this.groupBox3.Location = new System.Drawing.Point(4, 620);
+ this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(379, 114);
+ this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox3.Size = new System.Drawing.Size(505, 140);
this.groupBox3.TabIndex = 41;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Alarms";
@@ -499,9 +520,10 @@
// ErrRT_03
//
this.ErrRT_03.AutoSize = true;
- this.ErrRT_03.Location = new System.Drawing.Point(268, 66);
+ this.ErrRT_03.Location = new System.Drawing.Point(357, 81);
+ this.ErrRT_03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ErrRT_03.Name = "ErrRT_03";
- this.ErrRT_03.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_03.Size = new System.Drawing.Size(83, 21);
this.ErrRT_03.TabIndex = 11;
this.ErrRT_03.Text = "ERR_12";
this.ErrRT_03.UseVisualStyleBackColor = true;
@@ -510,9 +532,10 @@
// ErrRT_02
//
this.ErrRT_02.AutoSize = true;
- this.ErrRT_02.Location = new System.Drawing.Point(268, 43);
+ this.ErrRT_02.Location = new System.Drawing.Point(357, 53);
+ this.ErrRT_02.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ErrRT_02.Name = "ErrRT_02";
- this.ErrRT_02.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_02.Size = new System.Drawing.Size(83, 21);
this.ErrRT_02.TabIndex = 10;
this.ErrRT_02.Text = "ERR_11";
this.ErrRT_02.UseVisualStyleBackColor = true;
@@ -521,9 +544,10 @@
// CncErr_02
//
this.CncErr_02.AutoSize = true;
- this.CncErr_02.Location = new System.Drawing.Point(181, 43);
+ this.CncErr_02.Location = new System.Drawing.Point(241, 53);
+ this.CncErr_02.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.CncErr_02.Name = "CncErr_02";
- this.CncErr_02.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_02.Size = new System.Drawing.Size(97, 21);
this.CncErr_02.TabIndex = 9;
this.CncErr_02.Text = "CncErr_08";
this.CncErr_02.UseVisualStyleBackColor = true;
@@ -532,9 +556,10 @@
// CncErr_03
//
this.CncErr_03.AutoSize = true;
- this.CncErr_03.Location = new System.Drawing.Point(181, 66);
+ this.CncErr_03.Location = new System.Drawing.Point(241, 81);
+ this.CncErr_03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.CncErr_03.Name = "CncErr_03";
- this.CncErr_03.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_03.Size = new System.Drawing.Size(97, 21);
this.CncErr_03.TabIndex = 8;
this.CncErr_03.Text = "CncErr_09";
this.CncErr_03.UseVisualStyleBackColor = true;
@@ -543,9 +568,10 @@
// CncErr_01
//
this.CncErr_01.AutoSize = true;
- this.CncErr_01.Location = new System.Drawing.Point(181, 20);
+ this.CncErr_01.Location = new System.Drawing.Point(241, 25);
+ this.CncErr_01.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.CncErr_01.Name = "CncErr_01";
- this.CncErr_01.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_01.Size = new System.Drawing.Size(97, 21);
this.CncErr_01.TabIndex = 7;
this.CncErr_01.Text = "CncErr_07";
this.CncErr_01.UseVisualStyleBackColor = true;
@@ -554,9 +580,10 @@
// SysErr_03
//
this.SysErr_03.AutoSize = true;
- this.SysErr_03.Location = new System.Drawing.Point(7, 66);
+ this.SysErr_03.Location = new System.Drawing.Point(9, 81);
+ this.SysErr_03.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SysErr_03.Name = "SysErr_03";
- this.SysErr_03.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_03.Size = new System.Drawing.Size(96, 21);
this.SysErr_03.TabIndex = 3;
this.SysErr_03.Text = "SysErr_03";
this.SysErr_03.UseVisualStyleBackColor = true;
@@ -565,9 +592,10 @@
// ErrRT_01
//
this.ErrRT_01.AutoSize = true;
- this.ErrRT_01.Location = new System.Drawing.Point(268, 20);
+ this.ErrRT_01.Location = new System.Drawing.Point(357, 25);
+ this.ErrRT_01.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ErrRT_01.Name = "ErrRT_01";
- this.ErrRT_01.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_01.Size = new System.Drawing.Size(83, 21);
this.ErrRT_01.TabIndex = 2;
this.ErrRT_01.Text = "ERR_10";
this.ErrRT_01.UseVisualStyleBackColor = true;
@@ -576,9 +604,10 @@
// SysErr_02
//
this.SysErr_02.AutoSize = true;
- this.SysErr_02.Location = new System.Drawing.Point(7, 43);
+ this.SysErr_02.Location = new System.Drawing.Point(9, 53);
+ this.SysErr_02.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SysErr_02.Name = "SysErr_02";
- this.SysErr_02.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_02.Size = new System.Drawing.Size(96, 21);
this.SysErr_02.TabIndex = 1;
this.SysErr_02.Text = "SysErr_02";
this.SysErr_02.UseVisualStyleBackColor = true;
@@ -587,9 +616,10 @@
// SysErr_01
//
this.SysErr_01.AutoSize = true;
- this.SysErr_01.Location = new System.Drawing.Point(7, 20);
+ this.SysErr_01.Location = new System.Drawing.Point(9, 25);
+ this.SysErr_01.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SysErr_01.Name = "SysErr_01";
- this.SysErr_01.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_01.Size = new System.Drawing.Size(96, 21);
this.SysErr_01.TabIndex = 0;
this.SysErr_01.Text = "SysErr_01";
this.SysErr_01.UseVisualStyleBackColor = true;
@@ -627,84 +657,95 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.AxLoad);
- this.groupBox2.Location = new System.Drawing.Point(385, 418);
+ this.groupBox2.Location = new System.Drawing.Point(513, 514);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(375, 225);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox2.Size = new System.Drawing.Size(500, 277);
this.groupBox2.TabIndex = 40;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Axis";
//
// AxAccelAct
//
- this.AxAccelAct.Location = new System.Drawing.Point(80, 184);
+ this.AxAccelAct.Location = new System.Drawing.Point(107, 226);
+ this.AxAccelAct.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxAccelAct.Name = "AxAccelAct";
- this.AxAccelAct.Size = new System.Drawing.Size(46, 20);
+ this.AxAccelAct.Size = new System.Drawing.Size(60, 22);
this.AxAccelAct.TabIndex = 43;
//
// label37
//
this.label37.AutoSize = true;
- this.label37.Location = new System.Drawing.Point(10, 187);
+ this.label37.Location = new System.Drawing.Point(13, 230);
+ this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(55, 15);
+ this.label37.Size = new System.Drawing.Size(66, 17);
this.label37.TabIndex = 42;
this.label37.Text = "Accel Act";
//
// AxBatt
//
- this.AxBatt.Location = new System.Drawing.Point(304, 184);
+ this.AxBatt.Location = new System.Drawing.Point(405, 226);
+ this.AxBatt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxBatt.Name = "AxBatt";
- this.AxBatt.Size = new System.Drawing.Size(61, 20);
+ this.AxBatt.Size = new System.Drawing.Size(80, 22);
this.AxBatt.TabIndex = 41;
//
// label36
//
this.label36.AutoSize = true;
- this.label36.Location = new System.Drawing.Point(262, 187);
+ this.label36.Location = new System.Drawing.Point(349, 230);
+ this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(44, 15);
+ this.label36.Size = new System.Drawing.Size(53, 17);
this.label36.TabIndex = 40;
this.label36.Text = "Battery";
//
// AxAccTime
//
- this.AxAccTime.Location = new System.Drawing.Point(197, 184);
+ this.AxAccTime.Location = new System.Drawing.Point(263, 226);
+ this.AxAccTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxAccTime.Name = "AxAccTime";
- this.AxAccTime.Size = new System.Drawing.Size(52, 20);
+ this.AxAccTime.Size = new System.Drawing.Size(68, 22);
this.AxAccTime.TabIndex = 39;
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(127, 187);
+ this.label11.Location = new System.Drawing.Point(169, 230);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(75, 15);
+ this.label11.Size = new System.Drawing.Size(85, 17);
this.label11.TabIndex = 38;
this.label11.Text = "Accum Time";
//
// AxDir
//
- this.AxDir.Location = new System.Drawing.Point(265, 67);
+ this.AxDir.Location = new System.Drawing.Point(353, 82);
+ this.AxDir.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxDir.Name = "AxDir";
- this.AxDir.Size = new System.Drawing.Size(80, 20);
+ this.AxDir.Size = new System.Drawing.Size(105, 22);
this.AxDir.TabIndex = 37;
this.AxDir.Text = "1";
//
// label35
//
this.label35.AutoSize = true;
- this.label35.Location = new System.Drawing.Point(218, 71);
+ this.label35.Location = new System.Drawing.Point(291, 87);
+ this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(56, 15);
+ this.label35.Size = new System.Drawing.Size(64, 17);
this.label35.TabIndex = 36;
this.label35.Text = "Direction";
//
// label34
//
this.label34.AutoSize = true;
- this.label34.Location = new System.Drawing.Point(12, 72);
+ this.label34.Location = new System.Drawing.Point(16, 89);
+ this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(58, 15);
+ this.label34.Size = new System.Drawing.Size(69, 17);
this.label34.TabIndex = 35;
this.label34.Text = "Axis Type";
//
@@ -714,50 +755,56 @@
this.cbAxType.Items.AddRange(new object[] {
"LINEAR",
"ROTARY"});
- this.cbAxType.Location = new System.Drawing.Point(81, 69);
+ this.cbAxType.Location = new System.Drawing.Point(108, 85);
+ this.cbAxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbAxType.Name = "cbAxType";
- this.cbAxType.Size = new System.Drawing.Size(90, 21);
+ this.cbAxType.Size = new System.Drawing.Size(119, 24);
this.cbAxType.TabIndex = 34;
//
// AxMastId
//
- this.AxMastId.Location = new System.Drawing.Point(285, 41);
+ this.AxMastId.Location = new System.Drawing.Point(380, 50);
+ this.AxMastId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxMastId.Name = "AxMastId";
- this.AxMastId.Size = new System.Drawing.Size(80, 20);
+ this.AxMastId.Size = new System.Drawing.Size(105, 22);
this.AxMastId.TabIndex = 33;
//
// label33
//
this.label33.AutoSize = true;
- this.label33.Location = new System.Drawing.Point(238, 45);
+ this.label33.Location = new System.Drawing.Point(317, 55);
+ this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(49, 15);
+ this.label33.Size = new System.Drawing.Size(55, 17);
this.label33.TabIndex = 32;
this.label33.Text = "Mast ID";
//
// AxIsMaster
//
this.AxIsMaster.AutoSize = true;
- this.AxIsMaster.Location = new System.Drawing.Point(178, 44);
+ this.AxIsMaster.Location = new System.Drawing.Point(237, 54);
+ this.AxIsMaster.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxIsMaster.Name = "AxIsMaster";
- this.AxIsMaster.Size = new System.Drawing.Size(67, 19);
+ this.AxIsMaster.Size = new System.Drawing.Size(73, 21);
this.AxIsMaster.TabIndex = 31;
this.AxIsMaster.Text = "Master";
this.AxIsMaster.UseVisualStyleBackColor = true;
//
// AxMainProc
//
- this.AxMainProc.Location = new System.Drawing.Point(81, 41);
+ this.AxMainProc.Location = new System.Drawing.Point(108, 50);
+ this.AxMainProc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxMainProc.Name = "AxMainProc";
- this.AxMainProc.Size = new System.Drawing.Size(46, 20);
+ this.AxMainProc.Size = new System.Drawing.Size(60, 22);
this.AxMainProc.TabIndex = 30;
//
// label32
//
this.label32.AutoSize = true;
- this.label32.Location = new System.Drawing.Point(11, 44);
+ this.label32.Location = new System.Drawing.Point(15, 54);
+ this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(63, 15);
+ this.label32.Size = new System.Drawing.Size(71, 17);
this.label32.TabIndex = 29;
this.label32.Text = "Main Proc";
//
@@ -765,9 +812,10 @@
//
this.cbAxNum.DisplayMember = "Name";
this.cbAxNum.FormattingEnabled = true;
- this.cbAxNum.Location = new System.Drawing.Point(81, 15);
+ this.cbAxNum.Location = new System.Drawing.Point(108, 18);
+ this.cbAxNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbAxNum.Name = "cbAxNum";
- this.cbAxNum.Size = new System.Drawing.Size(121, 21);
+ this.cbAxNum.Size = new System.Drawing.Size(160, 24);
this.cbAxNum.TabIndex = 28;
this.cbAxNum.ValueMember = "Value";
this.cbAxNum.SelectedIndexChanged += new System.EventHandler(this.cbAxNum_SelectedIndexChanged);
@@ -775,81 +823,89 @@
// label31
//
this.label31.AutoSize = true;
- this.label31.Location = new System.Drawing.Point(12, 19);
+ this.label31.Location = new System.Drawing.Point(16, 23);
+ this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(59, 15);
+ this.label31.Size = new System.Drawing.Size(66, 17);
this.label31.TabIndex = 27;
this.label31.Text = "Axis Num";
//
// AxPositionValue
//
- this.AxPositionValue.Location = new System.Drawing.Point(265, 121);
+ this.AxPositionValue.Location = new System.Drawing.Point(353, 149);
+ this.AxPositionValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxPositionValue.Name = "AxPositionValue";
- this.AxPositionValue.Size = new System.Drawing.Size(100, 20);
+ this.AxPositionValue.Size = new System.Drawing.Size(132, 22);
this.AxPositionValue.TabIndex = 26;
//
// AxLoadValue
//
- this.AxLoadValue.Location = new System.Drawing.Point(265, 100);
+ this.AxLoadValue.Location = new System.Drawing.Point(353, 123);
+ this.AxLoadValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.AxLoadValue.Name = "AxLoadValue";
- this.AxLoadValue.Size = new System.Drawing.Size(100, 20);
+ this.AxLoadValue.Size = new System.Drawing.Size(132, 22);
this.AxLoadValue.TabIndex = 25;
//
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(12, 124);
+ this.label5.Location = new System.Drawing.Point(16, 153);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(51, 15);
+ this.label5.Size = new System.Drawing.Size(58, 17);
this.label5.TabIndex = 24;
this.label5.Text = "Position";
//
// AxPosition
//
- this.AxPosition.Location = new System.Drawing.Point(81, 121);
+ this.AxPosition.Location = new System.Drawing.Point(108, 149);
this.AxPosition.Name = "AxPosition";
- this.AxPosition.Size = new System.Drawing.Size(168, 18);
+ this.AxPosition.Size = new System.Drawing.Size(224, 18);
this.AxPosition.TabIndex = 23;
this.AxPosition.Scroll += new System.Windows.Forms.ScrollEventHandler(this.xPosition_Scroll);
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(12, 103);
+ this.label4.Location = new System.Drawing.Point(16, 127);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(35, 15);
+ this.label4.Size = new System.Drawing.Size(40, 17);
this.label4.TabIndex = 22;
this.label4.Text = "Load";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(87, 95);
+ this.label3.Location = new System.Drawing.Point(116, 117);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(0, 15);
+ this.label3.Size = new System.Drawing.Size(0, 17);
this.label3.TabIndex = 21;
//
// AxLoad
//
- this.AxLoad.Location = new System.Drawing.Point(81, 100);
+ this.AxLoad.Location = new System.Drawing.Point(108, 123);
this.AxLoad.Name = "AxLoad";
- this.AxLoad.Size = new System.Drawing.Size(168, 18);
+ this.AxLoad.Size = new System.Drawing.Size(224, 18);
this.AxLoad.TabIndex = 20;
this.AxLoad.Scroll += new System.Windows.Forms.ScrollEventHandler(this.xLoad_Scroll);
//
// program
//
- this.program.Location = new System.Drawing.Point(80, 19);
+ this.program.Location = new System.Drawing.Point(107, 23);
+ this.program.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.program.Name = "program";
- this.program.Size = new System.Drawing.Size(153, 20);
+ this.program.Size = new System.Drawing.Size(203, 22);
this.program.TabIndex = 39;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(7, 22);
+ this.label2.Location = new System.Drawing.Point(9, 27);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(81, 15);
+ this.label2.Size = new System.Drawing.Size(93, 17);
this.label2.TabIndex = 38;
this.label2.Text = "Curr Program";
//
@@ -871,93 +927,105 @@
this.groupBox9.Controls.Add(this.label13);
this.groupBox9.Controls.Add(this.functionalMode);
this.groupBox9.Controls.Add(this.label12);
- this.groupBox9.Location = new System.Drawing.Point(3, 148);
+ this.groupBox9.Location = new System.Drawing.Point(4, 182);
+ this.groupBox9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox9.Name = "groupBox9";
- this.groupBox9.Size = new System.Drawing.Size(379, 158);
+ this.groupBox9.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox9.Size = new System.Drawing.Size(505, 194);
this.groupBox9.TabIndex = 55;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "Produzione";
//
// txtPzKo
//
- this.txtPzKo.Location = new System.Drawing.Point(313, 98);
+ this.txtPzKo.Location = new System.Drawing.Point(417, 121);
+ this.txtPzKo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPzKo.Name = "txtPzKo";
- this.txtPzKo.Size = new System.Drawing.Size(60, 20);
+ this.txtPzKo.Size = new System.Drawing.Size(79, 22);
this.txtPzKo.TabIndex = 59;
this.txtPzKo.TextChanged += new System.EventHandler(this.pzKo_TextChanged);
//
// label25
//
this.label25.AutoSize = true;
- this.label25.Location = new System.Drawing.Point(269, 101);
+ this.label25.Location = new System.Drawing.Point(359, 124);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(41, 15);
+ this.label25.Size = new System.Drawing.Size(48, 17);
this.label25.TabIndex = 58;
this.label25.Text = "Pz KO";
//
// txtPzOk
//
this.txtPzOk.Enabled = false;
- this.txtPzOk.Location = new System.Drawing.Point(201, 98);
+ this.txtPzOk.Location = new System.Drawing.Point(268, 121);
+ this.txtPzOk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPzOk.Name = "txtPzOk";
- this.txtPzOk.Size = new System.Drawing.Size(60, 20);
+ this.txtPzOk.Size = new System.Drawing.Size(79, 22);
this.txtPzOk.TabIndex = 57;
//
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(157, 101);
+ this.label23.Location = new System.Drawing.Point(209, 124);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(41, 15);
+ this.label23.Size = new System.Drawing.Size(48, 17);
this.label23.TabIndex = 56;
this.label23.Text = "Pz OK";
//
// txtPzTot
//
this.txtPzTot.Enabled = false;
- this.txtPzTot.Location = new System.Drawing.Point(80, 98);
+ this.txtPzTot.Location = new System.Drawing.Point(107, 121);
+ this.txtPzTot.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPzTot.Name = "txtPzTot";
- this.txtPzTot.Size = new System.Drawing.Size(60, 20);
+ this.txtPzTot.Size = new System.Drawing.Size(79, 22);
this.txtPzTot.TabIndex = 55;
//
// label21
//
this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(33, 101);
+ this.label21.Location = new System.Drawing.Point(44, 124);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(41, 15);
+ this.label21.Size = new System.Drawing.Size(49, 17);
this.label21.TabIndex = 54;
this.label21.Text = "Pz Tot";
//
// OPERATOR_ID
//
- this.OPERATOR_ID.Location = new System.Drawing.Point(273, 45);
+ this.OPERATOR_ID.Location = new System.Drawing.Point(364, 55);
+ this.OPERATOR_ID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.OPERATOR_ID.Name = "OPERATOR_ID";
- this.OPERATOR_ID.Size = new System.Drawing.Size(100, 20);
+ this.OPERATOR_ID.Size = new System.Drawing.Size(132, 22);
this.OPERATOR_ID.TabIndex = 53;
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(222, 48);
+ this.label19.Location = new System.Drawing.Point(296, 59);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(50, 15);
+ this.label19.Size = new System.Drawing.Size(58, 17);
this.label19.TabIndex = 52;
this.label19.Text = "ID oper.";
//
// PROG_ROW_NUM
//
- this.PROG_ROW_NUM.Location = new System.Drawing.Point(313, 19);
+ this.PROG_ROW_NUM.Location = new System.Drawing.Point(417, 23);
+ this.PROG_ROW_NUM.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PROG_ROW_NUM.Name = "PROG_ROW_NUM";
- this.PROG_ROW_NUM.Size = new System.Drawing.Size(60, 20);
+ this.PROG_ROW_NUM.Size = new System.Drawing.Size(79, 22);
this.PROG_ROW_NUM.TabIndex = 51;
//
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(253, 22);
+ this.label17.Location = new System.Drawing.Point(337, 27);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(62, 15);
+ this.label17.Size = new System.Drawing.Size(68, 17);
this.label17.TabIndex = 50;
this.label17.Text = "Row Num";
//
@@ -971,9 +1039,11 @@
this.groupBox11.Controls.Add(this.label18);
this.groupBox11.Controls.Add(this.STATUS_STRB_DW0);
this.groupBox11.Controls.Add(this.lblPLC_ADP);
- this.groupBox11.Location = new System.Drawing.Point(3, 108);
+ this.groupBox11.Location = new System.Drawing.Point(4, 133);
+ this.groupBox11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox11.Name = "groupBox11";
- this.groupBox11.Size = new System.Drawing.Size(382, 155);
+ this.groupBox11.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox11.Size = new System.Drawing.Size(509, 191);
this.groupBox11.TabIndex = 57;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "Strobes PLC --> ADP";
@@ -981,68 +1051,76 @@
// STATUS_STRB_DW3
//
this.STATUS_STRB_DW3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_STRB_DW3.Location = new System.Drawing.Point(85, 119);
+ this.STATUS_STRB_DW3.Location = new System.Drawing.Point(113, 146);
+ this.STATUS_STRB_DW3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_STRB_DW3.Name = "STATUS_STRB_DW3";
- this.STATUS_STRB_DW3.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW3.Size = new System.Drawing.Size(387, 28);
this.STATUS_STRB_DW3.TabIndex = 59;
//
// label49
//
this.label49.AutoSize = true;
- this.label49.Location = new System.Drawing.Point(15, 125);
+ this.label49.Location = new System.Drawing.Point(20, 154);
+ this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label49.Name = "label49";
- this.label49.Size = new System.Drawing.Size(73, 15);
+ this.label49.Size = new System.Drawing.Size(84, 17);
this.label49.TabIndex = 58;
this.label49.Text = "STRB_DW3";
//
// STATUS_STRB_DW2
//
this.STATUS_STRB_DW2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_STRB_DW2.Location = new System.Drawing.Point(85, 84);
+ this.STATUS_STRB_DW2.Location = new System.Drawing.Point(113, 103);
+ this.STATUS_STRB_DW2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_STRB_DW2.Name = "STATUS_STRB_DW2";
- this.STATUS_STRB_DW2.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW2.Size = new System.Drawing.Size(387, 28);
this.STATUS_STRB_DW2.TabIndex = 57;
//
// label47
//
this.label47.AutoSize = true;
- this.label47.Location = new System.Drawing.Point(15, 90);
+ this.label47.Location = new System.Drawing.Point(20, 111);
+ this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label47.Name = "label47";
- this.label47.Size = new System.Drawing.Size(73, 15);
+ this.label47.Size = new System.Drawing.Size(84, 17);
this.label47.TabIndex = 56;
this.label47.Text = "STRB_DW2";
//
// STATUS_STRB_DW1
//
this.STATUS_STRB_DW1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_STRB_DW1.Location = new System.Drawing.Point(85, 49);
+ this.STATUS_STRB_DW1.Location = new System.Drawing.Point(113, 60);
+ this.STATUS_STRB_DW1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_STRB_DW1.Name = "STATUS_STRB_DW1";
- this.STATUS_STRB_DW1.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW1.Size = new System.Drawing.Size(387, 28);
this.STATUS_STRB_DW1.TabIndex = 55;
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(15, 55);
+ this.label18.Location = new System.Drawing.Point(20, 68);
+ this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(73, 15);
+ this.label18.Size = new System.Drawing.Size(84, 17);
this.label18.TabIndex = 54;
this.label18.Text = "STRB_DW1";
//
// STATUS_STRB_DW0
//
this.STATUS_STRB_DW0.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_STRB_DW0.Location = new System.Drawing.Point(85, 14);
+ this.STATUS_STRB_DW0.Location = new System.Drawing.Point(113, 17);
+ this.STATUS_STRB_DW0.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_STRB_DW0.Name = "STATUS_STRB_DW0";
- this.STATUS_STRB_DW0.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW0.Size = new System.Drawing.Size(387, 28);
this.STATUS_STRB_DW0.TabIndex = 53;
//
// lblPLC_ADP
//
this.lblPLC_ADP.AutoSize = true;
- this.lblPLC_ADP.Location = new System.Drawing.Point(15, 22);
+ this.lblPLC_ADP.Location = new System.Drawing.Point(20, 27);
+ this.lblPLC_ADP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblPLC_ADP.Name = "lblPLC_ADP";
- this.lblPLC_ADP.Size = new System.Drawing.Size(73, 15);
+ this.lblPLC_ADP.Size = new System.Drawing.Size(84, 17);
this.lblPLC_ADP.TabIndex = 52;
this.lblPLC_ADP.Text = "STRB_DW0";
//
@@ -1054,9 +1132,10 @@
this.lblVers,
this.MainProgrBar,
this.lblStatus});
- this.statusStrip1.Location = new System.Drawing.Point(0, 716);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 883);
this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(785, 25);
+ this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
+ this.statusStrip1.Size = new System.Drawing.Size(1047, 29);
this.statusStrip1.TabIndex = 59;
this.statusStrip1.Text = "statusStrip1";
//
@@ -1065,7 +1144,7 @@
this.lblApp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
this.lblApp.ForeColor = System.Drawing.SystemColors.ControlText;
this.lblApp.Name = "lblApp";
- this.lblApp.Size = new System.Drawing.Size(21, 20);
+ this.lblApp.Size = new System.Drawing.Size(21, 24);
this.lblApp.Text = "...";
//
// lblVers
@@ -1073,19 +1152,19 @@
this.lblVers.Font = new System.Drawing.Font("Segoe UI", 8F);
this.lblVers.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.lblVers.Name = "lblVers";
- this.lblVers.Size = new System.Drawing.Size(18, 20);
+ this.lblVers.Size = new System.Drawing.Size(18, 24);
this.lblVers.Text = "...";
//
// MainProgrBar
//
this.MainProgrBar.Name = "MainProgrBar";
- this.MainProgrBar.Size = new System.Drawing.Size(100, 19);
+ this.MainProgrBar.Size = new System.Drawing.Size(133, 23);
this.MainProgrBar.Step = 1;
//
// lblStatus
//
this.lblStatus.Name = "lblStatus";
- this.lblStatus.Size = new System.Drawing.Size(27, 20);
+ this.lblStatus.Size = new System.Drawing.Size(27, 24);
this.lblStatus.Text = "---";
//
// groupBox13
@@ -1103,9 +1182,11 @@
this.groupBox13.Controls.Add(this.txtPathFeed);
this.groupBox13.Controls.Add(this.label26);
this.groupBox13.Controls.Add(this.hsPathFeed);
- this.groupBox13.Location = new System.Drawing.Point(385, 84);
+ this.groupBox13.Location = new System.Drawing.Point(513, 103);
+ this.groupBox13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox13.Name = "groupBox13";
- this.groupBox13.Size = new System.Drawing.Size(379, 167);
+ this.groupBox13.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox13.Size = new System.Drawing.Size(505, 206);
this.groupBox13.TabIndex = 60;
this.groupBox13.TabStop = false;
this.groupBox13.Text = "PATH";
@@ -1114,9 +1195,10 @@
//
this.cbPathSel.DisplayMember = "Name";
this.cbPathSel.FormattingEnabled = true;
- this.cbPathSel.Location = new System.Drawing.Point(80, 16);
+ this.cbPathSel.Location = new System.Drawing.Point(107, 20);
+ this.cbPathSel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbPathSel.Name = "cbPathSel";
- this.cbPathSel.Size = new System.Drawing.Size(121, 21);
+ this.cbPathSel.Size = new System.Drawing.Size(160, 24);
this.cbPathSel.TabIndex = 63;
this.cbPathSel.ValueMember = "Value";
this.cbPathSel.SelectedIndexChanged += new System.EventHandler(this.cbPathSel_SelectedIndexChanged);
@@ -1124,96 +1206,104 @@
// label38
//
this.label38.AutoSize = true;
- this.label38.Location = new System.Drawing.Point(11, 20);
+ this.label38.Location = new System.Drawing.Point(15, 25);
+ this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(62, 15);
+ this.label38.Size = new System.Drawing.Size(70, 17);
this.label38.TabIndex = 62;
this.label38.Text = "Path Num";
//
// label29
//
this.label29.AutoSize = true;
- this.label29.Location = new System.Drawing.Point(12, 133);
+ this.label29.Location = new System.Drawing.Point(16, 164);
+ this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(56, 15);
+ this.label29.Size = new System.Drawing.Size(66, 17);
this.label29.TabIndex = 33;
this.label29.Text = "Posiz Act";
//
// txtPathSpeedOver
//
- this.txtPathSpeedOver.Location = new System.Drawing.Point(298, 88);
+ this.txtPathSpeedOver.Location = new System.Drawing.Point(397, 108);
+ this.txtPathSpeedOver.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPathSpeedOver.Name = "txtPathSpeedOver";
- this.txtPathSpeedOver.Size = new System.Drawing.Size(74, 20);
+ this.txtPathSpeedOver.Size = new System.Drawing.Size(97, 22);
this.txtPathSpeedOver.TabIndex = 32;
this.txtPathSpeedOver.TextChanged += new System.EventHandler(this.txtPathSpeedOver_TextChanged);
//
// label28
//
this.label28.AutoSize = true;
- this.label28.Location = new System.Drawing.Point(10, 91);
+ this.label28.Location = new System.Drawing.Point(13, 112);
+ this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(71, 15);
+ this.label28.Size = new System.Drawing.Size(84, 17);
this.label28.TabIndex = 31;
this.label28.Text = "Rapid Over.";
//
// hsPathSpeedOver
//
- this.hsPathSpeedOver.Location = new System.Drawing.Point(80, 91);
+ this.hsPathSpeedOver.Location = new System.Drawing.Point(107, 112);
this.hsPathSpeedOver.Maximum = 150;
this.hsPathSpeedOver.Name = "hsPathSpeedOver";
- this.hsPathSpeedOver.Size = new System.Drawing.Size(213, 18);
+ this.hsPathSpeedOver.Size = new System.Drawing.Size(284, 18);
this.hsPathSpeedOver.TabIndex = 30;
this.hsPathSpeedOver.ValueChanged += new System.EventHandler(this.hsPathSpeedOver_ValueChanged);
//
// txtPathFeedOver
//
- this.txtPathFeedOver.Location = new System.Drawing.Point(298, 63);
+ this.txtPathFeedOver.Location = new System.Drawing.Point(397, 78);
+ this.txtPathFeedOver.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPathFeedOver.Name = "txtPathFeedOver";
- this.txtPathFeedOver.Size = new System.Drawing.Size(74, 20);
+ this.txtPathFeedOver.Size = new System.Drawing.Size(97, 22);
this.txtPathFeedOver.TabIndex = 29;
this.txtPathFeedOver.TextChanged += new System.EventHandler(this.txtPathFeedOver_TextChanged);
//
// label27
//
this.label27.AutoSize = true;
- this.label27.Location = new System.Drawing.Point(10, 66);
+ this.label27.Location = new System.Drawing.Point(13, 81);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(66, 15);
+ this.label27.Size = new System.Drawing.Size(79, 17);
this.label27.TabIndex = 28;
this.label27.Text = "Feed Over.";
//
// hsPathFeedOver
//
- this.hsPathFeedOver.Location = new System.Drawing.Point(80, 66);
+ this.hsPathFeedOver.Location = new System.Drawing.Point(107, 81);
this.hsPathFeedOver.Maximum = 150;
this.hsPathFeedOver.Name = "hsPathFeedOver";
- this.hsPathFeedOver.Size = new System.Drawing.Size(213, 18);
+ this.hsPathFeedOver.Size = new System.Drawing.Size(284, 18);
this.hsPathFeedOver.TabIndex = 27;
this.hsPathFeedOver.ValueChanged += new System.EventHandler(this.hsPathFeedOver_ValueChanged);
//
// txtPathFeed
//
- this.txtPathFeed.Location = new System.Drawing.Point(298, 37);
+ this.txtPathFeed.Location = new System.Drawing.Point(397, 46);
+ this.txtPathFeed.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPathFeed.Name = "txtPathFeed";
- this.txtPathFeed.Size = new System.Drawing.Size(74, 20);
+ this.txtPathFeed.Size = new System.Drawing.Size(97, 22);
this.txtPathFeed.TabIndex = 26;
this.txtPathFeed.TextChanged += new System.EventHandler(this.txtPathFeed_TextChanged);
//
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(10, 40);
+ this.label26.Location = new System.Drawing.Point(13, 49);
+ this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(56, 15);
+ this.label26.Size = new System.Drawing.Size(65, 17);
this.label26.TabIndex = 24;
this.label26.Text = "Feedrate";
//
// hsPathFeed
//
- this.hsPathFeed.Location = new System.Drawing.Point(80, 40);
+ this.hsPathFeed.Location = new System.Drawing.Point(107, 49);
this.hsPathFeed.Maximum = 150;
this.hsPathFeed.Name = "hsPathFeed";
- this.hsPathFeed.Size = new System.Drawing.Size(213, 18);
+ this.hsPathFeed.Size = new System.Drawing.Size(284, 18);
this.hsPathFeed.TabIndex = 23;
this.hsPathFeed.ValueChanged += new System.EventHandler(this.hsPathFeed_ValueChanged);
//
@@ -1225,7 +1315,8 @@
this.sETUPToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(785, 28);
+ this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
+ this.menuStrip1.Size = new System.Drawing.Size(1047, 28);
this.menuStrip1.TabIndex = 61;
this.menuStrip1.Text = "menuStrip1";
//
@@ -1240,7 +1331,7 @@
// mLoadAdaptConf
//
this.mLoadAdaptConf.Name = "mLoadAdaptConf";
- this.mLoadAdaptConf.Size = new System.Drawing.Size(232, 26);
+ this.mLoadAdaptConf.Size = new System.Drawing.Size(233, 26);
this.mLoadAdaptConf.Text = "LOAD ADAPTER CONF";
this.mLoadAdaptConf.Click += new System.EventHandler(this.mLoadAdaptConf_Click);
//
@@ -1257,7 +1348,7 @@
//
this.mConfGen.Name = "mConfGen";
this.mConfGen.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T)));
- this.mConfGen.Size = new System.Drawing.Size(327, 26);
+ this.mConfGen.Size = new System.Drawing.Size(336, 26);
this.mConfGen.Text = "TEMPLATE CONF GENERATOR";
this.mConfGen.Click += new System.EventHandler(this.mConfGen_Click);
//
@@ -1266,8 +1357,9 @@
this.lblCurrAdapt.Dock = System.Windows.Forms.DockStyle.Top;
this.lblCurrAdapt.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblCurrAdapt.Location = new System.Drawing.Point(0, 28);
+ this.lblCurrAdapt.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCurrAdapt.Name = "lblCurrAdapt";
- this.lblCurrAdapt.Size = new System.Drawing.Size(785, 26);
+ this.lblCurrAdapt.Size = new System.Drawing.Size(1047, 32);
this.lblCurrAdapt.TabIndex = 64;
this.lblCurrAdapt.Text = "Adapter loaded: N.A.";
this.lblCurrAdapt.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@@ -1278,10 +1370,11 @@
this.tabCtrlMain.Controls.Add(this.tbConf);
this.tabCtrlMain.Controls.Add(this.tpSIM);
this.tabCtrlMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabCtrlMain.Location = new System.Drawing.Point(0, 54);
+ this.tabCtrlMain.Location = new System.Drawing.Point(0, 60);
+ this.tabCtrlMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabCtrlMain.Name = "tabCtrlMain";
this.tabCtrlMain.SelectedIndex = 0;
- this.tabCtrlMain.Size = new System.Drawing.Size(785, 662);
+ this.tabCtrlMain.Size = new System.Drawing.Size(1047, 823);
this.tabCtrlMain.TabIndex = 65;
//
// tpStatus
@@ -1292,17 +1385,20 @@
this.tpStatus.Controls.Add(this.groupBox6);
this.tpStatus.Controls.Add(this.groupBox1);
this.tpStatus.Controls.Add(this.groupBox11);
- this.tpStatus.Location = new System.Drawing.Point(4, 22);
+ this.tpStatus.Location = new System.Drawing.Point(4, 25);
+ this.tpStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tpStatus.Name = "tpStatus";
- this.tpStatus.Padding = new System.Windows.Forms.Padding(3);
- this.tpStatus.Size = new System.Drawing.Size(777, 636);
+ this.tpStatus.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tpStatus.Size = new System.Drawing.Size(1039, 794);
this.tpStatus.TabIndex = 0;
this.tpStatus.Text = "STATUS";
//
// lblOutMessage
//
this.lblOutMessage.AutoSize = true;
- this.lblOutMessage.Location = new System.Drawing.Point(95, 281);
+ this.lblOutMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblOutMessage.Location = new System.Drawing.Point(127, 346);
+ this.lblOutMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblOutMessage.Name = "lblOutMessage";
this.lblOutMessage.Size = new System.Drawing.Size(16, 15);
this.lblOutMessage.TabIndex = 60;
@@ -1311,9 +1407,10 @@
// label53
//
this.label53.AutoSize = true;
- this.label53.Location = new System.Drawing.Point(18, 281);
+ this.label53.Location = new System.Drawing.Point(24, 346);
+ this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label53.Name = "label53";
- this.label53.Size = new System.Drawing.Size(61, 15);
+ this.label53.Size = new System.Drawing.Size(69, 17);
this.label53.TabIndex = 59;
this.label53.Text = "Data Mon";
//
@@ -1327,9 +1424,11 @@
this.groupBox6.Controls.Add(this.label50);
this.groupBox6.Controls.Add(this.STATUS_ACK_DW0);
this.groupBox6.Controls.Add(this.label48);
- this.groupBox6.Location = new System.Drawing.Point(388, 108);
+ this.groupBox6.Location = new System.Drawing.Point(517, 133);
+ this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(384, 155);
+ this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox6.Size = new System.Drawing.Size(512, 191);
this.groupBox6.TabIndex = 58;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "ACK ADP --> PLC";
@@ -1337,68 +1436,76 @@
// STATUS_ACK_DW3
//
this.STATUS_ACK_DW3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_ACK_DW3.Location = new System.Drawing.Point(85, 118);
+ this.STATUS_ACK_DW3.Location = new System.Drawing.Point(113, 145);
+ this.STATUS_ACK_DW3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_ACK_DW3.Name = "STATUS_ACK_DW3";
- this.STATUS_ACK_DW3.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW3.Size = new System.Drawing.Size(389, 28);
this.STATUS_ACK_DW3.TabIndex = 59;
//
// label52
//
this.label52.AutoSize = true;
- this.label52.Location = new System.Drawing.Point(15, 126);
+ this.label52.Location = new System.Drawing.Point(20, 155);
+ this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label52.Name = "label52";
- this.label52.Size = new System.Drawing.Size(64, 15);
+ this.label52.Size = new System.Drawing.Size(74, 17);
this.label52.TabIndex = 58;
this.label52.Text = "ACK_DW3";
//
// STATUS_ACK_DW2
//
this.STATUS_ACK_DW2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_ACK_DW2.Location = new System.Drawing.Point(85, 83);
+ this.STATUS_ACK_DW2.Location = new System.Drawing.Point(113, 102);
+ this.STATUS_ACK_DW2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_ACK_DW2.Name = "STATUS_ACK_DW2";
- this.STATUS_ACK_DW2.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW2.Size = new System.Drawing.Size(389, 28);
this.STATUS_ACK_DW2.TabIndex = 57;
//
// label51
//
this.label51.AutoSize = true;
- this.label51.Location = new System.Drawing.Point(15, 91);
+ this.label51.Location = new System.Drawing.Point(20, 112);
+ this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label51.Name = "label51";
- this.label51.Size = new System.Drawing.Size(64, 15);
+ this.label51.Size = new System.Drawing.Size(74, 17);
this.label51.TabIndex = 56;
this.label51.Text = "ACK_DW2";
//
// STATUS_ACK_DW1
//
this.STATUS_ACK_DW1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_ACK_DW1.Location = new System.Drawing.Point(85, 48);
+ this.STATUS_ACK_DW1.Location = new System.Drawing.Point(113, 59);
+ this.STATUS_ACK_DW1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_ACK_DW1.Name = "STATUS_ACK_DW1";
- this.STATUS_ACK_DW1.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW1.Size = new System.Drawing.Size(389, 28);
this.STATUS_ACK_DW1.TabIndex = 55;
//
// label50
//
this.label50.AutoSize = true;
- this.label50.Location = new System.Drawing.Point(15, 56);
+ this.label50.Location = new System.Drawing.Point(20, 69);
+ this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label50.Name = "label50";
- this.label50.Size = new System.Drawing.Size(64, 15);
+ this.label50.Size = new System.Drawing.Size(74, 17);
this.label50.TabIndex = 54;
this.label50.Text = "ACK_DW1";
//
// STATUS_ACK_DW0
//
this.STATUS_ACK_DW0.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.STATUS_ACK_DW0.Location = new System.Drawing.Point(85, 15);
+ this.STATUS_ACK_DW0.Location = new System.Drawing.Point(113, 18);
+ this.STATUS_ACK_DW0.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.STATUS_ACK_DW0.Name = "STATUS_ACK_DW0";
- this.STATUS_ACK_DW0.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW0.Size = new System.Drawing.Size(389, 28);
this.STATUS_ACK_DW0.TabIndex = 53;
//
// label48
//
this.label48.AutoSize = true;
- this.label48.Location = new System.Drawing.Point(15, 19);
+ this.label48.Location = new System.Drawing.Point(20, 23);
+ this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label48.Name = "label48";
- this.label48.Size = new System.Drawing.Size(64, 15);
+ this.label48.Size = new System.Drawing.Size(74, 17);
this.label48.TabIndex = 52;
this.label48.Text = "ACK_DW0";
//
@@ -1409,18 +1516,21 @@
this.groupBox1.Controls.Add(this.start);
this.groupBox1.Controls.Add(this.port);
this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Location = new System.Drawing.Point(6, 6);
+ this.groupBox1.Location = new System.Drawing.Point(8, 7);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(379, 43);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox1.Size = new System.Drawing.Size(505, 53);
this.groupBox1.TabIndex = 35;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Server Info";
//
// dump
//
- this.dump.Location = new System.Drawing.Point(298, 15);
+ this.dump.Location = new System.Drawing.Point(397, 18);
+ this.dump.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dump.Name = "dump";
- this.dump.Size = new System.Drawing.Size(75, 23);
+ this.dump.Size = new System.Drawing.Size(100, 28);
this.dump.TabIndex = 4;
this.dump.Text = "Show Dump";
this.dump.UseVisualStyleBackColor = true;
@@ -1428,9 +1538,10 @@
//
// stop
//
- this.stop.Location = new System.Drawing.Point(202, 15);
+ this.stop.Location = new System.Drawing.Point(269, 18);
+ this.stop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.stop.Name = "stop";
- this.stop.Size = new System.Drawing.Size(75, 23);
+ this.stop.Size = new System.Drawing.Size(100, 28);
this.stop.TabIndex = 3;
this.stop.Text = "Stop";
this.stop.UseVisualStyleBackColor = true;
@@ -1438,9 +1549,10 @@
//
// start
//
- this.start.Location = new System.Drawing.Point(121, 15);
+ this.start.Location = new System.Drawing.Point(161, 18);
+ this.start.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.start.Name = "start";
- this.start.Size = new System.Drawing.Size(75, 23);
+ this.start.Size = new System.Drawing.Size(100, 28);
this.start.TabIndex = 2;
this.start.Text = "Start";
this.start.UseVisualStyleBackColor = true;
@@ -1448,9 +1560,10 @@
//
// port
//
- this.port.Location = new System.Drawing.Point(50, 17);
+ this.port.Location = new System.Drawing.Point(67, 21);
+ this.port.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.port.Name = "port";
- this.port.Size = new System.Drawing.Size(62, 20);
+ this.port.Size = new System.Drawing.Size(81, 22);
this.port.TabIndex = 1;
this.port.Text = "7878";
this.port.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
@@ -1458,9 +1571,10 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(18, 20);
+ this.label1.Location = new System.Drawing.Point(24, 25);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(29, 15);
+ this.label1.Size = new System.Drawing.Size(34, 17);
this.label1.TabIndex = 0;
this.label1.Text = "Port";
//
@@ -1468,20 +1582,22 @@
//
this.tbConf.BackColor = System.Drawing.Color.Maroon;
this.tbConf.Controls.Add(this.wbXmlConf);
- this.tbConf.Location = new System.Drawing.Point(4, 22);
+ this.tbConf.Location = new System.Drawing.Point(4, 25);
+ this.tbConf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tbConf.Name = "tbConf";
- this.tbConf.Padding = new System.Windows.Forms.Padding(3);
- this.tbConf.Size = new System.Drawing.Size(777, 640);
+ this.tbConf.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbConf.Size = new System.Drawing.Size(1039, 786);
this.tbConf.TabIndex = 1;
this.tbConf.Text = "XML CONFIG";
//
// wbXmlConf
//
this.wbXmlConf.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wbXmlConf.Location = new System.Drawing.Point(3, 3);
- this.wbXmlConf.MinimumSize = new System.Drawing.Size(20, 20);
+ this.wbXmlConf.Location = new System.Drawing.Point(4, 4);
+ this.wbXmlConf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.wbXmlConf.MinimumSize = new System.Drawing.Size(27, 25);
this.wbXmlConf.Name = "wbXmlConf";
- this.wbXmlConf.Size = new System.Drawing.Size(771, 634);
+ this.wbXmlConf.Size = new System.Drawing.Size(1031, 778);
this.wbXmlConf.TabIndex = 0;
//
// tpSIM
@@ -1499,9 +1615,10 @@
this.tpSIM.Controls.Add(this.groupBox9);
this.tpSIM.Controls.Add(this.groupBox2);
this.tpSIM.Controls.Add(this.groupBox12);
- this.tpSIM.Location = new System.Drawing.Point(4, 22);
+ this.tpSIM.Location = new System.Drawing.Point(4, 25);
+ this.tpSIM.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tpSIM.Name = "tpSIM";
- this.tpSIM.Size = new System.Drawing.Size(777, 640);
+ this.tpSIM.Size = new System.Drawing.Size(1039, 786);
this.tpSIM.TabIndex = 2;
this.tpSIM.Text = "SIMULATION";
//
@@ -1525,138 +1642,154 @@
this.groupBox5.Controls.Add(this.label42);
this.groupBox5.Controls.Add(this.cbUnOpSel);
this.groupBox5.Controls.Add(this.label39);
- this.groupBox5.Location = new System.Drawing.Point(385, 257);
+ this.groupBox5.Location = new System.Drawing.Point(513, 316);
+ this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(379, 155);
+ this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox5.Size = new System.Drawing.Size(505, 191);
this.groupBox5.TabIndex = 62;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Unita Operatrice / Mandrino";
//
// uoSpeedVal
//
- this.uoSpeedVal.Location = new System.Drawing.Point(257, 119);
+ this.uoSpeedVal.Location = new System.Drawing.Point(343, 146);
+ this.uoSpeedVal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoSpeedVal.Name = "uoSpeedVal";
- this.uoSpeedVal.Size = new System.Drawing.Size(100, 20);
+ this.uoSpeedVal.Size = new System.Drawing.Size(132, 22);
this.uoSpeedVal.TabIndex = 81;
//
// uoLoadVal
//
- this.uoLoadVal.Location = new System.Drawing.Point(257, 98);
+ this.uoLoadVal.Location = new System.Drawing.Point(343, 121);
+ this.uoLoadVal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoLoadVal.Name = "uoLoadVal";
- this.uoLoadVal.Size = new System.Drawing.Size(100, 20);
+ this.uoLoadVal.Size = new System.Drawing.Size(132, 22);
this.uoLoadVal.TabIndex = 80;
//
// label45
//
this.label45.AutoSize = true;
- this.label45.Location = new System.Drawing.Point(4, 122);
+ this.label45.Location = new System.Drawing.Point(5, 150);
+ this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(43, 15);
+ this.label45.Size = new System.Drawing.Size(49, 17);
this.label45.TabIndex = 79;
this.label45.Text = "Speed";
//
// uoSpeed
//
- this.uoSpeed.Location = new System.Drawing.Point(73, 119);
+ this.uoSpeed.Location = new System.Drawing.Point(97, 146);
this.uoSpeed.Name = "uoSpeed";
- this.uoSpeed.Size = new System.Drawing.Size(168, 18);
+ this.uoSpeed.Size = new System.Drawing.Size(224, 18);
this.uoSpeed.TabIndex = 78;
this.uoSpeed.Scroll += new System.Windows.Forms.ScrollEventHandler(this.uoSpeed_Scroll);
//
// label46
//
this.label46.AutoSize = true;
- this.label46.Location = new System.Drawing.Point(4, 101);
+ this.label46.Location = new System.Drawing.Point(5, 124);
+ this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label46.Name = "label46";
- this.label46.Size = new System.Drawing.Size(35, 15);
+ this.label46.Size = new System.Drawing.Size(40, 17);
this.label46.TabIndex = 77;
this.label46.Text = "Load";
//
// uoLoad
//
- this.uoLoad.Location = new System.Drawing.Point(73, 98);
+ this.uoLoad.Location = new System.Drawing.Point(97, 121);
this.uoLoad.Name = "uoLoad";
- this.uoLoad.Size = new System.Drawing.Size(168, 18);
+ this.uoLoad.Size = new System.Drawing.Size(224, 18);
this.uoLoad.TabIndex = 76;
this.uoLoad.Scroll += new System.Windows.Forms.ScrollEventHandler(this.uoLoad_Scroll);
//
// uoVitaRes
//
- this.uoVitaRes.Location = new System.Drawing.Point(73, 72);
+ this.uoVitaRes.Location = new System.Drawing.Point(97, 89);
+ this.uoVitaRes.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoVitaRes.Name = "uoVitaRes";
- this.uoVitaRes.Size = new System.Drawing.Size(46, 20);
+ this.uoVitaRes.Size = new System.Drawing.Size(60, 22);
this.uoVitaRes.TabIndex = 75;
//
// label43
//
this.label43.AutoSize = true;
- this.label43.Location = new System.Drawing.Point(6, 75);
+ this.label43.Location = new System.Drawing.Point(8, 92);
+ this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(49, 15);
+ this.label43.Size = new System.Drawing.Size(57, 17);
this.label43.TabIndex = 74;
this.label43.Text = "VitaRes";
//
// uoAccTime
//
- this.uoAccTime.Location = new System.Drawing.Point(190, 72);
+ this.uoAccTime.Location = new System.Drawing.Point(253, 89);
+ this.uoAccTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoAccTime.Name = "uoAccTime";
- this.uoAccTime.Size = new System.Drawing.Size(52, 20);
+ this.uoAccTime.Size = new System.Drawing.Size(68, 22);
this.uoAccTime.TabIndex = 73;
//
// label44
//
this.label44.AutoSize = true;
- this.label44.Location = new System.Drawing.Point(120, 75);
+ this.label44.Location = new System.Drawing.Point(160, 92);
+ this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(57, 15);
+ this.label44.Size = new System.Drawing.Size(66, 17);
this.label44.TabIndex = 72;
this.label44.Text = "Acc Time";
//
// uoToolId
//
- this.uoToolId.Location = new System.Drawing.Point(73, 46);
+ this.uoToolId.Location = new System.Drawing.Point(97, 57);
+ this.uoToolId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoToolId.Name = "uoToolId";
- this.uoToolId.Size = new System.Drawing.Size(46, 20);
+ this.uoToolId.Size = new System.Drawing.Size(60, 22);
this.uoToolId.TabIndex = 71;
//
// label40
//
this.label40.AutoSize = true;
- this.label40.Location = new System.Drawing.Point(6, 49);
+ this.label40.Location = new System.Drawing.Point(8, 60);
+ this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(46, 15);
+ this.label40.Size = new System.Drawing.Size(53, 17);
this.label40.TabIndex = 70;
this.label40.Text = "Tool ID";
//
// uoStatus
//
- this.uoStatus.Location = new System.Drawing.Point(297, 46);
+ this.uoStatus.Location = new System.Drawing.Point(396, 57);
+ this.uoStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoStatus.Name = "uoStatus";
- this.uoStatus.Size = new System.Drawing.Size(61, 20);
+ this.uoStatus.Size = new System.Drawing.Size(80, 22);
this.uoStatus.TabIndex = 69;
//
// label41
//
this.label41.AutoSize = true;
- this.label41.Location = new System.Drawing.Point(255, 49);
+ this.label41.Location = new System.Drawing.Point(340, 60);
+ this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(41, 15);
+ this.label41.Size = new System.Drawing.Size(48, 17);
this.label41.TabIndex = 68;
this.label41.Text = "Status";
//
// uoNumCU
//
- this.uoNumCU.Location = new System.Drawing.Point(190, 46);
+ this.uoNumCU.Location = new System.Drawing.Point(253, 57);
+ this.uoNumCU.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uoNumCU.Name = "uoNumCU";
- this.uoNumCU.Size = new System.Drawing.Size(52, 20);
+ this.uoNumCU.Size = new System.Drawing.Size(68, 22);
this.uoNumCU.TabIndex = 67;
//
// label42
//
this.label42.AutoSize = true;
- this.label42.Location = new System.Drawing.Point(120, 49);
+ this.label42.Location = new System.Drawing.Point(160, 60);
+ this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(51, 15);
+ this.label42.Size = new System.Drawing.Size(56, 17);
this.label42.TabIndex = 66;
this.label42.Text = "NumCU";
//
@@ -1664,9 +1797,10 @@
//
this.cbUnOpSel.DisplayMember = "Name";
this.cbUnOpSel.FormattingEnabled = true;
- this.cbUnOpSel.Location = new System.Drawing.Point(73, 19);
+ this.cbUnOpSel.Location = new System.Drawing.Point(97, 23);
+ this.cbUnOpSel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbUnOpSel.Name = "cbUnOpSel";
- this.cbUnOpSel.Size = new System.Drawing.Size(121, 21);
+ this.cbUnOpSel.Size = new System.Drawing.Size(160, 24);
this.cbUnOpSel.TabIndex = 65;
this.cbUnOpSel.ValueMember = "Value";
this.cbUnOpSel.SelectedIndexChanged += new System.EventHandler(this.cbUnOpSel_SelectedIndexChanged);
@@ -1674,9 +1808,10 @@
// label39
//
this.label39.AutoSize = true;
- this.label39.Location = new System.Drawing.Point(4, 23);
+ this.label39.Location = new System.Drawing.Point(5, 28);
+ this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(69, 15);
+ this.label39.Size = new System.Drawing.Size(78, 17);
this.label39.TabIndex = 64;
this.label39.Text = "Num UnOp";
//
@@ -1686,9 +1821,11 @@
this.Execution.Controls.Add(this.feedhold);
this.Execution.Controls.Add(this.stopped);
this.Execution.Controls.Add(this.running);
- this.Execution.Location = new System.Drawing.Point(3, 94);
+ this.Execution.Location = new System.Drawing.Point(4, 116);
+ this.Execution.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Execution.Name = "Execution";
- this.Execution.Size = new System.Drawing.Size(380, 48);
+ this.Execution.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Execution.Size = new System.Drawing.Size(507, 59);
this.Execution.TabIndex = 61;
this.Execution.TabStop = false;
this.Execution.Text = "Execution";
@@ -1697,9 +1834,10 @@
//
this.ready.AutoSize = true;
this.ready.Checked = true;
- this.ready.Location = new System.Drawing.Point(114, 16);
+ this.ready.Location = new System.Drawing.Point(152, 20);
+ this.ready.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ready.Name = "ready";
- this.ready.Size = new System.Drawing.Size(63, 19);
+ this.ready.Size = new System.Drawing.Size(70, 21);
this.ready.TabIndex = 9;
this.ready.TabStop = true;
this.ready.Text = "Ready";
@@ -1708,9 +1846,10 @@
// feedhold
//
this.feedhold.AutoSize = true;
- this.feedhold.Location = new System.Drawing.Point(253, 16);
+ this.feedhold.Location = new System.Drawing.Point(337, 20);
+ this.feedhold.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.feedhold.Name = "feedhold";
- this.feedhold.Size = new System.Drawing.Size(85, 19);
+ this.feedhold.Size = new System.Drawing.Size(94, 21);
this.feedhold.TabIndex = 8;
this.feedhold.Text = "Feed Hold";
this.feedhold.UseVisualStyleBackColor = true;
@@ -1718,9 +1857,10 @@
// stopped
//
this.stopped.AutoSize = true;
- this.stopped.Location = new System.Drawing.Point(180, 16);
+ this.stopped.Location = new System.Drawing.Point(240, 20);
+ this.stopped.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.stopped.Name = "stopped";
- this.stopped.Size = new System.Drawing.Size(74, 19);
+ this.stopped.Size = new System.Drawing.Size(82, 21);
this.stopped.TabIndex = 7;
this.stopped.Text = "Stopped";
this.stopped.UseVisualStyleBackColor = true;
@@ -1728,9 +1868,10 @@
// running
//
this.running.AutoSize = true;
- this.running.Location = new System.Drawing.Point(36, 16);
+ this.running.Location = new System.Drawing.Point(48, 20);
+ this.running.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.running.Name = "running";
- this.running.Size = new System.Drawing.Size(75, 19);
+ this.running.Size = new System.Drawing.Size(82, 21);
this.running.TabIndex = 6;
this.running.Text = "Running";
this.running.UseVisualStyleBackColor = true;
@@ -1741,9 +1882,11 @@
this.mode.Controls.Add(this.mdi);
this.mode.Controls.Add(this.manual);
this.mode.Controls.Add(this.automatic);
- this.mode.Location = new System.Drawing.Point(3, 40);
+ this.mode.Location = new System.Drawing.Point(4, 49);
+ this.mode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.mode.Name = "mode";
- this.mode.Size = new System.Drawing.Size(379, 48);
+ this.mode.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.mode.Size = new System.Drawing.Size(505, 59);
this.mode.TabIndex = 60;
this.mode.TabStop = false;
this.mode.Text = "Mode";
@@ -1751,9 +1894,10 @@
// edit
//
this.edit.AutoSize = true;
- this.edit.Location = new System.Drawing.Point(299, 16);
+ this.edit.Location = new System.Drawing.Point(399, 20);
+ this.edit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.edit.Name = "edit";
- this.edit.Size = new System.Drawing.Size(49, 19);
+ this.edit.Size = new System.Drawing.Size(53, 21);
this.edit.TabIndex = 9;
this.edit.Text = "Edit";
this.edit.UseVisualStyleBackColor = true;
@@ -1761,9 +1905,10 @@
// mdi
//
this.mdi.AutoSize = true;
- this.mdi.Location = new System.Drawing.Point(180, 15);
+ this.mdi.Location = new System.Drawing.Point(240, 18);
+ this.mdi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.mdi.Name = "mdi";
- this.mdi.Size = new System.Drawing.Size(129, 19);
+ this.mdi.Size = new System.Drawing.Size(144, 21);
this.mdi.TabIndex = 8;
this.mdi.Text = "Manual Data Input";
this.mdi.UseVisualStyleBackColor = true;
@@ -1772,9 +1917,10 @@
//
this.manual.AutoSize = true;
this.manual.Checked = true;
- this.manual.Location = new System.Drawing.Point(114, 15);
+ this.manual.Location = new System.Drawing.Point(152, 18);
+ this.manual.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.manual.Name = "manual";
- this.manual.Size = new System.Drawing.Size(70, 19);
+ this.manual.Size = new System.Drawing.Size(75, 21);
this.manual.TabIndex = 7;
this.manual.TabStop = true;
this.manual.Text = "Manual";
@@ -1783,9 +1929,10 @@
// automatic
//
this.automatic.AutoSize = true;
- this.automatic.Location = new System.Drawing.Point(36, 16);
+ this.automatic.Location = new System.Drawing.Point(48, 20);
+ this.automatic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.automatic.Name = "automatic";
- this.automatic.Size = new System.Drawing.Size(82, 19);
+ this.automatic.Size = new System.Drawing.Size(91, 21);
this.automatic.TabIndex = 6;
this.automatic.Text = "Automatic";
this.automatic.UseVisualStyleBackColor = true;
@@ -1802,9 +1949,11 @@
this.groupBox7.Controls.Add(this.label16);
this.groupBox7.Controls.Add(this.label15);
this.groupBox7.Controls.Add(this.label14);
- this.groupBox7.Location = new System.Drawing.Point(385, 3);
+ this.groupBox7.Location = new System.Drawing.Point(513, 4);
+ this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(380, 75);
+ this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox7.Size = new System.Drawing.Size(507, 92);
this.groupBox7.TabIndex = 59;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Macchina";
@@ -1813,7 +1962,8 @@
//
this.D1_UUID.AutoSize = true;
this.D1_UUID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.D1_UUID.Location = new System.Drawing.Point(233, 54);
+ this.D1_UUID.Location = new System.Drawing.Point(311, 66);
+ this.D1_UUID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.D1_UUID.Name = "D1_UUID";
this.D1_UUID.Size = new System.Drawing.Size(23, 17);
this.D1_UUID.TabIndex = 66;
@@ -1823,7 +1973,8 @@
//
this.D1_ID.AutoSize = true;
this.D1_ID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.D1_ID.Location = new System.Drawing.Point(54, 53);
+ this.D1_ID.Location = new System.Drawing.Point(72, 65);
+ this.D1_ID.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.D1_ID.Name = "D1_ID";
this.D1_ID.Size = new System.Drawing.Size(23, 17);
this.D1_ID.TabIndex = 65;
@@ -1833,7 +1984,8 @@
//
this.D1_NAME.AutoSize = true;
this.D1_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.D1_NAME.Location = new System.Drawing.Point(54, 20);
+ this.D1_NAME.Location = new System.Drawing.Point(72, 25);
+ this.D1_NAME.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.D1_NAME.Name = "D1_NAME";
this.D1_NAME.Size = new System.Drawing.Size(23, 17);
this.D1_NAME.TabIndex = 64;
@@ -1842,68 +1994,77 @@
// lblAT
//
this.lblAT.AutoSize = true;
- this.lblAT.Location = new System.Drawing.Point(189, 20);
+ this.lblAT.Location = new System.Drawing.Point(252, 25);
+ this.lblAT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblAT.Name = "lblAT";
- this.lblAT.Size = new System.Drawing.Size(47, 15);
+ this.lblAT.Size = new System.Drawing.Size(53, 17);
this.lblAT.TabIndex = 63;
this.lblAT.Text = "AccMin";
//
// txtAccTime
//
- this.txtAccTime.Location = new System.Drawing.Point(234, 17);
+ this.txtAccTime.Location = new System.Drawing.Point(312, 21);
+ this.txtAccTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtAccTime.Name = "txtAccTime";
- this.txtAccTime.Size = new System.Drawing.Size(53, 20);
+ this.txtAccTime.Size = new System.Drawing.Size(69, 22);
this.txtAccTime.TabIndex = 62;
//
// label30
//
this.label30.AutoSize = true;
- this.label30.Location = new System.Drawing.Point(288, 20);
+ this.label30.Location = new System.Drawing.Point(384, 25);
+ this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(41, 15);
+ this.label30.Size = new System.Drawing.Size(46, 17);
this.label30.TabIndex = 61;
this.label30.Text = "power";
//
// txtPower
//
- this.txtPower.Location = new System.Drawing.Point(325, 17);
+ this.txtPower.Location = new System.Drawing.Point(433, 21);
+ this.txtPower.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPower.Name = "txtPower";
- this.txtPower.Size = new System.Drawing.Size(49, 20);
+ this.txtPower.Size = new System.Drawing.Size(64, 22);
this.txtPower.TabIndex = 60;
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(193, 53);
+ this.label16.Location = new System.Drawing.Point(257, 65);
+ this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(37, 15);
+ this.label16.Size = new System.Drawing.Size(41, 17);
this.label16.TabIndex = 59;
this.label16.Text = "UUID";
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(10, 53);
+ this.label15.Location = new System.Drawing.Point(13, 65);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(19, 15);
+ this.label15.Size = new System.Drawing.Size(21, 17);
this.label15.TabIndex = 57;
this.label15.Text = "ID";
//
// label14
//
this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(10, 20);
+ this.label14.Location = new System.Drawing.Point(13, 25);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(41, 15);
+ this.label14.Size = new System.Drawing.Size(45, 17);
this.label14.TabIndex = 54;
this.label14.Text = "Nome";
//
// groupBox10
//
this.groupBox10.Controls.Add(this.enableDataSim);
- this.groupBox10.Location = new System.Drawing.Point(205, 3);
+ this.groupBox10.Location = new System.Drawing.Point(273, 4);
+ this.groupBox10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox10.Name = "groupBox10";
- this.groupBox10.Size = new System.Drawing.Size(177, 31);
+ this.groupBox10.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox10.Size = new System.Drawing.Size(236, 38);
this.groupBox10.TabIndex = 58;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "Simulazione";
@@ -1911,10 +2072,11 @@
// enableDataSim
//
this.enableDataSim.AutoSize = true;
- this.enableDataSim.Location = new System.Drawing.Point(112, 9);
+ this.enableDataSim.Location = new System.Drawing.Point(149, 11);
+ this.enableDataSim.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.enableDataSim.Name = "enableDataSim";
this.enableDataSim.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.enableDataSim.Size = new System.Drawing.Size(68, 19);
+ this.enableDataSim.Size = new System.Drawing.Size(74, 21);
this.enableDataSim.TabIndex = 55;
this.enableDataSim.Text = "Enable";
this.enableDataSim.UseVisualStyleBackColor = true;
@@ -1922,9 +2084,11 @@
// groupBox8
//
this.groupBox8.Controls.Add(this.estop);
- this.groupBox8.Location = new System.Drawing.Point(3, 3);
+ this.groupBox8.Location = new System.Drawing.Point(4, 4);
+ this.groupBox8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox8.Name = "groupBox8";
- this.groupBox8.Size = new System.Drawing.Size(196, 31);
+ this.groupBox8.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox8.Size = new System.Drawing.Size(261, 38);
this.groupBox8.TabIndex = 57;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "Sicurezze";
@@ -1932,10 +2096,11 @@
// estop
//
this.estop.AutoSize = true;
- this.estop.Location = new System.Drawing.Point(59, 9);
+ this.estop.Location = new System.Drawing.Point(79, 11);
+ this.estop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.estop.Name = "estop";
this.estop.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
- this.estop.Size = new System.Drawing.Size(119, 19);
+ this.estop.Size = new System.Drawing.Size(134, 21);
this.estop.TabIndex = 55;
this.estop.Text = "Emergency Stop";
this.estop.UseVisualStyleBackColor = true;
@@ -1951,9 +2116,11 @@
this.groupBox12.Controls.Add(this.lblCodaM);
this.groupBox12.Controls.Add(this.addCodM);
this.groupBox12.Controls.Add(this.label20);
- this.groupBox12.Location = new System.Drawing.Point(3, 312);
+ this.groupBox12.Location = new System.Drawing.Point(4, 384);
+ this.groupBox12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox12.Name = "groupBox12";
- this.groupBox12.Size = new System.Drawing.Size(380, 100);
+ this.groupBox12.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.groupBox12.Size = new System.Drawing.Size(507, 123);
this.groupBox12.TabIndex = 58;
this.groupBox12.TabStop = false;
this.groupBox12.Text = "Codici M/S/T";
@@ -1961,17 +2128,19 @@
// lblCodaT
//
this.lblCodaT.AutoSize = true;
- this.lblCodaT.Location = new System.Drawing.Point(117, 74);
+ this.lblCodaT.Location = new System.Drawing.Point(156, 91);
+ this.lblCodaT.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCodaT.Name = "lblCodaT";
- this.lblCodaT.Size = new System.Drawing.Size(22, 15);
+ this.lblCodaT.Size = new System.Drawing.Size(28, 17);
this.lblCodaT.TabIndex = 60;
this.lblCodaT.Text = "[...]";
//
// addCodT
//
- this.addCodT.Location = new System.Drawing.Point(51, 71);
+ this.addCodT.Location = new System.Drawing.Point(68, 87);
+ this.addCodT.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.addCodT.Name = "addCodT";
- this.addCodT.Size = new System.Drawing.Size(60, 20);
+ this.addCodT.Size = new System.Drawing.Size(79, 22);
this.addCodT.TabIndex = 59;
this.addCodT.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodT_KeyDown);
this.addCodT.Leave += new System.EventHandler(this.addCodT_Leave);
@@ -1979,26 +2148,29 @@
// label24
//
this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(9, 74);
+ this.label24.Location = new System.Drawing.Point(12, 91);
+ this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(35, 15);
+ this.label24.Size = new System.Drawing.Size(42, 17);
this.label24.TabIndex = 58;
this.label24.Text = "AddT";
//
// lblCodaS
//
this.lblCodaS.AutoSize = true;
- this.lblCodaS.Location = new System.Drawing.Point(118, 48);
+ this.lblCodaS.Location = new System.Drawing.Point(157, 59);
+ this.lblCodaS.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCodaS.Name = "lblCodaS";
- this.lblCodaS.Size = new System.Drawing.Size(22, 15);
+ this.lblCodaS.Size = new System.Drawing.Size(28, 17);
this.lblCodaS.TabIndex = 57;
this.lblCodaS.Text = "[...]";
//
// addCodS
//
- this.addCodS.Location = new System.Drawing.Point(52, 45);
+ this.addCodS.Location = new System.Drawing.Point(69, 55);
+ this.addCodS.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.addCodS.Name = "addCodS";
- this.addCodS.Size = new System.Drawing.Size(60, 20);
+ this.addCodS.Size = new System.Drawing.Size(79, 22);
this.addCodS.TabIndex = 56;
this.addCodS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodS_KeyDown);
this.addCodS.Leave += new System.EventHandler(this.addCodS_Leave);
@@ -2006,26 +2178,29 @@
// label22
//
this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(10, 48);
+ this.label22.Location = new System.Drawing.Point(13, 59);
+ this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(36, 15);
+ this.label22.Size = new System.Drawing.Size(42, 17);
this.label22.TabIndex = 55;
this.label22.Text = "AddS";
//
// lblCodaM
//
this.lblCodaM.AutoSize = true;
- this.lblCodaM.Location = new System.Drawing.Point(118, 22);
+ this.lblCodaM.Location = new System.Drawing.Point(157, 27);
+ this.lblCodaM.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCodaM.Name = "lblCodaM";
- this.lblCodaM.Size = new System.Drawing.Size(22, 15);
+ this.lblCodaM.Size = new System.Drawing.Size(28, 17);
this.lblCodaM.TabIndex = 54;
this.lblCodaM.Text = "[...]";
//
// addCodM
//
- this.addCodM.Location = new System.Drawing.Point(52, 19);
+ this.addCodM.Location = new System.Drawing.Point(69, 23);
+ this.addCodM.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.addCodM.Name = "addCodM";
- this.addCodM.Size = new System.Drawing.Size(60, 20);
+ this.addCodM.Size = new System.Drawing.Size(79, 22);
this.addCodM.TabIndex = 53;
this.addCodM.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodM_KeyDown);
this.addCodM.Leave += new System.EventHandler(this.addCodM_Leave);
@@ -2033,9 +2208,10 @@
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(10, 22);
+ this.label20.Location = new System.Drawing.Point(13, 27);
+ this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(39, 15);
+ this.label20.Size = new System.Drawing.Size(44, 17);
this.label20.TabIndex = 52;
this.label20.Text = "AddM";
//
@@ -2055,9 +2231,9 @@
//
// MainForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(785, 741);
+ this.ClientSize = new System.Drawing.Size(1047, 912);
this.Controls.Add(this.tabCtrlMain);
this.Controls.Add(this.lblCurrAdapt);
this.Controls.Add(this.statusStrip1);
@@ -2065,6 +2241,7 @@
this.Controls.Add(this.label6);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.Name = "MainForm";
this.ShowInTaskbar = false;