From 8967a876e8d7e8986aa47a8a44d3a35660cafa7b Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 19 Sep 2018 17:38:04 +0200 Subject: [PATCH] completata primo riversamento allarmi --- MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs | 32 ++++++++------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs index 3a53217..37c5713 100644 --- a/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs +++ b/MTC_Adapter/SCMA/AdapterCom/GatewaySOURS.cs @@ -214,25 +214,23 @@ namespace SCMA.AdapterCom /// public override void addAlarm(allarme currAllarm) { -#if false // in base al tipo di allarme decodifico condizione... - Condition.Level livello = Condition.Level.NORMAL; + ConditionRed.Level livello = ConditionRed.Level.NORMAL; switch (currAllarm.livello) { case "WARNING": - livello = Condition.Level.WARNING; + livello = ConditionRed.Level.WARNING; break; case "FAULT": default: - livello = Condition.Level.FAULT; + livello = ConditionRed.Level.FAULT; break; } if (conditionNodes.ContainsKey(currAllarm.gruppo)) { - Condition mAlarm = (Condition)conditionNodes[currAllarm.gruppo].cObject; + ConditionRed mAlarm = (ConditionRed)conditionNodes[currAllarm.gruppo].cObject; mAlarm.Add(livello, currAllarm.descrizione, currAllarm.codNum, "", ""); } -#endif } /// /// Speciofica implementazione x formattazione ALLARMI @@ -241,22 +239,20 @@ namespace SCMA.AdapterCom /// Generico nodo di tipo condition public override void addAlarm(itemNode alarmNode, allarme currAllarm) { -#if false // in base al tipo di allarme decodifico condizione... - Condition.Level livello = Condition.Level.NORMAL; + ConditionRed.Level livello = ConditionRed.Level.NORMAL; switch (currAllarm.livello) { case "WARNING": - livello = Condition.Level.WARNING; + livello = ConditionRed.Level.WARNING; break; case "FAULT": default: - livello = Condition.Level.FAULT; + livello = ConditionRed.Level.FAULT; break; } - Condition mAlarm = (Condition)alarmNode.cObject; + ConditionRed mAlarm = (ConditionRed)alarmNode.cObject; mAlarm.Add(livello, currAllarm.descrizione, currAllarm.codNum, "", ""); -#endif } /// /// Wrapper setup obj allarmi @@ -275,13 +271,11 @@ namespace SCMA.AdapterCom /// public override void initAlarms() { -#if false // trasformo i nodi in elenchi conditions e li aggiungo... foreach (var item in conditionNodes) { - ((Condition)item.Value.cObject).Normal(); - } -#endif + ((ConditionRed)item.Value.cObject).Normal(); + } } /// /// inizializazione allarme a normal @@ -289,10 +283,8 @@ namespace SCMA.AdapterCom /// public override void initAlarm(itemNode alarmNode) { -#if false - Condition mAlarm = (Condition)alarmNode.cObject; - mAlarm.Normal(); -#endif + ConditionRed mAlarm = (ConditionRed)alarmNode.cObject; + mAlarm.Normal(); } #endregion