From 974965c5071efe2ce523fcf62412a6a2b36da158 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 24 Apr 2017 18:35:13 +0200
Subject: [PATCH] cambio aree visualizzazione (3)

---
 MTC_Adapter/MTC_Adapter/AdapterESA.cs        | 10 ++++-----
 MTC_Adapter/MTC_Adapter/AdapterFanuc.cs      |  8 +++----
 MTC_Adapter/MTC_Adapter/MainForm.Designer.cs | 17 ++++++++++++++-
 MTC_Adapter/MTC_Adapter/MainForm.cs          | 22 ++++++++++++++++----
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/MTC_Adapter/MTC_Adapter/AdapterESA.cs b/MTC_Adapter/MTC_Adapter/AdapterESA.cs
index e2d4882..f896ffa 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterESA.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterESA.cs
@@ -572,7 +572,7 @@ namespace MTC_Adapter
             sb.AppendLine(string.Format("SpeedRateOver: {0} %", SpeedRateOver));
 
             // update form!
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
         /// <summary>
         /// Carica ed acquisisce dati del buffer WORD (16 bit) di memoria
@@ -930,7 +930,7 @@ namespace MTC_Adapter
                 if (FeedRateGrp[i] != 0) sb.AppendLine(string.Format("FeedRate_{1}: {0:00} mm/min", FeedRateGrp[i], i));
             }
             // update form!
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
         /// <summary>
         /// Carica ed acquisisce dati del buffer STRING di memoria
@@ -976,7 +976,7 @@ namespace MTC_Adapter
                 sb.AppendLine(string.Format("{0}: {1}", mapIOT_String[j].varName, valString));
             }
             // update form!
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
         public override void getGlobalData()
         {
@@ -989,7 +989,7 @@ namespace MTC_Adapter
         public override void processAllMemory()
         {
             // inizializzo data monitor su FORM
-            parentForm.dataMonitorSx = "";
+            parentForm.dataMonitor_1 = "";
 
             // recupero le varie memorie (prima string che mi serve x area selezionata --> programma selezionato)
             getIotMem_String();
@@ -1097,7 +1097,7 @@ namespace MTC_Adapter
                 prevDirAxis[i] = newDir;
             }
 
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
     }
 }
diff --git a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs
index d923469..e874536 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs
@@ -1226,7 +1226,7 @@ namespace MTC_Adapter
                 allarmiCNC = new CMSCncLib.Focas1.ODBALMMSG2();
             }
 
-            parentForm.dataMonitorSx = sb.ToString();
+            parentForm.dataMonitor_1 = sb.ToString();
 
             // gestisco lettura dati manutenzione da PLC...
             getMtzDataFromPlc();
@@ -1405,7 +1405,7 @@ namespace MTC_Adapter
             }
 
 
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
         /// <summary>
         /// procedura di lettura (Multipla) dati da memoria x caricare dati utensile
@@ -1627,7 +1627,7 @@ namespace MTC_Adapter
                 sb.AppendLine(string.Format("Path {0}, Cent 1: {1:N3}", i + 1, ((decimal)vettTTCoord.c1) / utils.CRI("fattdecimale")));
                 sb.AppendLine(string.Format("Path {0}, Cent 2: {1:N3}", i + 1, ((decimal)vettTTCoord.c2) / utils.CRI("fattdecimale")));
 
-                parentForm.dataMonitorSx += sb.ToString();
+                parentForm.dataMonitor_1 += sb.ToString();
             }
 
         }
@@ -1857,7 +1857,7 @@ namespace MTC_Adapter
                 }
             }
 
-            parentForm.dataMonitorSx += sb.ToString();
+            parentForm.dataMonitor_1 += sb.ToString();
         }
     }
 }
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
index 8ce5cac..183f95a 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.Designer.cs
@@ -217,6 +217,7 @@
             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.lblOutMessage3 = new System.Windows.Forms.Label();
             this.groupBox4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit();
             this.groupBox3.SuspendLayout();
