diff --git a/MAC/Navigator2/panels/Hardware/Station_Cabinet_detailed.pnl b/MAC/Navigator2/panels/Hardware/Station_Cabinet_detailed.pnl
index 9c5f0778af23109c93a20ab3ebb9e103a9578b69..932d9c1d8c6c1605adcc3ed0a5eb2b3475781edc 100644
--- a/MAC/Navigator2/panels/Hardware/Station_Cabinet_detailed.pnl
+++ b/MAC/Navigator2/panels/Hardware/Station_Cabinet_detailed.pnl
@@ -348,13 +348,13 @@ LANG:1 6 Layer8
3 86 "selfState"
"objects\\lofar_self_state.pnl" 284 264 T 851 1 0 1 114 -23.99999999999997
0
-3 89 "PANEL_REF90"
+3 89 "topSubrack"
"objects\\Hardware\\Station_Subrack_small.pnl" 48 330 T 855 1 0 1 354 117
2
"$CabinetNr""0"
"$SubrackNr""0"
-3 90 "PANEL_REF91"
-"objects\\Hardware\\Station_Subrack_small.pnl" 48 520 T 856 1 0 1 354 110
+3 90 "bottomSubrack"
+"objects\\Hardware\\Station_Subrack_small.pnl" 48 520 T 856 1 0 1 354 108
2
"$CabinetNr""0"
"$SubrackNr""1"
diff --git a/MAC/Navigator2/panels/Processes/BGPAppl.pnl b/MAC/Navigator2/panels/Processes/BGPAppl.pnl
index 012964850c765415bf1f955400bbb810112956ae..61db19b02569516993d8958da1f7af2197d2d426 100644
--- a/MAC/Navigator2/panels/Processes/BGPAppl.pnl
+++ b/MAC/Navigator2/panels/Processes/BGPAppl.pnl
@@ -9,7 +9,34 @@ PANEL,-1 -1 1013 750 N "_3DFace" 0
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);
+ int pos = strpos(bareDP,\"_TempObs\" );
+
+ if (pos > -1) {
+ string obsDP=substr(bareDP,0,pos+12);
+ dpGet(MainDBName+obsDP+\".claim.name\",observationName);
+ observation=navFunct_dpGetLastElement(observationName);
+ }
+
+ // get involved stations.
+ // look if that name is available in the Observation List
+ int j = dynContains(g_observations[\"NAME\"],observationName);
+ if ( j > 0) {
+ // get the Stationlist from that observation
+ string sts=g_observations[\"STATIONLIST\"][j];
+ // add stations if not allready there
+ stationList = navFunct_listToDynString(sts);
+ }
+
+ // set the observation selectable items
+ prepareProcesses();
+
+
// check if the requiered datapoint for this view are enabled and accessible
if (dpExists(baseDP + \".KSPType\")) {
if (dpConnect(\"updateBGPAppl\", baseDP + \".KSPType\",
@@ -40,9 +67,6 @@ updateBGPAppl(string dp1, string KSPType,
string SymbolCol=\"_Window\";
if (!invalid) {
setValue(\"ksp_txt\", \"text\", KSPType);
- setValue(\"inputBuffer_txt\", \"text\", inputBufferList);
- setValue(\"adder_txt\", \"text\", adderList);
-
} else {
SymbolCol=\"Lofar_invalid\";
if (dp1 == \"\") {
@@ -50,8 +74,22 @@ updateBGPAppl(string dp1, string KSPType,
}
}
setValue(\"ksp_txt\", \"backCol\",SymbolCol );
- setValue(\"inputBuffer_txt\", \"backCol\", SymbolCol);
- setValue(\"adder_txt\", \"backCol\", SymbolCol);
+
+ dyn_string adders = navFunct_listToDynString(adderList);
+ dyn_string inputBuffers = navFunct_listToDynString(inputBufferList);
+ //determine nr of adders (for now we assume only 1 inputbuffer per station)
+ int skipFactor=0;
+ if (dynlen(adders) > 0 && dynlen(inputBuffers) >0 ) {
+ skipFactor == dynlen(adders)/dynlen(inputBuffers);
+ }
+
+ // update stations based inputbuffers and adders
+ // clear stationtable
+ stationTable.deleteAllLines();
+ for (int i=1; i <= dynlen(stationList); i++) {
+ stationTable.appendLine(\"Station\",stationList[i],\"InputBuffers\",inputBuffers[i],\"Adders\",adders[i]);
+ }
+
}
@@ -61,11 +99,12 @@ void prepareProcesses() {
// append _BGPAppl
dynAppend(result,\",BGPAppl,\"+baseDP);
dynAppend(g_processesList,baseDP);
- // append BGPAppl_BGPProc
- dynAppend(result,baseDP+\",BGPProc,\"+baseDP+\"_BGPProc\");
+ // append all involved stations
+ for (int i=1; i <= dynlen(stationList); i++) {
+ dynAppend(result,baseDP+\",BGLProc->\"+stationList[i]+\",\"+baseDP+\"_BGPProc_\"+stationList[i]);
+ }
dynAppend(g_processesList,baseDP+\"_BGPProc\");
-
// write result to the db so various panels can reset themselves
dpSet(DPNAME_NAVIGATOR + g_navigatorID + \".processesList\",result);
@@ -98,9 +137,6 @@ void reload() {
navFunct_clearGlobalLists();
- // set the observation selectable items
- prepareProcesses();
-
// set panel to ready
g_objectReady=true;
@@ -114,7 +150,9 @@ E "#uses \"navPanel.ctl\"
string baseDP=\"\";
string database=\"\";
-" 0
+string observation=\"\";
+string observationName = \"\";
+dyn_string stationList=\"\";" 0
2
"CBRef" "1"
"EClose" E
@@ -123,39 +161,39 @@ 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 25 0 "" 0
+1 43 0 "" 0
0
-1 26 0 "0" 1
+1 44 0 "0" 1
0
-1 27 0 "" 2
+1 45 0 "" 2
0
-1 28 0 "" 3
+1 46 0 "" 3
0
-1 29 0 "" 7
+1 47 0 "" 7
0
-1 30 0 "" 8
+1 48 0 "" 8
0
-1 31 0 "" 9
+1 49 0 "" 9
0
-1 32 0 "" 10
+1 50 0 "" 10
0
-1 33 0 "" 11
+1 51 0 "" 11
0
-1 34 0 "" 12
+1 52 0 "" 12
0
-1 35 0 "" 13
+1 53 0 "" 13
0
-1 36 0 "" 15
+1 54 0 "" 15
0
-1 37 0 "" 16
+1 55 0 "" 16
0
-1 38 0 "" 17
+1 56 0 "" 17
0
-1 39 0 "" 18
+1 57 0 "" 18
0
-1 40 0 "" 19
+1 58 0 "" 19
0
-1 41 0 "" 20
+1 59 0 "" 20
0
2 18
"PRIMITIVE_TEXT10"
@@ -177,46 +215,6 @@ LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,
0 ""
1
LANG:1 19 Key Science Project
-2 19
-"PRIMITIVE_TEXT11"
-""
-1 28 396 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 28 396 111 410
-0 2 2 "0s" 0 0 0 192 0 0 28 396 1
-1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
-LANG:1 15 InputBufferList
-2 20
-"PRIMITIVE_TEXT12"
-""
-1 28 432 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 28 432 81 446
-0 2 2 "0s" 0 0 0 192 0 0 28 432 1
-1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
-LANG:1 9 AdderList
14 21
"ksp_txt"
""
@@ -234,12 +232,12 @@ LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,
0 ""
178 354 402 375
2 "0s" 0 0 0 0 0 -1 E E E
-14 23
-"inputBuffer_txt"
+25 42
+"stationTable"
""
1 180 390 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
-9 0 0 0 0 0
+12 0 0 0 0 0
E E E
0
1
@@ -249,25 +247,32 @@ LANG:1 0
1
LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
0 ""
- 178 388 402 409
-2 "0s" 0 0 0 0 0 -1 E E E
-14 24
-"adder_txt"
-""
-1 180 429 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-11 0 0 0 0 0
-E E E
-0
+ 178 388 762 562
+EE 1 0 1 3 0 "Station" 8 1 0 "s" 1
+LANG:1 7 Station
+E
1
LANG:1 0
-0
+80 "InputBuffers" 26 1 0 "s" 1
+LANG:1 12 InputBuffers
+E
+1
+LANG:1 0
+
+250 "Adders" 26 1 0 "s" 1
+LANG:1 6 Adders
+E
+1
+LANG:1 0
+
+250
+14 14 10 10
1
LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
0 ""
- 178 427 402 448
-2 "0s" 0 0 0 0 0 -1 E E E
+0 1 0 1 7
+1 0
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Hardware/RCU_HB_Filter.pnl b/MAC/Navigator2/panels/objects/Hardware/RCU_HB_Filter.pnl
index 9002c918e0a0569cb119a2bb36ab3be152039de9..257f4340806d4b154cab195f21edcba492b15cb0 100644
--- a/MAC/Navigator2/panels/objects/Hardware/RCU_HB_Filter.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/RCU_HB_Filter.pnl
@@ -12,8 +12,6 @@ PANEL,-1 -1 147 92 N "_3DFace" 0
if (!navFunct_dpReachable(baseDP)) {
controlHBFilter(\"\",0,\"\",true);
}
- } else {
- setValue(\"txt_state\", \"backCol\", \"Lofar_dpdoesnotexist\");
}
}
@@ -23,24 +21,15 @@ void controlHBFilter(string dp1, unsigned filter,
if(!invalid) {
if (filter == 2) {
- setValue(\"txt_state\" , \"backCol\" , \"Lofar_operational\");
setValue(\"txt_filter\" , \"text\" , \"110-190 MHz\" );
} else if (filter == 1) {
- setValue(\"txt_state\", \"backCol\", \"Lofar_operational\");
setValue(\"txt_filter\" , \"text\" , \"170-230 MHz\" );
} else if (filter == 0) {
- setValue(\"txt_state\", \"backCol\", \"Lofar_operational\");
- setValue(\"txt_filter\" , \"text\" , \"210-240 MHz\" );
+ setValue(\"txt_filter\" , \"text\" , \"210-270 MHz\" );
} else if (filter == 3) {
- setValue(\"txt_state\", \"backCol\", \"Lofar_off\");
setValue(\"txt_filter\" , \"text\" , \"Filter OFF\" );
}
} else {
- if (dp1 == \"\") {
- setValue(\"txt_state\", \"backCol\", \"Lofar_dpOffline\");
- } else {
- setValue(\"txt_state\", \"backCol\", \"Lofar_invalid\");
- }
setValue(\"txt_filter\" , \"text\" , \"\" );
}
}" 0
@@ -96,20 +85,6 @@ LANG:1 84 -*-Arial-*-r-normal-*-13-*-100-100-*-*-iso8859-1|-13,0,0,0,404,0,0,0,0
0 ""
1
LANG:1 15 Highband filter
-7 7
-"txt_state"
-""
-1 23 23 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-6 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 1 E 23 23 7 7
14 8
"txt_filter"
""
diff --git a/MAC/Navigator2/panels/objects/Hardware/RCU_LB_Filter.pnl b/MAC/Navigator2/panels/objects/Hardware/RCU_LB_Filter.pnl
index 9afce341f9fb873242d54be71e1021d2a1d82ef7..a2083755047cb85c29ff0bdde11cc64de4846645 100644
--- a/MAC/Navigator2/panels/objects/Hardware/RCU_LB_Filter.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/RCU_LB_Filter.pnl
@@ -24,9 +24,9 @@ void controlLBFilter(string dp1, unsigned filter,
if(!invalid) {
if (filter == 0) {
- setValue(\"txt_filter\" , \"text\" , \"10-80 MHz\" );
+ setValue(\"txt_filter\" , \"text\" , \"10-90 MHz\" );
} else if (filter == 1) {
- setValue(\"txt_filter\" , \"text\" , \"30-80 MHz\" );
+ setValue(\"txt_filter\" , \"text\" , \"30-90 MHz\" );
}
} else {
setValue(\"txt_filter\" , \"text\" , \"\" );
diff --git a/MAC/Navigator2/panels/objects/Hardware/Station_Clock.pnl b/MAC/Navigator2/panels/objects/Hardware/Station_Clock.pnl
index eaad655dfcd65cf6b5975ea8b653ac7239adcef5..cf3ddb478e2eb696f96290a1d44875ea0b56fd39 100644
--- a/MAC/Navigator2/panels/objects/Hardware/Station_Clock.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/Station_Clock.pnl
@@ -22,8 +22,6 @@ PANEL,-1 -1 242 64 N "_3DFace" 0
setValue(\"selfState.light\",\"toolTipText\",baseDP);
- // connect for childUpdates
- showChildState(baseDP);
// connect for selfUpdates
showSelfState(baseDP);
}
@@ -50,7 +48,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"childStateBorder"
+"border1"
""
1 10 50 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -62,7 +60,7 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E U 1 E 10 10 225 50
+E E 0 1 1 0 1 E U 1 E 10 10 225 50
2 1
"Text1"
""
diff --git a/MAC/Navigator2/panels/objects/Hardware/Station_Subrack_small.pnl b/MAC/Navigator2/panels/objects/Hardware/Station_Subrack_small.pnl
index 415214074821d63e815fc6c2614e29c9eff222f8..eb3326e3a08783cb9186b8879b128d729c093678 100644
--- a/MAC/Navigator2/panels/objects/Hardware/Station_Subrack_small.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/Station_Subrack_small.pnl
@@ -24,10 +24,26 @@ PANEL,-1 -1 185 272 N "_3DFace" 2
// 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) ){
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+ } else {
+ Border1.visible(false);
+ setValue(\"selfState.light\",\"visible\",false);
+ childStateBorder.visible(false);
+ subrack_highLight.visible(false);
+ Subrack_Txt.visible(false);
+ subRackClkBoard.visible(false);
+ subRackRSP0.visible(false);
+ subRackRSP1.visible(false);
+ subRackRSP2.visible(false);
+ subRackRSP3.visible(false);
+ subRackSPUBoard.visible(false);
+ subRackTBB0.visible(false);
+ subRackTBB1.visible(false);
+ }
}" 0
E "main()
{
@@ -142,7 +158,7 @@ void SubrackCallback(string dp1, bool aTrig) {
{
click();
}" 0
- 0 1 1 2 1 E 1 0 1 -181 1 1 E 200 10 333 193
+ 0 1 1 2 1 E 1 0 1 -180 0 1 E 200 10 333 193
6 901
"childStateBorder"
""
diff --git a/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl b/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
index 1845d6f344919654d63501bd5d50780dfac4cffe..2c5809997b0829db853cb17112759a3678c7bc52 100644
--- a/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/ObsSW_CEP.pnl
@@ -172,25 +172,25 @@ LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,
0 ""
1
LANG:1 6 logMsg
-1 145 15 "" 4
+1 156 15 "" 4
0
-1 146 15 "" 3
+1 157 15 "" 3
0
-1 147 15 "0" 1
+1 158 15 "0" 1
0
-1 148 15 "" 2
+1 159 15 "" 2
0
-1 149 15 "" 6
+1 160 15 "" 6
0
-1 150 16 "" 4
+1 161 16 "" 4
0
-1 151 16 "" 3
+1 162 16 "" 3
0
-1 152 16 "0" 1
+1 163 16 "0" 1
0
-1 153 16 "" 2
+1 164 16 "" 2
0
-1 154 16 "" 6
+1 165 16 "" 6
0
2 113
"observationName"
@@ -232,6 +232,51 @@ LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,
0 ""
1
LANG:1 7 CCU001:
+29 166
+"stationTree"
+""
+1 1180 -180.3187868866587 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+43 0 0 0 0 0
+E E E
+0
+1
+LANG:1 18 Involved stations
+
+8
+"frameShadow" "enum 48"
+"selectionMode" "enum 0"
+"backgroundOrigin" "enum 0"
+"defaultRenameAction" "enum 0"
+"frameShape" "enum 6"
+"vScrollBarMode" "enum 0"
+"hScrollBarMode" "enum 0"
+"resizeMode" "enum 0"
+ 820 20 990 271
+10 TreeWidget
+7
+0 "expanded" "(string id)"
+""
+0 "collapsed" "(string id)"
+""
+0 "selectionChanged" "(string id)"
+""
+0 "clicked" "(string id, int column)"
+""
+0 "doubleClicked" "(string id, int column)"
+""
+0 "rightClicked" "(string id, int column)"
+""
+0 "itemRenamed" "(string id, int column, string text)"
+""
+"main()
+{
+ stationTree.addColumn(\"Involved Stations\");
+ stationTree.setColumnWidth(0,201);
+
+}
+
+" 0
0
LAYER, 1
1