Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix decodifica UnOp (Operating Groups)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-07-16 17:00:58 +02:00
parent 86bd956895
commit f2ed2274ff
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=394']) {
withEnv(['NEXT_BUILD_NUMBER=395']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
MTC_Adapter/SCMA/MainForm.cs
+37 -2
View File
@@ -1316,6 +1316,10 @@ namespace SCMA
int numProc = 0;
List<element> listaProc = new List<element>();
// UnOp...
int numUnOp = 0;
List<element> listaUnOp = new List<element>();
// cerco i dati dei vari elementi opzionali
// VacuumPump...
int numVP = 0;
@@ -1380,8 +1384,7 @@ namespace SCMA
numRules += 9;
}
fileOut.WriteLine("");
// cerco PATH come componenti...
List<DataModel.Component> selProc = currDataModel.Components.FindAll(x => x.BrowseName.Contains("Machine:Cnc:CncProcesses:"));
string procBaseName = "";
@@ -1406,6 +1409,33 @@ namespace SCMA
}
fileOut.WriteLine("");
// cerco Gruppi operatori come componenti...
List<DataModel.Component> selUnOp = currDataModel.Components.FindAll(x => x.BrowseName.Contains("Machine:OperatingGroups:"));
string procUnOp = "";
foreach (var item in selUnOp)
{
numUnOp++;
procUnOp = $"UnOp_{numUnOp.ToString("00")}";
newElement = new element()
{
ident = procUnOp
};
listaUnOp.Add(newElement);
// aggiungo su file...
replString = item.BrowseName.Replace("Machine:", "");
fileOut.WriteLine($"A|I|{newElement.ident}_Speed|{replString}:SpeedRate");
fileOut.WriteLine($"A|I|{newElement.ident}_KRev|{replString}:Distance");
fileOut.WriteLine($"A|I|{newElement.ident}_ToolId|{replString}:ToolId");
fileOut.WriteLine($"A|I|{newElement.ident}_NumCU|{replString}:ToolChanges");
fileOut.WriteLine($"A|I|{newElement.ident}_AccTime|{replString}:ActiveTime");
fileOut.WriteLine($"A|I|{newElement.ident}_Load|{replString}:Load");
fileOut.WriteLine($"A|I|{newElement.ident}_SpeedOverr|{replString}:SpeedOverride");
fileOut.WriteLine($"A|I|{newElement.ident}_Status|{replString}:Status");
fileOut.WriteLine($"A|I|ST_{newElement.ident}_Status|{replString}:Status");
numRules += 9;
}
fileOut.WriteLine("");
// cerco gruppi ausiliari...
List<DataModel.Property> listaAux = currDataModel.Properties.FindAll(x => x.BrowseName.Contains("Machine:AuxiliaryGroups"));
foreach (var item in listaAux)
@@ -1478,6 +1508,11 @@ namespace SCMA
element[] elencoProc = listaProc.ToArray();
adpConf.Path = elencoProc;
}
if (numUnOp > 0)
{
element[] elencoUnOp = listaUnOp.ToArray();
adpConf.UnOp = elencoUnOp;
}
if (numVP > 0)
{
element[] elencoVP = listaVP.ToArray();