From 817a1588fad6bddc7df47a80a2633fc4f97e1bc4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 9 Nov 2019 09:03:16 +0100 Subject: [PATCH] Update accorpamento x mostrare rawData... --- IOB-WIN/IobFanuc.cs | 12 +++++------- IOB-WIN/IobGeneric.cs | 18 +++++++++++------- IOB-WIN/IobKawasaki.cs | 11 +++++------ IOB-WIN/IobOSAI.cs | 10 ++++------ IOB-WIN/IobOmron.cs | 11 +++++------ IOB-WIN/IobSiemens.cs | 12 +++++------- IOB-WIN/IobSimula.cs | 12 +++++++----- IOB-WIN/IobWPS.cs | 9 +++++++-- 8 files changed, 49 insertions(+), 46 deletions(-) diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index 36b40699..03d30f0f 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -513,13 +513,12 @@ namespace IOB_WIN } } /// - /// lettura principale (bit semafori) + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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 /// diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index c72e81ac..1d0d8948 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -335,13 +335,17 @@ namespace IOB_WIN } } /// - /// Riporta alla parentForm i valori di RawInput rilevati + /// Aggiunge ai dati da inviare alla parentform i valori di RawInput rilevati /// - 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 } /// /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - public virtual void readSemafori() + public virtual void readSemafori(ref newDisplayData currDispData) { } diff --git a/IOB-WIN/IobKawasaki.cs b/IOB-WIN/IobKawasaki.cs index 95957eaf..7454921a 100644 --- a/IOB-WIN/IobKawasaki.cs +++ b/IOB-WIN/IobKawasaki.cs @@ -794,13 +794,12 @@ namespace IOB_WIN { } /// - /// lettura bit semafori + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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); } /// diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs index e5a273f0..db52fd87 100644 --- a/IOB-WIN/IobOSAI.cs +++ b/IOB-WIN/IobOSAI.cs @@ -277,13 +277,12 @@ namespace IOB_WIN } } /// - /// lettura principale (bit semafori) + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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); } /// /// Effettua decodifica aree memoria alla bitmap usata x MAPO diff --git a/IOB-WIN/IobOmron.cs b/IOB-WIN/IobOmron.cs index 338a223a..e4e7749a 100644 --- a/IOB-WIN/IobOmron.cs +++ b/IOB-WIN/IobOmron.cs @@ -640,13 +640,12 @@ namespace IOB_WIN } /// - /// lettura bit semafori + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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); } /// diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs index bad1c7e3..02ab3a6a 100644 --- a/IOB-WIN/IobSiemens.cs +++ b/IOB-WIN/IobSiemens.cs @@ -737,13 +737,12 @@ namespace IOB_WIN } } /// - /// lettura bit semafori + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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); } /// /// decodifica da bitmap il CURRENT MODE del controllo diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs index 3fb2a3cd..a0659aed 100644 --- a/IOB-WIN/IobSimula.cs +++ b/IOB-WIN/IobSimula.cs @@ -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 { } /// - /// lettura bit semafori + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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); } /// /// Processo contatori eventi... diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs index ca561250..798d34ad 100644 --- a/IOB-WIN/IobWPS.cs +++ b/IOB-WIN/IobWPS.cs @@ -269,10 +269,12 @@ namespace IOB_WIN } /// - /// Effettua lettura dati di status da apposite variabili + /// Effettua lettura semafori principale + /// Parametri da aggiornare x display in form /// - 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; } } ///