From b6c0ab0d2c3ee8940f04d2b9ae63205ce0ff4c1d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Sep 2018 17:42:59 +0200 Subject: [PATCH] Fix cast delel condition... --- Jenkinsfile | 2 +- MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 32cd3a5..ca3961c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs index 37c5713..10966f8 100644 --- a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs +++ b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs @@ -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, "", ""); - } + } } /// /// 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, "", ""); } /// /// Wrapper setup obj allarmi