diff --git a/.gitattributes b/.gitattributes
index 3f1c7945cd831d741813fb7fc2033c92b3b702fb..80cfa87137519c86db47f55f969f2cd8bf7f7780 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4237,6 +4237,8 @@ MAC/Navigator2/panels/Hardware/Station_UniBoard.pnl -text
MAC/Navigator2/panels/Hardware/Station_UriBoard.pnl -text
MAC/Navigator2/panels/Hardware/SuperTerpOverview.pnl -text
MAC/Navigator2/panels/HardwareTemplatePanel.pnl -text
+MAC/Navigator2/panels/Helper/DPIDconverter.pnl -text
+MAC/Navigator2/panels/Helper/set_powerunit_snmp.pnl -text
MAC/Navigator2/panels/LofarSpeedTest/LofarSpeedTest.pnl -text
MAC/Navigator2/panels/Observations/MainObservationFlow.pnl -text
MAC/Navigator2/panels/Observations/Observation_overview.pnl -text
@@ -4304,6 +4306,7 @@ MAC/Navigator2/panels/Test/testExist.pnl -text
MAC/Navigator2/panels/Test/testHBA.pnl -text
MAC/Navigator2/panels/Test/testStatesetter.pnl -text
MAC/Navigator2/panels/Test/testStationSumAlertToMCUalert.pnl -text
+MAC/Navigator2/panels/Test/testTrend.pnl -text
MAC/Navigator2/panels/Test/testclick.pnl -text
MAC/Navigator2/panels/Test/testdpnames.pnl -text
MAC/Navigator2/panels/Test/testdptypename.pnl -text
@@ -4314,6 +4317,7 @@ MAC/Navigator2/panels/navigator.pnl -text
MAC/Navigator2/panels/nopanel.pnl -text
MAC/Navigator2/panels/objects/Alerts/alarms.pnl -text
MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA.pnl -text
+MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA_3.10.pnl -text
MAC/Navigator2/panels/objects/FRENKM_STATION.pnl -text
MAC/Navigator2/panels/objects/Hardware/AARTFAAC-RSP.pnl -text
MAC/Navigator2/panels/objects/Hardware/AARTFAAC-UNIBoard.pnl -text
@@ -4436,6 +4440,7 @@ MAC/Navigator2/panels/objects/compass.pnl -text
MAC/Navigator2/panels/objects/connectionBroken.pnl -text
MAC/Navigator2/panels/objects/datastreamLevel.pnl -text
MAC/Navigator2/panels/objects/genericOnOffView.pnl -text
+MAC/Navigator2/panels/objects/iltLine.pnl -text
MAC/Navigator2/panels/objects/lofar_colors.pnl -text
MAC/Navigator2/panels/objects/lofar_logger.pnl -text
MAC/Navigator2/panels/objects/lofar_self_state.pnl -text
diff --git a/MAC/Navigator2/colorDB/Lofar colors b/MAC/Navigator2/colorDB/Lofar colors
index e560ed6195227321be32313035c834341be6822c..57eb8f8b858be3b773f82204825d341d57babb88 100644
--- a/MAC/Navigator2/colorDB/Lofar colors
+++ b/MAC/Navigator2/colorDB/Lofar colors
@@ -1,4 +1,4 @@
-0 14 0
+15
"Lofar_broken" N {255,0,0}
"Lofar_dpdoesnotexist" N {219,153,255}
"Lofar_invalid" N {255,0,255}
@@ -7,9 +7,10 @@
"Lofar_operational" N {86,255,1}
"Lofar_suspicious" N {255,153,0}
"Lofar_test" N {0,255,255}
-"Lofar_broken_came" N <{255,0,0},2,{255,255,255},2,{0,0,0},0,{0,0,0},0,{0,0,0},0,{0,0,0},0>
-"Lofar_broken_went" N <{255,0,0},4,"_3DFace",4,{0,0,0},0,{0,0,0},0,{0,0,0},0,{0,0,0},0>
-"Lofar_dpOffline" N <{153,0,204},8,{255,0,255},8,{0,0,0},0,{0,0,0},0,{0,0,0},0,{0,0,0},0>
-"Lofar_highLight" N <{255,255,255},3,"STD_spinner_busy_light",3,{0,0,0},0,{0,0,0},0,{0,0,0},0,{0,0,0},0>
-"Lofar_suspicious_came" N <{0,0,0},0,{255,153,0},2,{255,255,255},2,{0,0,0},0,{0,0,0},0,{0,0,0},0>
-"Lofar_suspicious_went" N <{0,0,0},0,{255,153,0},4,{255,255,255},4,{0,0,0},0,{0,0,0},0,{0,0,0},0>
+"Lofar_broken_came" N <{255,0,0},2,{255,255,255},2>
+"Lofar_broken_went" N <{255,0,0},4,"_3DFace",4>
+"Lofar_dpOffline" N <{153,0,204},8,{255,0,255},8>
+"Lofar_highLight" N <{255,255,255},3,"STD_spinner_busy_light",3>
+"Lofar_suspicious_came" N <{0,0,0},0,{255,153,0},2,{255,255,255},2>
+"Lofar_suspicious_went" N <{0,0,0},0,{255,153,0},4,{255,255,255},4>
+"Lofar_beyond_repair" N {0,0,0}
diff --git a/MAC/Navigator2/panels/Helper/DPIDconverter.pnl b/MAC/Navigator2/panels/Helper/DPIDconverter.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..e3846eb8fd3f9908e87857fae15b9ebe4203d34c
--- /dev/null
+++ b/MAC/Navigator2/panels/Helper/DPIDconverter.pnl
@@ -0,0 +1,403 @@
+V 13
+2
+LANG:1 0
+LANG:0 0
+PANEL,-1 -1 881 242 N "_3DFace" 0
+E E E E E 1 -1 -1 0 107 65
+""0 1
+E E 3
+"CBRef" "1"
+"EClose" E
+"dpi" "96"
+0 0 0
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+2 0
+"PRIMITIVE_TEXT1"
+""
+1 416 41 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+0 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 216 41 616 72
+0 2 2 "0s" 0 0 0 193 0 0 416 41 1
+2
+LANG:1 26 Arial,-1,27,5,50,0,0,0,0,0
+LANG:0 26 Arial,20,-1,5,50,0,0,0,0,0
+0 2
+LANG:1 29 DP ID <--> DP Name Conversion
+LANG:0 29 DP ID <--> DP Name Konversion
+13 1
+"PUSH_BUTTON1"
+""
+1 35 113 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+1 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 33 111 75 153
+
+P
+4294967295
+"pictures/tree.png"
+2
+LANG:1 12 PUSH_BUTTON1
+LANG:0 12 PUSH_BUTTON1
+"main()
+{
+ string sName;
+ dpSelector(sName);
+ DPNAME.text = sName;
+}" 0
+ E E E
+13 2
+"PUSH_BUTTON2"
+""
+1 534 111 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+2 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 532 109 574 132
+
+T
+2
+LANG:1 2 >>
+LANG:0 2 >>
+"main()
+{
+
+ unsigned id1;
+ int id2;
+ bool x;
+ DPID.text = \"---\";
+ ELID.text = \"---\";
+
+ if( dpExists(DPNAME.text))
+ {
+
+ x =dpGetId(DPNAME.text, id1, id2);
+ DPID.text = id1;
+ ELID.text = id2;
+ }
+
+}
+" 0
+ E E E
+14 3
+"DPNAME"
+""
+1 84 114 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+3 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 82 112 524 150
+3 "0s" 0 0 0 0 0 -1 E E E
+14 4
+"DPID"
+""
+1 580 114 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+4 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 578 112 700 150
+3 "0s" 0 0 0 0 0 -1 E E E
+2 5
+"PRIMITIVE_TEXT2"
+""
+1 211 96 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+5 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 183 96 239 111
+0 2 2 "0s" 0 0 0 193 0 0 211 96 1
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 2
+LANG:1 7 DP Name
+LANG:0 7 DP Name
+2 8
+"PRIMITIVE_TEXT3"
+""
+1 635 95 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+8 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 618 95 652 110
+0 2 2 "0s" 0 0 0 193 0 0 635 95 1
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 2
+LANG:1 5 DP ID
+LANG:0 5 DP ID
+2 9
+"PRIMITIVE_TEXT4"
+""
+1 765 95 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+9 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 726 95 804 110
+0 2 2 "0s" 0 0 0 193 0 0 765 95 1
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 2
+LANG:1 10 ELEMENT ID
+LANG:0 10 ELEMENT ID
+14 10
+"ELID"
+""
+1 706 115 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+10 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 704 113 826 151
+3 "0s" 0 0 0 0 0 -1 E E E
+13 11
+"PUSH_BUTTON3"
+""
+1 534 131 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+11 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 532 129 574 152
+
+T
+2
+LANG:1 2 <<
+LANG:0 2 <<
+"main()
+{
+ dyn_string dsList;
+ string sDp;
+
+ unsigned id1,idCheck;
+ int id2,elCheck;
+ bool x;
+ DPNAME.text = \" ??? \";
+ idCheck = DPID.text;
+ dsList = dpNames(\"*.\");
+ sDp = \"\";
+
+ // search dpnames
+ for (int i = 1; i<= dynlen(dsList);i++)
+ {
+ x =dpGetId(dsList[i], id1, id2);
+ if (id1 == idCheck)
+ {
+ //DebugN(\"Erwischt DP\"+dsList[i]);
+ sDp = dsList[i];
+
+ break;
+ }
+ }
+ if (sDp != \"\")
+ {
+ elCheck = ELID.text;
+ if (elCheck != \"\")
+ {
+ dsList = dpNames(dpSubStr( sDp,DPSUB_SYS_DP ) + \".**\");
+
+ for (int i = 1; i<= dynlen(dsList);i++)
+ {
+ x =dpGetId(dsList[i], id1, id2);
+ if (id2 == elCheck)
+ {
+ //DebugN(\"Erwischt EL\"+dsList[i]);
+ DPNAME.text = dsList[i];
+ break;
+ }
+ }
+ }
+ }
+
+
+}
+" 0
+ E E E
+30 12
+"FRAME1"
+""
+1 8 7 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E
+ E E
+12 0 0 0 0 0
+E E E
+1
+2
+LANG:1 0
+LANG:0 0
+
+2
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 0 1 0 1 E 1 0 0.7954545454545454 0 1.431818181818182 0 E 8 7 865 228
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 2
+LANG:1 0
+LANG:0 0
+13 13
+"PUSH_BUTTON4"
+""
+1 735 200 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+13 0 0 0 0 0
+E E E
+0
+2
+LANG:1 0
+LANG:0 0
+
+0
+2
+LANG:1 26 Arial,-1,13,5,50,0,0,0,0,0
+LANG:0 26 Arial,10,-1,5,50,0,0,0,0,0
+0 733 198 866 233
+
+T
+2
+LANG:1 5 Close
+LANG:0 10 Schliessen
+"// SimpleCtrlScriptStart {valid}
+main()
+{
+ EP_panelOff();
+}
+
+EP_panelOff()
+{
+ PanelOff();
+}
+
+// SimpleCtrlScript {EP_panelOff}
+// Function {PanelOff}
+// Panel {}
+// Module {}
+// SimpleCtrlScriptEnd {EP_panelOff}
+" 0
+ E E E
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/Helper/set_powerunit_snmp.pnl b/MAC/Navigator2/panels/Helper/set_powerunit_snmp.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..eccdc232609d40939a0a28b8072a07f9f7bf6efe
--- /dev/null
+++ b/MAC/Navigator2/panels/Helper/set_powerunit_snmp.pnl
@@ -0,0 +1,328 @@
+V 13
+1
+LANG:1 0
+PANEL,-1 -1 872 400 N "_3DFace" 0
+"main()
+{
+ navFunct_fillStationLists();
+ TEXT_FIELD2.text = \"CS001\";
+
+}
+
+" 0
+ E E E E 1 -1 -1 0 50 50
+""0 1
+E "#uses \"navigator.ctl\"
+string db=\"\";
+
+
+
+void pushCB()
+{
+ db = TEXT_FIELD2.text + \":\";
+
+ // deactivate polling
+ dpSet(db+\"_SNMP.Active\",0);
+
+ if (SNMPchoice.number() == 0)
+ {
+ setTimings();
+ }
+ else if (SNMPchoice.number() == 1)
+ {
+ setPCSAddresses();
+ }
+ else if (SNMPchoice.number() == 2)
+ {
+ setACXAddresses();
+ }
+
+ // activate polling
+ dpSet(db+\"_SNMP.Active\",1);
+}
+
+void setTimings()
+{
+
+ dpSet(db+\"_SNMP.PollInterval\",300000);
+ dpSet(db+\"_2_SNMPAgent_1.Access.WriteCommunity\",\"private\");
+ dpSet(db+\"_2_SNMPAgent_1.Access.Timeout\",500);
+ dpSet(db+\"_2_SNMPAgent_1.Access.Retries\",10);
+ dpSet(db+\"_2_SNMPAgent_2.Access.WriteCommunity\",\"private\");
+ dpSet(db+\"_2_SNMPAgent_2.Access.Timeout\",500);
+ dpSet(db+\"_2_SNMPAgent_2.Access.Retries\",10);
+
+ DebugN(db + \"SNMP timings done\");
+}
+
+void setPCSAddresses()
+{
+ dpSet(db+\"LOFAR_PIC_POWEC0.powerSystemType:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.1.3.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.nrOfModules:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.3.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.voltage:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.3.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.current:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.3.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.temperature:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.3.2.1.6B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.nrOfAlarms:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.clearAlarmHistory:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.3.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmReason:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmText:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.5B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmType:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.2B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmTime:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.OK:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.3.2.1.2B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.powerSystemType:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.1.3.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.nrOfModules:_address.._reference\", \"2_1.3.6.1.4.1.5961.1.3.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.voltage:_address.._reference\", \"2_1.3.6.1.4.1.5961.1.3.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.current:_address.._reference\", \"2_1.3.6.1.4.1.5961.1.3.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.temperature:_address.._reference\", \"2_1.3.6.1.4.1.5961.1.3.2.1.6B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.OK:_address.._reference\", \"2_1.3.6.1.4.1.5961.1.3.2.1.2B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.nrOfAlarms:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.clearAlarmHistory:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.3.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmReason:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmText:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.5B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmType:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.2B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmTime:_address.._reference\", \"1_1.3.6.1.4.1.5961.1.12.2.1.4B\");
+
+ DebugN(db + \" PCS addresses set\");
+}
+
+void setACXAddresses()
+{
+ dpSet(db+\"LOFAR_PIC_POWEC0.powerSystemType:_address.._reference\", \"1_1.3.6.1.4.1.5961.4.1.2.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.nrOfModules:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.6.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.voltage:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.6.2.1.7B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.current:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.6.2.1.8B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.temperature:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.6.2.1.10B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.OK:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.6.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.nrOfAlarms:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.clearAlarmHistory:_address.._reference\", \"\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmReason:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmText:_address.._reference\", \"\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmType:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC0.alarmTime:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.2B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.powerSystemType:_address.._reference\", \"1_1.3.6.1.4.1.5961.4.1.2.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.nrOfModules:_address.._reference\", \"2_1.3.6.1.4.1.5961.5.6.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.voltage:_address.._reference\", \"2_1.3.6.1.4.1.5961.5.6.2.1.7B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.current:_address.._reference\", \"2_1.3.6.1.4.1.5961.5.6.2.1.8B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.temperature:_address.._reference\", \"2_1.3.6.1.4.1.5961.5.6.2.1.10B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.OK:_address.._reference\", \"2_1.3.6.1.4.1.5961.5.6.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.nrOfAlarms:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.1.0\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.clearAlarmHistory:_address.._reference\", \"\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmReason:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.4B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmText:_address.._reference\", \"\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmType:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.3B\");
+ dpSet(db+\"LOFAR_PIC_POWEC1.alarmTime:_address.._reference\", \"1_1.3.6.1.4.1.5961.5.8.2.1.2B\");
+
+ DebugN(db + \" ACX addresses set\");
+}
+
+" 0
+ 3
+"CBRef" "1"
+"EClose" E
+"dpi" "96"
+0 0 0
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+14 1
+"TEXT_FIELD2"
+""
+1 197 18.25 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+1 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 195 9 329 35
+3 "0s" 0 0 0 0 0 -1 E E E
+13 2
+"PUSH_BUTTON1"
+""
+1 357 15.59210526315789 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+2 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 355 9 479 35
+
+T
+1
+LANG:1 11 Set Station
+"main()
+{
+ pushCB();
+}" 0
+ E E E
+13 3
+"PUSH_BUTTON2"
+""
+1 357 128.25 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+3 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 355 121 479 147
+
+T
+1
+LANG:1 17 Set International
+"main()
+{
+ for (int i=1; i<=dynlen(europeStations); i++)
+ {
+ TEXT_FIELD2.text=europeStations[i];
+ pushCB();
+ }
+}" 0
+ E E E
+13 4
+"PUSH_BUTTON3"
+""
+1 357 53.25 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+4 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 355 46 479 72
+
+T
+1
+LANG:1 8 Set Core
+"main()
+{
+ for (int i=1; i<=dynlen(coreStations); i++)
+ {
+ TEXT_FIELD2.text=coreStations[i];
+ pushCB();
+ }
+}" 0
+ E E E
+13 5
+"PUSH_BUTTON4"
+""
+1 357 90.25 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+5 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 355 83 479 109
+
+T
+1
+LANG:1 10 Set Remote
+"main()
+{
+ for (int i=1; i<=dynlen(remoteStations); i++)
+ {
+ TEXT_FIELD2.text=remoteStations[i];
+ pushCB();
+ }
+}
+" 0
+ E E E
+19 7
+"SNMPchoice"
+""
+1 10 14.25 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+7 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 8 12 132 136
+3
+T
+1
+LANG:1 16 Set SNMP timings
+
+1
+1
+LANG:1 0
+E E
+0 0 0 0 0
+T
+1
+LANG:1 17 Set PCS addresses
+
+0
+1
+LANG:1 0
+E E
+0 0 0 0 0
+T
+1
+LANG:1 17 Set ACX addresses
+
+0
+1
+LANG:1 0
+E E
+0 0 0 0 0
+1
+E E
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/Test/testTrend.pnl b/MAC/Navigator2/panels/Test/testTrend.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..6f7cf6dc6159c453070dfc3a47a3640f311e7e02
--- /dev/null
+++ b/MAC/Navigator2/panels/Test/testTrend.pnl
@@ -0,0 +1,81 @@
+V 13
+1
+LANG:1 0
+PANEL,-1 -1 689 434 N "_3DFace" 0
+E E E E E 1 -1 -1 0 110 70
+""0 1
+E E 3
+"CBRef" "1"
+"EClose" E
+"dpi" "96"
+0 0 0
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+23 3
+"TREND1"
+""
+1 14.5 17 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+2 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 13 15 677 419
+5 E E E 1 659 N {0,0,0} 0 0 1 0 1 0 1 0 "#1_1" "" 0 2 0 0 1 "3 2 0.0" "%x" 0 1 2 0 E
+E
+1 0 0 3 2
+1
+LANG:1 4 #1_1
+1
+LANG:1 0
+1 "" "" 1 0 0 1 0 1 N "Red"
+0 0 0 0 0 0 0 0
+1 1 "%H:%M:%S" "%x" 0 1 0 0
+E 1 1 1 0 90 0 20 7200
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 100
+N {0,0,0} 0 0 1 0 1 150 1 5 5 1 2
+0
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/main.pnl b/MAC/Navigator2/panels/main.pnl
index 76a93a40eb1d2ee36a78dd19507722bd010594fa..eb58707277f5ce0a52dbf7443794a8f5db791010 100644
--- a/MAC/Navigator2/panels/main.pnl
+++ b/MAC/Navigator2/panels/main.pnl
@@ -48,6 +48,9 @@ void doAction(string aDP, string anAction) {
} else if (actionString[1] == \"DistChanged\") {
redraw(1);
return;
+ } else if (actionString[1] == \"ILTSwitched\") {
+ redraw(1);
+ return;
}
}
" 0
@@ -134,7 +137,7 @@ void addBackLines(int status) {
int yPos_AddSymbol = 28;
string barColor=\"\";
int ref = 1;
- string addPanelName = \"objects/baseLine.pnl\";
+ string addPanelName = \"\";
//loop over list and prepare panel with all stations and swlevel objects
for (int i=1; i<= dynlen(stationList); i++) {
if ((float)i/2. != floor(i/2.)) {
@@ -146,26 +149,30 @@ void addBackLines(int status) {
if (dynContains(g_involved_stations,stationList[i]+\":\") || status == 0) {
-// if (i == 1 || stationList[i] == \"MCU001\" || stationList[i] == \"CCU001\") {
- if (status == 1) {
- removeSymbol(strModuleName,\"\",refname);
- }
- if ( addSymbol( strModuleName, // Stay in this modul
- \"\", // Name of this panel
- addPanelName, // Panel to add
- refname, // Ref of the addedPanel
- makeDynString( \"$station:\" + stationList[i],
- \"$barColor:\" + barColor,
- \"$xPos:\" + xPos_AddSymbol,
- \"$yPos:\" + yPos_AddSymbol) , // Define all $values
- xPos_AddSymbol, // Xpos of the AddedSymbol
- yPos_AddSymbol, // Ypos of the AddedSymbol
- 0, // angle
- 1 ,1 // zoomX , zoomY
- ) < 0 ) {
- LOG_ERROR(\"swlevel.pnl:addBackLines|Error Appending backLine for: \" + stationList[i] + \" in this panel.\");
- }
-// }
+ if (status == 1) {
+ removeSymbol(strModuleName,\"\",refname);
+ }
+ if (navFunct_isLocalMode(stationList[i])) {
+ addPanelName = \"objects/iltLine.pnl\";
+ } else {
+ addPanelName = \"objects/baseLine.pnl\";
+ }
+
+ if ( addSymbol( strModuleName, // Stay in this modul
+ \"\", // Name of this panel
+ addPanelName, // Panel to add
+ refname, // Ref of the addedPanel
+ makeDynString( \"$station:\" + stationList[i],
+ \"$barColor:\" + barColor,
+ \"$xPos:\" + xPos_AddSymbol,
+ \"$yPos:\" + yPos_AddSymbol) , // Define all $values
+ xPos_AddSymbol, // Xpos of the AddedSymbol
+ yPos_AddSymbol, // Ypos of the AddedSymbol
+ 0, // angle
+ 1 ,1 // zoomX , zoomY
+ ) < 0 ) {
+ LOG_ERROR(\"swlevel.pnl:addBackLines|Error Appending backLine for: \" + stationList[i] + \" in this panel.\");
+ }
}
yPos_AddSymbol += 12;
}
diff --git a/MAC/Navigator2/panels/navigator.pnl b/MAC/Navigator2/panels/navigator.pnl
index ab27e55fd4bef6e06c7121beb96b4dea0260a723..1a88d61b57f92558298ffe0f28196aabc43c8207 100644
--- a/MAC/Navigator2/panels/navigator.pnl
+++ b/MAC/Navigator2/panels/navigator.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 9 Navigator
PANEL,-1 -1 1503 1000 N "_3DFace" 0
@@ -165,70 +165,34 @@ E "#uses \"navigator.ctl\"
string progressBarDPE;" 0
- 2
+ 3
"CBRef" "1"
"EClose" "main()
{
navigator_handleEventClose();
}" 0
+"dpi" "96"
+0 0 0
""
NC
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
1
LANG:1 6 Layer1
-1 73 5 "" 0
+1 104 5 "" 0
0
-1 75 9 "" 2
+1 106 9 "" 2
0
-1 76 9 "" 3
+1 94 3 "" 12
0
-1 77 9 "" 0
+1 99 4 "" 12
0
-1 78 9 "" 1
+1 105 6 "" 2
0
-1 79 9 "" 5
+1 112 12 "" 18
0
-1 80 9 "" 6
-0
-1 63 3 "" 12
-0
-1 64 3 "" 6
-0
-1 65 3 "" 7
-0
-1 66 3 "" 11
-0
-1 67 3 "" 5
-0
-1 68 4 "" 12
-0
-1 69 4 "" 6
-0
-1 70 4 "" 7
-0
-1 71 4 "" 11
-0
-1 72 4 "" 5
-0
-1 74 6 "" 2
-0
-1 81 12 "" 18
-0
-1 82 12 "" 14
-0
-1 83 12 "0" 1
-0
-1 84 12 "1" 1
-0
-1 85 12 "2" 1
-0
-1 86 12 "" 24
-0
-1 87 16 "" 1
-0
-1 88 16 "" 2
+1 118 16 "" 1
0
15 33
"CLOCK1"
@@ -252,13 +216,9 @@ LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0
-1 89 20 "" 1
-0
-1 90 21 "" 9
+1 120 20 "" 1
0
-1 92 21 "" 16
-0
-1 91 21 "" 11
+1 121 21 "" 9
0
13 62
"undock"
@@ -273,7 +233,7 @@ LANG:1 16 Undock this view
0
1
-LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 948 3 972 27
P
@@ -284,6 +244,39 @@ LANG:1 12 PUSH_BUTTON1
"main()
{
navFunct_handleUndockClick();
+}" 0
+ E E E
+13 93
+"b_iltSwitch"
+""
+1 1010.2025 11 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
+ E E
+32 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
+0 991 3 1062 27
+
+T
+1
+LANG:1 9 iltSwitch
+"main()
+{
+ bool localmode;
+ g_involved_stations = makeDynString(\"\");
+
+ dpGet(\"MCU001:LOFAR_PIC_Europe_DE601.localMode.stationSwitch\",localmode);
+ localmode = !localmode;
+ dpSet(\"MCU001:LOFAR_PIC_Europe_DE601.localMode.stationSwitch\",localmode);
+
+ dynAppend(g_involved_stations,\"DE601:\");
+ navCtrl_handleNavigatorEvent(\"\",\"ILTSwitched\",\"GCFCWD.ctl\");
+
}" 0
E E E
0
@@ -316,40 +309,49 @@ LAYER, 7
LANG:1 6 Layer8
0
3 3 "fw_topDetailSelection" -1
-"objects\\navigator_typeSelector.pnl" 1002 89 T 16 0.9964285714285714 0 1.002364066193853 -67.42142857142859 -119.2104018912529
+"" ""
+"objects/navigator_typeSelector.pnl" 1002 89 T 16 0.9964285714285714 0 1.002364066193853 -67.42142857142859 -119.2104018912529
2
"$name""fw_topDetailSelection"
"$selection""Hardware"
3 4 "fw_bottomDetailSelection" -1
-"objects\\navigator_typeSelector.pnl" 1084 468 T 17 1 0 1 -154 -73
+"" ""
+"objects/navigator_typeSelector.pnl" 1084 468 T 17 1 0 1 -154 -73
2
"$name""fw_bottomDetailSelection"
"$selection""Processes"
3 5 "fw_headLines" -1
-"objects\\navigator_headlines.pnl" 87 765 T 19 1 0 1 -87 92
+"" ""
+"objects/navigator_headlines.pnl" 87 765 T 19 1 0 1 -87 92
1
"$name""fw_headLines"
3 6 "fw_locator" -1
-"objects\\navigator_locator.pnl" 1065 798 T 20 1.00104275286757 0 0.6884422110552761 153.8894681960378 315.0251256281408
+"" ""
+"objects/navigator_locator.pnl" 1065 798 T 20 1.00104275286757 0 0.6884422110552761 153.8894681960378 315.0251256281408
1
"$name""fw_locator"
3 9 "fw_progressBar" -1
-"objects\\navigator_progressBar.pnl" 815 767 T 23 1.305 0 1 46.42499999999998 90.00000000000003
+"" ""
+"objects/navigator_progressBar.pnl" 815 767 T 23 1.305 0 1 46.42499999999998 90.00000000000003
1
"$name""fw_progressBar"
3 12 "fw_viewSelection" -1
-"objects\\navigator_viewSelection.pnl" -6 -6.99999999999989 T 25 1.000234110183463 0 1.003854010097507 6.001404661100779 6.02312406058504
+"" ""
+"objects/navigator_viewSelection.pnl" -6 -6.99999999999989 T 25 1.000234110183463 0 1.003854010097507 6.001404661100779 6.02312406058504
1
"$name""fw_viewSelection"
3 16 "PANEL_REF17" -1
-"objects\\navigator_fastJumper.pnl" 580 10 T 26 1 0 1 17 -5
+"" ""
+"objects/navigator_fastJumper.pnl" 580 10 T 26 1 0 1 17 -5
1
"$name""fw_fastJumper"
3 20 "PANEL_REF21" -1
-"objects\\show_legenda.pnl" 500 110 T 28 1 0 1 20 -4
+"" ""
+"objects/show_legenda.pnl" 500 110 T 28 1 0 1 20 -4
0
3 21 "PANEL_REF21" -1
-"objects\\navigator_alerts.pnl" 40 813 T 30 1 0 1 -50 57
+"" ""
+"objects/navigator_alerts.pnl" 40 813 T 30 1 0 1 -50 57
1
"$name""fw_alerts"
0
diff --git a/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA_3.10.pnl b/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA_3.10.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..ad816b45328fdfedfbac4af93349ddf7158b3f5a
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/Alerts/alarmsWinCCOA_3.10.pnl
@@ -0,0 +1,116 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1242 823 N "_3DFace" 0
+E E E E E 1 -1 -1 0 10 10
+""0 1
+E E 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+1 1 0 "" 26
+0
+1 2 0 "" 27
+0
+1 3 0 "" 0
+0
+1 4 0 "" 1
+0
+1 5 0 "" 17
+0
+1 6 0 "" 19
+0
+1 7 0 "" 20
+0
+1 8 0 "" 21
+0
+1 9 0 "" 25
+0
+1 10 0 "0" 0
+0
+1 11 0 "0" 1
+0
+1 12 0 "" 11
+0
+1 13 0 "" 12
+0
+1 14 0 "" 15
+0
+1 15 0 "" 14
+0
+1 16 0 "" 16
+0
+29 17
+"BackgroundCover_ewo1"
+""
+1 710.0000000000003 753 E E E 1 E 1 E N "_3DText" E N {170,170,170} E E
+ E E
+5 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 710 753 1078 793
+19 BackgroundCover.ewo
+0
+E29 18
+"BackgroundCover_ewo2"
+""
+1 400 680 E E E 1 E 1 E N "_3DText" E N {240,240,240} E E
+ E E
+6 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+0
+1
+LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+0 400 680 768 720
+19 BackgroundCover.ewo
+0
+E0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+3 0 "PANEL_REF0" -1
+"vision\\aes\\AEScreen.pnl" 118 1270 T 4 1 0 1 -20 -40
+3
+"$ACTION""1"
+"$FILENAME"""
+"$SCREENTYPE""aes_alerts_LOFAR"
+0
diff --git a/MAC/Navigator2/panels/objects/iltLine.pnl b/MAC/Navigator2/panels/objects/iltLine.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..16da6f7909288df1f2e88a26033cbbb69a4cf641
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/iltLine.pnl
@@ -0,0 +1,289 @@
+V 13
+1
+LANG:1 0
+PANEL,-1 -1 1062 56 N "_3DFace" 4
+"$barColor"
+"$station"
+"$xPos"
+"$yPos"
+"main()
+{
+ //
+ // This panel is used to replace the baseLine.pnl in case a station is switched to local mode
+ //
+
+ bar.backCol($barColor);
+ bar.foreCol($barColor);
+ station = $station;
+ station_text_1.text = station;
+ station_text_2.text = station;
+ xPos= (int) $xPos;
+ yPos= (int) $yPos;
+}
+
+" 0
+ E "main()
+{
+ click(station);
+}" 0
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+ 1 -1 -1 0 0 0
+""0 1
+E "#uses \"navPanel.ctl\"
+string station = \"\";
+string baseDP = \"\";
+int xPos;
+int yPos;
+bool bDoubleClicked = false;
+
+// routine for single mouse click
+void click(string name) {
+ // set delay in case double click was meant
+ delay(0, 100);
+ if (!bDoubleClicked) {
+ navPanel_setEvent(name,\"EventClick\");
+ }
+}
+
+// routine for double mouse click
+void dblClick(string name) {
+ // indicate this is a doubleClick
+ bDoubleClicked = true;
+ if (name == station) baseDP=station+\":LOFAR\";
+
+ if (dpExists(baseDP) ) {
+ LOG_DEBUG(\"swlevel.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
+ g_currentDatapoint=baseDP;
+ if (name == station) {
+ navPanel_setEvent(station,\"ChangePanel\");
+ }
+ }
+
+ // set delay to avoid click event will be triggered
+ delay(0, 500);
+ bDoubleClicked = false;
+}
+
+// routine for right mouse click
+void rClick(string name) {
+
+} " 0
+ 3
+"CBRef" "1"
+"EClose" E
+"dpi" "96"
+0 0 0
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+6 3
+"station_highLight"
+""
+1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+
+3 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+2
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+"main()
+{
+ dpConnect( \"iltLine_stationCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
+}
+
+void iltLine_stationCallback(string dp1, bool aTrig) {
+
+ LOG_DEBUG(\"iltLine.pnl:iltLine_stationCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
+ LOG_DEBUG(\"iltLine.pnl:iltLine_stationCallback|Found highlight : \" + highlight + \" Looking for station\");
+ bool bHighlight=false;
+ if (dynContains(highlight,station)) {
+ bHighlight=true;
+ }
+ LOG_DEBUG(\"iltLine.pnl:iltLine_stationCallback|Highlight request: \"+bHighlight);
+ station_highLight.visible = bHighlight;
+
+}
+
+" 0
+ "main()
+{
+ click(station);
+}" 0
+ 0 1 1 2 1 E U 1 E 0 0 961 15
+6 0
+"bar"
+""
+1 0 30 E E E 1 E 1 E N "_3DFace" E N "_3DFace" E E
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+
+0 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+2
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E "main()
+{
+ click(station);
+}" 0
+ 0 0 1 2 1 E U 1 E 3 3 958 12
+2 4
+"station_text_2"
+""
+1 928 0 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+
+4 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E "main()
+{
+ click(station);
+}" 0
+ 0 1 1 2 1 E U 0 E 928 0 958 12
+0 2 2 "0s" 0 0 0 192 0 0 928 0 1
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 1
+LANG:1 5 cs001
+2 32
+"station_text_1"
+""
+1 3 0 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+
+11 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E "main()
+{
+ click(station);
+}" 0
+ 0 1 1 2 1 E U 0 E 3 0 33 12
+0 2 2 "0s" 0 0 0 192 0 0 3 0 1
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 1
+LANG:1 5 cs001
+2 33
+"PRIMITIVE_TEXT2"
+""
+1 375 0 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ "main()
+{
+ rClick(station);
+}" 0
+ "main()
+{
+ dblClick(station);
+}" 0
+
+12 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E "main()
+{
+ click(station);
+}" 0
+ 0 1 3 2 1 E U 0 E 375 0 511 12
+0 2 2 "0s" 0 0 0 192 0 0 375 0 1
+1
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
+0 1
+LANG:1 33 Station in local mode
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+0
diff --git a/MAC/Navigator2/panels/objects/lofar_colors.pnl b/MAC/Navigator2/panels/objects/lofar_colors.pnl
index 7e6892a1cbacccbcfc99e5378610670261dabbd9..766ce92b82a2cb7e62ba30899019431d1d3f2aee 100644
--- a/MAC/Navigator2/panels/objects/lofar_colors.pnl
+++ b/MAC/Navigator2/panels/objects/lofar_colors.pnl
@@ -1,12 +1,14 @@
-V 11
+V 13
1
LANG:1 20 Colors used by LOFAR
-PANEL,-1 -1 927 749 N "_3DFace" 0
+PANEL,-1 -1 943 749 N "_3DFace" 0
E E E E E 1 -1 -1 0 30 110
""0 1
-E E 2
+E E 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -23,13 +25,14 @@ E E E
1
LANG:1 0
-1
+2
"dashclr"N "_Transparent"
-E E 0 2 3 2 1 E 1 0 1 0 -10 1 E 0 10 510 370
+"antiAliased" "0"
+E E 0 2 3 2 1 E 1 0 1.083333333333333 8 -11.83333333333333 1 E 0 10 510 370
2 1
"PRIMITIVE_TEXT1"
""
-1 10 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 18 9 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
1 0 0 0 0 0
E E E
@@ -37,10 +40,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 10 10 153 26
-0 2 2 "0s" 0 0 0 192 0 0 10 10 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 18 9 151 24
+0 2 2 "0s" 0 0 0 192 0 0 18 9 1
1
LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
0 1
@@ -48,7 +53,7 @@ LANG:1 20 Lofar General Colors
2 2
"PRIMITIVE_TEXT2"
""
-1 10 130 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 18 129 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
3 0 0 0 0 0
E E E
@@ -56,10 +61,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 10 130 141 146
-0 2 2 "0s" 0 0 0 192 0 0 10 130 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 18 129 145 144
+0 2 2 "0s" 0 0 0 192 0 0 18 129 1
1
LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
0 1
@@ -75,13 +82,14 @@ E E E
1
LANG:1 21 Lofar_dpdoesnotexists
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 1 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 0 1 E 110 30 184 44
2 4
"PRIMITIVE_TEXT3"
""
-1 100 34 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 33 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
5 0 0 0 0 0
E E E
@@ -89,10 +97,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 34 324 47
-0 2 2 "0s" 0 0 0 192 0 0 100 34 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 33 341 45
+0 2 2 "0s" 0 0 0 192 0 0 108 33 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -108,13 +118,14 @@ E E E
1
LANG:1 15 Lofar_dpOffline
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 20 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 19 1 E 110 30 184 44
2 6
"PRIMITIVE_TEXT4"
""
-1 100 53 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 52 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
9 0 0 0 0 0
E E E
@@ -122,10 +133,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 53 390 66
-0 2 2 "0s" 0 0 0 192 0 0 100 53 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 52 412 64
+0 2 2 "0s" 0 0 0 192 0 0 108 52 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -141,13 +154,14 @@ E E E
1
LANG:1 13 Lofar_invalid
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 39 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 38 1 E 110 30 184 44
2 8
"PRIMITIVE_TEXT5"
""
-1 100 72 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 71 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
13 0 0 0 0 0
E E E
@@ -155,10 +169,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 72 350 85
-0 2 2 "0s" 0 0 0 192 0 0 100 72 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 71 366 83
+0 2 2 "0s" 0 0 0 192 0 0 108 71 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -174,13 +190,14 @@ E E E
1
LANG:1 15 Lofar_highlight
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 58 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 57 1 E 110 30 184 44
2 10
"PRIMITIVE_TEXT6"
""
-1 100 91 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 90 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
17 0 0 0 0 0
E E E
@@ -188,10 +205,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 91 245 104
-0 2 2 "0s" 0 0 0 192 0 0 100 91 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 90 259 102
+0 2 2 "0s" 0 0 0 192 0 0 108 90 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -207,13 +226,14 @@ E E E
1
LANG:1 9 Lofar_off
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 120 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 119 1 E 110 30 184 44
2 12
"PRIMITIVE_TEXT7"
""
-1 100 152 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 151 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
21 0 0 0 0 0
E E E
@@ -221,10 +241,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 152 289 165
-0 2 2 "0s" 0 0 0 192 0 0 100 152 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 151 305 163
+0 2 2 "0s" 0 0 0 192 0 0 108 151 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -240,13 +262,14 @@ E E E
1
LANG:1 17 Lofar_operational
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 140 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 139 1 E 110 30 184 44
2 14
"PRIMITIVE_TEXT8"
""
-1 100 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 171 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
25 0 0 0 0 0
E E E
@@ -254,10 +277,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 172 262 185
-0 2 2 "0s" 0 0 0 192 0 0 100 172 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 171 275 183
+0 2 2 "0s" 0 0 0 192 0 0 108 171 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -273,13 +298,14 @@ E E E
1
LANG:1 17 Lofar_maintenance
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 160 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 159 1 E 110 30 184 44
2 16
"PRIMITIVE_TEXT9"
""
-1 100 192 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 191 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
29 0 0 0 0 0
E E E
@@ -287,10 +313,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 192 282 205
-0 2 2 "0s" 0 0 0 192 0 0 100 192 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 191 296 203
+0 2 2 "0s" 0 0 0 192 0 0 108 191 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -306,13 +334,14 @@ E E E
1
LANG:1 10 Lofar_test
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 180 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 179 1 E 110 30 184 44
2 18
"PRIMITIVE_TEXT10"
""
-1 100 212 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 211 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
33 0 0 0 0 0
E E E
@@ -320,10 +349,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 212 267 225
-0 2 2 "0s" 0 0 0 192 0 0 100 212 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 211 283 223
+0 2 2 "0s" 0 0 0 192 0 0 108 211 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -339,13 +370,14 @@ E E E
1
LANG:1 16 Lofar_suspicious
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 200 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 199 1 E 110 30 184 44
2 20
"PRIMITIVE_TEXT11"
""
-1 100 232 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 231 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
37 0 0 0 0 0
E E E
@@ -353,10 +385,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 232 351 245
-0 2 2 "0s" 0 0 0 192 0 0 100 232 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 231 360 243
+0 2 2 "0s" 0 0 0 192 0 0 108 231 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -372,13 +406,14 @@ E E E
1
LANG:1 21 Lofar_suspicious_went
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 220 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 219 1 E 110 30 184 44
2 22
"PRIMITIVE_TEXT12"
""
-1 100 252 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 251 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
41 0 0 0 0 0
E E E
@@ -386,10 +421,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 252 491 265
-0 2 2 "0s" 0 0 0 192 0 0 100 252 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 251 507 263
+0 2 2 "0s" 0 0 0 192 0 0 108 251 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -405,13 +442,14 @@ E E E
1
LANG:1 21 Lofar_suspicious_came
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 240 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 239 1 E 110 30 184 44
2 24
"PRIMITIVE_TEXT13"
""
-1 100 272 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 271 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
45 0 0 0 0 0
E E E
@@ -419,10 +457,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 272 410 285
-0 2 2 "0s" 0 0 0 192 0 0 100 272 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 271 420 283
+0 2 2 "0s" 0 0 0 192 0 0 108 271 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -438,13 +478,14 @@ E E E
1
LANG:1 12 Lofar_broken
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 260 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 259 1 E 110 30 184 44
2 26
"PRIMITIVE_TEXT14"
""
-1 100 292 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 291 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
49 0 0 0 0 0
E E E
@@ -452,10 +493,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 292 347 305
-0 2 2 "0s" 0 0 0 192 0 0 100 292 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 291 358 303
+0 2 2 "0s" 0 0 0 192 0 0 108 291 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -471,13 +514,14 @@ E E E
1
LANG:1 17 Lofar_broken_went
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 280 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 279 1 E 110 30 184 44
2 28
"PRIMITIVE_TEXT15"
""
-1 100 312 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 311 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
53 0 0 0 0 0
E E E
@@ -485,10 +529,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 312 429 325
-0 2 2 "0s" 0 0 0 192 0 0 100 312 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 311 446 323
+0 2 2 "0s" 0 0 0 192 0 0 108 311 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -504,13 +550,14 @@ E E E
1
LANG:1 17 Lofar_broken_came
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -100 300 1 E 110 30 184 44
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 299 1 E 110 30 184 44
2 30
"PRIMITIVE_TEXT16"
""
-1 100 332 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 108 331 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
57 0 0 0 0 0
E E E
@@ -518,10 +565,12 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 332 344 345
-0 2 2 "0s" 0 0 0 192 0 0 100 332 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 331 355 343
+0 2 2 "0s" 0 0 0 192 0 0 108 331 1
1
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
@@ -537,13 +586,14 @@ E E E
1
LANG:1 0
-1
+2
"dashclr"N "_Transparent"
-E E 0 2 3 2 1 E 1.784313725490196 0 1 0 360 1 E 0 10 510 370
+"antiAliased" "0"
+E E 0 2 3 2 1 E 1.784313725490196 0 0.9999999999999998 10 403.9999999999999 1 E 0 10 510 370
2 34
"PRIMITIVE_TEXT17"
""
-1 22 382 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 32 426 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
61 0 0 0 0 0
E E E
@@ -551,12 +601,14 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 22 382 64 395
-0 2 2 "0s" 0 0 0 192 0 0 22 382 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 32 426 76 438
+0 2 2 "0s" 0 0 0 192 0 0 32 426 1
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 7 swlevel
6 35
@@ -570,9 +622,10 @@ E E E
1
LANG:1 7 Level 6
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 0.7142857142857143 -100 310 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -90 354 1 E 140 140 150 210
6 36
"RECTANGLE19"
""
@@ -584,9 +637,10 @@ E E E
1
LANG:1 9 Level 2-5
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 0.7142857142857143 -100 360 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -90 404 1 E 140 140 150 210
6 37
"RECTANGLE20"
""
@@ -598,9 +652,10 @@ E E E
1
LANG:1 7 Level 1
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 0.7142857142857143 -100 410 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -90 454 1 E 140 140 150 210
6 38
"RECTANGLE21"
""
@@ -612,13 +667,14 @@ E E E
1
LANG:1 7 Level 0
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 0.7142857142857143 -100 460 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -90 504 1 E 140 140 150 210
2 39
"PRIMITIVE_TEXT18"
""
-1 112 382 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 122 426 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
66 0 0 0 0 0
E E E
@@ -626,12 +682,14 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 112 382 153 395
-0 2 2 "0s" 0 0 0 192 0 0 112 382 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 122 426 165 438
+0 2 2 "0s" 0 0 0 192 0 0 122 426 1
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 6 stream
6 40
@@ -645,9 +703,10 @@ E E E
1
LANG:1 13 datastream on
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1.428571428571429 -10 209.9999999999999 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 0 253.9999999999999 1 E 140 140 150 210
6 41
"RECTANGLE23"
""
@@ -659,13 +718,14 @@ E E E
1
LANG:1 14 datastream off
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1.428571428571429 -10 309.9999999999999 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 0 353.9999999999999 1 E 140 140 150 210
2 42
"PRIMITIVE_TEXT19"
""
-1 202 382 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 212 426 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
69 0 0 0 0 0
E E E
@@ -673,16 +733,18 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 202 382 285 410
-0 2 2 "0s" 0 0 0 192 0 0 202 382 2
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 212 426 297 453
+0 2 2 "0s" 0 0 0 192 0 0 212 426 2
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 14 softwarelevels
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 0
6 43
@@ -696,9 +758,10 @@ E E E
1
LANG:1 13 datastream on
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1.428571428571429 100 209.9999999999999 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 110 253.9999999999999 1 E 140 140 150 210
6 44
"RECTANGLE25"
""
@@ -710,9 +773,10 @@ E E E
1
LANG:1 14 datastream off
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1.428571428571429 100 309.9999999999999 1 E 140 140 150 210
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 110 353.9999999999999 1 E 140 140 150 210
6 45
"RECTANGLE26"
""
@@ -724,9 +788,10 @@ E E E
1
LANG:1 6 all ok
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -610 250 1 E 970 160 980 200
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -600 294 1 E 970 160 980 200
6 46
"RECTANGLE27"
""
@@ -738,9 +803,10 @@ E E E
1
LANG:1 13 33% > 66% bad
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -610 270 1 E 970 220 980 260
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -600 314 1 E 970 220 980 260
6 47
"RECTANGLE28"
""
@@ -752,9 +818,10 @@ E E E
1
LANG:1 14 66% > 100% bad
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -610 280 1 E 970 250 980 290
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -600 324 1 E 970 250 980 290
6 48
"RECTANGLE29"
""
@@ -766,9 +833,10 @@ E E E
1
LANG:1 13 100% bad data
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -610 290 1 E 970 280 980 320
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -600 334 1 E 970 280 980 320
6 49
"RECTANGLE30"
""
@@ -780,13 +848,14 @@ E E E
1
LANG:1 12 0% > 33% bad
-1
+2
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 -610 260 1 E 970 190 980 230
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -600 304 1 E 970 190 980 230
2 50
"PRIMITIVE_TEXT20"
""
-1 320 380 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 330 424 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
77 0 0 0 0 0
E E E
@@ -794,14 +863,52 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 320 380 400 393
-0 2 2 "0s" 0 0 0 192 0 0 320 380 1
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 330 424 412 436
+0 2 2 "0s" 0 0 0 192 0 0 330 424 1
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 13 brokenstation
+6 51
+"RECTANGLE31"
+""
+1 110 30 E E E 1 E 1 E N {0,0,0} E N "Lofar_beyond_repair" E E
+ E E
+78 0 0 0 0 0
+E E E
+0
+1
+LANG:1 17 Lofar_broken_came
+
+2
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E 1 0 1 -92 318.5 1 E 110 30 184 44
+2 52
+"PRIMITIVE_TEXT21"
+""
+1 108 348.5 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+79 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+3
+"sizePolicy" "Fixed Fixed"
+"dashclr"N "_Transparent"
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 1 E 108 348.5 245 361
+0 2 2 "0s" 0 0 0 192 0 0 108 348.5 1
+1
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 1
+LANG:1 28 The object is beyond repair.
0
LAYER, 1
1
diff --git a/MAC/Navigator2/scripts/libs/GCFCWD.ctl b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
index 916d07f0ae781872797c7205e0ad07927cfe6631..d24cccd1cee7fb810a4350b24011af0d4ad5be80 100644
--- a/MAC/Navigator2/scripts/libs/GCFCWD.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
@@ -168,8 +168,8 @@ void GCFCWD_connectWD(string dp1, dyn_int systemID,
}
// if not first call during init process, inform framewotk that something has changed
if (!isAnswer()) {
- navCtrl_handleNavigatorEvent("","DistChanged","GCFCWD.ctl");
g_involved_stations = involved;
+ navCtrl_handleNavigatorEvent("","DistChanged","GCFCWD.ctl");
} else
g_involved_stations = makeDynString("");
}
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
index 0fbf30539b65fbd58f32bd1db5d34e492d1bb17a..bf3d15e6e6a86c6f14df1758e8533b9753f34b01 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
@@ -73,6 +73,7 @@ void initLofarColors() {
stateColor [50] = "Lofar_broken";
stateColor [53] = "Lofar_broken_went";
stateColor [56] = "Lofar_broken_came";
+ stateColor [56] = "Lofar_beyond_repair";
stateColor [60] = "Lofar_dpOffline";
stateName [0] = "off";
@@ -85,6 +86,7 @@ void initLofarColors() {
stateName [50] = "broken";
stateName [53] = "broken_went";
stateName [56] = "broken_came";
+ stateName [58] = "beyond_repair";
stateName [60] = "dp_Offline";
stateNumber ["off"] = 0;
@@ -97,6 +99,7 @@ void initLofarColors() {
stateNumber ["broken"] = 50;
stateNumber ["broken_went"] = 53;
stateNumber ["broken_came"] = 56;
+ stateNumber ["broken_repair"] = 58;
stateNumber ["dpOffline"] = 60;
}
@@ -111,6 +114,7 @@ const int SUSPICIOUS_CAME = 46;
const int BROKEN = 50;
const int BROKEN_WENT = 53;
const int BROKEN_CAME = 56;
+const int BEYOND_REPAIR = 58;
const int DPOFFLINE = 60;
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
index d626d82f7741223614781a58dc10f01026cf9b17..51ab441f0966e02f60261fa9114596afdb9391a7 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
@@ -73,6 +73,7 @@ void initLofarColors() {
stateColor [50] = "Lofar_broken";
stateColor [53] = "Lofar_broken_went";
stateColor [56] = "Lofar_broken_came";
+ stateColor [58] = "Lofar_beyond_repair";
stateColor [60] = "Lofar_dpOffline";
stateName [0] = "off";
@@ -85,6 +86,7 @@ void initLofarColors() {
stateName [50] = "broken";
stateName [53] = "broken_went";
stateName [56] = "broken_came";
+ stateName [58] = "beyond_repair";
stateName [60] = "dp_Offline";
stateNumber ["off"] = 0;
@@ -97,6 +99,7 @@ void initLofarColors() {
stateNumber ["broken"] = 50;
stateNumber ["broken_went"] = 53;
stateNumber ["broken_came"] = 56;
+ stateNumber ["beyond_repair"] = 58;
stateNumber ["dpOffline"] = 60;
}
@@ -111,6 +114,7 @@ const int SUSPICIOUS_CAME = 46;
const int BROKEN = 50;
const int BROKEN_WENT = 53;
const int BROKEN_CAME = 56;
+const int BEYOND_REPAIR = 58;
const int DPOFFLINE = 60;
diff --git a/MAC/Navigator2/scripts/libs/navCtrl.ctl b/MAC/Navigator2/scripts/libs/navCtrl.ctl
index 0f8e159eeeaa3b9f475b34e54f94c44a1456aa6d..4554288054c958d3f4a40505dc532fdfd5a313bd 100644
--- a/MAC/Navigator2/scripts/libs/navCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navCtrl.ctl
@@ -1313,11 +1313,14 @@ void navCtrl_handleNavigatorEvent(string selection,string event, string initiato
// if a system came online or went offline the viewbox needs a trigger to reload
if (event == "DistChanged") {
- // change locator
+ // change viewbox
dpSet(VIEWBOXACTIONDP,"DistChanged");
- navFunct_waitObjectReady(500,"handleNavigatorEvent:DistChanged wait ViewBox DistChanged");
-
-
+ navFunct_waitObjectReady(300,"handleNavigatorEvent:DistChanged wait ViewBox DistChanged");
+ // if a system came online or went offline the viewbox needs a trigger to reload
+ } else if (event == "ILTSwitched") {
+ // change viewbox
+ dpSet(VIEWBOXACTIONDP,"ILTSwitched");
+ navFunct_waitObjectReady(300,"handleNavigatorEvent:ILTSwitched wait ViewBox ILTSwitched");
}
}
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index 80d9a58b9eaeae77b36bd97cc303eefe6f498824..17ef94929fe760d95d6fe3002d8b8191d8073482 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -69,18 +69,19 @@
// navFunct_hardware2Obs : Looks if a piece of hardware maps to an observation
// navFunct_hasAARTFAAC : checks if a given station belongs to the AARTFAAC stations
// navFunct_IONode2DPName : returns the DP name based on the ionode number.
-// navFunct_isCoreStation : returns TRUE if the station is part of the Core stations
+// navFunct_isCoreStation : returns true if the station is part of the Core stations
// navFunct_isHBA : returns true if the antenna is an International HBA antenna
// navFunct_isHBAZero : returns true if the antenna is a Core HBA Zero antenna
// navFunct_isHBAOne : returns true if the antenna is a Core HBA One antenna
// navFunct_isHBAInner : returns true if the antenna is a Remote HBA Inner antenna
// navFunct_isHBAOuter : returns true if the antenna is a Remote HBA Outer antenna
-// navFunct_isInternationalStation : returns TRUE if the station is part of the International stations
+// navFunct_isInternationalStation : returns true if the station is part of the International stations
// navFunct_isLBA : returns true if the antenna is an International LBA antenna
// navFunct_isLBAInner : returns true if the antenna is a Core or Remote LBA Inner antenna
// navFunct_isLBAOuter : returns true if the antenna is a Core or Remote LBA Outer antenna
-// navFunct_isRemoteStation : returns TRUE if the station is part of the Remote stations
-// navFunct_isObservation : returns true is a given observationnumber is an observation or false when it is a pipeline
+// navFunct_isLocalMode : returns true if the station is in localmode
+// navFunct_isRemoteStation : returns true if the station is part of the Remote stations
+// navFunct_isObservation : returns true is a given observationnumber is an observation or false when it is a pipeline
// navFunct_listToDynString : puts [a,b,d] lists into dynstrings
// navFunct_locusNode2OSRack : Returns the OSRackNr for a given LocusNode
// navFunct_lofarDate2PVSSDate : returns Lofardate Datestring 2000.11.19 [18:12:21[.888]] in PVSS format 2000.11.19 [18:12:21[.888]]
@@ -2632,8 +2633,7 @@ void navFunct_handleUndockClick() {
//
// ***************************************
-bool navFunct_checkEmailAddress(string anAddress)
-{
+bool navFunct_checkEmailAddress(string anAddress) {
// an email should be in the form xxxx@yyyy.zz
// can be improved obviously
if (anAddress == "") return FALSE;
@@ -2644,12 +2644,33 @@ bool navFunct_checkEmailAddress(string anAddress)
return TRUE;
}
-void navFunct_printLastError(string place, dyn_errClass err)
-{
- if(dynlen(err) > 0)
- {
+void navFunct_printLastError(string place, dyn_errClass err) {
+ if(dynlen(err) > 0) {
string dpName = getErrorDpName(err); // get the dpname relatedto the error
string errText = getErrorText(err); //get the error text
LOG_ERROR(place+"| Error : " + dpName + " : " + errText);
- }
+ }
+}
+
+bool navFunct_isLocalMode(string station) {
+ string stationName = navFunct_bareDBName(station);
+ // no localmode for CEP or MCU
+ if (stationName+":" == MainDBName || stationName+":" == CEPDBName) return false;
+ string dp = MainDBName + "LOFAR_PIC_";
+ if (navFunct_isCoreStation(stationName)) {
+ dp += "Core_" + stationName + ".localMode.stationSwitch";
+ } else if (navFunct_isRemoteStation(stationName)) {
+ dp += "Remote_" + stationName + ".localMode.stationSwitch";
+ } else if (navFunct_isInternationalStation(stationName)) {
+ dp += "Europe_" + stationName + ".localMode.stationSwitch";
+ }
+
+ bool localMode = false;
+ if (dpExists(dp)) {
+ dpGet(dp,localMode);
+ } else {
+ LOG_ERROR("navFunct.ctl:navFunct_isLocalMode|dp: "+ dp+" does not exist");
+ }
+
+ return localMode;
}
diff --git a/MAC/Navigator2/scripts/libs/navPanel.ctl b/MAC/Navigator2/scripts/libs/navPanel.ctl
index 3757a05bd8e468352194060509ce80876ab79d60..96561ad592019b76f6ec4600b2d35de4ff65e977 100644
--- a/MAC/Navigator2/scripts/libs/navPanel.ctl
+++ b/MAC/Navigator2/scripts/libs/navPanel.ctl
@@ -529,10 +529,10 @@ void navPanel_statePopup(string baseDP) {
if (strpos(g_alarms["DPNAME"][i],bareDP)>-1) {
if (g_alarms["STATUS"][i] == CAME) {
g_alarms["STATUS"][i] = ACK;
- if (g_alarms["STATE"][i] == 56) {
- g_alarms["STATE"][i] = 50;
- } else if (g_alarms["STATE"] == 46) {
- g_alarms["STATE"][i] = 40;
+ if (g_alarms["STATE"][i] == BROKEN_CAME) {
+ g_alarms["STATE"][i] = BROKEN;
+ } else if (g_alarms["STATE"] == SUSPICIOUS_CAME) {
+ g_alarms["STATE"][i] = SUSPICIOUS;
}
changed=true;
} else if (g_alarms["STATUS"][i] == WENT) {
diff --git a/MAC/Navigator2/scripts/monitorAlarms.ctl b/MAC/Navigator2/scripts/monitorAlarms.ctl
index 79ea722ec1f36484982762a1f35ca636f8844361..5119eac5659ee439f98c33c14be8c8945c74fb35 100644
--- a/MAC/Navigator2/scripts/monitorAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorAlarms.ctl
@@ -172,7 +172,8 @@ void objectStateCallback(string ident, dyn_dyn_anytype aResult) {
int state = (int)aResult[nr+1][2];
- if (state == 60) {
+ // skip BEYOND_REPAIR(58) and DPOFFLINE(60)
+ if (state > 56) {
continue;
}
diff --git a/MAC/Navigator2/scripts/monitorStateChanges.ctl b/MAC/Navigator2/scripts/monitorStateChanges.ctl
index c87f7ab2bc128a380c1916391aca097c788f217d..47f8738c67d59ff36564650f9874e7830f2ed35f 100644
--- a/MAC/Navigator2/scripts/monitorStateChanges.ctl
+++ b/MAC/Navigator2/scripts/monitorStateChanges.ctl
@@ -307,6 +307,12 @@ void setStates(string datapoint,string element,int state,string message,bool for
int aVal;
dpGet(datapoint+"."+element,aVal);
+ // if state is BEYOND_REPAIR skip the set
+ if (aVal == BEYOND_REPAIR)
+ {
+ return;
+ }
+
if (state > -1 && state != aVal) {
if (force) {
dpSet(datapoint+"."+element,state);
@@ -419,6 +425,13 @@ bool setChildState(string Dp,int state) {
// take present value for comparing later.
dpGet(Dp+".status.childState",aVal);
+
+ // if state is BEYOND_REPAIR skip the set
+ if (aVal == BEYOND_REPAIR)
+ {
+ return;
+ }
+
if (bDebug) DebugN("monitorStateChanges.ctl:setChildState|"+Dp+".status.childState = "+aVal);
@@ -428,24 +441,12 @@ bool setChildState(string Dp,int state) {
// to the value we need to set, we can leave the loop and set the new state value. In case it is bigger we can take that value
// and set it as the new value (if > the original value)
- // at the moment there is a bug in the sql approach from ETM, if the result Select is an empty table then the sort still
- // is executed. This give an error. So for now we do the query two times.
- // the 2nd one only if the first one gives a result > 1;
-
-// =====>>>> Should be fixed in 3.7
-// string query = "SELECT '_original.._value' FROM '{"+Dp+"_*.status.childState,"+Dp+"_*.status.state}'";
-// int err = dpQuery(query, tab);
-
-// if (err < 0 | dynlen(tab)< 2) {
-// return true;
-// }
string query = "SELECT '_original.._value' FROM '{"+Dp+"_*.status.childState,"+Dp+"_*.status.state,"+Dp+".*.status.childState,"+Dp+".*.status.state}' SORT BY 1 DESC";
if (bDebug) DebugN("monitorStateChanges.ctl:setChildState|Query: ",query);
int err = dpQuery(query, tab);
-
if (err < 0) {
if (bDebug) DebugN("monitorStateChanges.ctl:setChildState|Error " + err + " while getting query.");
diff --git a/MAC/Navigator2/scripts/monitorStateReset.ctl b/MAC/Navigator2/scripts/monitorStateReset.ctl
index acf0379decdc7aa4316e384e75bbf9bf2aae8310..5a8c02b77a0c8dd48c7f113dd6a6983d2086ddea 100644
--- a/MAC/Navigator2/scripts/monitorStateReset.ctl
+++ b/MAC/Navigator2/scripts/monitorStateReset.ctl
@@ -94,7 +94,7 @@ void resetStateTriggered(string dp1, string trigger,
// This point should have points like:
//
// LOFAR_PIC_Cabinet0_Subrack0_RSPBoard0_RCU0
- // 1 (= good)
+ // 10 (= good)
// a msg indicating extra comments on the state
//
// first find out if the involved DP resides on this system or not
@@ -162,7 +162,7 @@ bool doAlarmReset(string database,string DP,int state, int originatorState,strin
string branch="PIC";
bool changed=false;
// select all WENT states
- string query = "SELECT '_online.._value' FROM '" + DP + "*.**.status.state' WHERE '_online.._value' == 56 OR '_online.._value' == 46";
+ string query = "SELECT '_online.._value' FROM '" + DP + "*.**.status.state' WHERE '_online.._value' == " + BROKEN_CAME + " OR '_online.._value' == " + SUSPICIOUS_CAME;
if (bDebug) DebugN("monitorStateResets.ctl:doAlarmReset|composed query: "+query);
dyn_dyn_anytype tab;
@@ -202,7 +202,7 @@ bool doAlarmReset(string database,string DP,int state, int originatorState,strin
if (i > 1) antennaQuery+=",";
antennaQuery += antennas[i]+"*.**.status.state";
}
- antennaQuery+= "}' WHERE '_online.._value' == 56 OR '_online.._value' == 46";
+ antennaQuery+= "}' WHERE '_online.._value' == " + BROKEN_CAME + " OR '_online.._value' == " + SUSPICIOUS_CAME;
if (bDebug) DebugN("monitorStateResets.ctl:doAlarmReset|composed antennaQuery: "+antennaQuery);
if (dpQuery(antennaQuery,anttab)<0) {
@@ -232,10 +232,10 @@ bool doAlarmReset(string database,string DP,int state, int originatorState,strin
if (dpExists(tab[z][1]) ){
string msgDp=navFunct_dpStripLastElement(tab[z][1])+".message";
int newstate=-1;
- if (tab[z][2] == 56) {
- newstate=50;
- } else if (tab[z][2]==46) {
- newstate=40;
+ if (tab[z][2] == BROKEN_CAME) {
+ newstate=BROKEN;
+ } else if (tab[z][2]==SUSPICIOUS_CAME) {
+ newstate=SUSPICIOUS;
} else {
DebugN("monitorStateResets.ctl:doAlarmReset|ERROR: wrong alarm state:"+tab[z][2]);
}
@@ -313,10 +313,10 @@ bool doAlarmReset(string database,string DP,int state, int originatorState,strin
if (dpExists(tab[z][1]) ){
string msgDp=navFunct_dpStripLastElement(tab[z][1])+".message";
int newstate=-1;
- if (tab[z][2] == 56) {
- newstate=50;
- } else if (tab[z][2]==46) {
- newstate=40;
+ if (tab[z][2] == BROKEN_CAME) {
+ newstate=BROKEN;
+ } else if (tab[z][2]==SUSPICIOUS_CAME) {
+ newstate=SUSPICIOUS;
} else {
DebugN("monitorStateResets.ctl:doAlarmReset|ERROR: wrong alarm state:"+tab[z][2]);
}
@@ -437,6 +437,12 @@ bool setStates(string DP,int state, int originatorState,string message) {
if (dpExists(tab[z][1])) {
string msgDp=navFunct_dpStripLastElement(tab[z][1])+".message";
+ // check if original state != BEYOND_REPAIR if so skip it
+ int aVal;
+ dpget(tab[z][1],aVal);
+ if (aVal == BEYOND_REPAIR) {
+ continue;
+ }
dynAppend(dpList,tab[z][1]);
dynAppend(dpStates,state);
dynAppend(dpMsgs,msgDp);
@@ -521,6 +527,11 @@ bool setChildStates(string DP,int state, int originatorState, string message) {
if (dpExists(tab[z][1]) && leaf == false){
string msgDp=navFunct_dpStripLastElement(tab[z][1])+".message";
+ int aVal;
+ dpget(tab[z][1],aVal);
+ if (aVal == BEYOND_REPAIR) {
+ continue;
+ }
dynAppend(valDPs,tab[z][1]);
dynAppend(values,state);
dynAppend(msgDPs,msgDp);
diff --git a/MAC/Navigator2/scripts/monitorStationAlarms.ctl b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
index 00cf522304596733dbc592e4f343abc9e4893999..0e7febd50d48c8bc512cc9a9b5653f59c978ce66 100644
--- a/MAC/Navigator2/scripts/monitorStationAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
@@ -140,8 +140,8 @@ void alarmCallback(string dp1, string DPName,
}
- // above 59 the states are no t monitorred for now
- if (state >= 60) {
+ // above 56 the states are not monitorred for now
+ if (state >= 57) {
occupied = false;
return;
}