diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 6bd4027..fd16fca 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -2326,24 +2326,17 @@ namespace MTC_Adapter
// controllo valore riferimento...
if (istNumInvAssi[i] > contNumInvAssi[i])
{
- uint delta = istNumInvAssi[i] - contNumInvAssi[i];
+ long delta = istNumInvAssi[i] - contNumInvAssi[i];
//uint contTot = updateAxisRefListByIncr(i, delta, "Axis_{0:00}_InvDDone");
- uint contTot = updateValUIntByIncr(i, delta, "Axis_{0:00}_InvDDone");
- // trappola x capire se ci siano valori "strani"...
- uint mtcVal = 0;
- try
- {
- mtcVal = Convert.ToUInt32(vettAxis[i].mAxInvDDone.Value);
- }
- catch
- { }
- if (Math.Abs((int)mtcVal - (int)contTot) > 10)
+ long contTot = updateValLongByIncr(i, delta, "Axis_{0:00}_InvDDone");
+ // trappola x capire se ci siano valori "strani"...
+ if (utils.CRB("logAll"))
{
// loggo anomalia...
- lg.Info(string.Format("Anomalia conteggio valori: asse {0}, istNumInvAssi[i]={1}, contNumInvAssi[i]={2}, nuovo contTot: {3}", i, istNumInvAssi[i], contNumInvAssi[i], contTot));
+ lg.Info(string.Format("Conteggio valori: asse {0}, istNumInvAssi[i]={1}, contNumInvAssi[i]={2}, nuovo contTot: {3}", i, istNumInvAssi[i], contNumInvAssi[i], contTot));
}
// passo valore totale all'adapter
- vettAxis[i].mAxInvDDone.Value = (int)contTot;
+ vettAxis[i].mAxInvDDone.Value = contTot;
// segnalo necessità salvataggio!
needSave = true;
}
@@ -2462,6 +2455,15 @@ namespace MTC_Adapter
return Convert.ToUInt32(getStoredVal(keyVal));
}
///
+ /// recupera valore salvato in persistence layer (se non c'è crea...) come INT
+ ///
+ ///
+ ///
+ private long getStoredValLong(string keyVal)
+ {
+ return Convert.ToInt64(getStoredVal(keyVal));
+ }
+ ///
/// recupera valore salvato in persistence layer (se non c'è crea...) come double
///
///
@@ -2514,6 +2516,26 @@ namespace MTC_Adapter
///
///
/// Nuovo valore incrementato
+ private long updateValLongByIncr(int i, long delta, string searchString)
+ {
+ // stringa da cercare..
+ string keyVal = string.Format(searchString, i + 1);
+ // recupero valore precedente...
+ long contAct = getStoredValLong(keyVal);
+ // nuovo valore...
+ contAct += delta;
+ // salvo in ram!
+ persistenceLayer[keyVal] = contAct.ToString();
+ // rendo il valore!
+ return contAct;
+ }
+ ///
+ /// Aggiorna un valore del dizionario in INCREMENTO e lo restituisce
+ ///
+ ///
+ ///
+ ///
+ /// Nuovo valore incrementato
private double updateValDoubleByIncr(int i, double delta, string searchString)
{
// stringa da cercare..
diff --git a/MTC_Sim/MTC_Sim/App.config b/MTC_Sim/MTC_Sim/App.config
index ad60b0e..24bd477 100644
--- a/MTC_Sim/MTC_Sim/App.config
+++ b/MTC_Sim/MTC_Sim/App.config
@@ -35,6 +35,7 @@
+
diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs
index bc547fb..572f1d5 100644
--- a/MTC_Sim/VersGen/AdapterVers.cs
+++ b/MTC_Sim/VersGen/AdapterVers.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.1.22.94")]
-[assembly: AssemblyFileVersion("1.1.22.94")]
+[assembly: AssemblyVersion("1.1.23.94")]
+[assembly: AssemblyFileVersion("1.1.23.94")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt
index d557b05..fd3c484 100644
--- a/MTC_Sim/VersGen/AdapterVers.tt
+++ b/MTC_Sim/VersGen/AdapterVers.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.1.22.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.1.22.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.1.23.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.1.23.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
<#+