diff --git a/.gitattributes b/.gitattributes
index 30bea4c8a00ff129effd7454acf74635479217b1..f4538fb310f560f9d7d0110bd17867d5c50e5f08 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3403,12 +3403,9 @@ MAC/Navigator2/panels/FRENKM/QueryObsCtrl.pnl -text
MAC/Navigator2/panels/FRENKM/TEST.pnl -text
MAC/Navigator2/panels/FRENKMnavigator.pnl -text
MAC/Navigator2/panels/Hardware/CEP.pnl -text
-MAC/Navigator2/panels/Hardware/CEP_BGPRack_detailed.pnl -text
MAC/Navigator2/panels/Hardware/CEP_CobaltNIC.pnl -text
MAC/Navigator2/panels/Hardware/CEP_CobaltNode_detailed.pnl -text
MAC/Navigator2/panels/Hardware/CEP_CobaltRack_detailed.pnl -text
-MAC/Navigator2/panels/Hardware/CEP_IONode.pnl -text
-MAC/Navigator2/panels/Hardware/CEP_Midplane.pnl -text
MAC/Navigator2/panels/Hardware/CEP_OSRack_detailed.pnl -text
MAC/Navigator2/panels/Hardware/CoreCS0nnOverview.pnl -text
MAC/Navigator2/panels/Hardware/CoreCSx01Overview.pnl -text
@@ -3430,12 +3427,9 @@ MAC/Navigator2/panels/HardwareTemplatePanel.pnl -text
MAC/Navigator2/panels/LofarSpeedTest/LofarSpeedTest.pnl -text
MAC/Navigator2/panels/Observations/Observation_overview.pnl -text
MAC/Navigator2/panels/Observations/Observations.pnl -text
-MAC/Navigator2/panels/Processes/BGPAppl.pnl -text
-MAC/Navigator2/panels/Processes/BGPProc.pnl -text
MAC/Navigator2/panels/Processes/BeamControl.pnl -text
MAC/Navigator2/panels/Processes/BeamServer.pnl -text
MAC/Navigator2/panels/Processes/CEPHardwareMonitor.pnl -text
-MAC/Navigator2/panels/Processes/CEP_IONodeProcesses.pnl -text
MAC/Navigator2/panels/Processes/CEP_Processes.pnl -text
MAC/Navigator2/panels/Processes/CEPlogProcessor.pnl -text
MAC/Navigator2/panels/Processes/CTStartDaemon.pnl -text
@@ -3494,15 +3488,12 @@ MAC/Navigator2/panels/objects/FRENKM_STATION.pnl -text
MAC/Navigator2/panels/objects/Hardware/APtemp_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/AntenneSymbol.pnl -text
MAC/Navigator2/panels/objects/Hardware/BPtemp_small.pnl -text
-MAC/Navigator2/panels/objects/Hardware/CEP_BGPRack.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_CobaltNIC_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_CobaltNode_detailed_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_CobaltNode_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_CobaltRack.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_CobaltRouter_small.pnl -text
-MAC/Navigator2/panels/objects/Hardware/CEP_IONode_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_LocusNode_small.pnl -text
-MAC/Navigator2/panels/objects/Hardware/CEP_Midplane_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_OSRack.pnl -text
MAC/Navigator2/panels/objects/Hardware/CEP_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/CS0nnStatusView.pnl -text
@@ -3560,7 +3551,6 @@ MAC/Navigator2/panels/objects/Hardware/antennaPercentage.pnl -text
MAC/Navigator2/panels/objects/Hardware/diskuse_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/lofar_HW_state.pnl -text
MAC/Navigator2/panels/objects/Hardware/memuse_small.pnl -text
-MAC/Navigator2/panels/objects/Hardware/midplane_small.pnl -text
MAC/Navigator2/panels/objects/Hardware/observationFlow_stations.pnl -text
MAC/Navigator2/panels/objects/Hardware/superterpStatusView.pnl -text
MAC/Navigator2/panels/objects/Observations/Observation_small.pnl -text
@@ -3577,7 +3567,6 @@ MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl -text
MAC/Navigator2/panels/objects/Processes/adder.pnl -text
MAC/Navigator2/panels/objects/Processes/adderDetail.pnl -text
MAC/Navigator2/panels/objects/Processes/adderView_small.pnl -text
-MAC/Navigator2/panels/objects/Processes/circularBuffer.pnl -text
MAC/Navigator2/panels/objects/Processes/controller_small.pnl -text
MAC/Navigator2/panels/objects/Processes/controller_top.pnl -text
MAC/Navigator2/panels/objects/Processes/daemon_big.pnl -text
@@ -3679,8 +3668,8 @@ MAC/Navigator2/scripts/monitorAlarms.ctl -text
MAC/Navigator2/scripts/monitorStateChanges.ctl -text
MAC/Navigator2/scripts/monitorStateReset.ctl -text
MAC/Navigator2/scripts/monitorStationAlarms.ctl -text
-MAC/Navigator2/scripts/readStationBGPconnections.ctl -text
MAC/Navigator2/scripts/readStationConfigs.ctl -text
+MAC/Navigator2/scripts/readStationConnections.ctl -text
MAC/Navigator2/scripts/transferMPs.ctl -text
MAC/Test/APL/PVSSproject/colorDB/Lofar[!!-~]colors -text svneol=native#application/octet-stream
MAC/Test/APL/PVSSproject/colorDB/colorDB_de -text svneol=native#application/octet-stream
diff --git a/MAC/Navigator2/config/progs.ccu b/MAC/Navigator2/config/progs.ccu
index f1c65b3c9fc6a9d8763384dd3bc21bed7a8fa9a8..44065159a51448195e0f40a6f87d2d3da2da48bd 100644
--- a/MAC/Navigator2/config/progs.ccu
+++ b/MAC/Navigator2/config/progs.ccu
@@ -16,7 +16,7 @@ PVSS00sim | always | 30 | 3 | 1 |
PVSS00dist | always | 30 | 3 | 1 |
PVSS00ctrl | always | 30 | 2 | 2 |claim.ctl
PVSS00ctrl | always | 30 | 2 | 2 |monitorStateChanges.ctl
-PVSS00ctrl | once | 30 | 2 | 2 |readStationBGPconnections.ctl
+PVSS00ctrl | once | 30 | 2 | 2 |readStationConnections.ctl
PVSS00ctrl | always | 30 | 2 | 2 |monitorStateReset.ctl
PVSS00ctrl | always | 30 | 2 | 2 |transferMPs.ctl
PVSS00ui | manual | 30 | 2 | 2 |-m para
diff --git a/MAC/Navigator2/panels/Hardware/CEP.pnl b/MAC/Navigator2/panels/Hardware/CEP.pnl
index 85ba31d4d44f1fefa19a6cbdd63428d1b28aff8d..22856b7684501f2ebc3e4733fc657dfcc0cdda9d 100644
--- a/MAC/Navigator2/panels/Hardware/CEP.pnl
+++ b/MAC/Navigator2/panels/Hardware/CEP.pnl
@@ -20,39 +20,10 @@ void prepareHardwareList() {
// For this panel CEP should be selectable so we get them for the treelist
dynAppend(g_stationList,navFunct_bareDBName(sysName));
- // BGP
- // For this panel BGPRacks and BGPMidplanes should be selectable so we get them for the treelist
- // BGPRacks first
- dpQuery(\"SELECT '_original.._value' FROM '\"+baseDP+\"_*.status.state' REMOTE '\"+sysName+\"' WHERE _DPT= \\\"BGPRack\\\" OR _DPT=\\\"BGPMidplane\\\" \", tab);
- LOG_TRACE(\"CEP.pnl:prepareHardwareList|tab: \"+tab);
-
- dyn_string aDS=navFunct_getDynString(tab, 2,1);
- dynSortAsc(aDS);
- for(z=1;z<=dynlen(aDS);z++){
-
- // strip .status.state from result
- string aS = dpSubStr(aDS[z],DPSUB_SYS_DP);
-
- // strip all b4 BGP out of the string
- strreplace(aS,baseDP+\"_\",\"\");
-
- // Remainder should be BGP?_Midplane? combinations, split on _
- dyn_string spl=strsplit(aS,\"_\");
- if (dynlen(spl) > 1) { // Midplane
- string midplane = spl[2];
- strreplace(midplane,\"Midplane\",\"\");
- int m = midplane;
- dynAppend(g_BGPMidplaneList,m);
- } else { // BGPRack
- int b = 0;
- if (navFunct_isBGPSwitch()) b=1;
- dynAppend(g_BGPRackList,b);
- }
- }
// Cobalt
// For this panel CobaltRacks and CobaltNodes should be selectable so we get them for the treelist
- // BGPRacks first
+ // CobaltRacks first
dpQuery(\"SELECT '_original.._value' FROM '\"+baseDP+\"_*.status.state' REMOTE '\"+sysName+\"' WHERE _DPT= \\\"CobaltRack\\\" OR _DPT=\\\"CobaltNode\\\" \", tab);
LOG_TRACE(\"CEP.pnl:prepareHardwareList|tab: \"+tab);
@@ -172,33 +143,6 @@ 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 246 0 "" 2190
-0
-1 247 0 "" 2188
-0
-1 248 0 "86" 1
-0
-1 249 0 "" 2187
-0
-2 9
-"PRIMITIVE_TEXT1"
-""
-1 50 82 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-2 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 50 82 92 102
-0 2 2 "0s" 0 0 0 192 0 0 50 82 1
-1
-LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
-0 1
-LANG:1 4 BG/P
2 10
"PRIMITIVE_TEXT2"
""
@@ -218,26 +162,6 @@ E E 0 1 1 2 1 E U 1 E 320 10 542 35
LANG:1 33 MS Shell Dlg,-1,21,5,75,0,0,0,0,0
0 1
LANG:1 18 LOFAR CEP Clusters
-1 250 6 "" 0
-0
-1 251 6 "" 1
-0
-1 252 6 "" 3
-0
-1 253 6 "" 4
-0
-1 254 6 "1" 1
-0
-1 255 7 "" 0
-0
-1 256 7 "" 1
-0
-1 257 7 "" 3
-0
-1 258 7 "" 4
-0
-1 259 7 "1" 1
-0
1 277 11 "" 2190
0
1 278 11 "" 2188
@@ -619,17 +543,6 @@ LAYER, 7
1
LANG:1 6 Layer8
0
-3 0 "PANEL_REF1" -1
-"objects\\Hardware\\CEP_BGPRack.pnl" 488 288 T 1 1 0 1 -310 -60
-0
-3 6 "PANEL_REF7" -1
-"objects\\Hardware\\CEP_Midplane_small.pnl" 18 460 T 8 1 0 1 -15 41
-1
-"$BGPMidplaneNr""0"
-3 7 "PANEL_REF8" -1
-"objects\\Hardware\\CEP_Midplane_small.pnl" 18 290 T 9 1 0 1 -15 27
-1
-"$BGPMidplaneNr""1"
3 10 "PANEL_REF11" -1
"objects\\Hardware\\CEP_OSRack.pnl" 588 198 T 12 1 0 1 90 32
1
diff --git a/MAC/Navigator2/panels/Hardware/CEP_BGPRack_detailed.pnl b/MAC/Navigator2/panels/Hardware/CEP_BGPRack_detailed.pnl
deleted file mode 100644
index c7657facc523b551a2e20c769cffc16e0b0b87c7..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Hardware/CEP_BGPRack_detailed.pnl
+++ /dev/null
@@ -1,237 +0,0 @@
-V 11
-1
-LANG:1 20 CEP_BGPRack_detailed
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
-
- baseDP = g_currentDatapoint;
-
- rNr=0;
- if (navFunct_isBGPSwitch()) rNr=1;
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- if(dpExists(baseDP + \".BGPSwitch\")) {
- dpConnect(\"controlBGP\", baseDP + \".BGPSwitch:_online.._value\",
- baseDP + \".BGPSwitch:_online.._invalid\");
- if (!navFunct_dpReachable(baseDP)) {
- controlIOnode(\"\",false,\"\",true);
- }
- }
- // connect for childUpdates
- showChildState(baseDP);
- // connect for selfUpdates
- showSelfState(baseDP);
-
- reload();
-
-}
-
-void controlBGP(string dp1, bool bgpswitch,
- string dp2, bool invalid) {
-
- if (!invalid) {
- string aS=navFunct_DPName2CEPName(baseDP);
- setValue(\"BGPRack\", \"text\", aS);
- reload();
- }
-}
-
-void prepareHardwareList() {
- // set the hardware selectable items
- dyn_dyn_anytype tab;
- int z;
-
-
- // For this panel midplanes should be selectable so we get them for the treelist
-
- dpQuery(\"SELECT '_original.._value' FROM '\"+baseDP+\"_*.status.state' REMOTE '\"+sysName+\"' WHERE _DPT=\\\"BGPMidplane\\\" \", tab);
- LOG_TRACE(\"CEP_BGPRack_detailed.pnl:prepareHardwareList|tab: \"+tab);
-
- dyn_string aDS=navFunct_getDynString(tab, 2,1);
- dynSortAsc(aDS);
-
- dynAppend(g_stationList,navFunct_bareDBName(sysName));
-
- for(z=1;z<=dynlen(aDS);z++){
-
- // strip .status.state and systemname from result
- string aS = dpSubStr(aDS[z],DPSUB_SYS_DP);
-
- // Remainder should be *BGP?_Midplane? combinations, split on _
- dyn_string spl=strsplit(aS,\"_\");
- string midplane = spl[dynlen(spl)];
- strreplace(midplane,\"Midplane\",\"\");
- int m= midplane;
-
- dynAppend(g_BGPMidplaneList,m);
- }
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"CEP_BGPRack_detailed.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"CEP_BGPRack_detailed.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- } else if (actionString[1] == \"DistChanged\") {
- // for dist system bound hardware only, if the distsystem went offline we need to replace
- // the screen with a broken connection screen.
- if (!g_initializing) {
-
- // check if this syst is in the connectionlist and down
- int iPos=dynContains(g_connections[\"NAME\"],sysName);
- if (iPos > 0) {
- if (!g_connections[\"UP\"][iPos]) {
- navPanel_setEvent(\"invalid DP\",\"ChangePanel\");
- }
- }
- }
- return;
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- // set the hardware selectable items for this screen
- prepareHardwareList();
-
- // set panel to ready
- g_objectReady=true;
-
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"CEP_BGPRack_detailed.pnl\",\"Update\");
-
-}
-" 0
- E E E E 1 -1 -1 0 188 128
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-int rNr=-1;
-
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 675
-"childStateBorder"
-""
-1 15 418 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-86 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 1 0 1 400 132 1 E 15 15 152 410
-1 676 70 "" 1
-0
-2 674
-"BGPRack"
-""
-1 438 150 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-84 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 440 150 479 166
-0 2 0 "0s" 0 0 0 192 0 0 440 150 1
-1
-LANG:1 26 Arial,-1,13,5,69,0,0,0,0,0
-0 1
-LANG:1 5 aRack
-1 677 71 "" 0
-0
-1 678 71 "" 1
-0
-1 679 71 "" 3
-0
-1 680 71 "" 4
-0
-1 681 71 "1" 1
-0
-1 682 72 "" 0
-0
-1 683 72 "" 1
-0
-1 684 72 "" 3
-0
-1 685 72 "" 4
-0
-1 686 72 "1" 1
-0
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 70 "selfState" -1
-"objects\\lofar_self_state.pnl" 284 264 T 82 1.13333333333333 0 1 92.13333333333299 -116
-0
-3 71 "PANEL_REF72" -1
-"objects\\Hardware\\CEP_Midplane_small.pnl" 408 350 T 87 1 0 1 5 0
-1
-"$BGPMidplaneNr""1"
-3 72 "PANEL_REF73" -1
-"objects\\Hardware\\CEP_Midplane_small.pnl" 408 540 T 88 1 0 1 5 -6
-1
-"$BGPMidplaneNr""0"
-0
diff --git a/MAC/Navigator2/panels/Hardware/CEP_IONode.pnl b/MAC/Navigator2/panels/Hardware/CEP_IONode.pnl
deleted file mode 100644
index b88a13f08fdd27f53811ac84f728a0653dbedcc7..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Hardware/CEP_IONode.pnl
+++ /dev/null
@@ -1,787 +0,0 @@
-V 11
-1
-LANG:1 10 CEP_IONode
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
-
- // This panel should give its own screen if switching to processes tab, so empty the save process point
- g_lastProcessesDatapoint=\"\";
-
- baseDP = g_currentDatapoint;
-
- dyn_string dpAr= strsplit(dpSubStr(g_currentDatapoint,DPSUB_DP),\"_\");
- if (strpos(dpAr[dynlen(dpAr)],\"IONode\") > -1) {
- ioNr = substr(dpAr[dynlen(dpAr)],6,strlen(dpAr[dynlen(dpAr)]));
- } else {
- LOG_ERROR(\"CEP_IONode.pnl:Initialize|No IONode found in currentDatapoint.\");
- }
-
-
- if(dpExists(baseDP + \".usedStation\")) {
- dpConnect(\"controlIOnode\", baseDP + \".station0:_online.._value\",
- baseDP + \".IP0:_online.._value\",
- baseDP + \".MAC0:_online.._value\",
- baseDP + \".station1:_online.._value\",
- baseDP + \".IP1:_online.._value\",
- baseDP + \".MAC1:_online.._value\",
- baseDP + \".MACForeign:_online.._value\",
- baseDP + \".usedStation:_online.._value\",
- baseDP + \".usedIP:_online.._value\",
- baseDP + \".usedMAC:_online.._value\",
- baseDP + \".use2ndStation:_online.._value\",
- CEPDBName + \"LOFAR_PIC_BGP.BGPSwitch:_online.._value\",
- baseDP + \".usedStation:_online.._invalid\");
- if (!navFunct_dpReachable(baseDP)) {
- controlIOnode(\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",true);
- }
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- // connect for selfUpdates
- showSelfState(baseDP);
-
- reload();
-}
-
-void controlIOnode(string dp1, string station0,
- string dp2, string ipAddress0,
- string dp3, string macAddress0,
- string dp4, string station1,
- string dp5, string ipAddress1,
- string dp6, string macAddress1,
- string dp7, string macForeign,
- string dp8, string station,
- string dp9, string ipAddress,
- string dp10, string macAddress,
- string dp11, bool use2ndStation,
- string dp12, bool bgpSwitch,
- string dp13, bool invalid) {
-
- string nodeName = navFunct_DPName2CEPName(baseDP);
- setValue(\"nodeName\",\"text\",\"Node: \"+nodeName);
-
- if (!invalid) {
- setValue(\"ip0_text\",\"text\",ipAddress0);
- setValue(\"mac0_text\",\"text\",macAddress0);
- setValue(\"station0_text\",\"text\",station0);
- setValue(\"ip1_text\",\"text\",ipAddress1);
- setValue(\"mac1_text\",\"text\",macAddress1);
- setValue(\"macForeign0_text\",\"text\",macForeign);
- setValue(\"macForeign1_text\",\"text\",macForeign);
- setValue(\"station1_text\",\"text\",station1);
- setValue(\"ip_text\",\"text\",ipAddress);
- setValue(\"mac_text\",\"text\",macAddress);
- setValue(\"station_text\",\"text\",station);
- if (bgpSwitch) {
- BGPline0.visible(false);
- BGPline1.visible(true);
- } else {
- BGPline0.visible(true);
- BGPline1.visible(false);
- }
- } else {
- setValue(\"ip0_text\",\"text\",\"???????\");
- setValue(\"mac0_text\",\"text\",\"???????\");
- setValue(\"station0_text\",\"text\",\"?????\");
- setValue(\"ip1_text\",\"text\",\"???????\");
- setValue(\"mac1_text\",\"text\",\"???????\");
- setValue(\"macForeign0_text\",\"text\",\"???????\");
- setValue(\"macForeign1_text\",\"text\",\"???????\");
- setValue(\"station1_text\",\"text\",\"?????\");
- setValue(\"ip_text\",\"text\",\"???????\");
- setValue(\"mac_text\",\"text\",\"???????\");
- setValue(\"station_text\",\"text\",\"?????\");
- BGPline0.visible(false);
- BGPline1.visible(false);
- }
-}
-
-void prepareHardwareList() {
- // set the hardware selectable items
- dynAppend(g_stationList,navFunct_bareDBName(sysName));
- dynAppend(g_IONodeList,ioNr);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"CEP_IONode.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"CEP_IONode.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- } else if (actionString[1] == \"DistChanged\") {
- // for dist system bound hardware only, if the distsystem went offline we need to replace
- // the screen with a broken connection screen.
- if (!g_initializing) {
-
- // check if this syst is in the connectionlist and down
- int iPos=dynContains(g_connections[\"NAME\"],sysName);
- if (iPos > 0) {
- if (!g_connections[\"UP\"][iPos]) {
- navPanel_setEvent(\"invalid DP\",\"ChangePanel\");
- }
- }
- }
- return;
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- // set the hardware selectable items for this screen
- prepareHardwareList();
-
- // set panel to ready
- g_objectReady=true;
-
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"CEP_IONode.pnl\",\"Update\");
-
-}
-" 0
- E E E E 1 -1 -1 0 188 128
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-int ioNr = -1;
-
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 658
-"childStateBorder"
-""
-1 500 80 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- E E
-77 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 1.723518850987432 0 0.5840455840455839 -181.6517055655296 118.3190883190883 1 E 117 20 674 722
-2 917
-"nodeName"
-""
-1 350 100 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-78 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 350 100 567 124
-0 2 2 "0s" 0 0 0 192 0 0 350 100 1
-1
-LANG:1 33 MS Shell Dlg,14,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 20 Node: R00-M0-N00-J00
-1 954 1 "" 1
-0
-2 919
-"PRIMITIVE_TEXT1"
-""
-1 82 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-80 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 82 172 279 191
-0 2 2 "0s" 0 0 0 192 0 0 82 172 1
-1
-LANG:1 35 MS Shell Dlg 2,12,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 24 Possible Configurations:
-2 920
-"PRIMITIVE_TEXT2"
-""
-1 600 160 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-81 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 600 160 781 179
-0 2 2 "0s" 0 0 0 192 0 0 600 160 1
-1
-LANG:1 35 MS Shell Dlg 2,12,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 21 Chosen Configuration:
-6 921
-"RECTANGLE1"
-""
-1 130 200 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-82 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.9310344827586207 0 0.8 -59.03448275862068 51.99999999999999 1 E 130 200 420 360
-2 922
-"PRIMITIVE_TEXT3"
-""
-1 72 252 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-83 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 252 90 268
-0 2 2 "0s" 0 0 0 192 0 0 72 252 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 3 Ip:
-2 923
-"PRIMITIVE_TEXT4"
-""
-1 72 222 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-84 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 222 124 238
-0 2 2 "0s" 0 0 0 192 0 0 72 222 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 Station:
-2 924
-"PRIMITIVE_TEXT5"
-""
-1 72 282 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-85 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 282 103 298
-0 2 2 "0s" 0 0 0 192 0 0 72 282 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Mac:
-14 925
-"station0_text"
-""
-1 162 219 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-86 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 160 217 314 240
-2 "0s" 0 0 0 0 0 -1 E E E
-14 926
-"ip0_text"
-""
-1 162 249 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-87 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 160 247 314 270
-2 "0s" 0 0 0 0 0 -1 E E E
-14 927
-"mac0_text"
-""
-1 162 279 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-88 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 160 277 314 300
-2 "0s" 0 0 0 0 0 -1 E E E
-2 928
-"PRIMITIVE_TEXT6"
-""
-1 32 252 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-89 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 32 252 42 275
-0 2 2 "0s" 0 0 0 192 0 0 32 252 1
-1
-LANG:1 35 MS Shell Dlg 2,14,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 1 0
-6 929
-"RECTANGLE2"
-""
-1 130 200 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-90 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.9310344827586207 0 0.8125 -59.03448275862068 227.5 1 E 130 200 420 360
-2 930
-"PRIMITIVE_TEXT7"
-""
-1 72 430 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-91 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 430 90 446
-0 2 2 "0s" 0 0 0 192 0 0 72 430 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 3 Ip:
-2 931
-"PRIMITIVE_TEXT8"
-""
-1 72 400 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-92 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 400 124 416
-0 2 2 "0s" 0 0 0 192 0 0 72 400 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 Station:
-2 932
-"PRIMITIVE_TEXT9"
-""
-1 72 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-93 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 460 103 476
-0 2 2 "0s" 0 0 0 192 0 0 72 460 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Mac:
-14 933
-"station1_text"
-""
-1 162 400 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-94 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 160 398 314 421
-2 "0s" 0 0 0 0 0 -1 E E E
-14 934
-"ip1_text"
-""
-1 162 430 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-95 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 160 428 314 451
-2 "0s" 0 0 0 0 0 -1 E E E
-14 935
-"mac1_text"
-""
-1 162 460 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-96 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 160 458 314 481
-2 "0s" 0 0 0 0 0 -1 E E E
-2 936
-"PRIMITIVE_TEXT10"
-""
-1 32 430 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-97 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 32 430 42 453
-0 2 2 "0s" 0 0 0 192 0 0 32 430 1
-1
-LANG:1 35 MS Shell Dlg 2,14,-1,5,50,0,0,0,0,0
-0 1
-LANG:1 1 1
-6 937
-"RECTANGLE3"
-""
-1 130 200 E E E 0 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-98 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.9310344827586207 0 0.625 558.9655172413793 185 1 E 130 200 420 360
-2 938
-"PRIMITIVE_TEXT11"
-""
-1 690 350 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-99 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 690 350 708 366
-0 2 2 "0s" 0 0 0 192 0 0 690 350 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 3 Ip:
-2 939
-"PRIMITIVE_TEXT12"
-""
-1 690 320 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-100 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 690 320 742 336
-0 2 2 "0s" 0 0 0 192 0 0 690 320 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 Station:
-2 940
-"PRIMITIVE_TEXT13"
-""
-1 690 380 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-101 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 690 380 721 396
-0 2 2 "0s" 0 0 0 192 0 0 690 380 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Mac:
-14 941
-"station_text"
-""
-1 780 317 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-102 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 778 315 932 338
-2 "0s" 0 0 0 0 0 -1 E E E
-14 942
-"ip_text"
-""
-1 780 347 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-103 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 778 345 932 368
-2 "0s" 0 0 0 0 0 -1 E E E
-14 943
-"mac_text"
-""
-1 780 377 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-104 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 778 375 932 398
-2 "0s" 0 0 0 0 0 -1 E E E
-4 945
-"BGPline0"
-""
-1 350 280 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-106 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 350 280 660 360
-4 948
-"BGPline1"
-""
-1 350.0000000000001 460 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- E E
-109 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 350 460 660 360
-2 950
-"PRIMITIVE_TEXT14"
-""
-1 72 313 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-110 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 313 124 329
-0 2 2 "0s" 0 0 0 192 0 0 72 313 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 Foreign:
-14 951
-"macForeign0_text"
-""
-1 162 310 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-111 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 160 308 314 331
-2 "0s" 0 0 0 0 0 -1 E E E
-2 952
-"PRIMITIVE_TEXT15"
-""
-1 72 493 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-112 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 72 493 124 509
-0 2 2 "0s" 0 0 0 192 0 0 72 493 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 8 Foreign:
-14 953
-"macForeign1_text"
-""
-1 162 490 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-113 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 160 488 314 511
-2 "0s" 0 0 0 0 0 -1 E E E
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 1 "selfState" -1
-"objects\\lofar_self_state.pnl" 7 8 T 79 1 0 1 50 130
-0
-0
diff --git a/MAC/Navigator2/panels/Hardware/CEP_Midplane.pnl b/MAC/Navigator2/panels/Hardware/CEP_Midplane.pnl
deleted file mode 100644
index 5b8e05a953b741fabbbddebb54df82cf7ae99fee..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Hardware/CEP_Midplane.pnl
+++ /dev/null
@@ -1,813 +0,0 @@
-V 11
-1
-LANG:1 7 Station
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
-
- baseDP = g_currentDatapoint;
-
- dyn_string dpAr= strsplit(dpSubStr(g_currentDatapoint,DPSUB_DP),\"_\");
- if (strpos(dpAr[dynlen(dpAr)],\"Midplane\") > -1) {
- mNr = substr(dpAr[dynlen(dpAr)],8,strlen(dpAr[dynlen(dpAr)]));
- } else {
- LOG_ERROR(\"CEP_Midplane.pnl:Initialize|No Midplane found in currentDatapoint.\");
- }
-
- reload();
-}
-
-void prepareHardwareList() {
- // set the hardware selectable items
- dyn_dyn_anytype tab;
- int z;
-
-
- // For this panel CEP should be selectable so we get them for the treelist
- dynAppend(g_stationList,navFunct_bareDBName(sysName));
-
- // For this panel IONodes's should be selectable so we get them for the treelist
- dpQuery(\"SELECT '_original.._value' FROM '\"+baseDP+\"_*.status.state' REMOTE '\"+sysName+\"' WHERE _DPT=\\\"IONode\\\"\", tab);
- LOG_TRACE(\"CEP_Midplane.pnl:prepareHardwareList|tab: \"+tab);
-
-
- dyn_string aDS=navFunct_getDynString(tab, 2,1);
- dynSortAsc(aDS);
- for(z=1;z<=dynlen(aDS);z++){
-
- // strip .status.state from result
- string aS = dpSubStr(aDS[z],DPSUB_SYS_DP);
- //keep Path
- string path=aS;
-
- // strip all b4 and including Midplane out of the string
- strreplace(aS,baseDP+\"_\",\"\");
-
- // Remainder should be IONode? split on _
- dyn_string spl=strsplit(aS,\"_\");
- if (strpos(spl[1],\"IONode\") > -1) { // IONode
- string aS = spl[1];
- strreplace(aS,\"IONode\",\"\");
- int i = aS;
- dynAppend(g_IONodeList,i);
- }
- }
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"CEP_Midplane.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"CEP_Midplane.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- } else if (actionString[1] == \"DistChanged\") {
- // for dist system bound hardware only, if the distsystem went offline we need to replace
- // the screen with a broken connection screen.
- if (!g_initializing) {
-
- // check if this syst is in the connectionlist and down
- int iPos=dynContains(g_connections[\"NAME\"],sysName);
- if (iPos > 0) {
- if (!g_connections[\"UP\"][iPos]) {
- navPanel_setEvent(\"invalid DP\",\"ChangePanel\");
- }
- }
- }
- return;
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- // set the hardware selectable items for this screen
- prepareHardwareList();
-
- // set panel to ready
- g_objectReady=true;
-
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"CEP_Midplane.pnl\",\"Update\");
-
-}
-" 0
- E E E E 1 -1 -1 0 188 128
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-int mNr = -1;" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 658
-"childStateBorder"
-""
-1 500 80 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- E E
-77 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E 1 0 1 150 -10 1 E 117 20 674 722
-1 659 3 "" 1
-0
-1 660 3 "" 0
-0
-1 661 3 "0" 1
-0
-1 662 3 "" 3
-0
-1 663 3 "" 4
-0
-1 664 3 "" 6
-0
-1 665 3 "" 9
-0
-1 666 3 "" 10
-0
-1 667 4 "" 1
-0
-1 668 4 "" 0
-0
-1 669 4 "0" 1
-0
-1 670 4 "" 3
-0
-1 671 4 "" 4
-0
-1 672 4 "" 6
-0
-1 673 4 "" 9
-0
-1 674 4 "" 10
-0
-1 675 5 "" 1
-0
-1 676 5 "" 0
-0
-1 677 5 "0" 1
-0
-1 678 5 "" 3
-0
-1 679 5 "" 4
-0
-1 680 5 "" 6
-0
-1 681 5 "" 9
-0
-1 682 5 "" 10
-0
-1 683 6 "" 1
-0
-1 684 6 "" 0
-0
-1 685 6 "0" 1
-0
-1 686 6 "" 3
-0
-1 687 6 "" 4
-0
-1 688 6 "" 6
-0
-1 689 6 "" 9
-0
-1 690 6 "" 10
-0
-1 691 7 "" 1
-0
-1 692 7 "" 0
-0
-1 693 7 "0" 1
-0
-1 694 7 "" 3
-0
-1 695 7 "" 4
-0
-1 696 7 "" 6
-0
-1 697 7 "" 9
-0
-1 698 7 "" 10
-0
-1 699 8 "" 1
-0
-1 700 8 "" 0
-0
-1 701 8 "0" 1
-0
-1 702 8 "" 3
-0
-1 703 8 "" 4
-0
-1 704 8 "" 6
-0
-1 705 8 "" 9
-0
-1 706 8 "" 10
-0
-1 707 9 "" 1
-0
-1 708 9 "" 0
-0
-1 709 9 "0" 1
-0
-1 710 9 "" 3
-0
-1 711 9 "" 4
-0
-1 712 9 "" 6
-0
-1 713 9 "" 9
-0
-1 714 9 "" 10
-0
-1 715 10 "" 1
-0
-1 716 10 "" 0
-0
-1 717 10 "0" 1
-0
-1 718 10 "" 3
-0
-1 719 10 "" 4
-0
-1 720 10 "" 6
-0
-1 721 10 "" 9
-0
-1 722 10 "" 10
-0
-1 723 11 "" 1
-0
-1 724 11 "" 0
-0
-1 725 11 "0" 1
-0
-1 726 11 "" 3
-0
-1 727 11 "" 4
-0
-1 728 11 "" 6
-0
-1 729 11 "" 9
-0
-1 730 11 "" 10
-0
-1 731 12 "" 1
-0
-1 732 12 "" 0
-0
-1 733 12 "0" 1
-0
-1 734 12 "" 3
-0
-1 735 12 "" 4
-0
-1 736 12 "" 6
-0
-1 737 12 "" 9
-0
-1 738 12 "" 10
-0
-1 739 13 "" 1
-0
-1 740 13 "" 0
-0
-1 741 13 "0" 1
-0
-1 742 13 "" 3
-0
-1 743 13 "" 4
-0
-1 744 13 "" 6
-0
-1 745 13 "" 9
-0
-1 746 13 "" 10
-0
-1 747 14 "" 1
-0
-1 748 14 "" 0
-0
-1 749 14 "0" 1
-0
-1 750 14 "" 3
-0
-1 751 14 "" 4
-0
-1 752 14 "" 6
-0
-1 753 14 "" 9
-0
-1 754 14 "" 10
-0
-1 755 15 "" 1
-0
-1 756 15 "" 0
-0
-1 757 15 "0" 1
-0
-1 758 15 "" 3
-0
-1 759 15 "" 4
-0
-1 760 15 "" 6
-0
-1 761 15 "" 9
-0
-1 762 15 "" 10
-0
-1 763 16 "" 1
-0
-1 764 16 "" 0
-0
-1 765 16 "0" 1
-0
-1 766 16 "" 3
-0
-1 767 16 "" 4
-0
-1 768 16 "" 6
-0
-1 769 16 "" 9
-0
-1 770 16 "" 10
-0
-1 771 17 "" 1
-0
-1 772 17 "" 0
-0
-1 773 17 "0" 1
-0
-1 774 17 "" 3
-0
-1 775 17 "" 4
-0
-1 776 17 "" 6
-0
-1 777 17 "" 9
-0
-1 778 17 "" 10
-0
-1 779 18 "" 1
-0
-1 780 18 "" 0
-0
-1 781 18 "0" 1
-0
-1 782 18 "" 3
-0
-1 783 18 "" 4
-0
-1 784 18 "" 6
-0
-1 785 18 "" 9
-0
-1 786 18 "" 10
-0
-1 787 19 "" 1
-0
-1 788 19 "" 0
-0
-1 789 19 "0" 1
-0
-1 790 19 "" 3
-0
-1 791 19 "" 4
-0
-1 792 19 "" 6
-0
-1 793 19 "" 9
-0
-1 794 19 "" 10
-0
-1 795 20 "" 1
-0
-1 796 20 "" 0
-0
-1 797 20 "0" 1
-0
-1 798 20 "" 3
-0
-1 799 20 "" 4
-0
-1 800 20 "" 6
-0
-1 801 20 "" 9
-0
-1 802 20 "" 10
-0
-1 803 21 "" 1
-0
-1 804 21 "" 0
-0
-1 805 21 "0" 1
-0
-1 806 21 "" 3
-0
-1 807 21 "" 4
-0
-1 808 21 "" 6
-0
-1 809 21 "" 9
-0
-1 810 21 "" 10
-0
-1 811 22 "" 1
-0
-1 812 22 "" 0
-0
-1 813 22 "0" 1
-0
-1 814 22 "" 3
-0
-1 815 22 "" 4
-0
-1 816 22 "" 6
-0
-1 817 22 "" 9
-0
-1 818 22 "" 10
-0
-1 819 23 "" 1
-0
-1 820 23 "" 0
-0
-1 821 23 "0" 1
-0
-1 822 23 "" 3
-0
-1 823 23 "" 4
-0
-1 824 23 "" 6
-0
-1 825 23 "" 9
-0
-1 826 23 "" 10
-0
-1 827 24 "" 1
-0
-1 828 24 "" 0
-0
-1 829 24 "0" 1
-0
-1 830 24 "" 3
-0
-1 831 24 "" 4
-0
-1 832 24 "" 6
-0
-1 833 24 "" 9
-0
-1 834 24 "" 10
-0
-1 835 25 "" 1
-0
-1 836 25 "" 0
-0
-1 837 25 "0" 1
-0
-1 838 25 "" 3
-0
-1 839 25 "" 4
-0
-1 840 25 "" 6
-0
-1 841 25 "" 9
-0
-1 842 25 "" 10
-0
-1 843 26 "" 1
-0
-1 844 26 "" 0
-0
-1 845 26 "0" 1
-0
-1 846 26 "" 3
-0
-1 847 26 "" 4
-0
-1 848 26 "" 6
-0
-1 849 26 "" 9
-0
-1 850 26 "" 10
-0
-1 851 27 "" 1
-0
-1 852 27 "" 0
-0
-1 853 27 "0" 1
-0
-1 854 27 "" 3
-0
-1 855 27 "" 4
-0
-1 856 27 "" 6
-0
-1 857 27 "" 9
-0
-1 858 27 "" 10
-0
-1 859 28 "" 1
-0
-1 860 28 "" 0
-0
-1 861 28 "0" 1
-0
-1 862 28 "" 3
-0
-1 863 28 "" 4
-0
-1 864 28 "" 6
-0
-1 865 28 "" 9
-0
-1 866 28 "" 10
-0
-1 867 29 "" 1
-0
-1 868 29 "" 0
-0
-1 869 29 "0" 1
-0
-1 870 29 "" 3
-0
-1 871 29 "" 4
-0
-1 872 29 "" 6
-0
-1 873 29 "" 9
-0
-1 874 29 "" 10
-0
-1 875 30 "" 1
-0
-1 876 30 "" 0
-0
-1 877 30 "0" 1
-0
-1 878 30 "" 3
-0
-1 879 30 "" 4
-0
-1 880 30 "" 6
-0
-1 881 30 "" 9
-0
-1 882 30 "" 10
-0
-1 883 31 "" 1
-0
-1 884 31 "" 0
-0
-1 885 31 "0" 1
-0
-1 886 31 "" 3
-0
-1 887 31 "" 4
-0
-1 888 31 "" 6
-0
-1 889 31 "" 9
-0
-1 890 31 "" 10
-0
-1 891 32 "" 1
-0
-1 892 32 "" 0
-0
-1 893 32 "0" 1
-0
-1 894 32 "" 3
-0
-1 895 32 "" 4
-0
-1 896 32 "" 6
-0
-1 897 32 "" 9
-0
-1 898 32 "" 10
-0
-1 899 33 "" 1
-0
-1 900 33 "" 0
-0
-1 901 33 "0" 1
-0
-1 902 33 "" 3
-0
-1 903 33 "" 4
-0
-1 904 33 "" 6
-0
-1 905 33 "" 9
-0
-1 906 33 "" 10
-0
-1 907 34 "" 1
-0
-1 908 34 "" 0
-0
-1 909 34 "0" 1
-0
-1 910 34 "" 3
-0
-1 911 34 "" 4
-0
-1 912 34 "" 6
-0
-1 913 34 "" 9
-0
-1 914 34 "" 10
-0
-1 915 69 "0" 1
-0
-1 916 69 "" 1
-0
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 3 "PANEL_REF4" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 30 T 13 1 0 1 61 6.00000000000016
-1
-"$nodeNr""31"
-3 4 "PANEL_REF5" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 50 T 14 1 0 1 61 7.00000000000016
-1
-"$nodeNr""30"
-3 5 "PANEL_REF6" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 70 T 15 1 0 1 61 8.00000000000016
-1
-"$nodeNr""29"
-3 6 "PANEL_REF7" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 90 T 16 1 0 1 61 9.00000000000016
-1
-"$nodeNr""28"
-3 7 "PANEL_REF8" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 110 T 17 1 0 1 61 10.00000000000016
-1
-"$nodeNr""27"
-3 8 "PANEL_REF9" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 140 T 18 1 0 1 61 1.00000000000016
-1
-"$nodeNr""26"
-3 9 "PANEL_REF10" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 160 T 19 1 0 1 61 2.00000000000016
-1
-"$nodeNr""25"
-3 10 "PANEL_REF11" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 180 T 20 1 0 1 61 3.00000000000016
-1
-"$nodeNr""24"
-3 11 "PANEL_REF12" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 200 T 21 1 0 1 61 4.00000000000016
-1
-"$nodeNr""23"
-3 12 "PANEL_REF13" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 22 1 0 1 61 5.00000000000016
-1
-"$nodeNr""22"
-3 13 "PANEL_REF14" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 30 T 23 1 0 1 61 216.0000000000001
-1
-"$nodeNr""21"
-3 14 "PANEL_REF15" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 24 1.003584229390681 0 1 60.67741935483869 47.00000000000016
-1
-"$nodeNr""20"
-3 15 "PANEL_REF16" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 70 T 25 1 0 1 61 218.0000000000001
-1
-"$nodeNr""19"
-3 16 "PANEL_REF17" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 90 T 26 1 0 1 61 219.0000000000001
-1
-"$nodeNr""18"
-3 17 "PANEL_REF18" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 110 T 27 1 0 1 61 220.0000000000001
-1
-"$nodeNr""17"
-3 18 "PANEL_REF19" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 140 T 28 1 0 1 61 211.0000000000001
-1
-"$nodeNr""16"
-3 19 "PANEL_REF20" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 160 T 29 1 0 1 61 212.0000000000001
-1
-"$nodeNr""15"
-3 20 "PANEL_REF21" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 180 T 30 1 0 1 61 213.0000000000001
-1
-"$nodeNr""14"
-3 21 "PANEL_REF22" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 200 T 31 1 0 1 61 214.0000000000001
-1
-"$nodeNr""13"
-3 22 "PANEL_REF23" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 32 1 0 1 61 215.0000000000001
-1
-"$nodeNr""12"
-3 23 "PANEL_REF24" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 33 1 0 1 61 257.0000000000002
-1
-"$nodeNr""10"
-3 24 "PANEL_REF25" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 30 T 34 1 0 1 61 426.0000000000002
-1
-"$nodeNr""11"
-3 25 "PANEL_REF26" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 70 T 35 1 0 1 61 428.0000000000002
-1
-"$nodeNr""9"
-3 26 "PANEL_REF27" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 90 T 36 1 0 1 61 429.0000000000002
-1
-"$nodeNr""8"
-3 27 "PANEL_REF28" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 110 T 37 1 0 1 61 430.0000000000002
-1
-"$nodeNr""7"
-3 28 "PANEL_REF29" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 140 T 38 1 0 1 61 421.0000000000002
-1
-"$nodeNr""6"
-3 29 "PANEL_REF30" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 160 T 39 1 0 1 61 422.0000000000002
-1
-"$nodeNr""5"
-3 30 "PANEL_REF31" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 180 T 40 1 0 1 61 423.0000000000002
-1
-"$nodeNr""4"
-3 31 "PANEL_REF32" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 200 T 41 1 0 1 61 424.0000000000002
-1
-"$nodeNr""3"
-3 32 "PANEL_REF33" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 42 1 0 1 61 425.0000000000002
-1
-"$nodeNr""2"
-3 33 "PANEL_REF34" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 220 T 43 1 0 1 61 467.0000000000002
-1
-"$nodeNr""0"
-3 34 "PANEL_REF35" -1
-"objects\\Hardware\\CEP_IONode_small.pnl" 90 30 T 44 1 0 1 61 636.0000000000001
-1
-"$nodeNr""1"
-3 69 "PANEL_REF70" -1
-"objects\\Hardware\\midplane_small.pnl" 360 20 T 78 1 0 1 -98 -8.000000000000043
-0
-0
diff --git a/MAC/Navigator2/panels/HardwareTemplatePanel.pnl b/MAC/Navigator2/panels/HardwareTemplatePanel.pnl
index 082b9d1f99b6363810b6c1f2fa86b4c22759f33c..f0e216f0592d6f83679e5ba7708680630cf7928b 100644
--- a/MAC/Navigator2/panels/HardwareTemplatePanel.pnl
+++ b/MAC/Navigator2/panels/HardwareTemplatePanel.pnl
@@ -59,9 +59,8 @@ void prepareHardwareList() {
// g_HBAList; // holds valid HBAAntenna's for choices in the viewBox
// g_LBAList; // holds valid LBAAntenna's for choices in the viewBox
// CEP based globals
- // g_BGPRackList; // holds valid bgpracks for choices in viewBox
- // g_BGPMidplaneList; // holds valid bgpmidplanes for choices in viewBox
- // g_IONodeList; // holds valid ionodes for choices in viewBox
+ // g_cobaltRackList // holds valid cobaltRacks for choices in viewBox
+ // g_cobaltNodeList; // holds valid ionodes for choices in viewBox
// g_OSRackList; // holds valid Offline/Storageracks for choices in view
// g_locusNodeList; // holds valid storagenodes for choices in view
diff --git a/MAC/Navigator2/panels/Processes/BGPAppl.pnl b/MAC/Navigator2/panels/Processes/BGPAppl.pnl
deleted file mode 100644
index 58b1fe60ea29a97a693b7adeecd11f4aa778f02d..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/BGPAppl.pnl
+++ /dev/null
@@ -1,335 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
-
- baseDP = g_currentDatapoint;
- database = dpSubStr(baseDP,DPSUB_SYS);
-
-
-
- // determine if we have an observation name in the DP, if so strip it and get the real name to be included in the toplabel
- string bareDP=dpSubStr(baseDP,DPSUB_DP);
-
-
- // The BGPappl belonging by an observation contains :
- // ioNodeList (all IoNodes involved, each ionode is connected to a station, obtainable via ionode#.usedStation)
- // and all of the next lists are contained per ionode in a [,,,] list
- // locusNodeList [x,x,x] list all used locusNodes per ionode
- // adderList [x,x,x] adders per ionode
- // writerList [x,x,x] writers per ionode
- // dataProductList [x,x,x] dataproducts per ionode
- // dataProductTypeList [x,x,x] dataproductTypes per ionode
-
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpExists(baseDP + \".ioNodeList\")) {
- if (dpConnect(\"updateBGPAppl\", baseDP + \".ioNodeList\",
- baseDP + \".adderList\",
- baseDP + \".ioNodeList:_online.._invalid\") == -1) {
- LOG_ERROR(\"BGPAppl.pnl:main|Couldn'tconnect to: \"+baseDP);
- }
- if (!navFunct_dpReachable(baseDP)) {
- updateBGPAppl(\"\",makeDynString(\"\"),\"\",makeDynString(\"\"),true);
- }
- } else {
- LOG_ERROR(\"BGPAppl.pnl:main|Couldn't find DP to connect to: \"+baseDP);
- setValue(\"stationTable\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
-
- reload();
-}
-
-updateBGPAppl(string dp1,dyn_string ioNodeList,
- string dp2,dyn_string adderList,
- string dp3, bool invalid)
-{
- LOG_TRACE(\"BGPAppl.pnl:updateBGPAppl|entered\");
- string SymbolCol=\"_Window\";
- if (invalid) {
- SymbolCol=\"Lofar_invalid\";
- if (dp1 == \"\") {
- SymbolCol=\"Lofar_dpOffline\";
- }
- }
- dyn_string stations;
-
- // clear stationtable
- stationTable.deleteAllLines();
-
- // loop over nr of ionodes to fill table
- for (int i = 1; i <= dynlen(ioNodeList); i++) {
- string station;
-
- dpGet(navFunct_IONode2DPName(ioNodeList[i])+\".usedStation\",station);
- dynAppend(stations,station);
- // update stationTable
- stationTable.appendLine(\"Station\",station,\"IONode\",ioNodeList[i],\"Adders\",adderList[i]);
- }
-
- stationList = stations;
- nodeList = ioNodeList;
- // set the observation selectable items
- prepareProcesses();
-
-}
-
-
-void prepareProcesses() {
- dyn_string result;
-
- // append _BGPAppl
- dynAppend(result,\",BGPAppl,\"+baseDP);
- dynAppend(g_processesList,baseDP);
- // append all involved stations
- for (int i=1; i <= dynlen(stationList); i++) {
- dynAppend(result,baseDP+\",BGLProc->\"+stationList[i]+\",\"+baseDP+\"_BGPProc#\"+nodeList[i]);
- }
- dynAppend(g_processesList,baseDP+\"_BGPProc\");
-
- // write result to the db so various panels can reset themselves
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
-
- LOG_DEBUG(\"BGPAppl.pnl:prepareProcesses|processList found: \"+ result);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"BGPAppl.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"BGPAppl.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
-
- reload();
- } else if (actionString[1] == \"DistChanged\") {
- // for dist system bound hardware only, if the distsystem went offline we need to replace
- // the screen with a broken connection screen.
- if (!g_initializing) {
-
- // check if this syst is in the connectionlist and down
- int iPos=dynContains(g_connections[\"NAME\"],sysName);
- if (iPos > 0) {
- if (!g_connections[\"UP\"][iPos]) {
- navPanel_setEvent(\"invalid DP\",\"ChangePanel\");
- }
- }
- }
- return;
- }
-}
-
-void reload() {
-
- navFunct_clearGlobalLists();
-
- // set panel to ready
- g_objectReady=true;
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"BGPAppl.pnl\",\"Update\");
-}
-" 0
- E E E E 1 -1 -1 0 49 92
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP=\"\";
-string database=\"\";
-string observation=\"\";
-string observationName = \"\";
-dyn_string stationList=\"\";
-dyn_string nodeList=\"\";
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(int row) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- string station = stationTable.cellValueRC(row,\"Station\");
- navPanel_setEvent(station,\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick(int row) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- string IONode = stationTable.cellValueRC(row,\"IONode\");
- if (IONode != \"\") {
- string selection = baseDP+\"_BGPProc#\"+IONode;
- navPanel_setEvent(selection,\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(int row) {
- navPanel_setEvent(\"BGPAppl\",\"EventRightClick\");
-}
-" 0
- 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 43 0 "" 0
-0
-1 44 0 "0" 1
-0
-1 45 0 "" 2
-0
-1 46 0 "" 3
-0
-1 47 0 "" 7
-0
-1 48 0 "" 8
-0
-1 49 0 "" 9
-0
-1 50 0 "" 10
-0
-1 51 0 "" 11
-0
-1 52 0 "" 12
-0
-1 53 0 "" 15
-0
-1 54 0 "" 16
-0
-1 55 0 "" 17
-0
-1 56 0 "" 18
-0
-1 57 0 "" 19
-0
-1 58 0 "" 20
-0
-25 42
-"stationTable"
-""
-1 30 570 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main(int row, string column)
-{
- rClick(row);
-}" 0
- "main(int row, string column)
-{
- dblClick(row);
-}" 0
-
-12 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 28 568 422 732
-"main()
-{
- stationTable.tableMode(TABLE_SELECT_BROWSE);
-
- // connect for highlight mechanism
- dpConnect( \"bgpapplCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void bgpapplCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"Observation_small.pnl:bgpapplCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"Observation_small.pnl:bgpapplCallback|Found highlight : \" + highlight + \" BGPAppl\");
- int lineNr=-1;
- for (int i=0; i< stationTable.lineCount(); i++) {
- stationTable.currentCell(i,0);
- if (dynContains(highlight,stationTable.cellValueRC(i,\"Station\"))) {
- stationTable.cellBackCol(\"Lofar_highLight\");
- lineNr=i;
- } else {
- stationTable.cellBackCol(\"white\");
- }
- }
-}" 0
-"main(int row, string column, string value)
-{
- click(row);
-}" 0
- 1 0 1 3 0 "Station" 10 1 0 "s" 1
-LANG:1 7 Station
-E
-1
-LANG:1 0
-
-100 "IONode" 7 1 0 "[2d,False,False,ALIGNMENT_BEGINNING,False]" 1
-LANG:1 6 IONode
-E
-1
-LANG:1 0
-
-75 "Adders" 21 1 0 "s" 1
-LANG:1 6 Adders
-E
-1
-LANG:1 0
-
-200
-14 14 10 10
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 0 1 0 1 7
-1 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
-3 0 "PANEL_REF1" -1
-"objects\\Processes\\controller_top.pnl" 49 92 T 0 1 0 1 1.4432899320127e-014 -40
-1
-"$ctrlName""BGPAppl"
-0
diff --git a/MAC/Navigator2/panels/Processes/BGPProc.pnl b/MAC/Navigator2/panels/Processes/BGPProc.pnl
deleted file mode 100644
index d518b613e947e4a7746bcc0ede46def5ee8d5181..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/BGPProc.pnl
+++ /dev/null
@@ -1,928 +0,0 @@
-V 11
-1
-LANG:1 7 Station
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- strModuleName = myModuleName();
- baseDP = g_currentDatapoint;
-
- if(dpExists(sysName+\"LOFAR_PIC_BGP.BGPSwitch\")) {
- dpConnect(\"switchBGP\", sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._value\",
- sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._invalid\");
- if (!navFunct_dpReachable(sysName+\"LOFAR_PIC_BGP.BGPSwitch\")) {
- controlBGP(\"\",false,\"\",true);
- }
- }
-}
-
-void switchBGP(string dp1, bool bgpswitch,
- string dp2, bool invalid) {
-
- if (!invalid) {
- reload();
- }
-}
-
-void prepareProcesses() {
- dyn_string result;
- // here we need to add the Inputbuffer, adders and the writers that are part of this screen
- // so we need to determine all the databasePoints for these processes
-
- inputBufferDP = sysName+\"LOFAR_PermSW_PSIONode\"+navFunct_formatInt(ioNode,99)+\"_InputBuffer\";
- adderDP = sysName+\"LOFAR_ObsSW_OSIONode\"+navFunct_formatInt(ioNode,99)+\"_Adder\";
- dynAppend(result,\",InputBuffer,\"+inputBufferDP);
- dynAppend(g_processesList,inputBufferDP);
- dynClear(writers);
- dynClear(locusNodes);
- for (int i = 1; i <= dynlen(adders); i++ ) {
- dynAppend(result,\",Adder\"+adders[i]+\",\"+adderDP+adders[i]);
- dynAppend(g_processesList,adderDP+adders[i]);
- int l;
- int w;
- bool invalid=true;
- if (dpGet(adderDP+adders[i]+\".locusNode\",l,adderDP+adders[i]+\".locusNode:_online.._invalid\",invalid) >= 0) {
- if (!invalid) dynAppend(locusNodes,l);
- }
- if (dpGet(adderDP+adders[i]+\".writer\",w,adderDP+adders[i]+\".writer:_online.._invalid\",invalid) >= 0) {
- if (!invalid) dynAppend(writers,w);
- }
- }
- for (int i = 1; i <= dynlen(writers); i++ ) {
- string writerDP=sysName+\"LOFAR_ObsSW_OSLocusNode\"+navFunct_formatInt(locusNodes[i],999)+\"_Writer\"+navFunct_formatInt(writers[i],99);
- dynAppend(result,\",Writer\"+navFunct_formatInt(writers[i],99)+\",\"+writerDP);
- dynAppend(g_processesList,writerDP);
- }
-
-
- // write result to the db so various panels can reset themselves
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
-
- LOG_DEBUG(\"BGPProc.pnl:prepareProcesses|processList found: \"+ result);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"BGPProcr.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"BGPProc.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- string var = \"\";
- // get the saved panelparams for this panel
- if (dpExists(DPNAME_NAVIGATOR + g_navigatorID + \".panelParamList\")) {
- dpGet(DPNAME_NAVIGATOR + g_navigatorID + \".panelParamList\",var);
- // empty the paramList
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".panelParamList\",\"\");
- } else {
- LOG_WARN(\"BGPProc.pnl:main| Error: no dp \" + DPNAME_NAVIGATOR + g_navigatorID+\".panelParamList\");
- }
-
- // get BGLAppl path to obtain the lists
- BGLApplDP = navFunct_getPathLessOne(baseDP);
-
- // if var is empty something went wrong (maybe back and fort between other panel, so the panelParamlist was emptied)
- // in that case we jump back to the prior screen
-
- if (var == \"\" && ioNode == -1) {
- g_currentDatapoint = BGLApplDP;
- navPanel_setEvent(\"BGPProc\",\"ChangePanel\");
- }
-
- if (ioNode == -1) {
- ioNode = (int)var;
- }
-
-
-
-
- if ( dpExists(BGLApplDP+\".ioNodeList\") ) {
- dpGet(BGLApplDP+\".ioNodeList\",ioNodeList);
- } else {
- LOG_ERROR(\"BGPProc.pnl:main|Error getting ioNodeList value\");
- }
-
- if ( dpExists(BGLApplDP+\".adderList\") ) {
- dpGet(BGLApplDP+\".adderList\",adderList);
- } else {
- LOG_ERROR(\"BGPProc.pnl:main|Error getting adderList value\");
- }
- LOG_DEBUG(\"BGPProc.pnl:main|selected ioNode: \"+ioNode);
- LOG_DEBUG(\"BGPProc.pnl:main|ioNodeList: \"+ioNodeList);
- LOG_DEBUG(\"BGPProc.pnl:main|adderList: \"+adderList);
-
-
- // get position of ioNode in dynArray to see what writers and adders belong to this screen
- int idx = dynContains(ioNodeList,ioNode);
- if (idx > 0) {
- adders=navFunct_listToDynString(adderList[idx]);
- } else {
- LOG_ERROR(\"BGPProc.pnl:main|ERROR: ionode not in ioNodeList !!!\");
- }
- LOG_DEBUG(\"BGPProc.pnl:main|adders: \"+adders);
-
- // In the database we can find the IONode involved
- nodeDP = navFunct_IONode2DPName(ioNode);
- string nodeName = navFunct_DPName2CEPName(nodeDP);
-
- LOG_DEBUG(\"BGPProc.pnl:main|nodeName working: \"+nodeName);
-
- redraw();
-
- // if no match found we have an error
- if (nodeName == \"\" ) {
- LOG_ERROR(\"BGPProc.pnl:main| ERROR no IONode-name found, can't view running processes\");
- } else {
-
- // we have to set the stripped inputBuffer List and Adder List here.
- // Since this is the Survey mode we only need one InputBuffer and one Adder
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName\",\"CircularBuffer\",
- DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.paramList\",makeDynString(ioNode));
-
-
-
- setValue(\"ionodeLabel\",\"text\",\"IONode: \"+nodeName);
- setValue(\"ionodeLabel\",\"toolTipText\",nodeDP);
-
- }
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- // connect for selfUpdates
- showSelfState(baseDP);
-
-
- navFunct_clearGlobalLists();
-
- // set the hardware selectable items for this screen
- prepareProcesses();
-
- // set panel to ready
- g_objectReady=true;
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"BGPProc.pnl\",\"Update\");
-
-}
-
- " 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-string BGLApplDP = \"\";
-
-int ioNode = -1;
-string nodeDP=\"\";
-string inputBufferDP=\"\";
-string adderDP=\"\";
-
-dyn_string ioNodeList;
-dyn_string adderList;
-
-dyn_string adders=\"\";
-dyn_string writers=\"\";
-dyn_string locusNodes=\"\";
-
-dyn_string refNames;
-string strModuleName;
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- navPanel_setEvent(\"BGPProc.pnl\",\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"BGPProc.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"BGPProc.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"BGPProc.pnl\",\"EventRightClick\");
-}
-void clearRefNames() {
- // remove all symbols because new ones will be added
- for (int i=1; i <= dynlen(refNames); i++) {
- removeSymbol(strModuleName,\"\",refNames[i]);
- }
- dynClear(refNames);
-}
-
-
-void redraw() {
- LOG_TRACE(\"BGPProc.pnl:redraw\");
- string addPanelName = \"objects/Processes/adder.pnl\";
-
- // clear old refNames if available
- if (dynlen(refNames) > 0) {
- clearRefNames();
- }
-
- // now start adding adders to panel
- int ref = 1;
- for (int i = 1; i <= dynlen(adders); i++ ) {
- LOG_TRACE(\"BGPProc.pnl:redraw|Adding adder: \" + adders[i]);
- refNames[ref]=\"adder\"+(ref);
-
- if ( addSymbol( strModuleName, // Stay in this modul
- \"\", // Name of this panel
- addPanelName, // Panel to add
- refNames[ref], // Ref of the addedPanel
- makeDynString( \"$adderNumber:\" + adders[i] , // Define all $values
- \"$nodeDP:\" + nodeDP), //
- -17, // Xpos of the AddedSymbol
- 350+((i-1)*30), // Ypos of the AddedSymbol
- 0, // angle
- 1 ,1 // zoomX , zoomY
- ) < 0 ) {
- LOG_ERROR(\"BGPProc.pnl:redraw|Error Appending adder : \" + i + \" in this panel.\");
- }
- ref++;
- }
-}
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 273
-"ionode_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick(nodeDP);
-}" 0
- "main()
-{
- dblClick(nodeDP);
-}" 0
-
-48 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"ionodeCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void ionodeCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"BGPProc.pnl:ionodeCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"BGPProc.pnl:ionodeCallback|Found highlight : \" + highlight + \" Looking for ionode: \"+nodeDP);
- bool bHighlight=false;
- if (dynContains(highlight,nodeDP)) {
- bHighlight=true;
- }
- LOG_DEBUG(\"BGPProc.pnl:ionodeCallback|Highlight request: \"+bHighlight);
- ionode_highLight.visible = bHighlight;
-
-}
-
-" 0
- "main()
-{
- click(nodeDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 144 -228 1 E 30 230 251 264
-6 0
-"RECTANGLE1"
-""
-1 40 110 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-3 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1.048387096774194 0 0.5609756097560976 68.06451612903223 -21.70731707317073 1 E 40 110 660 520
-6 1
-"RECTANGLE2"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-4 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 50 -208 1 E 740 230 789 279
-2 2
-"PRIMITIVE_TEXT1"
-""
-1 864 2 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
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 864 2 949 15
-0 2 2 "0s" 0 0 0 192 0 0 864 2 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 12 ComputeNodes
-2 3
-"ionodeLabel"
-""
-1 180 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(nodeDP);
-}" 0
- "main()
-{
- dblClick(nodeDP);
-}" 0
-
-6 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(nodeDP);
-}" 0
- 0 1 1 2 1 E U 1 E 180 10 387 30
-0 2 2 "0s" 0 0 0 192 0 0 180 10 1
-1
-LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
-0 1
-LANG:1 22 IONode: R00-M0-N00-J00
-6 5
-"RECTANGLE19"
-""
-1 150 40 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- E E
-8 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 180 90 2 1 0 "pictures/arrowRight.gif" 4294967295 E 570 30 619 79
-6 6
-"RECTANGLE20"
-""
-1 150 40 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- E E
-9 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-2
-"dashclr"N "_Transparent"
-"rotatefill" "r"
-E E 0 1 1 2 1 E -0.01886456694761347 -0.9998220482235222 0.9998220482235222 -0.01886456694761347 770.758141713434 840.464504495836 2 1 0 "pictures/arrowLeft.gif" 4294967295 E 570 30 619 79
-1 274 0 "" 1
-0
-6 9
-"RECTANGLE23"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-11 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 100 -208 1 E 740 230 789 279
-6 10
-"RECTANGLE24"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-12 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 150 -208 1 E 740 230 789 279
-6 11
-"RECTANGLE25"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-13 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 200 -208 1 E 740 230 789 279
-6 12
-"RECTANGLE26"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-14 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 50 -158 1 E 740 230 789 279
-6 13
-"RECTANGLE27"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-15 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 100 -158 1 E 740 230 789 279
-6 14
-"RECTANGLE28"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-16 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 150 -158 1 E 740 230 789 279
-6 15
-"RECTANGLE29"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-17 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 200 -158 1 E 740 230 789 279
-6 16
-"RECTANGLE30"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-18 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 50 -108 1 E 740 230 789 279
-6 17
-"RECTANGLE31"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-19 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 100 -108 1 E 740 230 789 279
-6 18
-"RECTANGLE32"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-20 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 150 -108 1 E 740 230 789 279
-6 19
-"RECTANGLE33"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-21 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 200 -108 1 E 740 230 789 279
-6 20
-"RECTANGLE34"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-22 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 50 -58 1 E 740 230 789 279
-6 21
-"RECTANGLE35"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-23 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 100 -58 1 E 740 230 789 279
-6 22
-"RECTANGLE36"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-24 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 150 -58 1 E 740 230 789 279
-6 23
-"RECTANGLE37"
-""
-1 760 220 E E E 1 E 1 E N {0,0,0} E N "STD_object_background" E E
- E E
-25 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 200 -58 1 E 740 230 789 279
-1 275 1 "" 285
-0
-1 276 1 "" 226
-0
-1 277 1 "" 229
-0
-1 278 1 "" 234
-0
-1 279 1 "" 235
-0
-1 280 1 "" 236
-0
-1 281 1 "" 237
-0
-1 282 1 "" 238
-0
-1 283 1 "" 239
-0
-1 284 1 "" 240
-0
-1 285 1 "" 241
-0
-1 286 1 "" 242
-0
-1 287 1 "" 243
-0
-1 288 1 "" 244
-0
-1 289 1 "" 245
-0
-1 290 1 "" 246
-0
-1 291 1 "" 247
-0
-1 292 1 "51" 1
-0
-1 293 1 "" 249
-0
-1 294 1 "" 250
-0
-1 295 1 "" 251
-0
-1 296 1 "" 252
-0
-1 297 1 "" 253
-0
-1 298 1 "" 254
-0
-1 299 1 "" 255
-0
-1 300 1 "" 261
-0
-1 301 1 "" 262
-0
-1 302 1 "" 263
-0
-1 303 1 "" 264
-0
-1 304 1 "" 265
-0
-1 305 1 "" 279
-0
-1 306 1 "" 280
-0
-1 307 1 "" 281
-0
-1 308 1 "" 282
-0
-1 309 1 "" 283
-0
-1 310 1 "" 290
-0
-1 311 1 "" 291
-0
-1 312 1 "" 292
-0
-6 112
-"RECTANGLE38"
-""
-1 40 110 E E E 1 E 1 E N {0,0,0} E N "_Transparent" E E
- E E
-29 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1.451612903225807 0 1 41.93548387096772 160 1 E 40 110 660 520
-2 156
-"PRIMITIVE_TEXT19"
-""
-1 105 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-30 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 105 350.0000000000001 117 363
-0 2 2 "0s" 0 0 0 192 0 0 105 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 2 Nr
-2 157
-"PRIMITIVE_TEXT20"
-""
-1 120 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-31 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 120 350.0000000000001 144 363
-0 2 2 "0s" 0 0 0 192 0 0 120 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Stat
-2 158
-"PRIMITIVE_TEXT21"
-""
-1 150 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-32 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 150 350.0000000000001 177 363
-0 2 2 "0s" 0 0 0 192 0 0 150 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Drop
-2 159
-"PRIMITIVE_TEXT22"
-""
-1 200 350.0000000000001 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
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 200 350.0000000000001 248 363
-0 2 2 "0s" 0 0 0 192 0 0 200 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 7 Dropped
-2 160
-"PRIMITIVE_TEXT23"
-""
-1 308 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-34 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 308 350.0000000000001 336 363
-0 2 2 "0s" 0 0 0 192 0 0 308 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 5 Error
-2 161
-"PRIMITIVE_TEXT24"
-""
-1 430 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-35 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 430 350.0000000000001 509 363
-0 2 2 "0s" 0 0 0 192 0 0 430 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 13 CurrentAction
-2 162
-"PRIMITIVE_TEXT25"
-""
-1 560 350.0000000000001 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-36 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 560 350.0000000000001 627 363
-0 2 2 "0s" 0 0 0 192 0 0 560 350.0000000000001 1
-1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 10 logMessage
-2 235
-"PRIMITIVE_TEXT26"
-""
-1 110 310 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-46 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 110 310 162 326
-0 2 2 "0s" 0 0 0 192 0 0 110 310 1
-1
-LANG:1 35 MS Shell Dlg 2,10,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 7 Adders:
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 0 "selfState" -1
-"objects\\lofar_self_state.pnl" 678 158 T 0 1 0 1 -540 -150
-0
-3 1 "PANEL_REF53" -1
-"objects\\Processes\\circularBuffer.pnl" 90 160 T 1 1 0 1 -100 -110
-0
-0
diff --git a/MAC/Navigator2/panels/Processes/CEP_IONodeProcesses.pnl b/MAC/Navigator2/panels/Processes/CEP_IONodeProcesses.pnl
deleted file mode 100644
index cdbbcf968fb2a0b1402eabfc78db39bf9f90f9ab..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/Processes/CEP_IONodeProcesses.pnl
+++ /dev/null
@@ -1,408 +0,0 @@
-V 11
-1
-LANG:1 10 CEP_IONode
-PANEL,-1 -1 1200 823 N "_3DFace" 0
-"main()
-{
- // Initialise the Panel
- navPanel_initPanel(\"fw_viewBox\");
- strModuleName = myModuleName();
- baseDP = g_currentDatapoint;
- nodeDP = baseDP;
-
- dyn_string dpAr= strsplit(dpSubStr(g_currentDatapoint,DPSUB_DP),\"_\");
- if (strpos(dpAr[dynlen(dpAr)],\"IONode\") > -1) {
- ioNode = substr(dpAr[dynlen(dpAr)],6,strlen(dpAr[dynlen(dpAr)]));
- } else {
- LOG_ERROR(\"CEP_IONodeProcesses.pnl:Initialize|No IONode found in currentDatapoint.\");
- }
-
- inputBufferDP = sysName+\"LOFAR_PermSW_PSIONode\"+navFunct_formatInt(ioNode,99)+\"_InputBuffer\";
- adderDP = sysName+\"LOFAR_ObsSW_OSIONode\"+navFunct_formatInt(ioNode,99)+\"_Adder\";
-
- reload();
-
-
-}
-
-void prepareProcesses() {
- dyn_string result;
- // here we need to add the Inputbuffer, adders and the locusnodes that are part of this screen
- // so we need to determine all the databasePoints for these processes
-
- dynAppend(result,\",InputBuffer,\"+inputBufferDP);
- dynAppend(g_processesList,inputBufferDP);
-
- dynClear(writers);
- dynClear(locusNodes);
- for (int i = 0; i < 10; i++ ) {
- dynAppend(result,\",Adder\"+i+\",\"+adderDP+i);
- dynAppend(g_processesList,adderDP+i);
- int l;
- int w;
- bool invalid=true;
- if (dpGet(adderDP+i+\".locusNode\",l,adderDP+i+\".locusNode:_online.._invalid\",invalid) >= 0) {
- if (!invalid) dynAppend(locusNodes,l);
- }
- if (dpGet(adderDP+i+\".writer\",w,adderDP+i+\".writer:_online.._invalid\",invalid) >= 0) {
- if (!invalid) dynAppend(writers,w);
- }
- }
- for (int i = 1; i <= dynlen(writers); i++ ) {
- string writerDP=sysName+\"LOFAR_ObsSW_OSLocusNode\"+navFunct_formatInt(locusNodes[i],999)+\"_Writer\"+navFunct_formatInt(writers[i],99);
- dynAppend(result,\",Writer\"+navFunct_formatInt(writers[i],99)+\",\"+writerDP);
- dynAppend(g_processesList,writerDP);
- }
-
- // write result to the db so various panels can reset themselves
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
-
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:prepareProcesses|processList found: \"+ result);
-
-}
-
-//
-// Callback for dpConnect to action point.
-// If there is an action required this point will tell so
-//
-void doAction(string aDP, string anAction) {
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:doAction| Action required. found: \" + anAction);
- // split action into essentials
- dyn_string actionString;
- if (!navFunct_splitAction(anAction,actionString)) {
- return;
- }
-
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:doAction|found actionString: \" + actionString);
-
- // Reload
- if (actionString[1] == \"Reload\") {
- reload();
- }
-}
-
-void reload() {
-
- // get the name of the selected station
- string dp = nodeDP+\".usedStation\";
- if (dpExists(dp) ){
- dpGet(dp,station);
- } else {
- LOG_ERROR(\"CEP_IONodeProcesses.pnl:main|ERROR DP does not exist: \"+dp);
- return;
- }
-
- stationDP=station+\":\";
-
- // In the database we can find the IONode involved
- string nodeName = navFunct_DPName2CEPName(nodeDP);
-
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:main|nodeName working: \"+nodeName);
-
- redraw();
-
- // if no match found we have an error
- if (nodeName == \"\" ) {
- LOG_ERROR(\"CEP_IONodeProcesses.pnl:main| ERROR no IONode-name found, can't view running processes\");
- } else {
-
- // we have to set the stripped inputBuffer List and Adder List here.
- // Since this is the Survey mode we only need one InputBuffer and one Adder
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName\",\"CircularBuffer\",
- DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.paramList\",makeDynString(ioNode));
-
-
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:main|Station: \"+station);
-
- setValue(\"ionodeLabel\",\"text\",\"IONode: \"+nodeName);
- setValue(\"stationLabel\",\"text\",station);
- setValue(\"ionodeLabel\",\"toolTipText\",nodeDP);
- setValue(\"stationLabel\",\"toolTipText\",stationDP);
-
- }
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
-
- // start the logging process
- // navPanel_showLogging(baseDP);
-
- // connect for selfUpdates
- showSelfState(baseDP);
-
-
-
-
-
- navFunct_clearGlobalLists();
-
- // set the hardware selectable items for this screen
- prepareProcesses();
-
- // set panel to ready
- g_objectReady=true;
-
- // trigger that the panel values are calculated and ready
- navPanel_setEvent(\"CEP_IONodeProcesses.pnl\",\"Update\");
-
-}
-
- " 0
- E E E E 1 -1 -1 0 188 128
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-
-string station;
-int ioNode;
-string nodeDP=\"\";
-string inputBufferDP=\"\";
-string adderDP=\"\";
-string stationDP=\"\";
-
-string locusNode;
-
-
-dyn_string refNames;
-dyn_string writers;
-dyn_string locusNodes;
-
-string strModuleName;
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- navPanel_setEvent(\"CEP_IONodeProcesses.pnl\",\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"CEP_IONodeProcesses.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"CEP_IONodeProcesses.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"CEP_IONodeProcesses.pnl\",\"EventRightClick\");
-}
-void clearRefNames() {
- // remove all symbols because new ones will be added
- for (int i=1; i <= dynlen(refNames); i++) {
- removeSymbol(strModuleName,\"\",refNames[i]);
- }
- dynClear(refNames);
-}
-
-
-void redraw() {
- LOG_TRACE(\"CEP_IONodeProcesses.pnl:redraw\");
- string addPanelName = \"objects/Processes/adder.pnl\";
-
- // clear old refNames if available
- if (dynlen(refNames) > 0) {
- clearRefNames();
- }
-
- // now start adding adders to panel
-
- for (int i = 0; i < 10; i++ ) {
- LOG_TRACE(\"CEP_IONodeProcesses.pnl:redraw|Adding adder: \" + i);
- refNames[i+1]=\"singleadder\"+(i);
-
- if ( addSymbol( strModuleName, // Stay in this modul
- \"\", // Name of this panel
- addPanelName, // Panel to add
- refNames[i+1], // Ref of the addedPanel
- makeDynString( \"$adderNumber:\" + i , // Define all $values
- \"$nodeDP:\" + nodeDP), //
- 0, // Xpos of the AddedSymbol
- 245+((i-1)*30), // Ypos of the AddedSymbol
- 0, // angle
- 1 ,1 // zoomX , zoomY
- ) < 0 ) {
- LOG_ERROR(\"CEP_IONodeProcesses.pnl:redraw|Error Appending adder : \" + i + \" in this panel.\");
- }
- }
-}
-" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 658
-"childStateBorder"
-""
-1 500 80 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
- E E
-77 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 3 1 2 1 E U 1 E 0 0 1199 822
-2 917
-"ionodeLabel"
-""
-1 340 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-78 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 340 10 557 34
-0 2 2 "0s" 0 0 0 192 0 0 340 10 1
-1
-LANG:1 33 MS Shell Dlg,14,-1,5,75,0,0,0,0,0
-0 1
-LANG:1 20 Node: R00-M0-N00-J00
-1 918 1 "" 1
-0
-1 919 2 "" 285
-0
-1 920 2 "" 226
-0
-1 921 2 "" 229
-0
-1 922 2 "" 234
-0
-1 923 2 "" 235
-0
-1 924 2 "" 236
-0
-1 925 2 "" 237
-0
-1 926 2 "" 238
-0
-1 927 2 "" 239
-0
-1 928 2 "" 240
-0
-1 929 2 "" 241
-0
-1 930 2 "" 242
-0
-1 931 2 "" 243
-0
-1 932 2 "" 244
-0
-1 933 2 "" 245
-0
-1 934 2 "" 246
-0
-1 935 2 "" 247
-0
-1 936 2 "51" 1
-0
-1 937 2 "" 249
-0
-1 938 2 "" 250
-0
-1 939 2 "" 251
-0
-1 940 2 "" 252
-0
-1 941 2 "" 253
-0
-1 942 2 "" 254
-0
-1 943 2 "" 255
-0
-1 944 2 "" 261
-0
-1 945 2 "" 262
-0
-1 946 2 "" 263
-0
-1 947 2 "" 264
-0
-1 948 2 "" 265
-0
-1 949 2 "" 279
-0
-1 950 2 "" 280
-0
-1 951 2 "" 281
-0
-1 952 2 "" 282
-0
-1 953 2 "" 283
-0
-1 954 2 "" 290
-0
-1 955 2 "" 291
-0
-1 956 2 "" 292
-0
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 1 "selfState" -1
-"objects\\lofar_self_state.pnl" 7 8 T 79 1 0 1 300 4
-0
-3 2 "PANEL_REF2" -1
-"objects\\Processes\\circularBuffer.pnl" 35 32 T 80 1 0 0.9949748743718592 190 14.16080402010051
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Hardware/CEP_BGPRack.pnl b/MAC/Navigator2/panels/objects/Hardware/CEP_BGPRack.pnl
deleted file mode 100644
index 78648fd56baeb464597e12fb7d0b1d47e9e928c7..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Hardware/CEP_BGPRack.pnl
+++ /dev/null
@@ -1,217 +0,0 @@
-V 11
-1
-LANG:1 7 BGPRack
-PANEL,-1 -1 669 432 N "_3DFace" 0
-"main()
-{
-
- baseDP= g_currentDatapoint+\"_BGP\";
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- // connect for childUpdates
- showChildState(baseDP);
- // connect for selfUpdates
- showSelfState(baseDP);
-
- if(dpExists(baseDP + \".BGPSwitch\")) {
- dpConnect(\"controlBGP\", baseDP + \".BGPSwitch:_online.._value\",
- baseDP + \".BGPSwitch:_online.._invalid\");
- if (!navFunct_dpReachable(baseDP)) {
- controlBGP(\"\",false,\"\",true);
- }
- }
-
-}
-
-void controlBGP(string dp1, bool bgpswitch,
- string dp2, bool invalid) {
-
- if (!invalid) {
- string aS=navFunct_DPName2CEPName(baseDP);
- setValue(\"BGPRack\", \"text\", aS);
- }
-}" 0
- E "main(int x, int y)
-{
- click();
-}" 0
- "main()
-{
- rClick();
-}" 0
- "main(int x, int y)
-{
- dblClick();
-}" 0
- 1 -1 -1 0 188 128
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click() {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- navPanel_setEvent(\"BGP\",\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick() {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(baseDP) ) {
- LOG_DEBUG(\"CEP_BGPRack.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
- g_currentDatapoint=baseDP;
- navPanel_setEvent(\"BGP\",\"ChangePanel\");
- }
-
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick() {
- navPanel_setEvent(\"BGP\",\"EventRightClick\");
-}" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 2190
-"bgprack_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-856 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"BGPRackCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void BGPRackCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"CEP_BGPRack.pnl:BGPRackCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"CEP_BGPRack.pnl:BGPRackCallback|Found highlight : \" + highlight + \" Looking for BGP\");
- bool bHighlight=false;
- if (dynContains(highlight,\"BGP\")) {
- bHighlight=true;
- }
- LOG_DEBUG(\"CEP_BGPRack.pnl:BGPRackCallback|Highlight request: \"+bHighlight);
- bgprack_highLight.visible = bHighlight;
-
-}
-
-" 0
- "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 10 10 157 415
-6 2188
-"childStateBorder"
-""
-1 14 418 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-855 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 2 1 0 1 E U 1 E 15 15 152 410
-1 2191 86 "" 1
-0
-2 2187
-"BGPRack"
-""
-1 47.5 16 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-854 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 49.5 18 89 34
-0 2 0 "0s" 0 0 0 192 0 0 49.5 18 1
-1
-LANG:1 26 Arial,-1,13,5,69,0,0,0,0,0
-0 1
-LANG:1 5 aRack
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 86 "selfState" -1
-"objects\\lofar_self_state.pnl" 284 264 T 851 1.13333333333333 0 1 -302.866666666667 -245
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Hardware/CEP_IONode_small.pnl b/MAC/Navigator2/panels/objects/Hardware/CEP_IONode_small.pnl
deleted file mode 100644
index 31f7437df86eace1dd8527a5c01aee027b6033a7..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Hardware/CEP_IONode_small.pnl
+++ /dev/null
@@ -1,352 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 823 158 N "_3DFace" 1
-"$nodeNr"
-"main()
-{
- baseDP = g_currentDatapoint;
-
- string database=dpSubStr(baseDP,DPSUB_SYS);
-
- dyn_string dpAr= strsplit(dpSubStr(baseDP,DPSUB_DP),\"_\");
-
- for (int i = 1; i <= dynlen(dpAr);i++ ) {
- if (strpos(dpAr[i],\"Midplane\") > -1) {
- midplaneNr = substr(dpAr[i],8,strlen(dpAr[i]));
- }
- }
-
-
-
- nodeNr = $nodeNr;
-
- IONodeNr=nodeNr+(32*midplaneNr); // Midplaneindex + (32* nodeNr);
- baseDP+=\"_IONode\"+navFunct_formatInt(IONodeNr,99);
- string nodeName = navFunct_DPName2CEPName(baseDP);
- setValue(\"nodeName\",\"text\",\"Node: \"+nodeName);
-
- if(dpExists(baseDP + \".usedStation\")) {
- dpConnect(\"controlIOnodeSmall\", baseDP + \".usedStation:_online.._value\",
- baseDP + \".usedIP:_online.._value\",
- baseDP + \".usedMAC:_online.._value\",
- baseDP + \".usedStation:_online.._invalid\");
- if (!navFunct_dpReachable(baseDP)) {
- controlIOnode(\"\",\"\",\"\",\"\",\"\",\"\",true);
- }
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- // connect for selfUpdates
- showSelfState(baseDP);
-}
-
-
-void controlIOnodeSmall(string dp1, string station,
- string dp2, string ipAddress,
- string dp3, string macAddress,
- string dp4, bool invalid) {
-
- if (!invalid) {
- setValue(\"ipAddress\",\"text\",\"IP: \"+ipAddress);
- setValue(\"macAddress\",\"text\",\"MAC: \"+macAddress);
- setValue(\"station\",\"text\",station);
- } else {
- setValue(\"ipAddress\",\"text\",\"IP: ???????\");
- setValue(\"macAddress\",\"text\",\"MAC: ???????\");
- setValue(\"station\",\"text\",\"?????\");
- }
-
-}
-
-" 0
- E "main()
-{
- click();
-}" 0
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
- 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP;
-int IONodeNr = -1;
-int midplaneNr = -1;
-int nodeNr = -1;
-bool bDoubleClicked = false;
-
-
-// routine for single mouse click
-void click() {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- navPanel_setEvent(\"IONode\"+IONodeNr,\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick() {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(baseDP) ) {
- LOG_DEBUG(\"CEP_IONode_small.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
- g_currentDatapoint=baseDP;
- navPanel_setEvent(\"IONode\"+IONodeNr,\"ChangePanel\");
- }
-
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick() {
- navPanel_setEvent(\"IONode\"+IONodeNr,\"EventRightClick\");
-}" 0
- 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
-6 1
-"ionodeHighlight"
-""
-1 30 120 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-2 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"IONodeCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void IONodeCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"CEP_IONode_small.pnl:IONodeCallback| ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"CEP_IONode_small.pnl:IONodeCallback|Found highlight : \" + highlight + \" Looking for: IONode\" + IONodeNr);
- bool bHighlight=false;
- if (dynContains(highlight,\"IONode\"+IONodeNr)) {
- bHighlight=true;
- }
- LOG_DEBUG(\"CEP_IONode_small.pnl:IONodeCallback|Highlight request: \"+bHighlight);
- ionodeHighlight.visible = bHighlight;
-}" 0
- "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E 24.95985904813425 -3.356361617823352e-020 -2.16492267239353e-017 0.07739242972851142 -254.3978857220141 -0.3869621486425571 1 E 15 5 37 287
-6 0
-"ionode"
-""
-1 10 -10 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-1 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 0 1 E U 1 E 122 2 665 18
-1 11 0 "" 1
-0
-6 3
-"RECTANGLE1"
-""
-1 340 80 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- E E
-3 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 0.75 0 1.5 -165 -124 2 1 0 "pictures/arrowRight.gif" 4294967295 E 340 80 380 100
-2 4
-"station"
-""
-1 41 5 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-4 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 41 5 81 18
-0 2 2 "0s" 0 0 0 192 0 0 41 5 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 5 CSXXX
-2 6
-"nodeName"
-""
-1 151 4 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-5 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 151 4 284 17
-0 2 2 "0s" 0 0 0 192 0 0 151 4 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 20 Node: R00-M0-N00-J00
-2 9
-"ipAddress"
-""
-1 327 4 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-8 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 327 4 443 17
-0 2 2 "0s" 0 0 0 192 0 0 327 4 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 19 IP: 999.999.999.999
-2 10
-"macAddress"
-""
-1 499 4 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-10 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 499 4 637 17
-0 2 2 "0s" 0 0 0 192 0 0 499 4 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 22 MAC: 00:00:00:00:00:00
-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
-3 0 "selfState" -1
-"objects\\lofar_self_state.pnl" 7 8 T 3 1 0 1 113 -8
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Hardware/CEP_Midplane_small.pnl b/MAC/Navigator2/panels/objects/Hardware/CEP_Midplane_small.pnl
deleted file mode 100644
index 8c2dfc13a6ff38b0562b4c3ab55672ea36eb645c..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Hardware/CEP_Midplane_small.pnl
+++ /dev/null
@@ -1,281 +0,0 @@
-V 11
-1
-LANG:1 8 (NoName)
-PANEL,-1 -1 453 525 N "_3DFace" 1
-"$BGPMidplaneNr"
-"main()
-{
- baseDP = g_currentDatapoint;
-
- if (!isRack()) {
- mNr = $BGPMidplaneNr;
- }
-
- if (strpos(g_currentDatapoint,\"_BGP\") > -1){
- baseDP += \"_Midplane\" + mNr;
- } else {
- baseDP += \"_BGP_Midplane\" + mNr;
- }
-
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
-
- if(dpExists(sysName+\"LOFAR_PIC_BGP.BGPSwitch\")) {
- dpConnect(\"controlMidplane\", sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._value\",
- sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._invalid\");
- if (!navFunct_dpReachable(\"LOFAR_PIC_BGP.BGPSwitch\")) {
- controlMidplane(\"\",false,\"\",true);
- }
- }
-
- // connect for childUpdates
- showChildState(baseDP);
- // connect for selfUpdates
- showSelfState(baseDP);
-
-}
-
-void controlMidplane(string dp1, bool bgpswitch,
- string dp2, bool invalid) {
-
- if (!invalid) {
- string aS = navFunct_DPName2CEPName(baseDP);
- setValue(\"Midplane_Txt\",\"text\",aS);
- }
-}
-" 0
- E "main()
-{
- click();
-}" 0
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
- 1 0 0 0 17 191
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string baseDP = \"\";
-int rNr = -1;
-int mNr = -1;
-bool bDoubleClicked = false;
-
-bool isRack() {
- dyn_string dpAr= strsplit(dpSubStr(baseDP,DPSUB_DP),\"_\");
- for (int i = 1; i <= dynlen(dpAr);i++ ) {
- if (strpos(dpAr[i],\"BGP\") > -1) {
- rNr=0;
- if (navFunct_isBGPSwitch()) rNr=1;
- mNr = $BGPMidplaneNr;
- return true;
- }
- }
- return false;
-}
-
-// routine for single mouse click
-void click() {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- navPanel_setEvent(\"Midplane\"+mNr,\"EventClick\");
- }
-}
-
-// routine for double mouse click
-void dblClick() {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(baseDP) ) {
- LOG_DEBUG(\"CEP_Midplane_small:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+baseDP);
- g_currentDatapoint=baseDP;
- navPanel_setEvent(\"Midplane\"+mNr,\"ChangePanel\");
- }
-
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick() {
- navPanel_setEvent(\"Midplane\"+mNr,\"EventRightClick\");
-}" 0
- 2
-"CBRef" "1"
-"EClose" E
-""
-1
-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
-6 0
-"midplane_highLight"
-""
-1 200 20 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-90 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"MidplaneCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void MidplaneCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"CEP_Midplane_small:MidplaneCallback| ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"CEP_Midplane_small:MidplaneCallback|Found highlight : \" + highlight + \" Looking for: Midplane\" + mNr);
- bool bHighlight=false;
- if (dynContains(highlight,\"Midplane\"+mNr)) {
- bHighlight=true;
- }
- LOG_DEBUG(\"CEP_Midplane_small:MidplaneCallback|Highlight request: \"+bHighlight);
- midplane_highLight.visible = bHighlight;
-}" 0
- "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 19 11 155 198
-6 1
-"childStateBorder"
-""
-1 18 197 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-77 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-3
-"hoverfclr" "N \"_Transparent\""
-"hoverbclr" "N \"_Transparent\""
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 3 1 0 1 E U 1 E 24 16 150 193
-6 3
-"RECTANGLE3"
-""
-1 100 250 E E E 1 E 1 E N "_3DFace" E N "_3DText" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-93 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_3DText"
-E "main()
-{
- click();
-}" 0
- 0 0 1 2 1 E U 3 0 10 0 E 25 19 149 192
-2 4
-"Midplane_Txt"
-""
-1 25 173 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-85 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 0 1 E U 0 E 27 175 86 191
-0 2 0 "0s" 0 0 0 192 0 0 27 175 1
-1
-LANG:1 26 Arial,-1,13,5,69,0,0,0,0,0
-0 1
-LANG:1 8 Midplane
-1 5 1 "" 1
-0
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 1 "selfState" -1
-"objects\\lofar_self_state.pnl" 363 291 T 87 0.8947368421052632 0 1 -298.7894736842105 -273
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Hardware/CEP_OSRack.pnl b/MAC/Navigator2/panels/objects/Hardware/CEP_OSRack.pnl
index 3dbe05ca5db708fa8fbd432086256ca2b9a07d90..47ebd95fb755fd3f43ebd163c10a14c40883c34d 100644
--- a/MAC/Navigator2/panels/objects/Hardware/CEP_OSRack.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/CEP_OSRack.pnl
@@ -1,6 +1,6 @@
V 11
1
-LANG:1 7 BGPRack
+LANG:1 10 CEP_OSRack
PANEL,-1 -1 201 432 N "_3DFace" 1
"$osNr"
"main()
@@ -163,7 +163,7 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 40 20 79.5 36
+E E 0 1 1 0 1 E U 0 E 40 20 79 36
0 2 0 "0s" 0 0 0 192 0 0 40 20 1
1
LANG:1 26 Arial,-1,13,5,69,0,0,0,0,0
diff --git a/MAC/Navigator2/panels/objects/Hardware/midplane_small.pnl b/MAC/Navigator2/panels/objects/Hardware/midplane_small.pnl
deleted file mode 100644
index 67f982d30f5d1bcb5718cbd1dd77e69e42614cff..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Hardware/midplane_small.pnl
+++ /dev/null
@@ -1,103 +0,0 @@
-V 11
-1
-LANG:1 0
-PANEL,-1 -1 500 400 N "_3DFace" 0
-"main()
-{
- baseDP = g_currentDatapoint;
-
-
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",baseDP);
- if(dpExists(sysName+\"LOFAR_PIC_BGP.BGPSwitch\")) {
- dpConnect(\"controlMidplane\", sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._value\",
- sysName+\"LOFAR_PIC_BGP.BGPSwitch:_online.._invalid\");
- if (!navFunct_dpReachable(\"LOFAR_PIC_BGP.BGPSwitch\")) {
- controlMidplane(\"\",false,\"\",true);
- }
- }
-
- // connect for childUpdates
- showChildState(baseDP);
- // connect for selfUpdates
- showSelfState(baseDP);
-
-}
-
-void controlMidplane(string dp1, bool bgpswitch,
- string dp2, bool invalid) {
-
- if (!invalid) {
- string aS = navFunct_DPName2CEPName(baseDP);
- setValue(\"midplaneName\",\"text\",aS);
- }
-}
-" 0
- E E E E 1 -1 -1 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-string baseDP = \"\";
-" 0
- 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 2 0 "" 1
-0
-2 1
-"midplaneName"
-""
-1 42 2.000000000000199 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-2 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 42 2.000000000000199 178 18
-0 2 2 "0s" 0 0 0 192 0 0 42 2.000000000000199 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 18 Midplane: R00-M00
-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
-3 0 "selfState" -1
-"objects\\lofar_self_state.pnl" 358 18 T 0 1 0 1 -350 -18.9999999999998
-0
-0
diff --git a/MAC/Navigator2/panels/objects/Observations/observation_smallCEPView.pnl b/MAC/Navigator2/panels/objects/Observations/observation_smallCEPView.pnl
index a6016b2cffb9fb058a1f94da36244c374c0a389f..baa4d913a4cac62659c83f9ddbc51a0ea6ee546a 100644
--- a/MAC/Navigator2/panels/objects/Observations/observation_smallCEPView.pnl
+++ b/MAC/Navigator2/panels/objects/Observations/observation_smallCEPView.pnl
@@ -167,18 +167,6 @@ E "main(int x, int y)
LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
0 1
LANG:1 18 Observation1111111
-1 17 0 "" 0
-0
-1 18 1 "" 0
-0
-1 19 2 "" 0
-0
-1 20 3 "" 0
-0
-1 21 4 "" 0
-0
-1 22 5 "" 0
-0
1 23 6 "" 2
0
1 24 6 "" 3
@@ -226,36 +214,8 @@ LAYER, 7
1
LANG:1 0
0
-3 0 "PANEL_REF0" -1
-"objects\\Processes\\streamView_small.pnl" 120 10 T 17 U
-2
-"$observation""$observation"
-"$streamNr""0"
-3 1 "PANEL_REF1" -1
-"objects\\Processes\\streamView_small.pnl" 150 10 T 17 U
-2
-"$observation""$observation"
-"$streamNr""1"
-3 2 "PANEL_REF2" -1
-"objects\\Processes\\streamView_small.pnl" 190 10 T 18 1 0 1 -10 0
-2
-"$observation""$observation"
-"$streamNr""2"
-3 3 "PANEL_REF3" -1
-"objects\\Processes\\streamView_small.pnl" 210 10 T 19 U
-2
-"$observation""$observation"
-"$streamNr""3"
-3 4 "PANEL_REF4" -1
-"objects\\Processes\\adderView_small.pnl" 250 10 T 19 1 0 1 5 0
-1
-"$observation""$observation"
-3 5 "PANEL_REF5" -1
-"objects\\Processes\\writerDroppedl.pnl" 290 10 T 20 1 0 1 30 0
-1
-"$observation""$observation"
3 6 "PANEL_REF6" -1
-"objects\\Observations\\observationProgressBar.pnl" 575 11 T 21 1 0 1 0 -1
+"objects\\Observations\\observationProgressBar.pnl" 575 11 T 21 1 0 1 -225 -1
1
"$observation""$observation"
0
diff --git a/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl b/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
index a8f3ffc2d910f284745c19efe7e206144e217dd6..66ec9058e7479972cc9a93fc4c8a4f9506a2362f 100644
--- a/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
@@ -185,16 +185,6 @@ E E 0 1 1 2 1 E U 1 E 453 22 487 35
LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 6 logMsg
-1 167 15 "" 4
-0
-1 168 15 "" 3
-0
-1 169 15 "0" 1
-0
-1 171 15 "" 6
-0
-1 170 15 "" 2
-0
2 113
"observationName"
""
@@ -245,14 +235,14 @@ E E E
LANG:1 18 Involved stations
8
-"resizeMode" "enum 0"
-"hScrollBarMode" "enum 0"
-"vScrollBarMode" "enum 0"
-"frameShape" "enum 6"
-"defaultRenameAction" "enum 0"
-"backgroundOrigin" "enum 0"
-"selectionMode" "enum 0"
"frameShadow" "enum 48"
+"selectionMode" "enum 0"
+"backgroundOrigin" "enum 0"
+"defaultRenameAction" "enum 0"
+"frameShape" "enum 6"
+"vScrollBarMode" "enum 0"
+"hScrollBarMode" "enum 0"
+"resizeMode" "enum 0"
1
LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
0 820 20 989 270
@@ -324,13 +314,8 @@ LAYER, 7
1
LANG:1 0
0
-3 15 "PANEL_REF16" -1
-"objects\\Processes\\interactive_controller_small.pnl" 170 90 T 27 1 0 1 0 -50
-2
-"$databaselevel""ccu"
-"$name""OnlineControl_BGPAppl"
3 16 "PANEL_REF16" -1
-"objects\\Processes\\interactive_controller_small.pnl" 170 90 T 44 U
+"objects\\Processes\\interactive_controller_small.pnl" 170 90 T 44 1 0 1 0 -50
2
"$databaselevel""ccu"
"$name""PythonControl"
diff --git a/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl b/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
index 728aacf53533101c0f510a1e45090f3508349a83..f938af0b6ff36c3c137a1dba4b5389b5197550b9 100644
--- a/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
@@ -112,14 +112,14 @@ E E E
LANG:1 19 Active Observations
8
-"resizeMode" "enum 0"
-"hScrollBarMode" "enum 0"
-"vScrollBarMode" "enum 0"
-"frameShape" "enum 6"
-"defaultRenameAction" "enum 0"
-"backgroundOrigin" "enum 0"
-"selectionMode" "enum 0"
"frameShadow" "enum 48"
+"selectionMode" "enum 0"
+"backgroundOrigin" "enum 0"
+"defaultRenameAction" "enum 0"
+"frameShape" "enum 6"
+"vScrollBarMode" "enum 0"
+"hScrollBarMode" "enum 0"
+"resizeMode" "enum 0"
1
LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
0 820 20 989 375
@@ -277,16 +277,6 @@ LANG:1 6 logMsg
0
1 149 14 "" 2
0
-1 151 15 "" 4
-0
-1 152 15 "" 3
-0
-1 153 15 "0" 1
-0
-1 155 15 "" 6
-0
-1 154 15 "" 2
-0
1 156 17 "" 4
0
1 157 17 "" 3
@@ -465,11 +455,6 @@ LANG:1 0
2
"$databaselevel""main"
"$name""ObservationControl"
-3 15 "PANEL_REF16" -1
-"objects\\Processes\\interactive_controller_small.pnl" 170 90 T 27 1 0 1 3 14
-2
-"$databaselevel""ccu"
-"$name""OnlineControl_BGPAppl"
3 17 "PANEL_REF18" -1
"objects\\Processes\\interactive_controller_small.pnl" 180 200 T 29 1 0 1 -7 23
2
diff --git a/MAC/Navigator2/panels/objects/Processes/circularBuffer.pnl b/MAC/Navigator2/panels/objects/Processes/circularBuffer.pnl
deleted file mode 100644
index a77cb1ca7ed41b14c186f0fdd43d73ae7495f749..0000000000000000000000000000000000000000
--- a/MAC/Navigator2/panels/objects/Processes/circularBuffer.pnl
+++ /dev/null
@@ -1,1348 +0,0 @@
-V 11
-1
-LANG:1 14 CircularBuffer
-PANEL,-1 -1 843 280 N "_3DFace" 0
-"main()
-{
-
-
-
- baseDP = g_currentDatapoint;
- database = dpSubStr(baseDP,DPSUB_SYS);
-
-
-
- panelName=\"CircularBuffer\";
-
- // check if the required datapoint for this view are enabled and accessible
- if (dpExists(DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName\") ){
- if (dpConnect(\"updateTrigger\", DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName:_online.._value\",
- DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.paramList:_online.._value\",
- DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName:_online.._invalid\") == -1) {
- LOG_ERROR(\"circularBuffer.pnl:main|Couldn't connect to: \"+DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName \"+ getLastError() );
- }
- } else {
- LOG_ERROR(\"circularBuffer.pnl:main|Couldn't find DP to connect to: \"+DPNAME_NAVIGATOR + g_navigatorID + \".updateTrigger.objectName\" );
- }
-}
-
-void updateTrigger( string dp1, string objectName,
- string dp2, dyn_string paramList,
- string dp3, bool invalid) {
-
-
- if (objectName == panelName) {
- LOG_TRACE(\"circularBuffer.pnl:updateTrigger|objectName: \"+objectName+
- \" panelName: \"+ panelName);
-
-
-
- int ioNr = -1;
- LOG_DEBUG(\"circularBuffer.pnl:updateTrigger|dynlen paramList: \"+dynlen(paramList)+\" paramList[1]: \"+paramList[1]);
- if (dynlen(paramList) <= (1)) {
- ioNr=paramList[1+objectNr];
- if (ioNr > 63) {
- LOG_ERROR(\"circularBuffer.pnl:updateTrigger|invalid InputBufferDP\");
- return;
- }
-
- LOG_DEBUG(\"circularBuffer.pnl:updateTrigger| found bufNr: \" + ioNr);
- setValue(\"InputBuffer_text\",\"text\",\"PSIONode\"+navFunct_formatInt(ioNr,99));
- inputBufferDP=database+\"LOFAR_PermSW_PSIONode\"+navFunct_formatInt(ioNr,99)+\"_InputBuffer\";
-
- // connect to the inputBuffer values
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpExists(inputBufferDP + \".stationName\")) {
- if (!dpConnect(\"updateBuffer\", inputBufferDP + \".stationName\",
- inputBufferDP + \".late\",
- inputBufferDP + \".IOTime\",
- inputBufferDP + \".stream0.blocksIn\",
- inputBufferDP + \".stream0.percBad\",
- inputBufferDP + \".stream0.rejected\",
- inputBufferDP + \".stream1.blocksIn\",
- inputBufferDP + \".stream1.percBad\",
- inputBufferDP + \".stream1.rejected\",
- inputBufferDP + \".stream2.blocksIn\",
- inputBufferDP + \".stream2.percBad\",
- inputBufferDP + \".stream2.rejected\",
- inputBufferDP + \".stream3.blocksIn\",
- inputBufferDP + \".stream3.percBad\",
- inputBufferDP + \".stream3.rejected\",
- inputBufferDP + \".status.state:_online.._invalid\") == -1) {
- LOG_ERROR(\"circularBuffer.pnl:updateTrigger|Couldn't connect to: \"+inputBufferDP+\" \"+getLastError());
- }
- } else {
- LOG_ERROR(\"circularBuffer.pnl:updateTrigger|Couldn't find DP to connect to: \"+inputBufferDP);
- setValue(\"Late\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"IOTime\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"In0\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Bad0\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Rejected0\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"In1\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Bad1\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Rejected1\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"In2\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Bad2\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Rejected2\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"In3\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Bad3\", \"backCol\", \"Lofar_dpdoesnotexist\");
- setValue(\"Rejected3\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
-
- // pass baseDP to selfstate Object to work with
- setValue(\"selfState.light\",\"toolTipText\",inputBufferDP);
-
-
- // get the name of the selected station
- nodeDP = navFunct_IONode2DPName(ioNr);
- string dp = nodeDP+\".usedStation\";
- if (dpExists(dp) ){
- dpGet(dp,station);
- } else {
- LOG_ERROR(\"circularBuffer.pnl:main|ERROR DP does not exist: \"+dp);
- return;
- }
-
- stationDP=station+\":\";
-
-
- setValue(\"stationLabel\",\"text\",station);
- setValue(\"stationLabel\",\"toolTipText\",stationDP);
-
-
- // connect for selfUpdates
- showSelfState(inputBufferDP);
-
- } else {
- LOG_ERROR(\"circularBuffer.pnl:main|inputBufferList out of range\");
- }
-
- }
-}
-
-updateBuffer(string dp1, string stationName,
- string dp2, string late,
- string dp3, string IOTime,
- string dp4, string in0,
- string dp5, string bad0,
- string dp6, string rejected0,
- string dp7, string in1,
- string dp8, string bad1,
- string dp9, string rejected1,
- string dp10, string in2,
- string dp11, string bad2,
- string dp12, string rejected2,
- string dp13, string in3,
- string dp14, string bad3,
- string dp15, string rejected3,
- string dp16, bool invalid)
-{
-
- LOG_DEBUG(\"circularBuffer.pnl:updateBuffer|entered\");
- if (!invalid) {
- setValue(\"Late\", \"text\", late);
- setValue(\"IOTime\", \"text\", IOTime);
- setValue(\"In0\", \"text\", in0);
- setValue(\"Bad0\", \"text\", bad0);
- setValue(\"Rejected0\", \"text\", rejected0);
- setValue(\"In1\", \"text\", in1);
- setValue(\"Bad1\", \"text\", bad1);
- setValue(\"Rejected1\", \"text\", rejected1);
- setValue(\"In2\", \"text\", in2);
- setValue(\"Bad2\", \"text\", bad2);
- setValue(\"Rejected2\", \"text\", rejected2);
- setValue(\"In3\", \"text\", in3);
- setValue(\"Bad3\", \"text\", bad3);
- setValue(\"Rejected3\", \"text\", rejected3);
- } else {
- setValue(\"Late\", \"text\", \"\");
- setValue(\"IOTime\", \"text\", \"\");
- setValue(\"In0\", \"text\", \"\");
- setValue(\"Bad0\", \"text\", \"\");
- setValue(\"Rejected0\", \"text\", \"\");
- setValue(\"In1\", \"text\", \"\");
- setValue(\"Bad1\", \"text\", \"\");
- setValue(\"Rejected1\", \"text\", \"\");
- setValue(\"In2\", \"text\", \"\");
- setValue(\"Bad2\", \"text\", \"\");
- setValue(\"Rejected2\", \"text\", \"\");
- setValue(\"In3\", \"text\", \"\");
- setValue(\"Bad3\", \"text\", \"\");
- setValue(\"Rejected3\", \"text\", \"\");
- }
-}
-" 0
- E E E E 1 0 0 0 0 0
-""0 1
-E "#uses \"navPanel.ctl\"
-
-string ksp=\"\";
-string inputbuffer=\"\";
-string database=\"\";
-string panelName=\"\";
-
-string baseDP = \"\";
-string inputBufferDP=\"\";
-string station=\"\";
-string stationDP=\"\";
-string nodeDP=\"\";
-
-int objectNr=0;
-
-bool bDoubleClicked = false;
-
-// routine for single mouse click
-void click(string dp) {
- // set delay in case double click was meant
- delay(0, 100);
- if (!bDoubleClicked) {
- if (dp == stationDP) {
- navPanel_setEvent(station,\"EventClick\");
- } else {
- navPanel_setEvent(\"InputBuffer\",\"EventClick\");
- }
- }
-}
-
-// routine for double mouse click
-void dblClick(string dp) {
- // indicate this is a doubleClick
- bDoubleClicked = true;
-
- if (dpExists(dp) ) {
- LOG_DEBUG(\"CircularBuffer.pnl:DoubleClick|Setting currentDatapoint from : \"+g_currentDatapoint+\" to \"+dp);
- g_currentDatapoint=dp;
- navPanel_setEvent(\"CircularBuffer.pnl\",\"ChangePanel\");
- }
- // set delay to avoid click event will be triggered
- delay(0, 500);
- bDoubleClicked = false;
-}
-
-// routine for right mouse click
-void rClick(string dp) {
- navPanel_setEvent(\"CircularBuffer.pnl\",\"EventRightClick\");
-}" 0
- 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 6 Layer1
-6 285
-"InputBuffer_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-223 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"InputBufferCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void InputBufferCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"circularBuffer.pnl:InputBufferCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"circularBuffer.pnl:InputBufferCallback|Found highlight : \" + highlight + \" Looking for InputBuffer\");
- bool bHighlight=false;
- if (dynContains(highlight,\"InputBuffer\")) {
- bHighlight=true;
- }
- LOG_DEBUG(\"circularBuffer.pnl:InputBufferCallback|Highlight request: \"+bHighlight);
- InputBuffer_highLight.visible = bHighlight;
-
-}
-
-" 0
- "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 140 -10 1 E 10 20 620 199
-6 226
-"RECTANGLE15"
-""
-1 120 180 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-132 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 55 -165 1 E 100 180 700 349
-6 229
-"RECTANGLE17"
-""
-1 120 20 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-136 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 341 28 2 1 0 "pictures/circleAni.gif" 4294967295 E 120 20 219 119
-14 234
-"In0"
-""
-1 187 45 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-144 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 185 43 253 67
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 235
-"Bad0"
-""
-1 259 45 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-146 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 257 43 325 67
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 236
-"PRIMITIVE_TEXT3"
-""
-1 167 50 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-147 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 167 50 174 63
-0 2 2 "0s" 0 0 0 192 0 0 167 50 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 1 0
-14 237
-"In1"
-""
-1 187 75 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-149 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 185 73 253 97
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 238
-"Bad1"
-""
-1 259 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-151 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 257 73 325 97
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 239
-"PRIMITIVE_TEXT4"
-""
-1 167 80 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-153 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 167 80 174 93
-0 2 2 "0s" 0 0 0 192 0 0 167 80 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 1 1
-14 240
-"In2"
-""
-1 187 105 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-155 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 185 103 253 127
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 241
-"Bad2"
-""
-1 259 105 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-157 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 257 103 325 127
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 242
-"PRIMITIVE_TEXT5"
-""
-1 167 110 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-159 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 167 110 174 123
-0 2 2 "0s" 0 0 0 192 0 0 167 110 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 1 2
-14 243
-"In3"
-""
-1 187 135 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-161 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 185 133 253 157
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 244
-"Bad3"
-""
-1 261 135 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-163 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 257 133 325 157
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 245
-"PRIMITIVE_TEXT6"
-""
-1 167 140 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-165 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 167 140 174 153
-0 2 2 "0s" 0 0 0 192 0 0 167 140 1
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 1 3
-2 246
-"PRIMITIVE_TEXT7"
-""
-1 186 30 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-166 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 185 30 197 46
-0 2 2 "0s" 0 0 0 192 0 0 185 30 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 2 In
-2 247
-"PRIMITIVE_TEXT8"
-""
-1 259 30 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-168 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 259 30 300 46
-0 2 2 "0s" 0 0 0 192 0 0 259 30 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 4 %Bad
-1 293 51 "" 1
-0
-14 249
-"Late"
-""
-1 655 65 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-171 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 653 63 719 87
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 250
-"PRIMITIVE_TEXT9"
-""
-1 591 68 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-172 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 591 68 621 84
-0 2 2 "0s" 0 0 0 192 0 0 591 68 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 4 Late
-2 251
-"PRIMITIVE_TEXT10"
-""
-1 722 67 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-174 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 722 67 742 83
-0 2 2 "0s" 0 0 0 192 0 0 722 67 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 2 ms
-14 252
-"IOTime"
-""
-1 655 105 E E E 1 E 1 E N "_3DText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-176 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 653 103 719 127
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 253
-"PRIMITIVE_TEXT11"
-""
-1 591 108 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-178 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 591 108 641 124
-0 2 2 "0s" 0 0 0 192 0 0 591 108 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 6 IOTime
-2 254
-"PRIMITIVE_TEXT12"
-""
-1 722 107 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-180 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 722 107 742 123
-0 2 2 "0s" 0 0 0 192 0 0 722 107 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 2 ms
-2 255
-"InputBuffer_text"
-""
-1 435 -8 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick();
-}" 0
- "main()
-{
- dblClick();
-}" 0
-
-181 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click();
-}" 0
- 0 1 1 2 1 E U 1 E 435 -8 508 8
-0 2 2 "0s" 0 0 0 192 0 0 435 -8 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 11 InputBuffer
-4 261
-"LINE5"
-""
-1 415 85 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-188 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 2 1 2 1 E 415 85 455 95
-4 262
-"LINE6"
-""
-1 415 55 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-189 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 2 1 2 1 E 415 55 455 85
-4 263
-"LINE7"
-""
-1 415 115 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-190 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 2 1 2 1 E 415 115 455 105
-4 264
-"LINE8"
-""
-1 415 145 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-191 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 2 1 2 1 E 415 145 455 115
-6 265
-"RECTANGLE22"
-""
-1 150 40 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-193 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 110 32 2 1 0 "pictures/arrowRight.gif" 4294967295 E 450 50 474 74
-14 279
-"Rejected0"
-""
-1 330 45 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-214 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 328 43 396 67
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 280
-"Rejected1"
-""
-1 330 75 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-216 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 328 73 396 97
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 281
-"Rejected2"
-""
-1 330 105 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-218 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 328 103 396 127
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-14 282
-"Rejected3"
-""
-1 332 135 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-220 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-0
-1
-LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
-0 328 133 396 157
-2 "0s" 0 0 0 0 0 -1 "main()
-{
- click(inputBufferDP);
-}" 0
- E E
-2 283
-"PRIMITIVE_TEXT17"
-""
-1 330 30 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(inputBufferDP);
-}" 0
- "main()
-{
- dblClick(inputBufferDP);
-}" 0
-
-222 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(inputBufferDP);
-}" 0
- 0 1 1 2 1 E U 1 E 330 30 388 46
-0 2 2 "0s" 0 0 0 192 0 0 330 30 1
-1
-LANG:1 33 MS Shell Dlg,-1,13,5,75,0,0,0,0,0
-0 1
-LANG:1 7 %Reject
-6 290
-"station_highLight"
-""
-1 240 10 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E
- "main()
-{
- rClick(stationDP);
-}" 0
- "main()
-{
- dblClick(stationDP);
-}" 0
-
-227 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-"main()
-{
- dpConnect( \"stationCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
-}
-
-void stationCallback(string dp1, bool aTrig) {
-
- LOG_DEBUG(\"BGPProc.pnl:stationCallback|ObjectTrigger Callback on: \"+dp1+\" trigger: \"+aTrig);
- LOG_DEBUG(\"BGPProc.pnl:stationCallback|Found highlight : \" + highlight + \" Looking for station: \"+station);
- bool bHighlight=false;
- if (dynContains(highlight,station)) {
- bHighlight=true;
- }
- LOG_DEBUG(\"BGPProc.pnl:stationCallback|Highlight request: \"+bHighlight);
- station_highLight.visible = bHighlight;
-}
-
-" 0
- "main()
-{
- click(stationDP);
-}" 0
- 0 1 1 2 1 E 1 0 1 10 -52 1 E 0 132 64 166
-6 291
-"RECTANGLE18"
-""
-1 150 40 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E
- E E
-228 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1 52 -180 2 1 0 "pictures/arrowRight.gif" 4294967295 E 30 240 104 314
-2 292
-"stationLabel"
-""
-1 15 90 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- "main()
-{
- rClick(stationDP);
-}" 0
- "main()
-{
- dblClick(stationDP);
-}" 0
-
-229 0 0 0 0 0
-E E E
-0
-1
-LANG:1 0
-
-1
-"dashclr"N "_Transparent"
-E "main()
-{
- click(stationDP);
-}" 0
- 0 1 1 2 1 E U 1 E 15 90 63 110
-0 2 2 "0s" 0 0 0 192 0 0 15 90 1
-1
-LANG:1 33 MS Shell Dlg,-1,16,5,75,0,0,0,0,0
-0 1
-LANG:1 5 CSxxx
-0
-LAYER, 1
-1
-LANG:1 6 Layer2
-0
-LAYER, 2
-1
-LANG:1 6 Layer3
-0
-LAYER, 3
-1
-LANG:1 6 Layer4
-0
-LAYER, 4
-1
-LANG:1 6 Layer5
-0
-LAYER, 5
-1
-LANG:1 6 Layer6
-0
-LAYER, 6
-1
-LANG:1 6 Layer7
-0
-LAYER, 7
-1
-LANG:1 6 Layer8
-0
-3 51 "selfState" -1
-"objects\\lofar_self_state.pnl" 678 158 T 169 1.062627825683233 0 1 -565.461665813232 -142
-0
-0
diff --git a/MAC/Navigator2/scripts/CMakeLists.txt b/MAC/Navigator2/scripts/CMakeLists.txt
index 9bec13c8022690f5bc17e886bd64938866249e36..ee432b86bf228f57257e92ea5e9a66f39d29da64 100644
--- a/MAC/Navigator2/scripts/CMakeLists.txt
+++ b/MAC/Navigator2/scripts/CMakeLists.txt
@@ -10,6 +10,6 @@ install(FILES
monitorStateChanges.ctl
monitorStateReset.ctl
readStationConfigs.ctl
- readStationBGPconnections.ctl
+ readStationConnections.ctl
transferMPs.ctl
DESTINATION pvss/scripts)
diff --git a/MAC/Navigator2/scripts/claim.ctl b/MAC/Navigator2/scripts/claim.ctl
index d4bc4266b98ddff21c72a7f8b51f34058fd29b3c..99c186468effda47cb864657c3c9f858fec6624a 100644
--- a/MAC/Navigator2/scripts/claim.ctl
+++ b/MAC/Navigator2/scripts/claim.ctl
@@ -985,16 +985,6 @@ void checkAndCreateDPs() {
dpCreate("LOFAR_ObsSW_TempObs"+pre+"_PythonControl","PythonControl");
changed = true;
}
- //BGPAppl
- if (!dpExists("LOFAR_ObsSW_TempObs"+pre+"_OnlineControl_BGPAppl")) {
- dpCreate("LOFAR_ObsSW_TempObs"+pre+"_OnlineControl_BGPAppl","BGPAppl");
- changed = true;
- }
- //BGPProc
- if (!dpExists("LOFAR_ObsSW_TempObs"+pre+"_OnlineControl_BGPAppl_BGPProc")) {
- dpCreate("LOFAR_ObsSW_TempObs"+pre+"_OnlineControl_BGPAppl_BGPProc","BGPProc");
- changed = true;
- }
//CobaltGPUProc
for (int k=1; k < 10; k++) {
for (int l=0; l < 2; l++) {
diff --git a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
index 2403f1feb14d678f5d1b9f677c776351cc7750f9..49b74063e287acfe89b7714fe868b1dc43fb7203 100644
--- a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
@@ -129,8 +129,8 @@ bool CEP_Processes_UpdateCEPControllers() {
// get the real name from the selected Observation
CEP_obsBaseDP=claimManager_nameToRealName("LOFAR_ObsSW_"+CEP_selectedObservation);
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","OnlineControl_BGPApplPanel",
- DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(CEP_obsBaseDP));
+// dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","OnlineControl_BGPApplPanel",
+// DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(CEP_obsBaseDP));
dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","PythonControlPanel",
DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(CEP_obsBaseDP));
diff --git a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
index 0852b1f894020d70824013c9869365c8ba136e32..1d1dca162510e93caca56f0710d52030fdfa9253 100644
--- a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
@@ -130,8 +130,6 @@ void MainCU_Processes_UpdateMainControllers() {
dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","ObservationControlPanel",
DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(obsBaseDP));
// also connect to CCU Ctrls
- dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","OnlineControl_BGPApplPanel",
- DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(obsBaseDP));
dpSet(DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.objectName","PythonControlPanel",
DPNAME_NAVIGATOR + g_navigatorID + ".updateTrigger.paramList",makeDynString(obsBaseDP));
}
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index cf5b51eeb9d35629981d4aa09f035aef6fb70544..9d1a4a2b292d2549d91ac97fc2a037489341b15c 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -28,14 +28,11 @@
//
// navFunct_acknowledgePanel : Returns acknowledge on a given action
// navFunct_bareDBName : Returns a DatabaseName without the : (if any)
-// navFunct_BGPMidplane2BGPRack : Returns the BGPRackNr for a given BGPMidplane
-// navFunct_CEPName2DPName : Translates Rxx-Mx-Nxx-Jxx names to _BGP_Midplane_IONode names
// navFunct_CEPName2inputBuf : returns ionr from CEPname
// navFunct_clearGlobalLists : clear all temporarily global hardware,observation and processes lists..
// navFunct_dpGetFullPathAsTypes : Returns full dp path (maincu && station components) as dynstring)
// navFunct_dpGetLastElement : Returns last element from DP
// navFunct_dpHasPanels : checkes if a given DP has loadable panels.
-// navFunct_DPName2CEPName : Translates _BGP_Midplane_IONode names to Rxx-Mx-Nxx-Jxx names
// navFunct_dpReachable : looks if the databpoint on a dist system is also reachable
// navFunct_dpStripLastElement : Returns DP string without last element
// navFunct_dynToString : Returns a dynArray as a , seperated string
@@ -68,10 +65,7 @@
// navFunct_getWritersForObservation : returns all the writers that are in use for an observation
// navFunct_giveFadedColor : returns faded color string between green and red depending on min,max and currentValue
// navFunct_hardware2Obs : Looks if a piece of hardware maps to an observation
-// navFunct_inputBuf2CEPName : Translates inputBufferNr 2 the Rxx-Mx-Nxx-Jxx name
-// navFunct_IONode2BGPMidplane : Returns the BGPMidplaneNr for a given IONode
// navFunct_IONode2DPName : returns the DP name based on the ionode number.
-// navFunct_isBGPSwitch : returns the BGPSwitch setting (True = BGPRack1, False=BGPRack0)
// 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
@@ -550,39 +544,6 @@ int navFunct_receiver2Subrack(int receiverNr) {
return floor(receiverNr/32);
}
-// ****************************************
-// Name : navFunct_IONode2Midplane
-// ****************************************
-// Description:
-// Returns the midplaneNr to which a IONode is connected
-//
-// Returns:
-// The midplanenr
-// ***************************************
-
-int navFunct_IONode2Midplane(int nodeNr) {
- return floor(nodeNr/32);
-}
-
-// ****************************************
-// Name : navFunct_IONode2BGPRack
-// ****************************************
-// Description:
-// Returns the rackNr to which a IONode is connected
-//
-// For now we only show the active rack, so all ionodes
-// automaticly belong to the active rack
-//
-// Returns:
-// The bgpracknr
-// ***************************************
-
-int navFunct_IONode2BGPRack(int nodeNr) {
- int r = 0;
- if (navFunct_isBGPSwitch()) r = 1;
- return r;
-}
-
// ****************************************
// Name : navFunct_receiver2RSP
// ****************************************
@@ -679,24 +640,6 @@ int navFunct_subrack2Cabinet(int subrackNr) {
return floor(subrackNr/2);
}
-
-
-// ****************************************
-// Name : navFunct_BGPMidplane2BGPRack
-// ****************************************
-// Description:
-// Returns the rackNr to which a midplane is connected
-//
-// Returns:
-// The racknr
-// ***************************************
-
-int navFunct_BGPMidplane2BGPRack(int midplaneNr) {
- return floor(midplaneNr/2);
-}
-
-
-
// ****************************************
// Name : navFunct_dpStripLastElement
// ****************************************
@@ -1525,62 +1468,21 @@ void navFunct_fillHardwareTree() {
if (g_stationList[1]+":" == CEPDBName) {
string baseConnect=connectTo;
- // add BGPRacks
- if (dynlen(g_BGPRackList) > 0) {
- for (int i = 1; i <= dynlen(g_BGPRackList); i++) {
- dp = station+":LOFAR_PIC_BGP";
- dynAppend(result,baseConnect+",BGP"+","+dp);
- }
- lvl="BGPRack";
- }
-
- // add midplanes
- if (dynlen(g_BGPMidplaneList) > 0) {
- for (int i = 1; i <= dynlen(g_BGPMidplaneList); i++) {
- int bgprackNr=navFunct_BGPMidplane2BGPRack(g_BGPMidplaneList[i]);
- if (lvl == "BGPRack") {
- connectTo = station+":LOFAR_PIC_BGP";
- }
- dp = station+":LOFAR_PIC_BGP_Midplane"+g_BGPMidplaneList[i];
- dynAppend(result,connectTo+",Midplane"+g_BGPMidplaneList[i]+","+dp);
- }
- lvl="BGPMidplane";
- }
-
- //add Ionodes
- if (dynlen(g_IONodeList) > 0) {
- for (int i = 1; i <= dynlen(g_IONodeList); i++) {
- int BGPRackNr=navFunct_IONode2BGPRack(g_IONodeList[i]);
- int midplaneNr=navFunct_IONode2Midplane(g_IONodeList[i]);
- if (lvl == "BGPRack") {
- connectTo = station+":LOFAR_PIC_BGP";
- } else if (lvl == "BGPMidplane") {
- connectTo = station+":LOFAR_PIC_BGP_Midplane"+midplaneNr;
- }
- dp = station+":LOFAR_PIC_BGP_Midplane"+midplaneNr+"_IONode"+g_IONodeList[i];
- dynAppend(result,connectTo+",IONode"+g_IONodeList[i]+","+dp);
- }
- }
-
- //add CobaltRacks
+ // add CobaltRacks
if (dynlen(g_cobaltRackList) > 0) {
for (int i = 1; i <= dynlen(g_cobaltRackList); i++) {
dp = station+":LOFAR_PIC_Cobalt";
dynAppend(result,baseConnect+",Cobalt"+","+dp);
}
- lvl="CobaltRack";
}
-
+
//add CobaltNodes
if (dynlen(g_cobaltNodeList) > 0) {
for (int i = 1; i <= dynlen(g_cobaltNodeList); i++) {
- if (lvl == "CobaltRack") {
- connectTo = station+":LOFAR_PIC_Cobalt";
- }
+ connectTo = station+":LOFAR_PIC_Cobalt";
dp = station+":LOFAR_PIC_Cobalt_CBT"+navFunct_formatInt(g_cobaltNodeList[i],999);
dynAppend(result,connectTo+",CBT"+navFunct_formatInt(g_cobaltNodeList[i],999)+","+dp);
}
- lvl="CobaltNode";
}
// add OSRacks
@@ -1815,9 +1717,6 @@ void navFunct_clearGlobalLists() {
dynClear(g_RCUList);
dynClear(g_HBAList);
dynClear(g_LBAList);
- dynClear(g_BGPRackList);
- dynClear(g_BGPMidplaneList);
- dynClear(g_IONodeList);
dynClear(g_OSRackList);
dynClear(g_locusNodeList);
dynClear(g_cobaltRackList);
@@ -1985,197 +1884,7 @@ void navFunct_waitObjectReady(int timer,string name) {
return;
}
-// ****************************************
-// Name: navFunct_CEPName2DPName
-// ****************************************
-// Translates Rxx-Mx-Nxx-Jxx names to _BGP_Midplane_IONode names
-//
-// returns the DPName for the CEPName representation
-// ****************************************
-string navFunct_CEPName2DPName(string CEPName) {
- string name = "";
- bool foundRack = false;
- bool foundMidplane = false;
- bool foundNodecard = false;
- bool foundIONode = false;
- int rack = -1;
- int midplane = -1;
- int nodecard = -1;
- int ionode = -1;
-
- if (CEPName == "") return name;
-
- dyn_string names = strsplit(CEPName,"-");
-
- for (int i=1; i<= dynlen(names); i++) {
-
- if (strpos(names[i],"R") > -1) {
- foundRack=true;
- rack = substr(names[i],1,strlen(names[i]));
- } else if (strpos(names[i],"M") > -1) {
- foundMidplane=true;
- midplane = substr(names[i],1,strlen(names[i]));
- } else if (strpos(names[i],"N") > -1) {
- foundNodecard=true;
- nodecard = substr(names[i],1,strlen(names[i]));
- } else if (strpos(names[i],"J") > -1) {
- foundIONode=true;
- ionode = substr(names[i],1,strlen(names[i]));
- } else {
- return name;
- }
- }
-
- int midnr=0;
- int nodenr=0;
- int ionr=0;
-
-
- if (foundRack) {
- name += "BGP";
- }
- if (foundRack && foundMidplane) {
- name += "_Midplane" + midplane;
- midnr=midplane;
- }
- if (foundRack && foundMidplane && foundNodecard && foundIONode) {
- nodenr = nodecard + (16*midnr);
- ionr = ionode + (2*nodenr);
- if (ionr < 10) {
- name += "_IONode0" + ionr;
- } else if (ionr >= 10 && ionr < 64) {
- name += "_IONode" + ionr;
- }
- }
-
- return name;
-}
-// ****************************************
-// Name: navFunct_DPName2CEPName
-// ****************************************
-// Translates _BGP_Midplane_IONode names to Rxx-Mx-Nxx-Jxx names
-//
-// returns the CEPName from the DPName representation
-// ****************************************
-string navFunct_DPName2CEPName(string DPName) {
- bool foundRack = false;
- bool foundMidplane = false;
- bool foundIONode = false;
- int rack = -1;
- int midplane = -1;
- int ionode = -1;
- string name = "";
-
- if (DPName == "") return name;
-
- // strip all b4 BGP if part of the name
- if (strpos(DPName,"BGP") >= 0) {
- string dp = substr(DPName,strpos(DPName,"BGP"));
- DPName = dp;
- }
-
- dyn_string names = strsplit(DPName,"_");
-
- for (int i=1; i<= dynlen(names); i++) {
- if (strpos(names[i],"BGP") > -1) {
- foundRack=true;
- rack=0;
- if (navFunct_isBGPSwitch()) rack=1;
- } else if (strpos(names[i],"Midplane") > -1) {
- foundMidplane=true;
- midplane = substr(names[i],8,strlen(names[i]));
- } else if (strpos(names[i],"IONode") > -1) {
- foundIONode=true;
- ionode = substr(names[i],6,strlen(names[i]));
- } else {
- LOG_ERROR("navFunct.ctl:navFunct_DPName2CEPName|Non DPName part in string: "+ names[i]);
- return name;
- }
- }
-
- int racknr=0;
- int midnr=0;
- int nodenr=0;
- int ionr=0;
-
- if (foundRack){
- name += "R0" + rack;
- }
-
- if (foundMidplane) {
- if (foundRack) name+="-";
- midnr = midplane;
- name += "M" + midnr;
- }
-
- if (foundIONode) {
- if (foundMidplane) name+="-";
- midnr = floor(ionode/32);
- nodenr = floor(ionode/2)-(midnr*16);
- float nr = fmod(ionode,2);
- ionr=nr;
- if (nodenr < 10) {
- name += "N0" + nodenr + "-J0" + ionr;
- } else {
- name += "N" + nodenr + "-J0" + ionr;
- }
- }
-
- return name;
-}
-
-// ****************************************
-// Name: navFunct_inputBuf2CEPName
-// ****************************************
-// Translates inputBufferNr 2 the Rxx-Mx-Nxx-Jxx name
-//
-// returns the CEPName
-// ****************************************
-string navFunct_inputBuf2CEPName(int buf) {
- int racknr = 0;
- if (navFunct_isBGPSwitch()) racknr=1;
- int midnr = floor(buf/32);
- buf=buf-midnr*32;
- int nodenr = floor(buf/2);
- buf=buf-nodenr*2;
- int ionr = buf;
-
- string name = "R0"+racknr+"-M"+midnr;
- if (nodenr < 10) {
- name += "-N0" + nodenr + "-J0" + ionr;
- } else {
- name += "-N" + nodenr + "-J0" + ionr;
- }
- return name;
-}
-
-// ****************************************
-// Name: navFunct_CEPName2InputBuf
-// ****************************************
-// Translates Rxx-Mx-Nxx-Jxx name 2 inputBufferNr
-//
-// returns the IONode
-// ****************************************
-int navFunct_CEPName2inputBuf(string name) {
-
- dyn_string spl_name = strsplit(name,"-");
-
-// DebugN("name :", name);
-// DebugN("spl_name :", spl_name);
-
- if (dynlen(spl_name) < 4) return -1;
- int nr=0;
- int r = (int) substr(spl_name[1],3,1);
- int m = (int) substr(spl_name[2],2,1);
- int n = (int) substr(spl_name[3],3,1);
- int j = (int) substr(spl_name[4],3,1);
-
- nr = (r*64)+(m*32)+(n*2)+j;
- if (nr > 63) nr-=64;
-
- return nr;
-}
string navFunct_ObsToTemp(string dp){
int pos=strpos(dp,"Observation");
@@ -2254,36 +1963,6 @@ bool navFunct_isOnline(int syst) {
return false;
}
}
-
-// Searchs all ionodes.usedStation names for match with the given name
-string navFunct_stationNameToIONode(string name) {
-
- dyn_dyn_anytype tab;
- dpQuery("SELECT '_original.._value' FROM 'LOFAR_PIC_BGP_Midplane*_IONode*.usedStation' REMOTE '"+CEPDBName+"' WHERE _DPT = \"IONode\"",tab);
-
- for(int z=2;z<=dynlen(tab);z++) {
- if (tab[z][2] == name) return dpSubStr(tab[z][1],DPSUB_DP);
- }
- return "not found";
-}
-
-// returns if the 2nd rack is used (true) or not (false)
-bool navFunct_isBGPSwitch() {
- // get BGPSwitch to see if rack 0 or rack 1 in use
- bool BGPSwitch=false;
- dpGet(CEPDBName+"LOFAR_PIC_BGP.BGPSwitch",BGPSwitch);
- return BGPSwitch;
-}
-
-//returns the name of the DataPoint for a given ionr
-string navFunct_IONode2DPName(int ionode) {
- string ext="";
- if (ionode < 10) ext = "0";
- string dp = CEPDBName+"LOFAR_PIC_BGP_Midplane"+navFunct_IONode2Midplane(ionode)+"_IONode"+ext+ionode;
-
- return dp;
-
-}
// ****************************************
// Name: navFunct_formatInt
diff --git a/MAC/Navigator2/scripts/libs/navigator.ctl b/MAC/Navigator2/scripts/libs/navigator.ctl
index 0317647c60e69eaeed8c66ff4930dda4d52ea507..4bf7969b2cecc72ec9a83f4db779abf90c7ad031 100644
--- a/MAC/Navigator2/scripts/libs/navigator.ctl
+++ b/MAC/Navigator2/scripts/libs/navigator.ctl
@@ -67,13 +67,10 @@ global dyn_int g_RCUList; // holds valid RCU's for choices in the v
global dyn_int g_HBAList; // holds valid HBAAntenna's for choices in the viewBox
global dyn_int g_LBAList; // holds valid LBAAntenna's for choices in the viewBox
// CEP based globals
-global dyn_int g_BGPRackList; // holds valid bgpracks for choices in viewBox
-global dyn_int g_BGPMidplaneList; // holds valid bgpmidplanes for choices in viewBox
-global dyn_int g_IONodeList; // holds valid ionodes for choices in viewBox
global dyn_int g_OSRackList; // holds valid Offline/Storageracks for choices in view
global dyn_int g_locusNodeList; // holds valid storagenodes for choices in view
global dyn_int g_cobaltRackList; // holds valid cobaltracks for choices in viewBox
-global dyn_int g_cobaltNodeList; // holds valid cobaltnodesplanes for choices in viewBox
+global dyn_int g_cobaltNodeList; // holds valid cobaltnodes for choices in viewBox
global dyn_int g_cobaltNICList; // holds valid cobaltNICs for choices in viewBox
diff --git a/MAC/Navigator2/scripts/readStationBGPconnections.ctl b/MAC/Navigator2/scripts/readStationConnections.ctl
similarity index 62%
rename from MAC/Navigator2/scripts/readStationBGPconnections.ctl
rename to MAC/Navigator2/scripts/readStationConnections.ctl
index c9a9c6a67259450d180bb686e03ff04617bab4d6..cfb5c82f552c9eff05924b6c36e589211dc042bb 100644
--- a/MAC/Navigator2/scripts/readStationBGPconnections.ctl
+++ b/MAC/Navigator2/scripts/readStationConnections.ctl
@@ -1,4 +1,4 @@
-//# readStationBGPConnections.ctl
+//# readStationConnections.ctl
//#
//# Copyright (C) 2007-2008
//# ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -31,12 +31,6 @@ bool showDebug = false;
*/
main()
{
-
-
- // first empty old settings
-
- emptyIONodes();
-
string strDataDir = "";
if (isdir("/opt/lofar/etc/") ) {
strDataDir = "/opt/lofar/etc/";
@@ -47,93 +41,10 @@ main()
return;
}
- readBGPDat(strDataDir+"RSPConnections_CCU.dat");
readCobaltDat(strDataDir+"RSPConnections_Cobalt.dat");
}
-void readBGPDat(string strBGPDatFile) {
- dyn_string dynStr_BGPFile;
-
- // first read the file
- dynStr_BGPFile = lto_getFile_asDynStr(strBGPDatFile);
-
- DebugN("Filling Database from file " + strBGPDatFile);
- for (int index=1;index <= dynlen(dynStr_BGPFile);index++) {
- if (strpos(dynStr_BGPFile[index],"#") < 0 || strpos(dynStr_BGPFile[index],"#") > 4) {
-
- dyn_string linesplitted=strsplit(dynStr_BGPFile[index]," \t");
- if (showDebug) DebugN(index+" :"+linesplitted);
-
- string station = linesplitted[1];
- string rspstr = linesplitted[2];
- string ionode = linesplitted[3];
- string ip = linesplitted[4];
- string mac = linesplitted[5];
- string macForeign = "";
- string rspForeign = "";
- // the station/mac/ip places are for the cases were rsp1 can be the 2nd ear or a foreign station
- // if a foreign station is used they will be in the list as R(00-01)_BG(1-3)_(DE,FR,SE,UK)(601-608)
- // and the real ionode can be found based on the shared ipnr
- // then the info will go to the 2nd station in the database
-
- int stationPlace=1;
- if (strpos(ionode,"R00") >= 0) {
- stationPlace=0;
- }
- if (strpos(ionode,"BG") >= 0) {
- if (showDebug) DebugN(" ionode contains BG router name, trying to find real ionode for connection based on ip: "+ip);
- ionode="";
- // check list based on ipnr and find the real ionode
- for (int idx=1;idx <= index;idx++) {
- if (strpos(dynStr_BGPFile[idx],ip) >= 0) {
- if (showDebug) DebugN(" found match for ip in: " + dynStr_BGPFile[idx]);
- dyn_string sp = strsplit(dynStr_BGPFile[idx]," \t");
- ionode= sp[3];
- macForeign = mac;
- //foreign stations always connected to HBA1 (= RSP1) allthough the foreign station will say RSP0
- rspForeign = "RSP"+1;
- break;
- }
- }
- }
-
- if (ionode == "" ) {
- DebugN("Found BG name in ionode, but couldn't find ip match. skipping....");
- continue;
- } else {
- if (showDebug) DebugN("ionode match found: "+ionode);
- }
-
- string ioname = "LOFAR_PIC_"+navFunct_CEPName2DPName(ionode);
-
-
-
- dyn_string rsp = strsplit(rspstr,"_");
- if (showDebug) DebugN( "node: "+ionode+ " ioname: "+ioname+" rspfull: " + rspstr+ " rsp[2]" + rsp[2]
- + " ip: "+ip+ " mac: "+mac);
- if (dpExists(ioname)) {
- dpSet(ioname+".IP"+stationPlace,ip);
- if (macForeign != "") {
- dpSet(ioname+".MACForeign",macForeign);
- dpSet(ioname+".station1",station);
- } else {
- dpSet(ioname+".MAC"+stationPlace,mac);
- dpSet(ioname+".station0",station);
- }
- if (rspForeign != "") {
- dpSet(ioname+".RSPForeign",rspForeign);
- dpSet(ioname+".RSP1","RSP"+rsp[2]);
- } else {
- dpSet(ioname+".RSP"+stationPlace,"RSP"+rsp[2]);
- }
- } else {
- DebugN(ionode+" gives wrong dp: " , ioname);
- }
- }
- }
- DebugN("Ready");
-}
void readCobaltDat(string strCobaltDatFile) {
dyn_string dynStr_CobaltFile;
@@ -307,22 +218,3 @@ dyn_string lto_getFile_asDynStr(string aFileName)
return aFile_asDynStr;
}
-
-void emptyIONodes() {
- for (int i = 0; i < 64;i++) {
- string ext = "";
- if (i < 10) ext = "0";
- string dp = "LOFAR_PIC_BGP_Midplane"+navFunct_IONode2Midplane(i)+"_IONode"+ext+i;
- if (dpExists(dp+".station0")) {
- dpSet(dp+".station0","");
- dpSet(dp+".IP0","");
- dpSet(dp+".MAC0","");
- dpSet(dp+".station1","");
- dpSet(dp+".IP1","");
- dpSet(dp+".MAC1","");
- dpSet(dp+".MACForeign","");
- } else {
- DebugN("wrong dp found: "+dp+".station0");
- }
- }
-}