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

Fix cast delel condition...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-19 17:42:59 +02:00
parent 8967a876e8
commit b6c0ab0d2c
2 changed files with 5 additions and 5 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=316']) {
withEnv(['NEXT_BUILD_NUMBER=317']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs
+4 -4
View File
@@ -81,10 +81,10 @@ namespace SCMA.AdapterCom
DataItemRed currObj;
switch (tipo)
{
#if false
case itemType.Condition:
currObj = new Condition(key);
currObj = new ConditionRed(key);
break;
#if false
case itemType.Event:
currObj = new Event(key);
break;
@@ -230,7 +230,7 @@ namespace SCMA.AdapterCom
{
ConditionRed mAlarm = (ConditionRed)conditionNodes[currAllarm.gruppo].cObject;
mAlarm.Add(livello, currAllarm.descrizione, currAllarm.codNum, "", "");
}
}
}
/// <summary>
/// Speciofica implementazione x formattazione ALLARMI
@@ -252,7 +252,7 @@ namespace SCMA.AdapterCom
break;
}
ConditionRed mAlarm = (ConditionRed)alarmNode.cObject;
mAlarm.Add(livello, currAllarm.descrizione, currAllarm.codNum, "", "");
mAlarm.Add(livello, currAllarm.descrizione, currAllarm.codNum, "", "");
}
/// <summary>
/// Wrapper setup obj allarmi