diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 7bfde817..aba44eff 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -98,6 +98,9 @@
Always
+
+ Always
+
Always
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index e08eec8a..b9b40dfc 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -233,22 +233,25 @@ namespace IOB_WIN
}
if (verboseLog) lg.Info(string.Format("Trasformazione B_input: {0}", B_input));
}
-
- public override void readPrgName()
+ ///
+ /// Recupero programma in lavorazione
+ ///
+ ///
+ public override string getPrgName()
{
- CncLib.Focas1.ODBEXEPRG answ = FANUC_ref.getPrgName();
string prgName = "";
+ CncLib.Focas1.ODBEXEPRG answ = FANUC_ref.getPrgName();
try
{
string nome = new string(answ.name);
- prgName= string.Format("{0} | {1}", answ.o_num, nome);
+ prgName= string.Format("PROG: {0} | {1}", answ.o_num, nome);
}
catch(Exception exc)
{
lg.Error(exc, "Errore in readPrgName");
}
if (verboseLog) lg.Info(string.Format("PrgName: {0}", prgName));
- parentForm.dataMonitor_3 += prgName;
+ return prgName;
}
}
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index cb13a1e1..784783c2 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -125,6 +125,10 @@ namespace IOB_WIN
/// Ultimo URL
///
public string lastUrl { get; set; }
+ ///
+ /// ULtimo programma letto
+ ///
+ public string lastPrgName { get; set; }
///
/// Array dei contatori x segnali blinking
@@ -251,6 +255,7 @@ namespace IOB_WIN
private void setDefaults()
{
numSim = utils.CRI("numSim");
+ lastPrgName = "";
nReadIN = 0;
nReadFilt = 0;
nSendOut = 0;
@@ -361,8 +366,8 @@ namespace IOB_WIN
}
else if (ciclo == gatherCycle.MF)
{
- parentForm.dataMonitor_3 = "";
- readPrgName();
+ processProgram();
+ getPrgName();
}
else if (ciclo == gatherCycle.LF)
{
@@ -426,6 +431,7 @@ namespace IOB_WIN
}
}
+
private void reportDataProc()
{
// update valori visualizzazione...
@@ -1019,10 +1025,26 @@ namespace IOB_WIN
displayRawData();
}
///
- /// lettura programma in esecuzione
+ /// Effettua gestioen programma: legge e mostra su display...
///
- public virtual void readPrgName()
+ private void processProgram()
{
+ string currPrgName = getPrgName();
+ // verifico SE sia cambiato il programma...
+ if (lastPrgName != currPrgName)
+ {
+ // lo mostro accodanto in cima...
+ accodaOtherData(currPrgName);
+ // salvo!
+ lastPrgName = currPrgName;
+ }
+ }
+ ///
+ /// Restituisce programma in esecuzione
+ ///
+ public virtual string getPrgName()
+ {
+ return "";
}
///
@@ -1031,7 +1053,9 @@ namespace IOB_WIN
public virtual void readSemafori()
{
}
-
+ ///
+ /// Mostra i dati grezzi letti in esadecimale
+ ///
private void displayRawData()
{
// mostro update......
@@ -1112,6 +1136,9 @@ namespace IOB_WIN
parentForm.dataMonitor_1 = newString;
}
+ ///
+ /// lettura memoria in SIMULAZIONE
+ ///
public void simReadMem()
{
if (lastSim == null)
@@ -1192,5 +1219,64 @@ namespace IOB_WIN
#endregion
+
+ #region gestione dataMonitor (accodamento valori)
+
+
+ ///
+ /// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
+ ///
+ ///
+ public void accodaInData(string newLine)
+ {
+ // inserisco in cima allo stack, trimmo e aggiorno display
+ parentForm.dataMonitor_0 = limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_0));
+ }
+ ///
+ /// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
+ ///
+ ///
+ public void accodaSignalData(string newLine)
+ {
+ // inserisco in cima allo stack, trimmo e aggiorno display
+ parentForm.dataMonitor_1 = limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_1));
+ }
+ ///
+ /// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
+ ///
+ ///
+ public void accodaUrlData(string newLine)
+ {
+ // inserisco in cima allo stack, trimmo e aggiorno display
+ parentForm.dataMonitor_2 = limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_2));
+ }
+ ///
+ /// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
+ ///
+ ///
+ public void accodaOtherData(string newLine)
+ {
+ // inserisco in cima allo stack, trimmo e aggiorno display
+ parentForm.dataMonitor_3 = limitLine2show(string.Format("{0}{1}{2}", newLine, Environment.NewLine, parentForm.dataMonitor_3));
+ }
+ ///
+ /// Effettua un trim della stringa al numero max di linee da mostrare a video
+ ///
+ ///
+ ///
+ private string limitLine2show(string newString)
+ {
+ // se num righe superiore a limite trimmo...
+ if (newString.Split('\n').Length > parentForm.nLine2show)
+ {
+ int idx = newString.LastIndexOf(Environment.NewLine);
+ newString = newString.Substring(0, idx);
+ }
+ return newString;
+ }
+
+
+ #endregion
+
}
}
diff --git a/Jenkinsfile b/Jenkinsfile
index 079cb38e..fe6b6e2e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,8 +12,8 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=67']) {
- // env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
- env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+ env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+ // env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'
}
}