@@ -1400,6 +1401,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.gbMonitor.BackColor = System.Drawing.Color.Black;
+            this.gbMonitor.Controls.Add(this.lblOutMessage3);
             this.gbMonitor.Controls.Add(this.lblOutMessage);
             this.gbMonitor.Controls.Add(this.lblOutMessage2);
             this.gbMonitor.ForeColor = System.Drawing.SystemColors.Control;
@@ -1429,7 +1431,7 @@
             this.lblOutMessage2.AutoSize = true;
             this.lblOutMessage2.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblOutMessage2.ForeColor = System.Drawing.Color.Yellow;
-            this.lblOutMessage2.Location = new System.Drawing.Point(325, 15);
+            this.lblOutMessage2.Location = new System.Drawing.Point(296, 15);
             this.lblOutMessage2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblOutMessage2.Name = "lblOutMessage2";
             this.lblOutMessage2.Size = new System.Drawing.Size(17, 16);
@@ -2251,6 +2253,18 @@
             this.trayMenu.Size = new System.Drawing.Size(67, 4);
             this.trayMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.trayMenu_ItemClicked);
             // 
+            // lblOutMessage3
+            // 
+            this.lblOutMessage3.AutoSize = true;
+            this.lblOutMessage3.Font = new System.Drawing.Font("Arial Narrow", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblOutMessage3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
+            this.lblOutMessage3.Location = new System.Drawing.Point(543, 15);
+            this.lblOutMessage3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblOutMessage3.Name = "lblOutMessage3";
+            this.lblOutMessage3.Size = new System.Drawing.Size(17, 16);
+            this.lblOutMessage3.TabIndex = 62;
+            this.lblOutMessage3.Text = "...";
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -2507,6 +2521,7 @@
         private System.Windows.Forms.ContextMenuStrip trayMenu;
         private System.Windows.Forms.Label lblOutMessage2;
         private System.Windows.Forms.GroupBox gbMonitor;
+        private System.Windows.Forms.Label lblOutMessage3;
     }
 }
 
diff --git a/MTC_Adapter/MTC_Adapter/MainForm.cs b/MTC_Adapter/MTC_Adapter/MainForm.cs
index b4df413..4cffb7f 100644
--- a/MTC_Adapter/MTC_Adapter/MainForm.cs
+++ b/MTC_Adapter/MTC_Adapter/MainForm.cs
@@ -1593,9 +1593,9 @@ namespace MTC_Adapter
 
 
         /// <summary>
-        /// Stringa dati monitoraggio mostrata (SX)...
+        /// Stringa dati monitoraggio mostrata (1 SX)...
         /// </summary>
-        public string dataMonitorSx
+        public string dataMonitor_1
         {
             get
             {
@@ -1607,9 +1607,9 @@ namespace MTC_Adapter
             }
         }
         /// <summary>
-        /// Stringa dati monitoraggio mostrata (DX)...
+        /// Stringa dati monitoraggio mostrata (2 centro)...
         /// </summary>
-        public string dataMonitorDx
+        public string dataMonitor_2
         {
             get
             {
@@ -1620,6 +1620,20 @@ namespace MTC_Adapter
                 lblOutMessage2.Text = value;
             }
         }
+        /// <summary>
+        /// Stringa dati monitoraggio mostrata (3 dx)...
+        /// </summary>
+        public string dataMonitor_3
+        {
+            get
+            {
+                return lblOutMessage3.Text;
+            }
+            set
+            {
+                lblOutMessage3.Text = value;
+            }
+        }
         private void SysErr_01_CheckedChanged(object sender, EventArgs e)
         {
             // aggiorno il vettore allarmi (da 128 byte) sulla base della selezione dei checkbox (per i primi 9...) - ultimi 3 selezionano 8 allarmi ciascuno...