diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index 04ab8fe..108f007 100644
Binary files a/MTC_Sim/.vs/MTC_Sim/v14/.suo and b/MTC_Sim/.vs/MTC_Sim/v14/.suo differ
diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs
index 8ac5184..dd42a75 100644
--- a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs
+++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs
@@ -91,16 +91,6 @@
this.label18 = new System.Windows.Forms.Label();
this.STATUS_PLC_ADP = new System.Windows.Forms.TextBox();
this.lblPLC_ADP = new System.Windows.Forms.Label();
- this.groupBox12 = new System.Windows.Forms.GroupBox();
- this.lblCodaT = new System.Windows.Forms.Label();
- this.addCodT = new System.Windows.Forms.TextBox();
- this.label24 = new System.Windows.Forms.Label();
- this.lblCodaS = new System.Windows.Forms.Label();
- this.addCodS = new System.Windows.Forms.TextBox();
- this.label22 = new System.Windows.Forms.Label();
- this.lblCodaM = new System.Windows.Forms.Label();
- this.addCodM = new System.Windows.Forms.TextBox();
- this.label20 = new System.Windows.Forms.Label();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.MainProgrBar = new System.Windows.Forms.ToolStripProgressBar();
@@ -157,6 +147,16 @@
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.estop = new System.Windows.Forms.CheckBox();
this.wbXmlConf = new System.Windows.Forms.WebBrowser();
+ this.label20 = new System.Windows.Forms.Label();
+ this.addCodM = new System.Windows.Forms.TextBox();
+ this.lblCodaM = new System.Windows.Forms.Label();
+ this.label22 = new System.Windows.Forms.Label();
+ this.addCodS = new System.Windows.Forms.TextBox();
+ this.lblCodaS = new System.Windows.Forms.Label();
+ this.label24 = new System.Windows.Forms.Label();
+ this.addCodT = new System.Windows.Forms.TextBox();
+ this.lblCodaT = new System.Windows.Forms.Label();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit();
@@ -164,7 +164,6 @@
this.groupBox2.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox11.SuspendLayout();
- this.groupBox12.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.groupBox13.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -178,6 +177,7 @@
this.groupBox7.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox8.SuspendLayout();
+ this.groupBox12.SuspendLayout();
this.SuspendLayout();
//
// ERR_05
@@ -200,7 +200,7 @@
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(405, 380);
+ this.groupBox4.Location = new System.Drawing.Point(386, 243);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(379, 52);
this.groupBox4.TabIndex = 44;
@@ -267,7 +267,7 @@
this.groupBox5.Controls.Add(this.label10);
this.groupBox5.Controls.Add(this.label11);
this.groupBox5.Controls.Add(this.cLoad);
- this.groupBox5.Location = new System.Drawing.Point(405, 663);
+ this.groupBox5.Location = new System.Drawing.Point(386, 377);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(375, 70);
this.groupBox5.TabIndex = 45;
@@ -437,7 +437,7 @@
//
// groupBox6
//
- this.groupBox6.Location = new System.Drawing.Point(404, 583);
+ this.groupBox6.Location = new System.Drawing.Point(385, 455);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(380, 74);
this.groupBox6.TabIndex = 50;
@@ -464,7 +464,7 @@
this.groupBox3.Controls.Add(this.ERR_02);
this.groupBox3.Controls.Add(this.ERR_01);
this.groupBox3.Controls.Add(this.cuttingToolButton);
- this.groupBox3.Location = new System.Drawing.Point(12, 619);
+ this.groupBox3.Location = new System.Drawing.Point(3, 412);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(375, 114);
this.groupBox3.TabIndex = 41;
@@ -521,7 +521,7 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.xLoad);
- this.groupBox2.Location = new System.Drawing.Point(404, 494);
+ this.groupBox2.Location = new System.Drawing.Point(385, 301);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(375, 70);
this.groupBox2.TabIndex = 40;
@@ -618,7 +618,7 @@
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(12, 274);
+ this.groupBox9.Location = new System.Drawing.Point(3, 94);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(379, 158);
this.groupBox9.TabIndex = 55;
@@ -755,111 +755,12 @@
this.lblPLC_ADP.TabIndex = 52;
this.lblPLC_ADP.Text = "PLC -> ADP";
//
- // groupBox12
- //
- this.groupBox12.Controls.Add(this.lblCodaT);
- this.groupBox12.Controls.Add(this.addCodT);
- this.groupBox12.Controls.Add(this.label24);
- this.groupBox12.Controls.Add(this.lblCodaS);
- this.groupBox12.Controls.Add(this.addCodS);
- this.groupBox12.Controls.Add(this.label22);
- 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(405, 274);
- this.groupBox12.Name = "groupBox12";
- this.groupBox12.Size = new System.Drawing.Size(380, 100);
- this.groupBox12.TabIndex = 58;
- this.groupBox12.TabStop = false;
- this.groupBox12.Text = "Codici M/S/T";
- //
- // lblCodaT
- //
- this.lblCodaT.AutoSize = true;
- this.lblCodaT.Location = new System.Drawing.Point(117, 74);
- this.lblCodaT.Name = "lblCodaT";
- this.lblCodaT.Size = new System.Drawing.Size(22, 13);
- this.lblCodaT.TabIndex = 60;
- this.lblCodaT.Text = "[...]";
- //
- // addCodT
- //
- this.addCodT.Location = new System.Drawing.Point(51, 71);
- this.addCodT.Name = "addCodT";
- this.addCodT.Size = new System.Drawing.Size(60, 20);
- this.addCodT.TabIndex = 59;
- this.addCodT.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodT_KeyDown);
- this.addCodT.Leave += new System.EventHandler(this.addCodT_Leave);
- //
- // label24
- //
- this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(9, 74);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(33, 13);
- this.label24.TabIndex = 58;
- this.label24.Text = "AddT";
- //
- // lblCodaS
- //
- this.lblCodaS.AutoSize = true;
- this.lblCodaS.Location = new System.Drawing.Point(118, 48);
- this.lblCodaS.Name = "lblCodaS";
- this.lblCodaS.Size = new System.Drawing.Size(22, 13);
- this.lblCodaS.TabIndex = 57;
- this.lblCodaS.Text = "[...]";
- //
- // addCodS
- //
- this.addCodS.Location = new System.Drawing.Point(52, 45);
- this.addCodS.Name = "addCodS";
- this.addCodS.Size = new System.Drawing.Size(60, 20);
- this.addCodS.TabIndex = 56;
- this.addCodS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodS_KeyDown);
- this.addCodS.Leave += new System.EventHandler(this.addCodS_Leave);
- //
- // label22
- //
- this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(10, 48);
- this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(33, 13);
- this.label22.TabIndex = 55;
- this.label22.Text = "AddS";
- //
- // lblCodaM
- //
- this.lblCodaM.AutoSize = true;
- this.lblCodaM.Location = new System.Drawing.Point(118, 22);
- this.lblCodaM.Name = "lblCodaM";
- this.lblCodaM.Size = new System.Drawing.Size(22, 13);
- this.lblCodaM.TabIndex = 54;
- this.lblCodaM.Text = "[...]";
- //
- // addCodM
- //
- this.addCodM.Location = new System.Drawing.Point(52, 19);
- this.addCodM.Name = "addCodM";
- this.addCodM.Size = new System.Drawing.Size(60, 20);
- this.addCodM.TabIndex = 53;
- this.addCodM.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodM_KeyDown);
- this.addCodM.Leave += new System.EventHandler(this.addCodM_Leave);
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(10, 22);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(35, 13);
- this.label20.TabIndex = 52;
- this.label20.Text = "AddM";
- //
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.MainProgrBar});
- this.statusStrip1.Location = new System.Drawing.Point(0, 817);
+ this.statusStrip1.Location = new System.Drawing.Point(0, 618);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(794, 22);
this.statusStrip1.TabIndex = 59;
@@ -889,7 +790,7 @@
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(12, 438);
+ this.groupBox13.Location = new System.Drawing.Point(3, 258);
this.groupBox13.Name = "groupBox13";
this.groupBox13.Size = new System.Drawing.Size(379, 148);
this.groupBox13.TabIndex = 60;
@@ -1042,23 +943,24 @@
this.tabCtrlMain.Controls.Add(this.tpStatus);
this.tabCtrlMain.Controls.Add(this.tbConf);
this.tabCtrlMain.Controls.Add(this.tpSIM);
- this.tabCtrlMain.Location = new System.Drawing.Point(15, 53);
+ this.tabCtrlMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabCtrlMain.Location = new System.Drawing.Point(0, 50);
this.tabCtrlMain.Name = "tabCtrlMain";
this.tabCtrlMain.SelectedIndex = 0;
- this.tabCtrlMain.Size = new System.Drawing.Size(779, 215);
+ this.tabCtrlMain.Size = new System.Drawing.Size(794, 568);
this.tabCtrlMain.TabIndex = 65;
//
// tpStatus
//
+ this.tpStatus.BackColor = System.Drawing.Color.WhiteSmoke;
this.tpStatus.Controls.Add(this.groupBox1);
this.tpStatus.Controls.Add(this.groupBox11);
this.tpStatus.Location = new System.Drawing.Point(4, 22);
this.tpStatus.Name = "tpStatus";
this.tpStatus.Padding = new System.Windows.Forms.Padding(3);
- this.tpStatus.Size = new System.Drawing.Size(771, 189);
+ this.tpStatus.Size = new System.Drawing.Size(786, 542);
this.tpStatus.TabIndex = 0;
this.tpStatus.Text = "STATUS";
- this.tpStatus.UseVisualStyleBackColor = true;
//
// groupBox1
//
@@ -1124,28 +1026,36 @@
//
// tbConf
//
+ this.tbConf.BackColor = System.Drawing.Color.Maroon;
this.tbConf.Controls.Add(this.wbXmlConf);
this.tbConf.Location = new System.Drawing.Point(4, 22);
this.tbConf.Name = "tbConf";
this.tbConf.Padding = new System.Windows.Forms.Padding(3);
- this.tbConf.Size = new System.Drawing.Size(771, 189);
+ this.tbConf.Size = new System.Drawing.Size(786, 542);
this.tbConf.TabIndex = 1;
this.tbConf.Text = "XML CONFIG";
- this.tbConf.UseVisualStyleBackColor = true;
//
// tpSIM
//
+ this.tpSIM.BackColor = System.Drawing.Color.LightGray;
this.tpSIM.Controls.Add(this.Execution);
this.tpSIM.Controls.Add(this.mode);
+ this.tpSIM.Controls.Add(this.groupBox13);
this.tpSIM.Controls.Add(this.groupBox7);
this.tpSIM.Controls.Add(this.groupBox10);
+ this.tpSIM.Controls.Add(this.groupBox6);
+ this.tpSIM.Controls.Add(this.groupBox5);
+ this.tpSIM.Controls.Add(this.groupBox3);
this.tpSIM.Controls.Add(this.groupBox8);
+ this.tpSIM.Controls.Add(this.groupBox4);
+ 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.Name = "tpSIM";
- this.tpSIM.Size = new System.Drawing.Size(771, 189);
+ this.tpSIM.Size = new System.Drawing.Size(786, 542);
this.tpSIM.TabIndex = 2;
this.tpSIM.Text = "SIMULATION";
- this.tpSIM.UseVisualStyleBackColor = true;
//
// Execution
//
@@ -1404,27 +1314,118 @@
this.wbXmlConf.Location = new System.Drawing.Point(3, 3);
this.wbXmlConf.MinimumSize = new System.Drawing.Size(20, 20);
this.wbXmlConf.Name = "wbXmlConf";
- this.wbXmlConf.Size = new System.Drawing.Size(765, 183);
+ this.wbXmlConf.Size = new System.Drawing.Size(780, 536);
this.wbXmlConf.TabIndex = 0;
//
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Location = new System.Drawing.Point(10, 22);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(35, 13);
+ this.label20.TabIndex = 52;
+ this.label20.Text = "AddM";
+ //
+ // addCodM
+ //
+ this.addCodM.Location = new System.Drawing.Point(52, 19);
+ this.addCodM.Name = "addCodM";
+ this.addCodM.Size = new System.Drawing.Size(60, 20);
+ this.addCodM.TabIndex = 53;
+ this.addCodM.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodM_KeyDown);
+ this.addCodM.Leave += new System.EventHandler(this.addCodM_Leave);
+ //
+ // lblCodaM
+ //
+ this.lblCodaM.AutoSize = true;
+ this.lblCodaM.Location = new System.Drawing.Point(118, 22);
+ this.lblCodaM.Name = "lblCodaM";
+ this.lblCodaM.Size = new System.Drawing.Size(22, 13);
+ this.lblCodaM.TabIndex = 54;
+ this.lblCodaM.Text = "[...]";
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.Location = new System.Drawing.Point(10, 48);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(33, 13);
+ this.label22.TabIndex = 55;
+ this.label22.Text = "AddS";
+ //
+ // addCodS
+ //
+ this.addCodS.Location = new System.Drawing.Point(52, 45);
+ this.addCodS.Name = "addCodS";
+ this.addCodS.Size = new System.Drawing.Size(60, 20);
+ this.addCodS.TabIndex = 56;
+ this.addCodS.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodS_KeyDown);
+ this.addCodS.Leave += new System.EventHandler(this.addCodS_Leave);
+ //
+ // lblCodaS
+ //
+ this.lblCodaS.AutoSize = true;
+ this.lblCodaS.Location = new System.Drawing.Point(118, 48);
+ this.lblCodaS.Name = "lblCodaS";
+ this.lblCodaS.Size = new System.Drawing.Size(22, 13);
+ this.lblCodaS.TabIndex = 57;
+ this.lblCodaS.Text = "[...]";
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Location = new System.Drawing.Point(9, 74);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(33, 13);
+ this.label24.TabIndex = 58;
+ this.label24.Text = "AddT";
+ //
+ // addCodT
+ //
+ this.addCodT.Location = new System.Drawing.Point(51, 71);
+ this.addCodT.Name = "addCodT";
+ this.addCodT.Size = new System.Drawing.Size(60, 20);
+ this.addCodT.TabIndex = 59;
+ this.addCodT.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addCodT_KeyDown);
+ this.addCodT.Leave += new System.EventHandler(this.addCodT_Leave);
+ //
+ // lblCodaT
+ //
+ this.lblCodaT.AutoSize = true;
+ this.lblCodaT.Location = new System.Drawing.Point(117, 74);
+ this.lblCodaT.Name = "lblCodaT";
+ this.lblCodaT.Size = new System.Drawing.Size(22, 13);
+ this.lblCodaT.TabIndex = 60;
+ this.lblCodaT.Text = "[...]";
+ //
+ // groupBox12
+ //
+ this.groupBox12.Controls.Add(this.lblCodaT);
+ this.groupBox12.Controls.Add(this.addCodT);
+ this.groupBox12.Controls.Add(this.label24);
+ this.groupBox12.Controls.Add(this.lblCodaS);
+ this.groupBox12.Controls.Add(this.addCodS);
+ this.groupBox12.Controls.Add(this.label22);
+ 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(386, 138);
+ this.groupBox12.Name = "groupBox12";
+ this.groupBox12.Size = new System.Drawing.Size(380, 100);
+ this.groupBox12.TabIndex = 58;
+ this.groupBox12.TabStop = false;
+ this.groupBox12.Text = "Codici M/S/T";
+ //
// CMS_MachineSim
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(794, 839);
+ this.ClientSize = new System.Drawing.Size(794, 640);
this.Controls.Add(this.tabCtrlMain);
this.Controls.Add(this.lblCurrAdapt);
- this.Controls.Add(this.groupBox13);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.menuStrip1);
- this.Controls.Add(this.groupBox12);
- this.Controls.Add(this.groupBox9);
- this.Controls.Add(this.groupBox4);
this.Controls.Add(this.label6);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.groupBox6);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
this.MainMenuStrip = this.menuStrip1;
this.Name = "CMS_MachineSim";
this.Text = "CMS MTConn Adapter SIM";
@@ -1441,8 +1442,6 @@
this.groupBox9.PerformLayout();
this.groupBox11.ResumeLayout(false);
this.groupBox11.PerformLayout();
- this.groupBox12.ResumeLayout(false);
- this.groupBox12.PerformLayout();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.groupBox13.ResumeLayout(false);
@@ -1465,6 +1464,8 @@
this.groupBox10.PerformLayout();
this.groupBox8.ResumeLayout(false);
this.groupBox8.PerformLayout();
+ this.groupBox12.ResumeLayout(false);
+ this.groupBox12.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1522,16 +1523,6 @@
private System.Windows.Forms.Label lblPLC_ADP;
private System.Windows.Forms.TextBox OPERATOR_ID;
private System.Windows.Forms.Label label19;
- private System.Windows.Forms.GroupBox groupBox12;
- private System.Windows.Forms.Label lblCodaT;
- private System.Windows.Forms.TextBox addCodT;
- private System.Windows.Forms.Label label24;
- private System.Windows.Forms.Label lblCodaS;
- private System.Windows.Forms.TextBox addCodS;
- private System.Windows.Forms.Label label22;
- private System.Windows.Forms.Label lblCodaM;
- private System.Windows.Forms.TextBox addCodM;
- private System.Windows.Forms.Label label20;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.ToolStripProgressBar MainProgrBar;
@@ -1600,6 +1591,16 @@
private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.CheckBox estop;
private System.Windows.Forms.WebBrowser wbXmlConf;
+ private System.Windows.Forms.GroupBox groupBox12;
+ private System.Windows.Forms.Label lblCodaT;
+ private System.Windows.Forms.TextBox addCodT;
+ private System.Windows.Forms.Label label24;
+ private System.Windows.Forms.Label lblCodaS;
+ private System.Windows.Forms.TextBox addCodS;
+ private System.Windows.Forms.Label label22;
+ private System.Windows.Forms.Label lblCodaM;
+ private System.Windows.Forms.TextBox addCodM;
+ private System.Windows.Forms.Label label20;
}
}
diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.resx b/MTC_Sim/MTC_Sim/CMS_MachineSim.resx
index d24e7d7..707fc60 100644
--- a/MTC_Sim/MTC_Sim/CMS_MachineSim.resx
+++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.resx
@@ -138,6 +138,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
104, 17