Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dock IOB-WIN adapter

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-16 09:40:00 +02:00
parent 0e07451e31
commit 2fac24be5a
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.Designer.cs
Generated
+8 -10
View File
@@ -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;
IOB-WIN/AdapterForm.cs
+18 -13
View File
@@ -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
/// <summary>
@@ -214,18 +214,6 @@ namespace IOB_WIN
displayTaskAndLog("Main Form OK");
}
/// <summary>
/// Init oggetti datamonitor
/// </summary>
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
}
}
/// <summary>
/// Init oggetti datamonitor
/// </summary>
private void initDatamonitor()
{
for (int i = 0; i < 4; i++)
{
dMonDisplVetoVeto.Add(i, DateTime.Now);
dMonValues.Add(i, "");
}
}
/// <summary>
/// GEstione evento refresh
/// </summary>
@@ -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
}
}