diff --git a/MAC/Navigator/images/objects/Objects.cat b/MAC/Navigator/images/objects/Objects.cat
index cb164ee08ec4b3179e6245e15a9585d6b6037646..63bd7c248956f3b61cfeed10bbcae6332f062811 100644
Binary files a/MAC/Navigator/images/objects/Objects.cat and b/MAC/Navigator/images/objects/Objects.cat differ
diff --git a/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl b/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl
index b140946e8d2ac42ed335134a710f4c1c9db3a7ae..10a0312b6368ec26eed93a8354f92807a7db4222 100644
--- a/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl
+++ b/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl
@@ -1,10 +1,11 @@
V 10
1
LANG:1 11 SwitchRect2
-PANEL,305 99 1094 839 N "_3DFace" 0
+PANEL,341 112 958 778 N "_3DFace" 0
EEE E E 1 0 0 0 130 470
"" 0 1
-EE 2
+E"#uses \"nav_fw/gcfnav-functions.ctl\"" 0
+ 2
"CBRef""1"
"EClose"E
""
diff --git a/MAC/Navigator/panels/nav_usr/CS1/Observations overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/Observations overview.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..3bbd3e53cfb71f8a7a49f1cd631d5724904f2a8c
--- /dev/null
+++ b/MAC/Navigator/panels/nav_usr/CS1/Observations overview.pnl
@@ -0,0 +1,186 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,335 108 950 741 N "_3DFace" 0
+EEE E E 1 0 0 0 10 10
+"" 0 1
+E"updateObservationsTable(string dpe, dyn_string dpv)
+{
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ navPMLunloadPropertySet(\"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\");
+ }
+ TableObservations.deleteAllLines();
+ for(int i=1; i<=dynlen(dpv);i++)
+ {
+ TableObservations.appendLine(\"Observation\",dpv[i]);
+ string dpPrefix = \"LOFAR_ObsSW_\" + dpv[i] + \"_ObsCtrl\";
+
+ navPMLloadPropertySet(dpPrefix);
+
+ for(int i=0; i<10 && !dpAccessable(dpPrefix);i++)
+ {
+ delay(0,250);
+ }
+
+ dpConnect(\"updateObservationsTableState\",dpPrefix + \".state:_online.._value\");
+ dpConnect(\"updateObservationsTableController\",dpPrefix + \".claimPeriod:_online.._value\",
+ dpPrefix + \".preparePeriod:_online.._value\",
+ dpPrefix + \".startTime:_online.._value\",
+ dpPrefix + \".stopTime:_online.._value\");
+ }
+}
+
+updateObservationsTableState(string dpe, string dpv)
+{
+ string dp = dpSubStr(dpe,DPSUB_DP);
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\"))
+ {
+ TableObservations.cellValueRC(i,\"Status\",dpv);
+ }
+ }
+}
+
+updateObservationsTableController(string dpe1, string claimPeriod,
+ string dpe2, string preparePeriod,
+ string dpe3, string startTime,
+ string dpe4, string stopTime)
+{
+ string dp = dpSubStr(dpe1,DPSUB_DP);
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\")
+ {
+ TableObservations.cellValueRC(i,\"ClaimPeriod\",claimPeriod);
+ TableObservations.cellValueRC(i,\"PreparePeriod\",preparePeriod);
+ TableObservations.cellValueRC(i,\"StartTime\",startTime);
+ TableObservations.cellValueRC(i,\"StopTime\",stopTime);
+ }
+ }
+}" 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
+2 0
+"Text1"
+""
+1 10 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U 0 E 12 12 316 44
+0 2 0 "s" 0 0 0 192 0 0 12 12
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-240-100-100-*-*-iso8859-1|-27,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 21 Observations Overview
+4 12
+"Line1"
+""
+1 10 50 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+ E E
+13 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 3 2 0 1 E 940 50 10 50
+25 20
+"TableObservations"
+""
+1 0 -1451 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+20 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
+0 ""
+8 58 942 732
+E "main(int row, string column, string value)
+{
+ DebugTN(\"ColumnCommand\",row,column,value);
+ string dp = \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(row,\"Observation\");
+ DebugTN(\"ColumnCommand: trigger Navigator with datapoint=\",dp);
+ navConfigTriggerNavigatorRefreshWithDP(dp);
+}" 0
+ 1 0 1 6 1 "Observation" 0 1 0 "s" 1
+LANG:1 11 Observation
+E1
+LANG:1 0
+ 225 "ClaimPeriod" 0 1 0 "s" 1
+LANG:1 12 Claim period
+E1
+LANG:1 0
+ 100 "PreparePeriod" 0 1 0 "s" 1
+LANG:1 14 Prepare period
+E1
+LANG:1 0
+ 100 "StartTime" 0 1 0 "s" 1
+LANG:1 10 Start time
+E1
+LANG:1 0
+ 150 "StopTime" 0 1 0 "s" 1
+LANG:1 9 Stop time
+E1
+LANG:1 0
+ 150 "Status" 0 1 0 "s" 1
+LANG:1 6 Status
+E1
+LANG:1 0
+ 180 26 16 "" 1 1
+LANG:1 2 #1
+8 30 1
+LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
+0 ""
+0 2 1 3 0
+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
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/nav_usr/CS1/WAN-CS1.pnl b/MAC/Navigator/panels/nav_usr/CS1/WAN-CS1.pnl
index c8200122e8e7b8dad83d5063bd4dce357458d7c2..ef8d904159cfe77ba41965ab843df17b8639fca2 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/WAN-CS1.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/WAN-CS1.pnl
@@ -1,11 +1,12 @@
V 10
1
LANG:1 7 Station
-PANEL,300 241 954 746 N "_3DFace" 3
+PANEL,335 106 954 746 N "_3DFace" 3
"$configDatapoint"
"$datapoint"
"$referenceDatapoint"
-"
+"main() {
+}
" 0
EE E E 1 -1 -1 0 188 128
"" 0 1
@@ -302,7 +303,7 @@ T
LANG:1 8 view CEP
"main()
{
- aplViewNavigateTo(\"\", $referenceDatapoint, \"LOFAR_CEP\", \"nav_usr/CEP/CEP_fysical_view.pnl\");
+ aplViewNavigateTo(\"\", $referenceDatapoint, \"LOFAR_PIC\", \"nav_usr/CEP/CEP_fysical_view.pnl\");
}" 0
E E E
0
diff --git a/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
index 4c17745c0ac07bb3cfd459f08879efa2cd02e4bf..5bc40a7f877cc8d3ae0a9ab042c8a911685729e3 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 13 ObsCtrl_State
-PANEL,372 214 950 741 N "_3DFace" 1
+PANEL,514 322 950 741 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -42,7 +42,7 @@ updateObsCtrl(string dp1, string state,
}
setValue(\"ObsCtrl_border\", \"backCol\", SymbolCol);
setValue(\"txt_State\", \"text\", state);
- setValue(\"txt_Error\", \"text\", error);
+ setValue(\"txt_Error\", \"text\", substr(error,0,30));
}
diff --git a/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl b/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl
index 0ed3cb1b0302d67827d0e899d730bae937ec2605..74cd8154df8f5c97c60e8f574c18a9f862288414 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl
@@ -1,12 +1,104 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,379 129 950 741 N "_3DFace" 2
-"$datapoint"
+PANEL,474 319 950 741 N "_3DFace" 1
"$referenceDatapoint"
-EEE E E 1 0 0 0 10 10
+"main()
+{
+ // select all states from Observations online (ObsCtrl) && offline(OfflineCtrl)
+ string onlineQuery = \"SELECT '_online.._value' FROM '{LOFAR_ObsSW_Observation*_ObsCtrl.state,LOFAR_ObsSW_Observation*_ObsCtrl.error}'\";
+ string offlineQuery = \"SELECT '_online.._value' FROM '{LOFAR_ObsSW_Observation*_OfflineCtrl.state,LOFAR_ObsSW_Observation*_OfflineCtrl.error}'\";
+
+
+ dpQueryConnectAll(\"updateObservationTable\",true,observationID,onlineQuery);
+ dpQueryConnectAll(\"updateOfflineTable\",true,offlineID,offlineQuery);
+}
+
+" 0
+"main()
+{
+// dpQueryDisconnect(\"updateObservationTable\",observationID);
+// dpQueryDisconnect(\"updateOfflineTable\",offlineID);
+
+}" 0
+E E E 1 0 0 0 10 10
"" 0 1
-E"#uses \"nav_usr/STS/STS-functions.ctl\"" 0
+E"#uses \"nav_usr/CS1/CS1_Common.ctl\"
+
+// Unique identifiesr to be able to disconnect the query connect later
+string observationID=\"mainObsStatusChange\";
+string offlineID=\"mainOfflineStatusChange\";
+
+
+string getObsName(string aString) {
+ return strsplit(aString,\"_\")[3];
+}
+
+string getResultType(string aString) {
+ dyn_string aS= strsplit(aString,\"|\");
+ string result=strsplit(aS[1],\".\")[2];
+ strreplace(result,\" \",\"\");
+ return result;
+}
+
+string getResultValue(string aString) {
+ DebugTN(\"Getting value from \" + aString);
+ return strsplit(aString,\"|\")[2];
+}
+
+updateObservationTable(string ident, dyn_dyn_anytype tab)
+{
+ //empty table
+ Observation_table.deleteAllLines();
+
+ if (dynlen(tab) > 1) {
+ for (int z = 2; z <= dynlen(tab); z++)
+ {
+ string obsName = getObsName(tab[z]);
+ string state=\"\";
+ string error=\"\";
+ // Determine if state or error callback
+ // update the table , if obsname is available it will be updated,
+ //otherwise a new line will be appended
+ if (getResultType(tab[z]) == \"state\" ) {
+ state = getResultValue(tab[z]);
+ Observation_table.updateLine(1,\"Observation\",obsName,\"Status\",state);
+ } else if (getResultType(tab[z]) == \"error\") {
+ error = getResultValue(tab[z]);
+ Observation_table.updateLine(1,\"Observation\",obsName,\"Error\",error);
+ } else {
+ DebugTN(\"Error in getType: \" + getResultType(tab[z]));
+ }
+ }
+ }
+}
+updateOfflineTable(string ident, dyn_dyn_anytype tab)
+{
+ //empty table
+ Offline_table.deleteAllLines();
+
+ if (dynlen(tab) > 1) {
+ for (int z = 2; z <= dynlen(tab); z++)
+ {
+ string obsName = getObsName(tab[z]);
+ string state=\"\";
+ string error=\"\";
+ // Determine if state or error callback
+ // update the table , if obsname is available it will be updated,
+ //otherwise a new line will be appended
+ if (getResultType(tab[z]) == \"state\" ) {
+ state = getResultValue(tab[z]);
+ Offline_table.updateLine(1,\"Offline\",obsName,\"Status\",state);
+ } else if (getResultType(tab[z]) == \"error\") {
+ error = getResultValue(tab[z]);
+ Offline_table.updateLine(1,\"Offline\",obsName,\"Error\",error);
+ } else {
+ DebugTN(\"Error in getType: \" + getResultType(tab[z]));
+ }
+ }
+ }
+}
+" 0
2
"CBRef""1"
"EClose"E
@@ -215,90 +307,90 @@ E E 0 5 1 0 1 E 450 240 450 114
0
1 155 1 "" 19
0
-1 210 10 "" 0
+1 156 10 "" 0
0
-1 211 10 "" 1
+1 157 10 "" 1
0
-1 212 10 "" 2
+1 158 10 "" 2
0
-1 213 10 "" 3
+1 159 10 "" 3
0
-1 214 10 "" 4
+1 160 10 "" 4
0
-1 215 10 "" 5
+1 161 10 "" 5
0
-1 216 10 "" 6
+1 162 10 "" 6
0
-1 217 10 "" 7
+1 163 10 "" 7
0
-1 218 10 "" 8
+1 164 10 "" 8
0
-1 219 10 "" 9
+1 165 10 "" 9
0
-1 220 10 "" 10
+1 166 10 "" 10
0
-1 221 10 "" 11
+1 167 10 "" 11
0
-1 222 10 "" 12
+1 168 10 "" 12
0
-1 223 10 "" 13
+1 169 10 "" 13
0
-1 224 11 "" 0
+1 170 11 "" 0
0
-1 225 11 "" 1
+1 171 11 "" 1
0
-1 226 11 "" 2
+1 172 11 "" 2
0
-1 227 11 "" 3
+1 173 11 "" 3
0
-1 228 11 "" 4
+1 174 11 "" 4
0
-1 229 11 "" 5
+1 175 11 "" 5
0
-1 230 11 "" 6
+1 176 11 "" 7
0
-1 231 11 "" 7
+1 177 11 "" 8
0
-1 232 11 "" 8
+1 178 11 "" 9
0
-1 233 11 "" 9
+1 179 11 "" 10
0
-1 234 11 "" 10
+1 180 11 "" 11
0
-1 235 11 "" 11
+1 181 11 "" 12
0
-1 236 11 "" 12
+1 182 11 "" 13
0
-1 237 12 "" 0
+1 183 12 "" 0
0
-1 238 12 "" 1
+1 184 12 "" 1
0
-1 239 12 "" 2
+1 185 12 "" 2
0
-1 240 12 "" 3
+1 186 12 "" 3
0
-1 241 12 "" 4
+1 187 12 "" 4
0
-1 242 12 "" 5
+1 188 12 "" 5
0
-1 243 12 "" 6
+1 189 12 "" 6
0
-1 244 12 "" 7
+1 190 12 "" 7
0
-1 245 12 "" 8
+1 191 12 "" 8
0
-1 246 12 "" 9
+1 192 12 "" 9
0
-1 247 12 "" 10
+1 193 12 "" 10
0
-1 248 12 "" 11
+1 194 12 "" 11
0
-1 249 12 "" 12
+1 195 12 "" 12
0
25 157
-"TableObservations"
+"Observation_table"
""
-1 570 16 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 10 16 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
60 0 0 0 0 0
EE E
@@ -309,37 +401,37 @@ LANG:1 0
1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
0 ""
-568 398 892 562
+8 398 892 562
E "main(int row, string column, string value)
{
DebugTN(\"ColumnCommand\",row,column,value);
- string dp = \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(row,\"Observation\");
+ string dp = \"LOFAR_ObsSW_\" + Observation_table.cellValueRC(row,\"Observation\");
DebugTN(\"ColumnCommand: trigger Navigator with datapoint=\",dp);
navConfigTriggerNavigatorRefreshWithDP(dp);
}" 0
- 1 0 1 1 5 "Observation" 0 1 0 "s" 1
+ 1 0 1 3 1 "Observation" 0 1 0 "s" 1
LANG:1 11 Observation
E1
LANG:1 0
- 300 26 26 "" 1 1
-LANG:1 2 #2
-"" 1 1
-LANG:1 2 #3
-"" 1 1
-LANG:1 2 #3
-"" 1 1
-LANG:1 2 #4
-"" 1 1
-LANG:1 2 #5
+ 250 "Status" 0 1 0 "s" 1
+LANG:1 6 Status
+E1
+LANG:1 0
+ 150 "Error" 0 1 0 "s" 1
+LANG:1 5 Error
+E1
+LANG:1 0
+ 460 16 16 "" 1 1
+LANG:1 2 #1
8 30 1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
0 ""
-0 2 1 3 0
+0 2 2 3 0
1 0
25 158
-"TableOffline"
+"Offline_table"
""
-1 565 -185 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 -3 -175 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
61 0 0 0 0 0
EE E
@@ -350,71 +442,25 @@ LANG:1 0
1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
0 ""
-568 558 892 722
-E E 1 0 1 1 5 "Offline" 0 1 0 "s" 1
+8 568 892 732
+E E 1 0 1 3 1 "Offline" 0 1 0 "s" 1
LANG:1 7 Offline
E1
LANG:1 0
- 300 26 26 "" 1 1
-LANG:1 2 #1
-"" 1 1
-LANG:1 2 #5
-"" 1 1
-LANG:1 2 #2
-"" 1 1
-LANG:1 2 #3
-"" 1 1
-LANG:1 2 #4
-8 30 1
-LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
-0 ""
-0 2 1 3 0
-1 0
-25 159
-"TableEvents"
-""
-1 -785 -1184 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-62 0 0 0 0 0
-EE E
-0
-1
+ 250 "Status" 0 1 0 "s" 1
+LANG:1 6 Status
+E1
LANG:1 0
-0
-1
-LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
-0 ""
-38 398 572 722
-E E 1 0 1 1 11 "Events" 0 1 0 "s" 1
-LANG:1 6 Events
+ 150 "Error" 0 1 0 "s" 1
+LANG:1 5 Error
E1
LANG:1 0
- 510 26 26 "" 1 1
-LANG:1 2 #2
-"" 1 1
-LANG:1 2 #6
-"" 1 1
-LANG:1 2 #7
-"" 1 1
-LANG:1 2 #8
-"" 1 1
-LANG:1 2 #9
-"" 1 1
-LANG:1 3 #10
-"" 1 1
-LANG:1 3 #11
-"" 1 1
-LANG:1 2 #3
-"" 1 1
-LANG:1 2 #3
-"" 1 1
-LANG:1 2 #4
-"" 1 1
-LANG:1 2 #5
+ 460 16 16 "" 1 1
+LANG:1 2 #1
8 30 1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
0 ""
-0 2 1 3 0
+0 2 2 3 0
1 0
0
LAYER, 1
@@ -467,14 +513,11 @@ LANG:1 6 Layer8
"$referenceDatapoint""$referenceDatapoint"
3 10 ""
"objects\\nav_usr\\CEP\\CEPIcon.pnl" 144 217 T 140 1 0 1 666 53
-1
-"$datapoint""$datapoint"
+0
3 11 ""
-"objects\\nav_usr\\WAN\\WanIcon.pnl" 633 203 T 141 1 0 1 203 -13
-1
-"$datapoint""$datapoint"
+"objects\\nav_usr\\WAN\\WanIcon.pnl" 633 203 T 141 1 0 1 157 -53
+0
3 12 ""
"objects\\nav_usr\\CS1\\Software_Icon.pnl" 163 138 T 142 1 0 1 647 232
-1
-"$datapoint""$datapoint"
+0
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
index d241269a21b4ec2dc8d338ff798d924487d4c69c..1232e7fb49c22d402702687508014f8e24f77037 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,352 226 1026 741 N "_3DFace" 0
+PANEL,227 144 1026 741 N "_3DFace" 0
"main()
{
dpConnect(\"updateObservationsTable\",\"LOFAR_PermSW_MACScheduler.activeObservations:_online.._value\");
@@ -18,64 +18,60 @@ EE E E 1 0 0 0 10 10
"" 0 1
E"updateObservationsTable(string dpe, dyn_string dpv)
{
- for(int i=0; i < TableObservations.lineCount; i++)
- {
- navPMLunloadPropertySet(\"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\");
- }
- TableObservations.deleteAllLines();
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ navPMLunloadPropertySet(\"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\");
+ }
+ TableObservations.deleteAllLines();
for(int i=1; i<=dynlen(dpv);i++)
{
- TableObservations.appendLine(\"Observation\",dpv[i]);
- string dpPrefix = \"LOFAR_ObsSW_\" + dpv[i] + \"_ObsCtrl\";
-
- navPMLloadPropertySet(dpPrefix);
+ TableObservations.appendLine(\"Observation\",dpv[i]);
+ string dpPrefix = \"LOFAR_ObsSW_\" + dpv[i] + \"_ObsCtrl\";
+
+ navPMLloadPropertySet(dpPrefix);
- for(int i=0; i<10 && !dpAccessable(dpPrefix);i++)
- {
- delay(0,250);
- }
-
- dpConnect(\"updateObservationsTableState\",dpPrefix + \".state:_online.._value\");
- dpConnect(\"updateObservationsTableController\",
- dpPrefix + \".claimPeriod:_online.._value\",
- dpPrefix + \".preparePeriod:_online.._value\",
- dpPrefix + \".startTime:_online.._value\",
- dpPrefix + \".stopTime:_online.._value\");
- }
+ for(int i=0; i<10 && !dpAccessable(dpPrefix);i++)
+ {
+ delay(0,250);
+ }
+
+ dpConnect(\"updateObservationsTableState\",dpPrefix + \".state:_online.._value\");
+ dpConnect(\"updateObservationsTableController\",dpPrefix + \".claimPeriod:_online.._value\",
+ dpPrefix + \".preparePeriod:_online.._value\",
+ dpPrefix + \".startTime:_online.._value\",
+ dpPrefix + \".stopTime:_online.._value\");
+ }
}
updateObservationsTableState(string dpe, string dpv)
{
- string dp = dpSubStr(dpe,DPSUB_DP);
- for(int i=0; i < TableObservations.lineCount; i++)
- {
- if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\"))
- {
- TableObservations.cellValueRC(i,\"Status\",dpv);
- }
- }
-
+ string dp = dpSubStr(dpe,DPSUB_DP);
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\"))
+ {
+ TableObservations.cellValueRC(i,\"Status\",dpv);
+ }
+ }
}
updateObservationsTableController(string dpe1, string claimPeriod,
- string dpe2, string preparePeriod,
- string dpe3, string startTime,
- string dpe4, string stopTime)
+ string dpe2, string preparePeriod,
+ string dpe3, string startTime,
+ string dpe4, string stopTime)
{
- string dp = dpSubStr(dpe1,DPSUB_DP);
- for(int i=0; i < TableObservations.lineCount; i++)
- {
- if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\")
- {
- TableObservations.cellValueRC(i,\"ClaimPeriod\",claimPeriod);
- TableObservations.cellValueRC(i,\"PreparePeriod\",preparePeriod);
- TableObservations.cellValueRC(i,\"StartTime\",startTime);
- TableObservations.cellValueRC(i,\"StopTime\",stopTime);
- }
- }
-
+ string dp = dpSubStr(dpe1,DPSUB_DP);
+ for(int i=0; i < TableObservations.lineCount; i++)
+ {
+ if(dp == \"LOFAR_ObsSW_\" + TableObservations.cellValueRC(i,\"Observation\") + \"_ObsCtrl\")
+ {
+ TableObservations.cellValueRC(i,\"ClaimPeriod\",claimPeriod);
+ TableObservations.cellValueRC(i,\"PreparePeriod\",preparePeriod);
+ TableObservations.cellValueRC(i,\"StartTime\",startTime);
+ TableObservations.cellValueRC(i,\"StopTime\",stopTime);
+ }
+ }
}
-
updateControllersTable(string identifier, dyn_dyn_anytype result)
{
if(identifier == \"ControllerStateQuery\")
diff --git a/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl b/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
index 77651076c9288edb02f6b97db6b6b103e8696979..bc9bf18512cec5456e3033e510cf62a6b1d8f92b 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
@@ -1,17 +1,47 @@
V 10
1
LANG:1 7 CepIcon
-PANEL,305 99 135 131 N "_3DFace" 1
-"$datapoint"
-EE"main()
+PANEL,613 404 433 325 N "_3DFace" 0
+"main()
+{
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable(baseDP+\".state\") && dpAccessable(baseDP + \".error\")) {
+ dpConnect(\"updateCEPIcon\",baseDP + \".state\",
+ baseDP + \".error\",
+ baseDP + \".state:_online.._invalid\");
+ } else {
+ setValue(\"CEPIcon_border\", \"foreCol\", \"_dpdoesnotexist\");
+ }
+
+
+}
+
+updateCEPIcon(string dp1, string state,
+ string dp2, string error,
+ string dp3, bool invalid)
+{
+ string SymbolCol;
+ if (invalid)
+ {
+ SymbolCol=\"Lofar_device_invalid\";
+ } else {
+ SymbolCol=\"Lofar_device_active\";
+ }
+ setValue(\"CEPIcon_border\", \"foreCol\", SymbolCol);
+}" 0
+E"main()
{
click();
}" 0
E E 1 0 0 0 20 90
"" 0 1
-E"click()
+E"#uses \"nav_usr/STS/STS-functions.ctl\"
+
+string baseDP=\"LOFAR_PIC\";
+
+click()
{
- aplViewNavigateTo($datapoint,\"\", \":LOFAR_PIC_CEP\", \"CEP_logical_view.pnl\");
+ aplViewNavigateTo(\"\",\"\", baseDP, \"\");
}" 0
2
"CBRef""1"
@@ -22,7 +52,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border23"
+"CEPIcon_border"
""
1 20 90 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -30,12 +60,12 @@ LANG:1 6 Layer1
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 20 20 90 90
7 1
@@ -47,12 +77,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E 1.166666666666667 0 1.029411764705882 -5.91666666666667 -1.632352941176465 1 E 35.5 55.5 3 17
6 2
@@ -64,12 +94,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 41 38 43 73
6 3
@@ -81,12 +111,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 45 38 53 73
6 4
@@ -98,12 +128,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 55 38 56 73
6 5
@@ -115,12 +145,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 45 70 47
6 6
@@ -132,12 +162,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 68 70 71
6 7
@@ -149,12 +179,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 63 70 66
6 8
@@ -166,12 +196,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 57 70 59
6 9
@@ -183,12 +213,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 51 69 54
6 10
@@ -200,12 +230,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 59 38 70 41
6 11
@@ -217,12 +247,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 73 38 81 73
6 12
@@ -234,12 +264,12 @@ click();
EE E
0
1
-LANG:1 0
+LANG:1 3 CEP
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 34 77 72 81
7 13
@@ -256,7 +286,7 @@ LANG:1 3 CEP
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
0 1 1 0 1 E 1.071428571428571 0 1 -3.964285714285713 0 1 E 55.5 28 7 4
0
@@ -288,6 +318,4 @@ LAYER, 7
1
LANG:1 6 Layer8
0
-2 "Group1" 20 20 90 90
-14 13 12 11 10 9 8 7 6 5 4 3 2 1 0
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CEP/CEP_internal_switch.pnl b/MAC/Navigator/panels/objects/nav_usr/CEP/CEP_internal_switch.pnl
index f45e1b95ed62a76b928d6d0a397fd8b3f3c366eb..aabaf574f634464cfdc617ec3d2a35fd64f03d8b 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CEP/CEP_internal_switch.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CEP/CEP_internal_switch.pnl
@@ -1,30 +1,8 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,265 103 806 562 N "_3DFace" 1
+PANEL,335 106 806 562 N "_3DFace" 1
"$switchType"
-EEE E E 1 0 0 0 80 65
-"" 0 1
-EE 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
-7 0
-"internalSwitch"
-""
-1 80 65 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
- E E
-1 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0
-1
-"dashclr"N "_Transparent"
"main()
{
// Check for PC types only
@@ -76,7 +54,29 @@ void computeSwitchSumAlert(string ident, dyn_dyn_anytype tab)
internalSwitch.backCol = \"Lofar_device_active\";
}
}" 0
- E 0 1 1 0 1 E U 1 E 80 65 50 25
+EE E E 1 0 0 0 80 65
+"" 0 1
+EE 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
+7 0
+"internalSwitch"
+""
+1 80 65 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U 1 E 80 65 50 25
2 1
"Text4"
""
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl
index 2236231fb5a86de75b37a783edf498085bcffe90..eaab04b68dea2ccb30a84023ebb267cf15619e39 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl
@@ -1,17 +1,48 @@
V 10
1
LANG:1 12 SoftwareIcon
-PANEL,305 99 154 186 N "_3DFace" 1
-"$datapoint"
-EE"main()
+PANEL,908 331 154 186 N "_3DFace" 0
+"main()
+{
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable(baseDP+\".state\") && dpAccessable(baseDP + \".error\")) {
+ dpConnect(\"updateSoftwareIcon\",baseDP + \".state\",
+ baseDP + \".error\",
+ baseDP + \".state:_online.._invalid\");
+ } else {
+ setValue(\"SoftwareIcon_border\", \"foreCol\", \"_dpdoesnotexist\");
+ }
+
+
+}
+
+
+updateSoftwareIcon(string dp1, string state,
+ string dp2, string error,
+ string dp3, bool invalid)
+{
+ string SymbolCol;
+ if (invalid)
+ {
+ SymbolCol=\"Lofar_device_invalid\";
+ } else {
+ SymbolCol=\"Lofar_device_active\";
+ }
+ setValue(\"SoftwareIcon_border\", \"foreCol\", SymbolCol);
+}" 0
+E"main()
{
click();
}" 0
E E 1 0 0 0 20 110
"" 0 1
-E"click()
+E"#uses \"nav_usr/STS/STS-functions.ctl\"
+
+string baseDP= \"LOFAR_PermSW\";
+
+click()
{
- aplViewNavigateTo($datapoint, \"\", \":LOFAR_PermSW\", \"software-overview.pnl\");
+ aplViewNavigateTo(\"\", \"\", baseDP, \"\");
}" 0
2
"CBRef""1"
@@ -22,7 +53,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border30"
+"SoftwareIcon_border"
""
1 20 110 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -30,7 +61,7 @@ LANG:1 6 Layer1
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -47,10 +78,14 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 70 80 50 80
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 70 80 50 80
4 2
"Line15"
""
@@ -60,10 +95,14 @@ E E 0 2 1 0 1 E 70 80 50 80
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 70 80 70 50
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 70 80 70 50
6 3
"Border26"
""
@@ -73,7 +112,7 @@ E E 0 2 1 0 1 E 70 80 70 50
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -90,10 +129,14 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 70 50 50 50
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 70 50 50 50
4 5
"Line13"
""
@@ -103,10 +146,14 @@ E E 0 2 1 0 1 E 70 50 50 50
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 46 90 46 36
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 46 90 46 36
10 6
"Polyline2"
""
@@ -116,7 +163,7 @@ E E 0 2 1 0 1 E 46 90 46 36
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -137,7 +184,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -154,7 +201,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -175,7 +222,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -192,7 +239,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -213,7 +260,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -230,7 +277,7 @@ E "main()
EE E
0
1
-LANG:1 0
+LANG:1 18 Permanent Software
1
"dashclr"N "_Transparent"
E "main()
@@ -267,6 +314,4 @@ LAYER, 7
1
LANG:1 6 Layer8
0
-2 "Group1" 20 20 90 110
-13 12 11 10 9 8 7 6 5 4 3 2 1 0
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl
index 81d16ef803109abdec713ab5321d081cb69f15a8..569abb5651059cbdcc56b6c846002e0de63dbdfe 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl
@@ -1,16 +1,47 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,258 100 203 231 N "_3DFace" 2
+PANEL,335 253 203 231 N "_3DFace" 2
"$Station"
"$referenceDatapoint"
"main()
{
- txt_station.text = $Station;
+ txt_Station.text = $Station;
+ baseDP = $Station+\":LOFAR\";
+
+ // load propertysets from datapoints
+ navPMLloadPropertySet(baseDP);
+
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable(baseDP+\".state\")) {
+ dpConnect(\"updateStation\",baseDP + \".state\",
+ baseDP + \".state:_online.._invalid\");
+ } else {
+ setValue(\"Station\", \"backCol\", \"_dpdoesnotexist\");
+ }
+}
+
+updateStation(string dp1, string state,
+ string dp3, bool invalid)
+{
+ string SymbolCol;
+ if (invalid)
+ {
+ SymbolCol=\"Lofar_device_invalid\";
+ } else {
+ SymbolCol=\"Lofar_device_active\";
+ }
+ setValue(\"Station\", \"backCol\", SymbolCol);
}" 0
-EE E E 1 0 0 0 145 145
+"main()
+{
+ navPMLunloadPropertySet(baseDP);
+}" 0
+E E E 1 0 0 0 145 145
"" 0 1
-E"click()
+E"string baseDP=\"\";
+
+click()
{
aplViewNavigateTo(\"\", $referenceDatapoint, $Station + \":LOFAR_PIC\", \"Station-CS1.pnl\");
}" 0
@@ -23,9 +54,9 @@ LAYER, 0
1
LANG:1 6 Layer1
7 47
-"Ellipse26"
+"Station"
""
-1 75 75 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E
+1 75 75 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_inactive" E E
E E
48 0 0 0 0 0
EE E
@@ -53,9 +84,9 @@ LANG:1 0
"dashclr"N "_Transparent"
E E 0 3 1 0 1 E 45 104 105 44
2 46
-"txt_station"
+"txt_Station"
""
-1 36 133 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E
+1 35 133 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
47 0 0 0 0 0
EE E
@@ -64,11 +95,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 38 135 114 151
-0 2 0 "s" 0 0 0 65 0 0 38 135
+E E 0 1 1 0 1 E U 1 E 37 135 113 151
+0 2 0 "s" 0 0 0 65 0 0 37 135
1
1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-140-100-100-*-*-iso8859-1|-16,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-140-100-100-*-*-iso8859-1|-16,0,0,0,700,0,0,0,0,3,2,1,34,Arial
0 ""
1
LANG:1 9 <station>
@@ -423,6 +454,12 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+2 "Group17" 91 36 111 56
+2 59 58
+2 "Group18" 37 36 57 56
+2 61 60
+2 "Group19" 35 92 55 112
+2 63 62
2 "Group13" 64 25 84 45
2 51 50
2 "Group14" 64 104 84 124
@@ -431,14 +468,8 @@ LANG:1 6 Layer8
2 33 32
2 "Group12" 64 64 84 84
2 49 48
-2 "Group15" 24 64 44 84
-2 55 54
-2 "Group17" 91 36 111 56
-2 59 58
-2 "Group18" 37 36 57 56
-2 61 60
-2 "Group19" 35 92 55 112
-2 63 62
2 "Group16" 104 64 124 84
2 57 56
+2 "Group15" 24 64 44 84
+2 55 54
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
index 302622045c7ba2025f21ebc09cf536268bd91ddf..85d5cc6ea5356686ac390d0528ca4db491e7c412 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
@@ -1,16 +1,48 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,730 103 174 196 N "_3DFace" 2
+PANEL,300 108 174 196 N "_3DFace" 2
"$Station"
"$referenceDatapoint"
"main()
{
- txt_station.text = $Station;
+ txt_Station.text = $Station;
+ baseDP = $Station+\":LOFAR\";
+
+ // load propertysets from datapoints
+ navPMLloadPropertySet(baseDP);
+
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable(baseDP+\".state\")) {
+ dpConnect(\"updateStation\",baseDP + \".state\",
+ baseDP + \".state:_online.._invalid\");
+ } else {
+ setValue(\"Station\", \"backCol\", \"_dpdoesnotexist\");
+ }
+}
+
+updateStation(string dp1, string state,
+ string dp3, bool invalid)
+{
+ string SymbolCol;
+ if (invalid)
+ {
+ SymbolCol=\"Lofar_device_invalid\";
+ } else {
+ SymbolCol=\"Lofar_device_active\";
+ }
+ setValue(\"Station\", \"backCol\", SymbolCol);
+}
+" 0
+"main()
+{
+ navPMLunloadPropertySet(baseDP);
}" 0
-EE E E 1 0 0 0 145 135
+E E E 1 0 0 0 145 135
"" 0 1
-E"click()
+E"string baseDP=\"\";
+
+click()
{
aplViewNavigateTo(\"\", $referenceDatapoint, $Station + \":LOFAR_PIC\", \"Station-CS1.pnl\");
}" 0
@@ -23,9 +55,9 @@ LAYER, 0
1
LANG:1 6 Layer1
7 0
-"Ellipse1"
+"Station"
""
-1 70 66 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E
+1 70 66 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_inactive" E E
E E
1 0 0 0 0 0
EE E
@@ -109,9 +141,9 @@ E "main()
}" 0
0 1 1 0 1 E U 1 E 71 67 10 10
2 12
-"txt_station"
+"txt_Station"
""
-1 31 119 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E
+1 28 119 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
13 0 0 0 0 0
EE E
@@ -120,11 +152,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 33 121 112 137
-0 2 0 "s" 0 0 0 65 0 0 33 121
+E E 0 1 1 0 1 E U 1 E 30 121 109 137
+0 2 0 "s" 0 0 0 65 0 0 30 121
1
1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-140-100-100-*-*-iso8859-1|-16,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-140-100-100-*-*-iso8859-1|-16,0,0,0,700,0,0,0,0,3,2,1,34,Arial
0 ""
1
LANG:1 9 <station>
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_view.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_view.pnl
index c433bb644a1f45496d21342806af56e0e9a28b50..b3cd7b89590f088d3982eaa784d982bf35d97400 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_view.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 20 StationCtrlViewPanel
-PANEL,372 214 484 325 N "_3DFace" 2
+PANEL,294 508 484 325 N "_3DFace" 2
"$Station"
"$datapoint"
"main()
diff --git a/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl b/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
index 0c7c2b8362a37f3c5939720fdefb8cedb039eac1..89a554236e73a3bac2c7959fb4117fa796ccba85 100644
--- a/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
@@ -1,17 +1,49 @@
V 10
1
LANG:1 7 WanIcon
-PANEL,332 104 119 151 N "_3DFace" 1
-"$datapoint"
-EE"main()
+PANEL,514 322 219 205 N "_3DFace" 0
+"main()
+{
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable(baseDP+\".state\") && dpAccessable(baseDP + \".error\")) {
+ dpConnect(\"updateWANIcon\",baseDP + \".state\",
+ baseDP + \".error\",
+ baseDP + \".state:_online.._invalid\");
+ } else {
+ setValue(\"WANIcon_border\", \"foreCol\", \"_dpdoesnotexist\");
+ }
+
+
+}
+
+updateWANIcon(string dp1, string state,
+ string dp2, string error,
+ string dp3, bool invalid)
+{
+ string SymbolCol;
+ if (invalid)
+ {
+ SymbolCol=\"Lofar_device_invalid\";
+ } else {
+ SymbolCol=\"Lofar_device_active\";
+ }
+ setValue(\"WANIcon_border\", \"foreCol\", SymbolCol);
+}
+
+" 0
+E"main()
{
click();
}" 0
E E 1 0 0 0 20 80
"" 0 1
-E"click()
+E"#uses \"nav_usr/STS/STS-functions.ctl\"
+
+string baseDP=\"LOFAR_PIC_WAN\";
+
+click()
{
- aplViewNavigateTo($datapoint,\"\", \":LOFAR_PIC\", \"WAN-CS1.pnl\");
+ aplViewNavigateTo(\"\",\"\", baseDP ,\"\");
}" 0
2
"CBRef""1"
@@ -22,193 +54,196 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border9"
+"WANIcon_border"
""
-1 20 80 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
+1 40 120 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 20 20 64 80
+ 0 1 1 0 1 E U 1 E 40 50 110 120
6 1
"Border2"
""
-1 24 52 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+1 56 90 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
E E
2 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 24 46 31 52
+ 0 1 1 0 1 E U 1 E 56 84 63 90
6 2
"Border4"
""
-1 50 31 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+1 82 69 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
E E
3 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 50 25 57 31
+ 0 1 1 0 1 E U 1 E 82 63 89 69
6 3
"Border5"
""
-1 50 41 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+1 82 79 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
E E
4 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 50 35 57 41
+ 0 1 1 0 1 E U 1 E 82 73 89 79
6 4
"Border6"
""
-1 50 51 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+1 82 89 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
E E
5 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 50 45 57 51
+ 0 1 1 0 1 E U 1 E 82 83 89 89
6 5
"Border7"
""
-1 50 61 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+1 82 99 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
E E
6 0 0 0 0 0
EE E
0
1
-LANG:1 0
-1
-"dashclr"N "_Transparent"
-E "main()
-{
-click();
-}" 0
- 0 1 1 0 1 E U 1 E 50 55 57 61
-6 6
-"Border8"
-""
-1 50 71 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
- E E
-7 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
E "main()
{
-click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 50 65 57 71
+ 0 1 1 0 1 E U 1 E 82 93 89 99
4 7
"Line6"
""
-1 40 28 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 72 66 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
8 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 40 70 40 28
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 72 108 72 66
4 8
"Line7"
""
-1 31 49 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 63 87 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
9 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 51 49 31 49
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 83 87 63 87
4 9
"Line8"
""
-1 40 29 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 72 67 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
10 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 50 29 40 29
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 82 67 72 67
4 10
"Line9"
""
-1 40 38 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 72 76 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
11 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 50 38 40 38
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 82 76 72 76
4 11
"Line10"
""
-1 41 59 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 73 97 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
12 0 0 0 0 0
EE E
0
1
-LANG:1 0
+LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 51 59 41 59
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 83 97 73 97
4 12
"Line11"
""
-1 40 69 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 72 107 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
E E
13 0 0 0 0 0
EE E
@@ -217,7 +252,28 @@ EE E
LANG:1 3 WAN
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E 50 69 40 69
+E "main()
+{
+ click();
+}" 0
+ 0 2 1 0 1 E 82 107 72 107
+6 13
+"Border1"
+""
+1 82 110 E E E 1 E 1 E N {0,0,0} E N {0,0,255} E E
+ E E
+13 0 0 0 0 0
+EE E
+0
+1
+LANG:1 3 WAN
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+ click();
+}" 0
+ 0 1 1 0 1 E U 1 E 82 104 89 110
0
LAYER, 1
1
@@ -247,6 +303,4 @@ LAYER, 7
1
LANG:1 6 Layer8
0
-2 "Group1" 20 20 64 80
-13 12 11 10 9 8 7 6 5 4 3 2 1 0
0
\ No newline at end of file