diff --git a/IOB-WIN/AdapterForm.Designer.cs b/IOB-WIN/AdapterForm.Designer.cs index 82a63c38..057303af 100644 --- a/IOB-WIN/AdapterForm.Designer.cs +++ b/IOB-WIN/AdapterForm.Designer.cs @@ -560,10 +560,8 @@ // // splitContainer1 // - this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.splitContainer1.Location = new System.Drawing.Point(7, 3); + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Top; + this.splitContainer1.Location = new System.Drawing.Point(3, 3); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -573,8 +571,8 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.panel4); - this.splitContainer1.Size = new System.Drawing.Size(777, 513); - this.splitContainer1.SplitterDistance = 426; + this.splitContainer1.Size = new System.Drawing.Size(886, 513); + this.splitContainer1.SplitterDistance = 485; this.splitContainer1.TabIndex = 94; // // panel3 @@ -593,7 +591,7 @@ this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(426, 513); + this.panel3.Size = new System.Drawing.Size(485, 513); this.panel3.TabIndex = 91; // // panel2 @@ -605,7 +603,7 @@ this.panel2.Controls.Add(this.lblTaskLog); this.panel2.Location = new System.Drawing.Point(3, 212); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(416, 295); + this.panel2.Size = new System.Drawing.Size(475, 295); this.panel2.TabIndex = 86; // // lblTaskLog @@ -711,7 +709,7 @@ this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Margin = new System.Windows.Forms.Padding(2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(347, 513); + this.panel4.Size = new System.Drawing.Size(397, 513); this.panel4.TabIndex = 92; // // lblWatchDog @@ -719,7 +717,7 @@ this.lblWatchDog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblWatchDog.AutoSize = true; this.lblWatchDog.Font = new System.Drawing.Font("Arial Narrow", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWatchDog.Location = new System.Drawing.Point(300, 53); + this.lblWatchDog.Location = new System.Drawing.Point(350, 53); this.lblWatchDog.Name = "lblWatchDog"; this.lblWatchDog.Size = new System.Drawing.Size(27, 15); this.lblWatchDog.TabIndex = 91; diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index b5c90ed1..c732dc66 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -6,7 +6,6 @@ using NLog.Config; using NLog.Targets; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Diagnostics; using System.Drawing; using System.IO; @@ -17,6 +16,7 @@ namespace IOB_WIN { public partial class AdapterForm : Form { + #region Protected Fields /// @@ -214,18 +214,6 @@ namespace IOB_WIN displayTaskAndLog("Main Form OK"); } - /// - /// Init oggetti datamonitor - /// - private void initDatamonitor() - { - for (int i = 0; i < 4; i++) - { - dMonDisplVetoVeto.Add(i, DateTime.Now); - dMonValues.Add(i, ""); - } - } - #endregion Public Constructors #region Private Delegates @@ -1027,6 +1015,18 @@ namespace IOB_WIN } } + /// + /// Init oggetti datamonitor + /// + private void initDatamonitor() + { + for (int i = 0; i < 4; i++) + { + dMonDisplVetoVeto.Add(i, DateTime.Now); + dMonValues.Add(i, ""); + } + } + /// /// GEstione evento refresh /// @@ -1765,13 +1765,17 @@ namespace IOB_WIN { // aggiorno SE diverso if (sOUT != currDispData.semOut) + { sOUT = currDispData.semOut; + } } if (currDispData.semIn != Semaforo.ND) { //aggiorno SE diverso if (sIN != currDispData.semIn) + { sIN = currDispData.semIn; + } } } } @@ -1790,5 +1794,6 @@ namespace IOB_WIN } #endregion Public Methods + } } \ No newline at end of file