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

Update accorpamento x mostrare rawData...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-09 09:03:16 +01:00
parent a89bd65d87
commit 817a1588fa
8 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobFanuc.cs
+5 -7
View File
@@ -513,13 +513,12 @@ namespace IOB_WIN
}
}
/// <summary>
/// lettura principale (bit semafori)
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
// init obj display
newDisplayData currDispData = new newDisplayData();
base.readSemafori(ref currDispData);
try
{
if (verboseLog)
@@ -587,7 +586,7 @@ namespace IOB_WIN
stopwatch.Stop();
// salvo il solo BYTE dell'input decifrando il semaforo...
decodeToBitmap();
reportRawInput();
reportRawInput(ref currDispData);
}
catch (Exception exc)
{
@@ -595,7 +594,6 @@ namespace IOB_WIN
connectionOk = false;
currDispData.semIn = Semaforo.SR;
}
parentForm.updateFormDisplay(currDispData);
}
#if false
/// <summary>
IOB-WIN/IobGeneric.cs
+11 -7
View File
@@ -335,13 +335,17 @@ namespace IOB_WIN
}
}
/// <summary>
/// Riporta alla parentForm i valori di RawInput rilevati
/// Aggiunge ai dati da inviare alla parentform i valori di RawInput rilevati
/// </summary>
public virtual void reportRawInput()
public virtual void reportRawInput(ref newDisplayData currDispData)
{
// processo eventualmente aggiungendo ad elementi esistenti...
if (currDispData == null)
{
currDispData = new newDisplayData();
}
try
{
newDisplayData currDispData = new newDisplayData();
StringBuilder sb = new StringBuilder();
sb.Append($"B_input --> {(short)B_input}{Environment.NewLine}");
sb.Append($"{baseUtils.binaryForm(B_input)}{Environment.NewLine}");
@@ -355,7 +359,6 @@ namespace IOB_WIN
}
sb.Append("-------------------------------");
currDispData.currBitmap = sb.ToString();
parentForm.updateFormDisplay(currDispData);
}
catch
{ }
@@ -1173,7 +1176,7 @@ namespace IOB_WIN
raiseRefresh(currDispData);
}
private void raiseRefresh(newDisplayData currDispData)
protected void raiseRefresh(newDisplayData currDispData)
{
if (currDispData.hasData)
{
@@ -2720,7 +2723,7 @@ namespace IOB_WIN
}
if (connectionOk)
{
readSemafori();
readSemafori(ref currDispData);
}
else
{
@@ -2854,8 +2857,9 @@ namespace IOB_WIN
}
/// <summary>
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public virtual void readSemafori()
public virtual void readSemafori(ref newDisplayData currDispData)
{
}
IOB-WIN/IobKawasaki.cs
+5 -6
View File
@@ -794,13 +794,12 @@ namespace IOB_WIN
{
}
/// <summary>
/// lettura bit semafori
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
// init obj display
newDisplayData currDispData = new newDisplayData();
base.readSemafori(ref currDispData);
try
{
if (verboseLog)
@@ -817,12 +816,12 @@ namespace IOB_WIN
// decodifica e gestione
decodeToBaseBitmap();
decodeOtherData();
reportRawInput(ref currDispData);
}
catch
{
currDispData.semIn = Semaforo.SR;
}
parentForm.updateFormDisplay(currDispData);
}
/// <summary>
IOB-WIN/IobOSAI.cs
+4 -6
View File
@@ -277,13 +277,12 @@ namespace IOB_WIN
}
}
/// <summary>
/// lettura principale (bit semafori)
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
// init obj display
newDisplayData currDispData = new newDisplayData();
base.readSemafori(ref currDispData);
try
{
if (verboseLog)
@@ -312,7 +311,6 @@ namespace IOB_WIN
connectionOk = false;
currDispData.semIn = Semaforo.SR;
}
parentForm.updateFormDisplay(currDispData);
}
/// <summary>
/// Effettua decodifica aree memoria alla bitmap usata x MAPO
IOB-WIN/IobOmron.cs
+5 -6
View File
@@ -640,13 +640,12 @@ namespace IOB_WIN
}
/// <summary>
/// lettura bit semafori
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
// init obj display
newDisplayData currDispData = new newDisplayData();
base.readSemafori(ref currDispData);
try
{
if (verboseLog)
@@ -666,12 +665,12 @@ namespace IOB_WIN
lastCountCNC = pesoRilevato;
// decodifica e gestione
decodeToBaseBitmap();
reportRawInput(ref currDispData);
}
catch
{
currDispData.semIn = Semaforo.SR;
}
parentForm.updateFormDisplay(currDispData);
}
/// <summary>
IOB-WIN/IobSiemens.cs
+5 -7
View File
@@ -737,13 +737,12 @@ namespace IOB_WIN
}
}
/// <summary>
/// lettura bit semafori
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
// init obj display
newDisplayData currDispData = new newDisplayData();
base.readSemafori(ref currDispData);
try
{
currDispData.semIn = Semaforo.SV;
@@ -764,13 +763,12 @@ namespace IOB_WIN
decodeToBaseBitmap();
decodeOtherData();
// riporto bitmap...
reportRawInput();
reportRawInput(ref currDispData);
}
catch
{
currDispData.semIn = Semaforo.SR;
}
parentForm.updateFormDisplay(currDispData);
}
/// <summary>
/// decodifica da bitmap il CURRENT MODE del controllo
IOB-WIN/IobSimula.cs
+7 -5
View File
@@ -1,4 +1,5 @@
using System;
using IOB_UT;
using System;
using System.Collections.Generic;
namespace IOB_WIN
@@ -331,15 +332,16 @@ namespace IOB_WIN
{
}
/// <summary>
/// lettura bit semafori
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori();
base.readSemafori(ref currDispData);
// decodifica e gestione
decodeToBaseBitmap();
decodeOtherData();
reportRawInput();
reportRawInput(ref currDispData);
}
/// <summary>
/// Processo contatori eventi...
IOB-WIN/IobWPS.cs
+7 -2
View File
@@ -269,10 +269,12 @@ namespace IOB_WIN
}
/// <summary>
/// Effettua lettura dati di status da apposite variabili
/// Effettua lettura semafori principale
/// <paramref name="currDispData">Parametri da aggiornare x display in form</paramref>
/// </summary>
public override void readSemafori()
public override void readSemafori(ref newDisplayData currDispData)
{
base.readSemafori(ref currDispData);
// init a zero...
B_input = 0;
// ciclo!
@@ -299,10 +301,13 @@ namespace IOB_WIN
B_input = int.Parse(cVal, System.Globalization.NumberStyles.HexNumber);
}
}
// riporto bitmap...
reportRawInput(ref currDispData);
}
catch (Exception exc)
{
lgError(exc, "Errore in getDynData x IOB WPS");
currDispData.semIn = Semaforo.SR;
}
}
/// <summary>