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

nuova gestione accodamento progName (mostra non + solo ultimo)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-10-25 15:44:19 +02:00
parent 392234ced0
commit 032986bb4e
4 changed files with 104 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IOB-WIN.csproj
+3
View File
@@ -98,6 +98,9 @@
<Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\logoSteamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resources\manifest.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
IOB-WIN/IobFanuc.cs
+8 -5
View File
@@ -233,22 +233,25 @@ namespace IOB_WIN
}
if (verboseLog) lg.Info(string.Format("Trasformazione B_input: {0}", B_input));
}
public override void readPrgName()
/// <summary>
/// Recupero programma in lavorazione
/// </summary>
/// <returns></returns>
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;
}
}
IOB-WIN/IobGeneric.cs
+91 -5
View File
@@ -125,6 +125,10 @@ namespace IOB_WIN
/// Ultimo URL
/// </summary>
public string lastUrl { get; set; }
/// <summary>
/// ULtimo programma letto
/// </summary>
public string lastPrgName { get; set; }
/// <summary>
/// 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();
}
/// <summary>
/// lettura programma in esecuzione
/// Effettua gestioen programma: legge e mostra su display...
/// </summary>
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;
}
}
/// <summary>
/// Restituisce programma in esecuzione
/// </summary>
public virtual string getPrgName()
{
return "";
}
/// <summary>
@@ -1031,7 +1053,9 @@ namespace IOB_WIN
public virtual void readSemafori()
{
}
/// <summary>
/// Mostra i dati grezzi letti in esadecimale
/// </summary>
private void displayRawData()
{
// mostro update......
@@ -1112,6 +1136,9 @@ namespace IOB_WIN
parentForm.dataMonitor_1 = newString;
}
/// <summary>
/// lettura memoria in SIMULAZIONE
/// </summary>
public void simReadMem()
{
if (lastSim == null)
@@ -1192,5 +1219,64 @@ namespace IOB_WIN
#endregion
#region gestione dataMonitor (accodamento valori)
/// <summary>
/// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
/// </summary>
/// <param name="newLine"></param>
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));
}
/// <summary>
/// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
/// </summary>
/// <param name="newLine"></param>
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));
}
/// <summary>
/// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
/// </summary>
/// <param name="newLine"></param>
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));
}
/// <summary>
/// Accoda (visualizzando in cima allo stack) la nuova stringa di output per area OTHER DATA
/// </summary>
/// <param name="newLine"></param>
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));
}
/// <summary>
/// Effettua un trim della stringa al numero max di linee da mostrare a video
/// </summary>
/// <param name="newString"></param>
/// <returns></returns>
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
}
}
Jenkinsfile
Vendored
+2 -2
View File
@@ -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'
}
}