diff --git a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
index a095441..d930c3b 100644
--- a/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
+++ b/MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
@@ -5,6 +5,7 @@
+
\ No newline at end of file
diff --git a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
index 715070b..df2b358 100644
--- a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
+++ b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
@@ -5,6 +5,7 @@
+
\ No newline at end of file
diff --git a/MTC_Adapter/MTC_Adapter/App.config b/MTC_Adapter/MTC_Adapter/App.config
index 07ecdad..4616eb6 100644
--- a/MTC_Adapter/MTC_Adapter/App.config
+++ b/MTC_Adapter/MTC_Adapter/App.config
@@ -49,7 +49,8 @@
-
+
+
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
index f107154..48ddbfa 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
@@ -215,6 +215,7 @@
this.addCodM = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
+ this.trayMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.groupBox4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit();
this.groupBox3.SuspendLayout();
@@ -244,7 +245,7 @@
this.PlcErr_02.AutoSize = true;
this.PlcErr_02.Location = new System.Drawing.Point(96, 43);
this.PlcErr_02.Name = "PlcErr_02";
- this.PlcErr_02.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_02.Size = new System.Drawing.Size(72, 17);
this.PlcErr_02.TabIndex = 6;
this.PlcErr_02.Text = "PlcErr_05";
this.PlcErr_02.UseVisualStyleBackColor = true;
@@ -272,7 +273,7 @@
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(118, 26);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(30, 15);
+ this.label8.Size = new System.Drawing.Size(28, 13);
this.label8.TabIndex = 19;
this.label8.Text = "Text";
//
@@ -281,7 +282,7 @@
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(4, 26);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(36, 15);
+ this.label7.Size = new System.Drawing.Size(32, 13);
this.label7.TabIndex = 18;
this.label7.Text = "Code";
//
@@ -305,7 +306,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(12, 367);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(0, 15);
+ this.label6.Size = new System.Drawing.Size(0, 13);
this.label6.TabIndex = 43;
//
// AxFeedOverValue
@@ -327,7 +328,7 @@
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(12, 166);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(63, 15);
+ this.label9.Size = new System.Drawing.Size(57, 13);
this.label9.TabIndex = 24;
this.label9.Text = "Feed Over";
//
@@ -345,7 +346,7 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(12, 145);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(54, 15);
+ this.label10.Size = new System.Drawing.Size(50, 13);
this.label10.TabIndex = 22;
this.label10.Text = "Feed Act";
//
@@ -369,7 +370,7 @@
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(31, 48);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(44, 15);
+ this.label13.Size = new System.Drawing.Size(40, 13);
this.label13.TabIndex = 48;
this.label13.Text = "Part ID";
//
@@ -386,7 +387,7 @@
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(15, 74);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(58, 15);
+ this.label12.Size = new System.Drawing.Size(53, 13);
this.label12.TabIndex = 46;
this.label12.Text = "Halt Type";
//
@@ -415,49 +416,49 @@
this.X.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.X.HeaderText = "X";
this.X.Name = "X";
- this.X.Width = 44;
+ this.X.Width = 39;
//
// Y
//
this.Y.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.Y.HeaderText = "Y";
this.Y.Name = "Y";
- this.Y.Width = 43;
+ this.Y.Width = 39;
//
// Z
//
this.Z.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.Z.HeaderText = "Z";
this.Z.Name = "Z";
- this.Z.Width = 43;
+ this.Z.Width = 39;
//
// I
//
this.I.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.I.HeaderText = "I";
this.I.Name = "I";
- this.I.Width = 39;
+ this.I.Width = 35;
//
// J
//
this.J.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.J.HeaderText = "J";
this.J.Name = "J";
- this.J.Width = 42;
+ this.J.Width = 37;
//
// K
//
this.K.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
this.K.HeaderText = "K";
this.K.Name = "K";
- this.K.Width = 44;
+ this.K.Width = 39;
//
// PlcErr_03
//
this.PlcErr_03.AutoSize = true;
this.PlcErr_03.Location = new System.Drawing.Point(96, 66);
this.PlcErr_03.Name = "PlcErr_03";
- this.PlcErr_03.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_03.Size = new System.Drawing.Size(72, 17);
this.PlcErr_03.TabIndex = 5;
this.PlcErr_03.Text = "PlcErr_06";
this.PlcErr_03.UseVisualStyleBackColor = true;
@@ -468,7 +469,7 @@
this.PlcErr_01.AutoSize = true;
this.PlcErr_01.Location = new System.Drawing.Point(96, 20);
this.PlcErr_01.Name = "PlcErr_01";
- this.PlcErr_01.Size = new System.Drawing.Size(83, 19);
+ this.PlcErr_01.Size = new System.Drawing.Size(72, 17);
this.PlcErr_01.TabIndex = 4;
this.PlcErr_01.Text = "PlcErr_04";
this.PlcErr_01.UseVisualStyleBackColor = true;
@@ -500,7 +501,7 @@
this.ErrRT_03.AutoSize = true;
this.ErrRT_03.Location = new System.Drawing.Point(268, 66);
this.ErrRT_03.Name = "ErrRT_03";
- this.ErrRT_03.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_03.Size = new System.Drawing.Size(67, 17);
this.ErrRT_03.TabIndex = 11;
this.ErrRT_03.Text = "ERR_12";
this.ErrRT_03.UseVisualStyleBackColor = true;
@@ -511,7 +512,7 @@
this.ErrRT_02.AutoSize = true;
this.ErrRT_02.Location = new System.Drawing.Point(268, 43);
this.ErrRT_02.Name = "ErrRT_02";
- this.ErrRT_02.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_02.Size = new System.Drawing.Size(67, 17);
this.ErrRT_02.TabIndex = 10;
this.ErrRT_02.Text = "ERR_11";
this.ErrRT_02.UseVisualStyleBackColor = true;
@@ -522,7 +523,7 @@
this.CncErr_02.AutoSize = true;
this.CncErr_02.Location = new System.Drawing.Point(181, 43);
this.CncErr_02.Name = "CncErr_02";
- this.CncErr_02.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_02.Size = new System.Drawing.Size(76, 17);
this.CncErr_02.TabIndex = 9;
this.CncErr_02.Text = "CncErr_08";
this.CncErr_02.UseVisualStyleBackColor = true;
@@ -533,7 +534,7 @@
this.CncErr_03.AutoSize = true;
this.CncErr_03.Location = new System.Drawing.Point(181, 66);
this.CncErr_03.Name = "CncErr_03";
- this.CncErr_03.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_03.Size = new System.Drawing.Size(76, 17);
this.CncErr_03.TabIndex = 8;
this.CncErr_03.Text = "CncErr_09";
this.CncErr_03.UseVisualStyleBackColor = true;
@@ -544,7 +545,7 @@
this.CncErr_01.AutoSize = true;
this.CncErr_01.Location = new System.Drawing.Point(181, 20);
this.CncErr_01.Name = "CncErr_01";
- this.CncErr_01.Size = new System.Drawing.Size(87, 19);
+ this.CncErr_01.Size = new System.Drawing.Size(76, 17);
this.CncErr_01.TabIndex = 7;
this.CncErr_01.Text = "CncErr_07";
this.CncErr_01.UseVisualStyleBackColor = true;
@@ -555,7 +556,7 @@
this.SysErr_03.AutoSize = true;
this.SysErr_03.Location = new System.Drawing.Point(7, 66);
this.SysErr_03.Name = "SysErr_03";
- this.SysErr_03.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_03.Size = new System.Drawing.Size(74, 17);
this.SysErr_03.TabIndex = 3;
this.SysErr_03.Text = "SysErr_03";
this.SysErr_03.UseVisualStyleBackColor = true;
@@ -566,7 +567,7 @@
this.ErrRT_01.AutoSize = true;
this.ErrRT_01.Location = new System.Drawing.Point(268, 20);
this.ErrRT_01.Name = "ErrRT_01";
- this.ErrRT_01.Size = new System.Drawing.Size(76, 19);
+ this.ErrRT_01.Size = new System.Drawing.Size(67, 17);
this.ErrRT_01.TabIndex = 2;
this.ErrRT_01.Text = "ERR_10";
this.ErrRT_01.UseVisualStyleBackColor = true;
@@ -577,7 +578,7 @@
this.SysErr_02.AutoSize = true;
this.SysErr_02.Location = new System.Drawing.Point(7, 43);
this.SysErr_02.Name = "SysErr_02";
- this.SysErr_02.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_02.Size = new System.Drawing.Size(74, 17);
this.SysErr_02.TabIndex = 1;
this.SysErr_02.Text = "SysErr_02";
this.SysErr_02.UseVisualStyleBackColor = true;
@@ -588,7 +589,7 @@
this.SysErr_01.AutoSize = true;
this.SysErr_01.Location = new System.Drawing.Point(7, 20);
this.SysErr_01.Name = "SysErr_01";
- this.SysErr_01.Size = new System.Drawing.Size(85, 19);
+ this.SysErr_01.Size = new System.Drawing.Size(74, 17);
this.SysErr_01.TabIndex = 0;
this.SysErr_01.Text = "SysErr_01";
this.SysErr_01.UseVisualStyleBackColor = true;
@@ -645,7 +646,7 @@
this.label37.AutoSize = true;
this.label37.Location = new System.Drawing.Point(10, 187);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(55, 15);
+ this.label37.Size = new System.Drawing.Size(53, 13);
this.label37.TabIndex = 42;
this.label37.Text = "Accel Act";
//
@@ -661,7 +662,7 @@
this.label36.AutoSize = true;
this.label36.Location = new System.Drawing.Point(262, 187);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(44, 15);
+ this.label36.Size = new System.Drawing.Size(40, 13);
this.label36.TabIndex = 40;
this.label36.Text = "Battery";
//
@@ -677,7 +678,7 @@
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(127, 187);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(75, 15);
+ this.label11.Size = new System.Drawing.Size(66, 13);
this.label11.TabIndex = 38;
this.label11.Text = "Accum Time";
//
@@ -694,7 +695,7 @@
this.label35.AutoSize = true;
this.label35.Location = new System.Drawing.Point(218, 71);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(56, 15);
+ this.label35.Size = new System.Drawing.Size(49, 13);
this.label35.TabIndex = 36;
this.label35.Text = "Direction";
//
@@ -703,7 +704,7 @@
this.label34.AutoSize = true;
this.label34.Location = new System.Drawing.Point(12, 72);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(58, 15);
+ this.label34.Size = new System.Drawing.Size(53, 13);
this.label34.TabIndex = 35;
this.label34.Text = "Axis Type";
//
@@ -730,7 +731,7 @@
this.label33.AutoSize = true;
this.label33.Location = new System.Drawing.Point(238, 45);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(49, 15);
+ this.label33.Size = new System.Drawing.Size(44, 13);
this.label33.TabIndex = 32;
this.label33.Text = "Mast ID";
//
@@ -739,7 +740,7 @@
this.AxIsMaster.AutoSize = true;
this.AxIsMaster.Location = new System.Drawing.Point(178, 44);
this.AxIsMaster.Name = "AxIsMaster";
- this.AxIsMaster.Size = new System.Drawing.Size(67, 19);
+ this.AxIsMaster.Size = new System.Drawing.Size(58, 17);
this.AxIsMaster.TabIndex = 31;
this.AxIsMaster.Text = "Master";
this.AxIsMaster.UseVisualStyleBackColor = true;
@@ -756,7 +757,7 @@
this.label32.AutoSize = true;
this.label32.Location = new System.Drawing.Point(11, 44);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(63, 15);
+ this.label32.Size = new System.Drawing.Size(55, 13);
this.label32.TabIndex = 29;
this.label32.Text = "Main Proc";
//
@@ -776,7 +777,7 @@
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(12, 19);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(59, 15);
+ this.label31.Size = new System.Drawing.Size(51, 13);
this.label31.TabIndex = 27;
this.label31.Text = "Axis Num";
//
@@ -799,7 +800,7 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(12, 124);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(51, 15);
+ this.label5.Size = new System.Drawing.Size(44, 13);
this.label5.TabIndex = 24;
this.label5.Text = "Position";
//
@@ -816,7 +817,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(12, 103);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(35, 15);
+ this.label4.Size = new System.Drawing.Size(31, 13);
this.label4.TabIndex = 22;
this.label4.Text = "Load";
//
@@ -825,7 +826,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(87, 95);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(0, 15);
+ this.label3.Size = new System.Drawing.Size(0, 13);
this.label3.TabIndex = 21;
//
// AxLoad
@@ -848,7 +849,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(7, 22);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(81, 15);
+ this.label2.Size = new System.Drawing.Size(68, 13);
this.label2.TabIndex = 38;
this.label2.Text = "Curr Program";
//
@@ -890,7 +891,7 @@
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(269, 101);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(41, 15);
+ this.label25.Size = new System.Drawing.Size(37, 13);
this.label25.TabIndex = 58;
this.label25.Text = "Pz KO";
//
@@ -907,7 +908,7 @@
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(157, 101);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(41, 15);
+ this.label23.Size = new System.Drawing.Size(37, 13);
this.label23.TabIndex = 56;
this.label23.Text = "Pz OK";
//
@@ -924,7 +925,7 @@
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(33, 101);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(41, 15);
+ this.label21.Size = new System.Drawing.Size(38, 13);
this.label21.TabIndex = 54;
this.label21.Text = "Pz Tot";
//
@@ -940,7 +941,7 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(222, 48);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(50, 15);
+ this.label19.Size = new System.Drawing.Size(45, 13);
this.label19.TabIndex = 52;
this.label19.Text = "ID oper.";
//
@@ -956,7 +957,7 @@
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(253, 22);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(62, 15);
+ this.label17.Size = new System.Drawing.Size(54, 13);
this.label17.TabIndex = 50;
this.label17.Text = "Row Num";
//
@@ -982,7 +983,7 @@
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.Name = "STATUS_STRB_DW3";
- this.STATUS_STRB_DW3.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW3.Size = new System.Drawing.Size(291, 24);
this.STATUS_STRB_DW3.TabIndex = 59;
//
// label49
@@ -990,7 +991,7 @@
this.label49.AutoSize = true;
this.label49.Location = new System.Drawing.Point(15, 125);
this.label49.Name = "label49";
- this.label49.Size = new System.Drawing.Size(73, 15);
+ this.label49.Size = new System.Drawing.Size(67, 13);
this.label49.TabIndex = 58;
this.label49.Text = "STRB_DW3";
//
@@ -999,7 +1000,7 @@
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.Name = "STATUS_STRB_DW2";
- this.STATUS_STRB_DW2.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW2.Size = new System.Drawing.Size(291, 24);
this.STATUS_STRB_DW2.TabIndex = 57;
//
// label47
@@ -1007,7 +1008,7 @@
this.label47.AutoSize = true;
this.label47.Location = new System.Drawing.Point(15, 90);
this.label47.Name = "label47";
- this.label47.Size = new System.Drawing.Size(73, 15);
+ this.label47.Size = new System.Drawing.Size(67, 13);
this.label47.TabIndex = 56;
this.label47.Text = "STRB_DW2";
//
@@ -1016,7 +1017,7 @@
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.Name = "STATUS_STRB_DW1";
- this.STATUS_STRB_DW1.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW1.Size = new System.Drawing.Size(291, 24);
this.STATUS_STRB_DW1.TabIndex = 55;
//
// label18
@@ -1024,7 +1025,7 @@
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(15, 55);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(73, 15);
+ this.label18.Size = new System.Drawing.Size(67, 13);
this.label18.TabIndex = 54;
this.label18.Text = "STRB_DW1";
//
@@ -1033,7 +1034,7 @@
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.Name = "STATUS_STRB_DW0";
- this.STATUS_STRB_DW0.Size = new System.Drawing.Size(291, 28);
+ this.STATUS_STRB_DW0.Size = new System.Drawing.Size(291, 24);
this.STATUS_STRB_DW0.TabIndex = 53;
//
// lblPLC_ADP
@@ -1041,7 +1042,7 @@
this.lblPLC_ADP.AutoSize = true;
this.lblPLC_ADP.Location = new System.Drawing.Point(15, 22);
this.lblPLC_ADP.Name = "lblPLC_ADP";
- this.lblPLC_ADP.Size = new System.Drawing.Size(73, 15);
+ this.lblPLC_ADP.Size = new System.Drawing.Size(67, 13);
this.lblPLC_ADP.TabIndex = 52;
this.lblPLC_ADP.Text = "STRB_DW0";
//
@@ -1064,13 +1065,13 @@
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(16, 20);
this.lblApp.Text = "...";
//
// lblStatus
//
this.lblStatus.Name = "lblStatus";
- this.lblStatus.Size = new System.Drawing.Size(27, 20);
+ this.lblStatus.Size = new System.Drawing.Size(22, 20);
this.lblStatus.Text = "---";
//
// MainProgrBar
@@ -1084,7 +1085,7 @@
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(16, 20);
this.lblVers.Text = "...";
//
// groupBox13
@@ -1125,7 +1126,7 @@
this.label38.AutoSize = true;
this.label38.Location = new System.Drawing.Point(11, 20);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(62, 15);
+ this.label38.Size = new System.Drawing.Size(54, 13);
this.label38.TabIndex = 62;
this.label38.Text = "Path Num";
//
@@ -1134,7 +1135,7 @@
this.label29.AutoSize = true;
this.label29.Location = new System.Drawing.Point(12, 133);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(56, 15);
+ this.label29.Size = new System.Drawing.Size(51, 13);
this.label29.TabIndex = 33;
this.label29.Text = "Posiz Act";
//
@@ -1151,7 +1152,7 @@
this.label28.AutoSize = true;
this.label28.Location = new System.Drawing.Point(10, 91);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(71, 15);
+ this.label28.Size = new System.Drawing.Size(64, 13);
this.label28.TabIndex = 31;
this.label28.Text = "Rapid Over.";
//
@@ -1177,7 +1178,7 @@
this.label27.AutoSize = true;
this.label27.Location = new System.Drawing.Point(10, 66);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(66, 15);
+ this.label27.Size = new System.Drawing.Size(60, 13);
this.label27.TabIndex = 28;
this.label27.Text = "Feed Over.";
//
@@ -1203,7 +1204,7 @@
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(10, 40);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(56, 15);
+ this.label26.Size = new System.Drawing.Size(49, 13);
this.label26.TabIndex = 24;
this.label26.Text = "Feedrate";
//
@@ -1224,7 +1225,7 @@
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.Size = new System.Drawing.Size(785, 24);
this.menuStrip1.TabIndex = 61;
this.menuStrip1.Text = "menuStrip1";
//
@@ -1233,13 +1234,13 @@
this.fILEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mLoadAdaptConf});
this.fILEToolStripMenuItem.Name = "fILEToolStripMenuItem";
- this.fILEToolStripMenuItem.Size = new System.Drawing.Size(47, 24);
+ this.fILEToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
this.fILEToolStripMenuItem.Text = "FILE";
//
// mLoadAdaptConf
//
this.mLoadAdaptConf.Name = "mLoadAdaptConf";
- this.mLoadAdaptConf.Size = new System.Drawing.Size(232, 26);
+ this.mLoadAdaptConf.Size = new System.Drawing.Size(194, 22);
this.mLoadAdaptConf.Text = "LOAD ADAPTER CONF";
this.mLoadAdaptConf.Click += new System.EventHandler(this.mLoadAdaptConf_Click);
//
@@ -1249,14 +1250,14 @@
this.mConfGen});
this.sETUPToolStripMenuItem.Name = "sETUPToolStripMenuItem";
this.sETUPToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.S)));
- this.sETUPToolStripMenuItem.Size = new System.Drawing.Size(63, 24);
+ this.sETUPToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
this.sETUPToolStripMenuItem.Text = "SETUP";
//
// mConfGen
//
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(271, 22);
this.mConfGen.Text = "TEMPLATE CONF GENERATOR";
this.mConfGen.Click += new System.EventHandler(this.mConfGen_Click);
//
@@ -1264,7 +1265,7 @@
//
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.Location = new System.Drawing.Point(0, 24);
this.lblCurrAdapt.Name = "lblCurrAdapt";
this.lblCurrAdapt.Size = new System.Drawing.Size(785, 26);
this.lblCurrAdapt.TabIndex = 64;
@@ -1277,10 +1278,10 @@
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, 50);
this.tabCtrlMain.Name = "tabCtrlMain";
this.tabCtrlMain.SelectedIndex = 0;
- this.tabCtrlMain.Size = new System.Drawing.Size(785, 662);
+ this.tabCtrlMain.Size = new System.Drawing.Size(785, 666);
this.tabCtrlMain.TabIndex = 65;
//
// tpStatus
@@ -1293,8 +1294,8 @@
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, 3, 3, 3);
- this.tpStatus.Size = new System.Drawing.Size(777, 636);
+ this.tpStatus.Padding = new System.Windows.Forms.Padding(3);
+ this.tpStatus.Size = new System.Drawing.Size(777, 640);
this.tpStatus.TabIndex = 0;
this.tpStatus.Text = "STATUS";
//
@@ -1303,7 +1304,7 @@
this.lblOutMessage.AutoSize = true;
this.lblOutMessage.Location = new System.Drawing.Point(95, 281);
this.lblOutMessage.Name = "lblOutMessage";
- this.lblOutMessage.Size = new System.Drawing.Size(16, 15);
+ this.lblOutMessage.Size = new System.Drawing.Size(16, 13);
this.lblOutMessage.TabIndex = 60;
this.lblOutMessage.Text = "...";
//
@@ -1312,7 +1313,7 @@
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(18, 281);
this.label53.Name = "label53";
- this.label53.Size = new System.Drawing.Size(61, 15);
+ this.label53.Size = new System.Drawing.Size(54, 13);
this.label53.TabIndex = 59;
this.label53.Text = "Data Mon";
//
@@ -1338,7 +1339,7 @@
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.Name = "STATUS_ACK_DW3";
- this.STATUS_ACK_DW3.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW3.Size = new System.Drawing.Size(293, 24);
this.STATUS_ACK_DW3.TabIndex = 59;
//
// label52
@@ -1346,7 +1347,7 @@
this.label52.AutoSize = true;
this.label52.Location = new System.Drawing.Point(15, 126);
this.label52.Name = "label52";
- this.label52.Size = new System.Drawing.Size(64, 15);
+ this.label52.Size = new System.Drawing.Size(59, 13);
this.label52.TabIndex = 58;
this.label52.Text = "ACK_DW3";
//
@@ -1355,7 +1356,7 @@
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.Name = "STATUS_ACK_DW2";
- this.STATUS_ACK_DW2.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW2.Size = new System.Drawing.Size(293, 24);
this.STATUS_ACK_DW2.TabIndex = 57;
//
// label51
@@ -1363,7 +1364,7 @@
this.label51.AutoSize = true;
this.label51.Location = new System.Drawing.Point(15, 91);
this.label51.Name = "label51";
- this.label51.Size = new System.Drawing.Size(64, 15);
+ this.label51.Size = new System.Drawing.Size(59, 13);
this.label51.TabIndex = 56;
this.label51.Text = "ACK_DW2";
//
@@ -1372,7 +1373,7 @@
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.Name = "STATUS_ACK_DW1";
- this.STATUS_ACK_DW1.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW1.Size = new System.Drawing.Size(293, 24);
this.STATUS_ACK_DW1.TabIndex = 55;
//
// label50
@@ -1380,7 +1381,7 @@
this.label50.AutoSize = true;
this.label50.Location = new System.Drawing.Point(15, 56);
this.label50.Name = "label50";
- this.label50.Size = new System.Drawing.Size(64, 15);
+ this.label50.Size = new System.Drawing.Size(59, 13);
this.label50.TabIndex = 54;
this.label50.Text = "ACK_DW1";
//
@@ -1389,7 +1390,7 @@
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.Name = "STATUS_ACK_DW0";
- this.STATUS_ACK_DW0.Size = new System.Drawing.Size(293, 28);
+ this.STATUS_ACK_DW0.Size = new System.Drawing.Size(293, 24);
this.STATUS_ACK_DW0.TabIndex = 53;
//
// label48
@@ -1397,7 +1398,7 @@
this.label48.AutoSize = true;
this.label48.Location = new System.Drawing.Point(15, 19);
this.label48.Name = "label48";
- this.label48.Size = new System.Drawing.Size(64, 15);
+ this.label48.Size = new System.Drawing.Size(59, 13);
this.label48.TabIndex = 52;
this.label48.Text = "ACK_DW0";
//
@@ -1459,7 +1460,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(18, 20);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(29, 15);
+ this.label1.Size = new System.Drawing.Size(26, 13);
this.label1.TabIndex = 0;
this.label1.Text = "Port";
//
@@ -1469,7 +1470,7 @@
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, 3, 3, 3);
+ this.tbConf.Padding = new System.Windows.Forms.Padding(3);
this.tbConf.Size = new System.Drawing.Size(777, 636);
this.tbConf.TabIndex = 1;
this.tbConf.Text = "XML CONFIG";
@@ -1550,7 +1551,7 @@
this.label45.AutoSize = true;
this.label45.Location = new System.Drawing.Point(4, 122);
this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(43, 15);
+ this.label45.Size = new System.Drawing.Size(38, 13);
this.label45.TabIndex = 79;
this.label45.Text = "Speed";
//
@@ -1567,7 +1568,7 @@
this.label46.AutoSize = true;
this.label46.Location = new System.Drawing.Point(4, 101);
this.label46.Name = "label46";
- this.label46.Size = new System.Drawing.Size(35, 15);
+ this.label46.Size = new System.Drawing.Size(31, 13);
this.label46.TabIndex = 77;
this.label46.Text = "Load";
//
@@ -1591,7 +1592,7 @@
this.label43.AutoSize = true;
this.label43.Location = new System.Drawing.Point(6, 75);
this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(49, 15);
+ this.label43.Size = new System.Drawing.Size(44, 13);
this.label43.TabIndex = 74;
this.label43.Text = "VitaRes";
//
@@ -1607,7 +1608,7 @@
this.label44.AutoSize = true;
this.label44.Location = new System.Drawing.Point(120, 75);
this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(57, 15);
+ this.label44.Size = new System.Drawing.Size(52, 13);
this.label44.TabIndex = 72;
this.label44.Text = "Acc Time";
//
@@ -1623,7 +1624,7 @@
this.label40.AutoSize = true;
this.label40.Location = new System.Drawing.Point(6, 49);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(46, 15);
+ this.label40.Size = new System.Drawing.Size(42, 13);
this.label40.TabIndex = 70;
this.label40.Text = "Tool ID";
//
@@ -1639,7 +1640,7 @@
this.label41.AutoSize = true;
this.label41.Location = new System.Drawing.Point(255, 49);
this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(41, 15);
+ this.label41.Size = new System.Drawing.Size(37, 13);
this.label41.TabIndex = 68;
this.label41.Text = "Status";
//
@@ -1655,7 +1656,7 @@
this.label42.AutoSize = true;
this.label42.Location = new System.Drawing.Point(120, 49);
this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(51, 15);
+ this.label42.Size = new System.Drawing.Size(44, 13);
this.label42.TabIndex = 66;
this.label42.Text = "NumCU";
//
@@ -1675,7 +1676,7 @@
this.label39.AutoSize = true;
this.label39.Location = new System.Drawing.Point(4, 23);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(69, 15);
+ this.label39.Size = new System.Drawing.Size(60, 13);
this.label39.TabIndex = 64;
this.label39.Text = "Num UnOp";
//
@@ -1698,7 +1699,7 @@
this.ready.Checked = true;
this.ready.Location = new System.Drawing.Point(114, 16);
this.ready.Name = "ready";
- this.ready.Size = new System.Drawing.Size(63, 19);
+ this.ready.Size = new System.Drawing.Size(56, 17);
this.ready.TabIndex = 9;
this.ready.TabStop = true;
this.ready.Text = "Ready";
@@ -1709,7 +1710,7 @@
this.feedhold.AutoSize = true;
this.feedhold.Location = new System.Drawing.Point(253, 16);
this.feedhold.Name = "feedhold";
- this.feedhold.Size = new System.Drawing.Size(85, 19);
+ this.feedhold.Size = new System.Drawing.Size(74, 17);
this.feedhold.TabIndex = 8;
this.feedhold.Text = "Feed Hold";
this.feedhold.UseVisualStyleBackColor = true;
@@ -1719,7 +1720,7 @@
this.stopped.AutoSize = true;
this.stopped.Location = new System.Drawing.Point(180, 16);
this.stopped.Name = "stopped";
- this.stopped.Size = new System.Drawing.Size(74, 19);
+ this.stopped.Size = new System.Drawing.Size(65, 17);
this.stopped.TabIndex = 7;
this.stopped.Text = "Stopped";
this.stopped.UseVisualStyleBackColor = true;
@@ -1729,7 +1730,7 @@
this.running.AutoSize = true;
this.running.Location = new System.Drawing.Point(36, 16);
this.running.Name = "running";
- this.running.Size = new System.Drawing.Size(75, 19);
+ this.running.Size = new System.Drawing.Size(65, 17);
this.running.TabIndex = 6;
this.running.Text = "Running";
this.running.UseVisualStyleBackColor = true;
@@ -1752,7 +1753,7 @@
this.edit.AutoSize = true;
this.edit.Location = new System.Drawing.Point(299, 16);
this.edit.Name = "edit";
- this.edit.Size = new System.Drawing.Size(49, 19);
+ this.edit.Size = new System.Drawing.Size(43, 17);
this.edit.TabIndex = 9;
this.edit.Text = "Edit";
this.edit.UseVisualStyleBackColor = true;
@@ -1762,7 +1763,7 @@
this.mdi.AutoSize = true;
this.mdi.Location = new System.Drawing.Point(180, 15);
this.mdi.Name = "mdi";
- this.mdi.Size = new System.Drawing.Size(129, 19);
+ this.mdi.Size = new System.Drawing.Size(113, 17);
this.mdi.TabIndex = 8;
this.mdi.Text = "Manual Data Input";
this.mdi.UseVisualStyleBackColor = true;
@@ -1773,7 +1774,7 @@
this.manual.Checked = true;
this.manual.Location = new System.Drawing.Point(114, 15);
this.manual.Name = "manual";
- this.manual.Size = new System.Drawing.Size(70, 19);
+ this.manual.Size = new System.Drawing.Size(60, 17);
this.manual.TabIndex = 7;
this.manual.TabStop = true;
this.manual.Text = "Manual";
@@ -1784,7 +1785,7 @@
this.automatic.AutoSize = true;
this.automatic.Location = new System.Drawing.Point(36, 16);
this.automatic.Name = "automatic";
- this.automatic.Size = new System.Drawing.Size(82, 19);
+ this.automatic.Size = new System.Drawing.Size(72, 17);
this.automatic.TabIndex = 6;
this.automatic.Text = "Automatic";
this.automatic.UseVisualStyleBackColor = true;
@@ -1814,7 +1815,7 @@
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.Name = "D1_UUID";
- this.D1_UUID.Size = new System.Drawing.Size(23, 17);
+ this.D1_UUID.Size = new System.Drawing.Size(19, 13);
this.D1_UUID.TabIndex = 66;
this.D1_UUID.Text = "...";
//
@@ -1824,7 +1825,7 @@
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.Name = "D1_ID";
- this.D1_ID.Size = new System.Drawing.Size(23, 17);
+ this.D1_ID.Size = new System.Drawing.Size(19, 13);
this.D1_ID.TabIndex = 65;
this.D1_ID.Text = "...";
//
@@ -1834,7 +1835,7 @@
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.Name = "D1_NAME";
- this.D1_NAME.Size = new System.Drawing.Size(23, 17);
+ this.D1_NAME.Size = new System.Drawing.Size(19, 13);
this.D1_NAME.TabIndex = 64;
this.D1_NAME.Text = "...";
//
@@ -1843,7 +1844,7 @@
this.lblAT.AutoSize = true;
this.lblAT.Location = new System.Drawing.Point(189, 20);
this.lblAT.Name = "lblAT";
- this.lblAT.Size = new System.Drawing.Size(47, 15);
+ this.lblAT.Size = new System.Drawing.Size(43, 13);
this.lblAT.TabIndex = 63;
this.lblAT.Text = "AccMin";
//
@@ -1859,7 +1860,7 @@
this.label30.AutoSize = true;
this.label30.Location = new System.Drawing.Point(288, 20);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(41, 15);
+ this.label30.Size = new System.Drawing.Size(36, 13);
this.label30.TabIndex = 61;
this.label30.Text = "power";
//
@@ -1875,7 +1876,7 @@
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(193, 53);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(37, 15);
+ this.label16.Size = new System.Drawing.Size(34, 13);
this.label16.TabIndex = 59;
this.label16.Text = "UUID";
//
@@ -1884,7 +1885,7 @@
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(10, 53);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(19, 15);
+ this.label15.Size = new System.Drawing.Size(18, 13);
this.label15.TabIndex = 57;
this.label15.Text = "ID";
//
@@ -1893,7 +1894,7 @@
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(10, 20);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(41, 15);
+ this.label14.Size = new System.Drawing.Size(35, 13);
this.label14.TabIndex = 54;
this.label14.Text = "Nome";
//
@@ -1913,7 +1914,7 @@
this.enableDataSim.Location = new System.Drawing.Point(112, 9);
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(59, 17);
this.enableDataSim.TabIndex = 55;
this.enableDataSim.Text = "Enable";
this.enableDataSim.UseVisualStyleBackColor = true;
@@ -1934,7 +1935,7 @@
this.estop.Location = new System.Drawing.Point(59, 9);
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(104, 17);
this.estop.TabIndex = 55;
this.estop.Text = "Emergency Stop";
this.estop.UseVisualStyleBackColor = true;
@@ -1962,7 +1963,7 @@
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, 15);
+ this.lblCodaT.Size = new System.Drawing.Size(22, 13);
this.lblCodaT.TabIndex = 60;
this.lblCodaT.Text = "[...]";
//
@@ -1980,7 +1981,7 @@
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(9, 74);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(35, 15);
+ this.label24.Size = new System.Drawing.Size(33, 13);
this.label24.TabIndex = 58;
this.label24.Text = "AddT";
//
@@ -1989,7 +1990,7 @@
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, 15);
+ this.lblCodaS.Size = new System.Drawing.Size(22, 13);
this.lblCodaS.TabIndex = 57;
this.lblCodaS.Text = "[...]";
//
@@ -2007,7 +2008,7 @@
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(10, 48);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(36, 15);
+ this.label22.Size = new System.Drawing.Size(33, 13);
this.label22.TabIndex = 55;
this.label22.Text = "AddS";
//
@@ -2016,7 +2017,7 @@
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, 15);
+ this.lblCodaM.Size = new System.Drawing.Size(22, 13);
this.lblCodaM.TabIndex = 54;
this.lblCodaM.Text = "[...]";
//
@@ -2034,16 +2035,23 @@
this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(10, 22);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(39, 15);
+ this.label20.Size = new System.Drawing.Size(35, 13);
this.label20.TabIndex = 52;
this.label20.Text = "AddM";
//
// notifyIcon1
//
+ this.notifyIcon1.ContextMenuStrip = this.trayMenu;
this.notifyIcon1.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon1.Icon")));
this.notifyIcon1.Text = "MTC Adapter";
this.notifyIcon1.DoubleClick += new System.EventHandler(this.notifyIcon1_DoubleClick);
//
+ // trayMenu
+ //
+ this.trayMenu.Name = "trayMenu";
+ this.trayMenu.Size = new System.Drawing.Size(61, 4);
+ this.trayMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.trayMenu_ItemClicked);
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2056,11 +2064,13 @@
this.Controls.Add(this.label6);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
+ this.MaximizeBox = false;
this.Name = "MainForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "MTConn Adapter";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+ this.Shown += new System.EventHandler(this.MainForm_Shown);
this.Resize += new System.EventHandler(this.MainForm_Resize);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
@@ -2294,6 +2304,7 @@
private System.Windows.Forms.ToolStripStatusLabel lblApp;
private System.Windows.Forms.ToolStripStatusLabel lblVers;
private System.Windows.Forms.NotifyIcon notifyIcon1;
+ private System.Windows.Forms.ContextMenuStrip trayMenu;
}
}
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.cs b/MTC_Adapter/MTC_Adapter/MainForm.cs
index ccbe824..cbb540a 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.cs
@@ -26,14 +26,36 @@ namespace MTC_Adapter
public partial class MainForm : Form
{
- protected int fastCount;
- protected int normCount;
- protected int slowCount;
- protected int alarmSyncCount;
+ #region inizializzazione contatori
+ ///
+ /// contatore veloce
+ ///
+ protected int fastCount;
+ ///
+ /// contatore normale
+ ///
+ protected int normCount;
+ ///
+ /// contatore lento
+ ///
+ protected int slowCount;
+ ///
+ /// contatore sync allarmi
+ ///
+ protected int alarmSyncCount;
+ ///
+ /// timer base in avvio
+ ///
protected int startTimerMs;
+ #endregion
+ #region inizializzazione oggetti base
+
+ ///
+ /// oggetto logging
+ ///
public static Logger lg;
///
@@ -49,6 +71,9 @@ namespace MTC_Adapter
///
protected tipoAdapter tipoScelto = tipoAdapter.DEMO;
+ #endregion
+
+
#region utils ed helpers
public static void EnableTab(TabPage page, bool enable)
@@ -85,13 +110,18 @@ namespace MTC_Adapter
#endregion
+ #region gestione form e visibilità
+
+ ///
+ /// Gestione form principale
+ ///
public MainForm()
{
InitializeComponent();
lblStatus.Text = "Loading";
// fix icon!
- this.Icon = Icon.ExtractAssociatedIcon(defIconFilePath);
+ Icon = Icon.ExtractAssociatedIcon(defIconFilePath);
notifyIcon1.Icon = Icon.ExtractAssociatedIcon(defIconFilePath);
// fix versione!
@@ -123,22 +153,130 @@ namespace MTC_Adapter
}
displayTaskAndWait("Running");
-
+ createTrayMenu();
// avvio minimizzato se richiesto
if (utils.CRB("startMinimized"))
{
- if (this.WindowState != FormWindowState.Minimized)
+ // imposto minimized se necessario!
+ if (WindowState != FormWindowState.Minimized)
{
- Thread.Sleep(100);
- this.WindowState = FormWindowState.Minimized;
- }
- else
- {
- Thread.Sleep(100);
- sendToTray();
+ WindowState = FormWindowState.Minimized;
}
}
}
+ ///
+ /// Verifica finale a fine show...
+ ///
+ ///
+ ///
+ private void MainForm_Shown(object sender, EventArgs e)
+ {
+ // avvio minimizzato se richiesto
+ if (utils.CRB("startMinimized"))
+ {
+ // controllo e mando a tray...
+ sendToTray();
+ }
+ }
+ ///
+ /// crea menù tray x applicazione
+ ///
+ private void createTrayMenu()
+ {
+ // Fix testi menù tray...
+ trayMenu.Items.Clear();
+ // SE permessa massimizzazione...
+ if (utils.CRB("windowCanMax"))
+ {
+ trayMenu.Items.Add("Show MTC Adapter");
+ }
+ trayMenu.Items.Add("Close MTC Adapter");
+ }
+
+ ///
+ /// doppio click su tray icon
+ ///
+ ///
+ ///
+ private void notifyIcon1_DoubleClick(object sender, EventArgs e)
+ {
+ // SOLO SE PERMESSO mostrare full...
+ if (utils.CRB("windowCanMax"))
+ {
+ Show();
+ WindowState = FormWindowState.Normal;
+ }
+ }
+ ///
+ /// evento resize
+ ///
+ ///
+ ///
+ private void MainForm_Resize(object sender, EventArgs e)
+ {
+ checkFormVisibility();
+ }
+ ///
+ /// Verifica stato windows (minimized/normal) e visibilità con tray...
+ ///
+ private void checkFormVisibility()
+ {
+ // se non può massimizzare imposto COMUNQUE a minimized...
+ if (!utils.CRB("windowCanMax"))
+ {
+ WindowState = FormWindowState.Minimized;
+ }
+ // controllo cosa devo mostrare...
+ if (WindowState == FormWindowState.Minimized)
+ {
+ sendToTray();
+ }
+ else
+ {
+ notifyIcon1.Visible = false;
+ }
+ }
+ ///
+ /// Gestisce "andata nel tray" della form
+ ///
+ private void sendToTray()
+ {
+ if (!notifyIcon1.Visible)
+ {
+ notifyIcon1.BalloonTipTitle = utils.CRS("appName");
+ notifyIcon1.BalloonTipText = string.Format("{0} running on tray", utils.CRS("appName"));
+ notifyIcon1.Visible = true;
+ notifyIcon1.ShowBalloonTip(100);
+ }
+ Hide();
+ }
+ ///
+ /// click su menù contestuale in tray
+ ///
+ ///
+ ///
+ private void trayMenu_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+ {
+ if (e.ClickedItem.Text.StartsWith("Close"))
+ {
+ // stop adapter...
+ closeAdapter();
+ // chiudo!
+ Close();
+ }
+ else if (e.ClickedItem.Text.StartsWith("Show"))
+ {
+ if (utils.CRB("windowCanMax"))
+ {
+ Show();
+ WindowState = FormWindowState.Normal;
+ }
+ }
+
+ }
+
+ #endregion
+
protected string defConfFilePath
{
get
@@ -1365,6 +1503,11 @@ namespace MTC_Adapter
}
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ closeAdapter();
+ }
+
+ private void closeAdapter()
{
agObj.stopAdapter();
// salvo!
@@ -1379,36 +1522,5 @@ namespace MTC_Adapter
agObj.tryDisconnect();
}
- private void notifyIcon1_DoubleClick(object sender, EventArgs e)
- {
- this.Show();
- this.WindowState = FormWindowState.Normal;
- }
-
- private void MainForm_Resize(object sender, EventArgs e)
- {
- if (FormWindowState.Minimized == this.WindowState)
- {
- sendToTray();
- }
- else if (FormWindowState.Normal == this.WindowState)
- {
- //notifyIcon1.Visible = false;
- }
- }
- ///
- /// Gestisce "andata nel tray" della form
- ///
- private void sendToTray()
- {
- if (!notifyIcon1.Visible)
- {
- notifyIcon1.BalloonTipTitle = utils.CRS("appName");
- notifyIcon1.BalloonTipText = string.Format("{0} running on tray", utils.CRS("appName"));
- notifyIcon1.Visible = true;
- notifyIcon1.ShowBalloonTip(100);
- this.Hide();
- }
- }
}
}
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.resx b/MTC_Adapter/MTC_Adapter/MainForm.resx
index 173c0c1..018cda4 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.resx
+++ b/MTC_Adapter/MTC_Adapter/MainForm.resx
@@ -165,6 +165,9 @@
355, 17
+
+ 468, 17
+