diff --git a/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl b/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
index bc9bf18512cec5456e3033e510cf62a6b1d8f92b..62af9134440d5c40b1bb3dd3e5046d95f0bb410a 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CEP/CEPIcon.pnl
@@ -1,60 +1,44 @@
V 10
1
LANG:1 7 CepIcon
-PANEL,613 404 433 325 N "_3DFace" 0
+PANEL,426 108 433 325 N "_3DFace" 2
+"$datapoint"
+"$referenceDatapoint"
"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);
+ baseDP=\"LOFAR_PIC\";
+
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
}" 0
E"main()
{
-click();
+ click();
}" 0
E E 1 0 0 0 20 90
"" 0 1
E"#uses \"nav_usr/STS/STS-functions.ctl\"
-string baseDP=\"LOFAR_PIC\";
+string baseDP=\"\";
-click()
-{
- aplViewNavigateTo(\"\",\"\", baseDP, \"\");
+click() {
+ aplViewNavigateTo($datapoint,$referenceDatapoint, baseDP, \"CEP/CEP_logical_view\");
}" 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
-"CEPIcon_border"
+"childStateBorder"
""
-1 20 90 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 20 90 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
@@ -67,11 +51,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 20 20 90 90
+ 0 3 1 0 1 E U 1 E 20 20 90 90
7 1
"Ellipse1"
""
-1 34.2143 54.0429 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E
+1 38.2143 54.0429 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
2 0 0 0 0 0
EE E
@@ -84,11 +68,11 @@ E "main()
{
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
+ 0 1 1 0 1 E 1.166666666666667 0 1.029411764705882 -6.583333333333337 -1.632352941176465 1 E 39.5 55.5 3 17
6 2
"Border10"
""
-1 41 73 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E
+1 45 73 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
3 0 0 0 0 0
EE E
@@ -101,11 +85,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 41 38 43 73
+ 0 1 1 0 1 E U 1 E 45 38 47 73
6 3
"Border11"
""
-1 45 73 E E E 1 E 1 E N "_WindowText" E N {0,255,51} E E
+1 49 73 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
4 0 0 0 0 0
EE E
@@ -118,11 +102,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 45 38 53 73
+ 0 1 1 0 1 E U 1 E 49 38 57 73
6 4
"Border12"
""
-1 55 73 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E
+1 59 73 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
5 0 0 0 0 0
EE E
@@ -135,11 +119,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 55 38 56 73
+ 0 1 1 0 1 E U 1 E 59 38 60 73
6 5
"Border14"
""
-1 59 45 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 45 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
6 0 0 0 0 0
EE E
@@ -152,11 +136,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 45 70 47
+ 0 1 1 0 1 E U 1 E 63 45 74 47
6 6
"Border16"
""
-1 59 68 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 68 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
7 0 0 0 0 0
EE E
@@ -169,11 +153,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 68 70 71
+ 0 1 1 0 1 E U 1 E 63 68 74 71
6 7
"Border17"
""
-1 59 63 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 63 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
8 0 0 0 0 0
EE E
@@ -186,11 +170,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 63 70 66
+ 0 1 1 0 1 E U 1 E 63 63 74 66
6 8
"Border18"
""
-1 59 57 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 57 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
9 0 0 0 0 0
EE E
@@ -203,11 +187,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 57 70 59
+ 0 1 1 0 1 E U 1 E 63 57 74 59
6 9
"Border19"
""
-1 59 51 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 51 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
10 0 0 0 0 0
EE E
@@ -220,11 +204,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 51 69 54
+ 0 1 1 0 1 E U 1 E 63 51 73 54
6 10
"Border20"
""
-1 59 38 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E
+1 63 38 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
11 0 0 0 0 0
EE E
@@ -237,11 +221,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 59 38 70 41
+ 0 1 1 0 1 E U 1 E 63 38 74 41
6 11
"Border21"
""
-1 73 73 E E E 1 E 1 E N "_WindowText" E N {0,255,51} E E
+1 77 73 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
12 0 0 0 0 0
EE E
@@ -254,11 +238,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 73 38 81 73
+ 0 1 1 0 1 E U 1 E 77 38 85 73
6 12
"Border22"
""
-1 34 81 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E
+1 38 81 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
13 0 0 0 0 0
EE E
@@ -271,11 +255,11 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 34 77 72 81
+ 0 1 1 0 1 E U 1 E 38 77 76 81
7 13
"Ellipse2"
""
-1 54.1 27 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E
+1 58.1 27 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
14 0 0 0 0 0
EE E
@@ -288,7 +272,9 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E 1.071428571428571 0 1 -3.964285714285713 0 1 E 55.5 28 7 4
+ 0 1 1 0 1 E 1.071428571428571 0 1 -4.249999999999998 0 1 E 59.5 28 7 4
+1 14 0 "" 1
+0
0
LAYER, 1
1
@@ -318,4 +304,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 23 31 T 15 0.6666666666666667 0 0.6666666666666666 7.666666666666657 56.33333333333334
+1
+"$object""CEP"
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 aabaf574f634464cfdc617ec3d2a35fd64f03d8b..c108134fbaa5adc00afc73e03bb3aba3b76ef159 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,60 +1,8 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,335 106 806 562 N "_3DFace" 1
-"$switchType"
-"main()
-{
- // Check for PC types only
- string query = \"SELECT '_online.._value' FROM 'CEP_PIC_Room*_Row*_Rack*_Item*.status' REMOTE ALL WHERE _DPT=\\\"TCepPicSwitch\\\" \";
- dpQueryConnectAll(\"computeSwitchSumAlert\", true, \"switchSumAlert\", query);
-}
-
-void computeSwitchSumAlert(string ident, dyn_dyn_anytype tab)
-{
- unsigned error = 0;
- for (int z = 2; z <= dynlen(tab); z++)
- {
-
- //This Object is for InputClusters OutputClusters and OfflineClusters only\\
- unsigned checkType=99;
- if ($switchType == \"Input\" )
- {
- checkType=0;
- }
- else if ($switchType == \"Output\")
- {
- checkType=1;
- }
- else if ($switchType == \"Aux\")
- {
- checkType=2;
- }
- else if ($switchType == \"Offline\")
- {
- checkType=3;
- }
- unsigned type;
- dpGet(strreplace(tab[z][1],\".status\",\".type\"),type);
- if (type == checkType)
- {
- if (tab[z][2] < 0)
- {
- error++;
- break;
- }
- }
- }
- if (error > 0)
- {
- internalSwitch.backCol = \"red\";
- }
- else
- {
- internalSwitch.backCol = \"Lofar_device_active\";
- }
-}" 0
-EE E E 1 0 0 0 80 65
+PANEL,469 105 806 562 N "_3DFace" 0
+EEE E E 1 0 0 0 80 65
"" 0 1
EE 2
"CBRef""1"
@@ -67,7 +15,7 @@ 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
+1 80 65 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
1 0 0 0 0 0
EE E
@@ -76,7 +24,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 80 65 50 25
+E E 0 1 1 0 1 E U 0 E 80 65 50 25
2 1
"Text4"
""
diff --git a/MAC/Navigator/panels/objects/nav_usr/CEP/Cep_logical_cluster.pnl b/MAC/Navigator/panels/objects/nav_usr/CEP/Cep_logical_cluster.pnl
index 509eb257b5f4d224ff54eb89b54daa59357a73a2..4aa14ebdda464f45fd6194273b6b7fb8fdbfc31b 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CEP/Cep_logical_cluster.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CEP/Cep_logical_cluster.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,353 139 799 547 N "_3DFace" 1
+PANEL,469 105 799 547 N "_3DFace" 1
"$clusterType"
EEE E E 1 0 0 0 320 450
"" 0 1
@@ -16,7 +16,7 @@ LANG:1 6 Layer1
6 1
"InputRect"
""
-1 330 430 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 330 430 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
2 0 0 0 0 0
EE E
@@ -25,56 +25,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-"main()
-{
- // Check for PC types only
- string query = \"SELECT '_online.._value' FROM 'CEP_PIC_Room*_Row*_Rack*_Item*.status' REMOTE ALL WHERE _DPT=\\\"TCepPicPc\\\" \";
- dpQueryConnectAll(\"computePCSumAlert\", true, \"PCSumAlert\", query);
-}
-
-void computePCSumAlert(string ident, dyn_dyn_anytype tab)
-{
- unsigned error = 0;
- for (int z = 2; z <= dynlen(tab); z++)
- {
-
- //This Object is for InputClusters Output and offline Clusters only\\
- unsigned checkType=99;
- if ($clusterType == \"Input\" )
- {
- checkType=0;
- } else if ($clusterType == \"Output\")
- {
- checkType=1;
- } else if ($clusterType == \"Offline\")
- {
- checkType=3;
- }
- unsigned type;
- dpGet(strreplace(tab[z][1],\".status\",\".type\"),type);
- if (type == checkType)
- {
- if (tab[z][2] < 0)
- {
- error++;
- break;
- }
- }
- }
- if (error > 0)
- {
- InputRect.backCol = \"red\";
- }
- else
- {
- InputRect.backCol = \"Lofar_device_active\";
- }
-}" 0
- E 0 1 1 0 1 E U 1 E 330 100 460 430
+E E 0 1 1 0 1 E U 0 E 330 100 460 430
6 2
"Border12"
""
-1 340 170 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 340 170 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
3 0 0 0 0 0
EE E
@@ -126,7 +81,7 @@ E E 1 1 1 0 1 E 395 300 395 250
2 7
"ClusterType"
""
-1 350 110 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 350 110 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
8 0 0 0 0 0
EE E
@@ -183,7 +138,7 @@ LANG:1 13 cluster pc(1)
2 11
"Text2"
""
-1 358 226 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 358 226 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
12 0 0 0 0 0
EE E
@@ -203,7 +158,7 @@ LANG:1 13 cluster pc(2)
2 12
"Text3"
""
-1 360 305 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 360 305 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
13 0 0 0 0 0
EE E
@@ -220,9 +175,9 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
0 ""
1
LANG:1 13 cluster pc(n)
-1 14 0 "" 0
+1 13 0 "" 0
0
-1 15 0 "" 1
+1 14 0 "" 1
0
0
LAYER, 1
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Beam_ctrl_details.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Beam_ctrl_details.pnl
index a9d27ea69f78f32ade7b9645c0bd2412db7082f9..ca4bbac2ec54c26802a066219df8e90b007894f3 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Beam_ctrl_details.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Beam_ctrl_details.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,265 108 950 286 N "_3DFace" 1
+PANEL,423 303 950 286 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -17,8 +17,6 @@ PANEL,265 108 950 286 N "_3DFace" 1
//DebugTN(\"connect to updateObservationsTable\");
dpConnect(\"updateObservationsTable\",observationsDP+\".activeObservations:_online.._value\",
observationsDP+\".state:_online.._invalid\");
- } else {
- setValue(\"Scheduler_Frame\", \"foreCol\", \"_dpdoesnotexist\");
}
}" 0
@@ -85,7 +83,7 @@ updateBeamCtrlTable(string dpe, dyn_dyn_anytype tab)
}
}
-updateBeamCtrlTableValues(string dp1, string state,
+updateBeamCtrlTableValues(string dp1, int state,
string dp2, bool connected,
string dp3, string subbandList,
string dp4, string beamletList,
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_begin.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_begin.pnl
index 0b68e55f1ae5ce3df289c718cb4b4e529985f3b3..6927ca6813ec02ad8750a811e8453a5fe83dccb5 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_begin.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_begin.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,298 306 280 210 N "_3DFace" 3
+PANEL,426 108 280 210 N "_3DFace" 3
"$AppName"
"$CEPnode"
"$datapoint"
@@ -42,7 +42,7 @@ LANG:1 6 Layer1
6 7
"rect"
""
-1 10 158 E E E 1 E 1 E N "_Transparent" E N "Lofar_cep_BG" E E
+1 10 158 E E E 1 E 1 E N "_Transparent" E N {170,254,215} E E
E E
7 0 0 0 0 0
EE E
@@ -91,11 +91,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-"main()
-{
-
-}" 0
- E 0 1 1 0 1 E U 0 E 22 17 192 33
+E E 0 1 1 0 1 E U 0 E 22 17 192 33
0 2 0 "s" 0 0 0 65 0 0 22 17
1
1
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_middle.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_middle.pnl
index 4127f06057eae5f7efe7982cc5ab9925c9839fe7..f610ed4b6fca1209dd7a5bbd9483df74ecfef763 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_middle.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_offline_middle.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,298 306 280 210 N "_3DFace" 3
+PANEL,426 108 280 210 N "_3DFace" 3
"$AppName"
"$CEPnode"
"$datapoint"
@@ -42,7 +42,7 @@ LANG:1 6 Layer1
6 7
"rect"
""
-1 10 158 E E E 1 E 1 E N "_Transparent" E N "Lofar_cep_BG" E E
+1 10 158 E E E 1 E 1 E N "_Transparent" E N {170,254,215} E E
E E
7 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_begin.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_begin.pnl
index 8442c0f8570b35e8e1acb04e7ef1c1f94b212684..4be338021facc3596cdf2cd2dab7355f7abb6a35 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_begin.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_begin.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,298 306 280 210 N "_3DFace" 3
+PANEL,426 108 280 210 N "_3DFace" 3
"$AppName"
"$CEPnode"
"$datapoint"
@@ -42,7 +42,7 @@ LANG:1 6 Layer1
6 7
"rect"
""
-1 10 158 E E E 1 E 1 E N "_Transparent" E N "Lofar_cep_BG" E E
+1 10 158 E E E 1 E 1 E N "_Transparent" E N {254,254,193} E E
E E
7 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_end.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_end.pnl
index 72461e32fe9f62f014793e4d93760eea8bf9ba41..5eecc30ba1384e685acd6ae811f3bf126a7e63f7 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_end.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_end.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,298 306 280 210 N "_3DFace" 3
+PANEL,426 108 280 210 N "_3DFace" 3
"$AppName"
"$CEPnode"
"$datapoint"
@@ -42,7 +42,7 @@ LANG:1 6 Layer1
6 7
"rect"
""
-1 10 158 E E E 1 E 1 E N "_Transparent" E N "Lofar_cep_BG" E E
+1 10 158 E E E 1 E 1 E N "_Transparent" E N {254,254,193} E E
E E
7 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_middle.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_middle.pnl
index 107205f9a29be3f81860417d6f6275d63aa12a6f..67fdb1348c784bbe3f8c2e056bb2242c4938f315 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_middle.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/CEP_app_online_middle.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,298 306 280 210 N "_3DFace" 3
+PANEL,426 108 280 210 N "_3DFace" 3
"$AppName"
"$CEPnode"
"$datapoint"
@@ -42,7 +42,7 @@ LANG:1 6 Layer1
6 7
"rect"
""
-1 10 158 E E E 1 E 1 E N "_Transparent" E N "Lofar_cep_BG" E E
+1 10 158 E E E 1 E 1 E N "_Transparent" E N {254,254,193} E E
E E
7 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Cal_ctrl_details.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Cal_ctrl_details.pnl
index 1a5d88eb0c4dbc6a7a9bddf6cd18d0f764d8f40c..08a73eb7ea5b18bab1c2cc32f17c239c8707b6d2 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Cal_ctrl_details.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Cal_ctrl_details.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,265 108 950 286 N "_3DFace" 1
+PANEL,423 296 950 286 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -10,15 +10,11 @@ PANEL,265 108 950 286 N "_3DFace" 1
// Set base Datapoint
baseDP = systemName + \"LOFAR_ObsSW_\";
- //DebugTN(\"SystemName: \", systemName);
-
+
string observationsDP = \"MCU001:LOFAR_PermSW_MACScheduler\";
if (dpAccessable(observationsDP + \".activeObservations\")) {
- DebugTN(\"connect to updateObservationsTable\");
- dpConnect(\"updateObservationsTable\",observationsDP+\".activeObservations:_online.._value\",
+ dpConnect(\"updateObservationsTable\",observationsDP+\".activeObservations:_online.._value\",
observationsDP+\".state:_online.._invalid\");
- } else {
- setValue(\"Scheduler_Frame\", \"foreCol\", \"_dpdoesnotexist\");
}
@@ -39,7 +35,7 @@ E"string systemName = \"\";
string baseDP = \"\";
string getObsName(string aString) {
-return strsplit(aString,\"_\")[3];
+ return strsplit(aString,\"_\")[3];
}
@@ -89,7 +85,7 @@ updateCalCtrlTable(string dpe, dyn_dyn_anytype tab)
}
}
-updateCalCtrlTableValues(string dp1, string state,
+updateCalCtrlTableValues(string dp1, int state,
string dp2, bool connected,
string dp3, string obsname,
string dp4, string antennaArray,
@@ -128,7 +124,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border1"
+"childStateBorder"
""
1 10 280 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -143,7 +139,7 @@ E E 0 2 1 0 1 E U 1 E 10 10 940 280
2 1
"Text4"
""
-1 17 19 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 47 19 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
2 0 0 0 0 0
EE E
@@ -152,8 +148,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 19 21 148 47
-0 2 0 "s" 0 0 0 64 0 0 19 21
+E E 0 1 1 0 1 E U 0 E 49 21 178 47
+0 2 0 "s" 0 0 0 64 0 0 49 21
1
1
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
@@ -182,7 +178,7 @@ E "main(int row, string column, string value)
navConfigTriggerNavigatorRefreshWithDP(dp);
}" 0
1 0 1 6 1 "Connected" 0 1 0 "s" 1
-LANG:1 0
+LANG:1 2 #1
E1
LANG:1 0
16 "Observation" 0 1 0 "s" 1
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/DigBoard_ctrl_details.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/DigBoard_ctrl_details.pnl
index f2a6900d00ab2fbc300a3867d1c2e871505347f1..b914efde0d5c59f1f77a9aed91deb83df1101ac0 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/DigBoard_ctrl_details.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/DigBoard_ctrl_details.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,265 108 950 124 N "_3DFace" 1
+PANEL,422 105 950 124 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -12,41 +12,45 @@ PANEL,265 108 950 124 N "_3DFace" 1
// load propertyset from datapoint
navPMLloadPropertySet(baseDP);
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpAccessable($datapoint+\".state\")) {
- dpConnect(\"updateDigBoardCtrl\",baseDP + \".state\",
- baseDP + \".error\",
- baseDP + \".connected\",
- baseDP + \".clock\",
- baseDP + \".state:_online.._invalid\");
- } else {
- setValue(\"Station\", \"backCol\", \"_dpdoesnotexist\");
- }
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
+ // check if the requiered datapoint for this view are enabled and accessible
+ if (dpAccessable($datapoint+\".currentAction\")) {
+ dpConnect(\"updateInfo\",baseDP + \".currentAction\",
+ baseDP + \".error\",
+ baseDP + \".connected\",
+ baseDP + \".clock\",
+ baseDP + \".error:_online.._invalid\");
+ }
}
-updateDigBoardCtrl(string dp1, string state,
- string dp2, string error,
- string dp3, bool connected,
- string dp4, int clock,
- string dp5, bool invalid)
+updateInfo(string dp1, string action,
+ string dp2, string error,
+ string dp3, bool connected,
+ string dp4, int clock,
+ string dp5, bool invalid)
{
- string SymbolCol;
- if (invalid)
- {
- SymbolCol=\"Lofar_device_invalid\";
- } else {
- SymbolCol=\"_3DFace\";
- }
- setValue(\"Border1\", \"backCol\", SymbolCol);
- setValue(\"stateTxt\",\"text\",state);
- setValue(\"errorTxt\",\"text\",error);
- setValue(\"clockTxt\",\"text\",clock);
- if (connected) {
- setValue(\"connectedTxt\",\"backCol\",\"green\");
- } else {
- setValue(\"connectedTxt\",\"backCol\",\"red\");
- setValue(\"clockTxt\",\"text\",\"00000\");
- }
+
+ if (!invalid) {
+ setValue(\"txt_action\",\"text\",action);
+ setValue(\"txt_error\",\"text\",error);
+ setValue(\"txt_clock\",\"text\",clock);
+ if (connected) {
+ setValue(\"txt_connected\",\"backCol\",\"green\");
+ } else {
+ setValue(\"txt_connected\",\"backCol\",\"red\");
+ setValue(\"txt_clock\",\"text\",\"\");
+ }
+ } else {
+ setValue(\"txt_action\",\"text\",\"\");
+ setValue(\"txt_error\",\"text\",\"\");
+ setValue(\"txt_clock\",\"text\",\"\");
+ setValue(\"txt_connected\",\"backCol\",\"red\");
+ setValue(\"txt_clock\",\"text\",\"\");
+ }
}
" 0
"main()
@@ -65,22 +69,22 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border1"
+"childStateBorder"
""
1 10 100 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
-1
+0
1
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E U 1 E 10 10 940 100
+E E 0 3 1 0 1 E U 1 E 10 10 940 100
2 1
"Text4"
""
-1 17 19 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 47 41 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
2 0 0 0 0 0
EE E
@@ -89,18 +93,18 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 19 21 255 47
-0 2 0 "s" 0 0 0 64 0 0 19 21
+E E 0 1 1 0 1 E U 0 E 49 43 198 69
+0 2 0 "s" 0 0 0 64 0 0 49 43
1
1
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 16 DigBrd Control :
+LANG:1 18 DigBoard Control :
2 2
"Text8"
""
-1 182 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 221 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
3 0 0 0 0 0
EE E
@@ -109,18 +113,18 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 184 20 221 36
-0 2 0 "s" 0 0 0 192 0 0 184 20
+E E 0 1 1 0 1 E U 0 E 223 20 267 36
+0 2 0 "s" 0 0 0 192 0 0 223 20
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
0 ""
1
-LANG:1 6 State:
+LANG:1 7 Action:
2 3
"Text1"
""
-1 182 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 221 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
4 0 0 0 0 0
EE E
@@ -129,8 +133,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 184 37 280 53
-0 2 0 "s" 0 0 0 64 0 0 184 37
+E E 0 1 1 0 1 E U 0 E 223 37 319 53
+0 2 0 "s" 0 0 0 64 0 0 223 37
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
@@ -138,9 +142,9 @@ LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|
1
LANG:1 6 Error:
2 4
-"stateTxt"
+"txt_action"
""
-1 290 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 299 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
5 0 0 0 0 0
EE E
@@ -149,8 +153,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 292 20 937 36
-0 2 0 "s" 0 0 0 64 0 0 292 20
+E E 0 1 1 0 1 E U 0 E 301 20 567 38
+0 2 0 "s" 0 0 0 64 0 0 301 20
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -158,9 +162,9 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
1
LANG:1 0
2 8
-"errorTxt"
+"txt_error"
""
-1 290 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 299 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
9 0 0 0 0 0
EE E
@@ -169,8 +173,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 292 37 937 53
-0 2 0 "s" 0 0 0 64 0 0 292 37
+E E 0 1 1 0 1 E U 0 E 301 37 907 58
+0 2 0 "s" 0 0 0 64 0 0 301 37
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -180,7 +184,7 @@ LANG:1 0
2 9
"Text9"
""
-1 182 54 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 221 54 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
10 0 0 0 0 0
EE E
@@ -189,8 +193,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 184 56 280 72
-0 2 0 "s" 0 0 0 64 0 0 184 56
+E E 0 1 1 0 1 E U 0 E 223 56 319 72
+0 2 0 "s" 0 0 0 64 0 0 223 56
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
@@ -198,9 +202,9 @@ LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|
1
LANG:1 10 Connected:
7 11
-"connectedTxt"
+"txt_connected"
""
-1 295 64 E E E 1 E 1 E N "_WindowText" E N "red" E E
+1 334 64 E E E 1 E 1 E N "_WindowText" E N "red" E E
E E
12 0 0 0 0 0
EE E
@@ -209,11 +213,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 295 64 5 5
+E E 0 1 1 0 1 E U 1 E 334 64 5 5
2 12
"Text3"
""
-1 182 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 221 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
13 0 0 0 0 0
EE E
@@ -222,8 +226,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 184 75 223 91
-0 2 0 "s" 0 0 0 192 0 0 184 75
+E E 0 1 1 0 1 E U 0 E 223 75 262 91
+0 2 0 "s" 0 0 0 192 0 0 223 75
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
@@ -233,7 +237,7 @@ LANG:1 6 Clock:
2 14
"Text5"
""
-1 408 72 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 447 72 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
15 0 0 0 0 0
EE E
@@ -242,8 +246,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 410 74 466 91
-0 2 0 "s" 0 0 0 64 0 0 410 74
+E E 0 1 1 0 1 E U 0 E 449 74 505 91
+0 2 0 "s" 0 0 0 64 0 0 449 74
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
@@ -251,9 +255,9 @@ LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|
1
LANG:1 4 Mhz.
2 13
-"clockTxt"
+"txt_clock"
""
-1 290 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 329 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
14 0 0 0 0 0
EE E
@@ -262,14 +266,16 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 292 75 348 91
-0 2 0 "s" 0 0 0 192 0 0 292 75
+E E 0 1 1 0 1 E U 0 E 331 75 387 91
+0 2 0 "s" 0 0 0 192 0 0 331 75
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
0 ""
1
LANG:1 8 00000000
+1 15 0 "" 1
+0
0
LAYER, 1
1
@@ -299,4 +305,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 38 77 T 16 1 0 1 -21 -60
+1
+"$object""DigBoardCtrl"
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_OTDB_status_small.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_OTDB_status_small.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..f8b157b4ac67540e6fa3eb0e15947fddd83992b9
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_OTDB_status_small.pnl
@@ -0,0 +1,222 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,438 111 359 141 N "_3DFace" 0
+"main()
+{
+ // main databasepoint for the MACScheduler
+ string aDP = \"MCU001:LOFAR_PermSW_MACScheduler.OTDB\";
+
+ if (!dpExists(aDP) ){
+ LOG_ERROR(\"MACSchedulerpoint.OTDB does not exist\");
+ }
+
+ // connect for childUpdates
+ showChildState(aDP);
+ // connect for selfUpdates
+ showSelfState(aDP);
+
+ // connect to update the txt fields of this object
+ if (dpAccessable(aDP + \".connected\")) {
+ dpConnect(\"updateInfo\",aDP+\".connected:_online.._value\",
+ aDP+\".lastPoll:_online.._value\",
+ aDP+\".pollinterval:_online.._value\",
+ aDP+\".connected:_online.._invalid\");
+ }
+}
+
+updateInfo(string dp1, bool connected ,
+ string dp2, string lastPoll,
+ string dp3, int pollinterval,
+ string dp4, bool invalid)
+{
+ if (!invalid){
+ setValue(\"txt_OTDBconnected\", \"text\", dpValToString(dp1, connected, TRUE) );
+ setValue(\"txt_OTDBlastPoll\", \"text\", lastPoll);
+ setValue(\"txt_OTDBpollinterval\", \"text\", dpValToString(dp3, pollinterval, TRUE) );
+ } else {
+ setValue(\"txt_OTDBconnected\", \"text\", \"\" );
+ setValue(\"txt_OTDBlastPoll\", \"text\", \"\");
+ setValue(\"txt_OTDBpollinterval\", \"text\", \"\" );
+ }
+}" 0
+EE E E 1 0 0 0 10 120
+"" 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
+30 0
+"childStateBorder"
+""
+1 10 120 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+E E 0 3 1 0 1 E U 0 E 10 10 310 120
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 OTDB
+2 1
+"Text9"
+""
+1 20 31 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 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 22 33 88 49
+0 2 0 "s" 0 0 0 192 0 0 22 33
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 10 Connected:
+2 2
+"Text10"
+""
+1 25 361 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+3 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 22 63 92 79
+0 2 0 "s" 0 0 0 192 0 0 22 63
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 14 Poll interval:
+2 3
+"Text11"
+""
+1 44 711 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+4 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 22 93 75 109
+0 2 0 "s" 0 0 0 192 0 0 22 93
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 10 Last poll:
+1 4 0 "" 1
+0
+14 4
+"txt_OTDBconnected"
+""
+1 100 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+5 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+98 28 242 55
+2 "s" 0 0 0 0 0 0
+E
+E
+E
+14 5
+"txt_OTDBpollinterval"
+""
+1 300 360 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+6 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+98 58 302 85
+2 "s" 0 0 0 0 0 0
+E
+E
+E
+14 6
+"txt_OTDBlastPoll"
+""
+1 500 720 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+7 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+98 88 302 115
+2 "s" 0 0 0 0 0 0
+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 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 269 40 T 8 1 0 1 19 -17
+1
+"$object""OTDB"
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_status_small.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_status_small.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..f235a1ca4d35a7d9309ca3592cb0debb7cdd43c5
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/MACScheduler_status_small.pnl
@@ -0,0 +1,181 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,596 683 327 112 N "_3DFace" 0
+"main()
+{
+ // main databasepoint for the MACScheduler
+ string aDP = \"MCU001:LOFAR_PermSW_MACScheduler\";
+
+ if (!dpExists(aDP) ){
+ LOG_ERROR(\"MACSchedulerpoint does not exist\");
+ }
+
+ // connect for childUpdates
+ showChildState(aDP);
+ // connect for selfUpdates
+ showSelfState(aDP);
+
+ // connect to update the txt fields of this object
+ if (dpAccessable(aDP + \".currentAction\")) {
+ dpConnect(\"updateInfo\",aDP+\".currentAction:_online.._value\",
+ aDP+\".error:_online.._value\",
+ aDP+\".error:_online.._invalid\");
+ }
+}
+
+updateInfo(string dp1, string action,
+ string dp2, string error,
+ string dp3, bool invalid)
+{
+
+
+ if (!invalid){
+ setValue(\"txt_action\",\"text\",action);
+ setValue(\"txt_error\",\"text\",error);
+ } else {
+ setValue(\"txt_action\",\"text\",\"\");
+ setValue(\"txt_error\",\"text\",\"\");
+ }
+}" 0
+EE E E 1 0 0 0 20 32
+"" 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
+2 0
+"Text12"
+""
+1 20 32 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 22 34 63 50
+0 2 0 "s" 0 0 0 192 0 0 22 34
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 7 Action:
+2 1
+"Text13"
+""
+1 21 362 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 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 22 64 54 80
+0 2 0 "s" 0 0 0 192 0 0 22 64
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 6 Error:
+30 2
+"childStateBorder"
+""
+1 10 90 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
+ E E
+3 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+E E 0 3 1 0 1 E U 0 E 10 10 310 90
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 13 MAC Scheduler
+1 3 0 "" 1
+0
+14 3
+"txt_action"
+""
+1 100 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+4 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+98 28 262 55
+2 "s" 0 0 0 0 0 0
+E
+E
+E
+14 4
+"txt_error"
+""
+1 300 360 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+5 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+98 58 302 85
+2 "s" 0 0 0 0 0 0
+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 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 286 35 T 6 1 0 1 2 -12
+1
+"$object""MACScheduler"
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Ring_status.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Ring_status.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..372d20924397d00d382e5436cbfa7f24c5aa2d91
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Ring_status.pnl
@@ -0,0 +1,124 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,442 339 947 70 N "_3DFace" 1
+"$datapoint"
+"main()
+{
+ // main databasepoint
+ string aDP = $datapoint;
+
+ dyn_string dpElements = splitDatapointPath($datapoint);
+ string ring = dpElements[dynlen(dpElements)];
+
+ // connect for childUpdates
+ showChildState(aDP);
+ // connect for selfUpdates
+ showSelfState(aDP);
+
+ // fill the txt field of this object
+ if (dpExists(aDP)) {
+ setValue(\"txt_ring\",\"text\",ring);
+ } else {
+ setValue(\"txt_ring\",\"text\",\"\");
+ }
+}" 0
+EE E E 1 0 0 0 -1 -1
+"" 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
+6 0
+"childStateBorder"
+""
+1 10 50 E E E 1 E 1 E N "_3DText" 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 3 1 0 1 E U 0 E 10 10 940 50
+2 1
+"Text1"
+""
+1 66 12 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 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 68 14 250 46
+0 2 0 "s" 0 0 0 192 0 0 68 14
+ 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 15 Ring details -
+2 2
+"txt_ring"
+""
+1 255 22 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+3 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 257 14 265 46
+0 2 0 "s" 0 0 0 192 0 0 257 14
+ 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 1 .
+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
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 27 62 T 4 1 0 1 -10 -45
+1
+"$object""Ring"
+0
\ No newline at end of file
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 eaab04b68dea2ccb30a84023ebb267cf15619e39..d1f5c58526a958fc0df4305ef61ae16c23977ce4 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Software_Icon.pnl
@@ -1,61 +1,43 @@
V 10
1
LANG:1 12 SoftwareIcon
-PANEL,908 331 154 186 N "_3DFace" 0
+PANEL,426 108 154 186 N "_3DFace" 2
+"$datapoint"
+"$referenceDatapoint"
"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\");
- }
+ baseDP=$datapoint+\"_PermSW\";
-
-}
-
-
-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);
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
}" 0
E"main()
{
-click();
+ click();
}" 0
E E 1 0 0 0 20 110
"" 0 1
E"#uses \"nav_usr/STS/STS-functions.ctl\"
+string baseDP=\"\";
-string baseDP= \"LOFAR_PermSW\";
-
-click()
-{
- aplViewNavigateTo(\"\", \"\", baseDP, \"\");
+click(){
+ aplViewNavigateTo($datapoint, $referenceDatapoint,\"_PermSW\", \"CS1/software-overview.pnl\");
}" 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
-"SoftwareIcon_border"
+"childStateBorder"
""
-1 20 110 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 20 100 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
@@ -66,13 +48,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 20 20 90 110
+ 0 3 1 0 1 E U 1 E 20 20 90 100
4 1
"Line14"
""
-1 50 80 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 56 77 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
2 0 0 0 0 0
EE E
@@ -83,13 +65,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 2 1 0 1 E 70 80 50 80
+ 0 2 1 0 1 E 76 77 56 77
4 2
"Line15"
""
-1 70 50 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 76 47 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
3 0 0 0 0 0
EE E
@@ -100,13 +82,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 2 1 0 1 E 70 80 70 50
+ 0 2 1 0 1 E 76 77 76 47
6 3
"Border26"
""
-1 62 67 E E E 1 E 1 E N "_WindowText" E N {102,255,0} E E
+1 68 64 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
4 0 0 0 0 0
EE E
@@ -117,13 +99,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 62 58 77 67
+ 0 1 1 0 1 E U 1 E 68 55 83 64
4 4
"Line12"
""
-1 50 50 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 56 47 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
5 0 0 0 0 0
EE E
@@ -134,13 +116,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 2 1 0 1 E 70 50 50 50
+ 0 2 1 0 1 E 76 47 56 47
4 5
"Line13"
""
-1 46 36 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+1 52 33 E E E 1 E 1 E N "_3DText" E N {255,255,255} E E
E E
6 0 0 0 0 0
EE E
@@ -151,13 +133,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 2 1 0 1 E 46 90 46 36
+ 0 2 1 0 1 E 52 87 52 33
10 6
"Polyline2"
""
-1 46 44 E E E 1 E 1 E N "_WindowText" E N {255,255,51} E E
+1 52 41 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
7 0 0 0 0 0
EE E
@@ -168,17 +150,17 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 4 46 44
-36 49
-46 54
-56 49
+ 0 1 1 0 1 E U 1 E 4 52 41
+42 46
+52 51
+62 46
1
7 7
"Ellipse3"
""
-1 45 33 E E E 1 E 1 E N "_WindowText" E N {255,0,255} E E
+1 51 30 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
8 0 0 0 0 0
EE E
@@ -189,13 +171,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 45 33 10 5
+ 0 1 1 0 1 E U 1 E 51 30 10 5
10 8
"Polyline3"
""
-1 70 44 E E E 1 E 1 E N "_WindowText" E N {255,255,51} E E
+1 76 41 E E E 1 E 1 E N "_WindowText" E N {0,0,255} E E
E E
9 0 0 0 0 0
EE E
@@ -206,17 +188,17 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 4 70 44
-60 49
-70 54
-80 49
+ 0 1 1 0 1 E U 1 E 4 76 41
+66 46
+76 51
+86 46
1
6 9
"Border27"
""
-1 38 67 E E E 1 E 1 E N "_WindowText" E N {102,255,0} E E
+1 44 64 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
10 0 0 0 0 0
EE E
@@ -227,13 +209,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 38 58 53 67
+ 0 1 1 0 1 E U 1 E 44 55 59 64
10 10
"Polyline4"
""
-1 46 74 E E E 1 E 1 E N "_WindowText" E N {255,255,51} E E
+1 52 71 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
11 0 0 0 0 0
EE E
@@ -244,17 +226,17 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 4 46 74
-36 79
-46 84
-56 79
+ 0 1 1 0 1 E U 1 E 4 52 71
+42 76
+52 81
+62 76
1
6 11
"Border28"
""
-1 65 95 E E E 1 E 1 E N "_WindowText" E N {0,0,255} E E
+1 71 92 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
12 0 0 0 0 0
EE E
@@ -265,13 +247,13 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 65 75 75 95
+ 0 1 1 0 1 E U 1 E 71 72 81 92
7 12
"Ellipse5"
""
-1 46 94 E E E 1 E 1 E N "_WindowText" E N {255,0,51} E E
+1 52 91 E E E 1 E 1 E N "_3DText" E N {0,0,255} E E
E E
13 0 0 0 0 0
EE E
@@ -282,9 +264,11 @@ LANG:1 18 Permanent Software
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
- 0 1 1 0 1 E U 1 E 46 94 5 5
+ 0 1 1 0 1 E U 1 E 52 91 5 5
+1 13 1 "" 1
+0
0
LAYER, 1
1
@@ -314,4 +298,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 1 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 45 105 T 13 0.6666666666666666 0 0.6666666666666666 -6 15.66666666666667
+1
+"$object""Software"
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 bb7db0c955890472b4dfc0a077eb9fcf9826f571..6a551dd2227dd310a7412a4d48ad59b18570cad1 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station-core.pnl
@@ -1,8 +1,9 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,480 261 203 231 N "_3DFace" 2
+PANEL,426 108 203 231 N "_3DFace" 3
"$Station"
+"$datapoint"
"$referenceDatapoint"
"main()
{
@@ -11,39 +12,26 @@ PANEL,480 261 203 231 N "_3DFace" 2
// 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);
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
}" 0
"main()
{
navPMLunloadPropertySet(baseDP);
}" 0
-E E E 1 0 0 0 145 145
+"main()
+{
+ click();
+}" 0
+ E E 1 0 0 0 145 145
"" 0 1
E"string baseDP=\"\";
-click()
-{
- aplViewNavigateTo(\"\", $referenceDatapoint, $Station + \":LOFAR\", \"\");
+click() {
+ aplViewNavigateTo($datapoint, $referenceDatapoint,\"_PIC_Core_\"+$Station, \"CS1/Station-CS1.pnl\");
}" 0
2
"CBRef""1"
@@ -54,9 +42,9 @@ LAYER, 0
1
LANG:1 6 Layer1
7 47
-"Station"
+"childStateBorder"
""
-1 75 75 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_inactive" E E
+1 75 75 E E E 1 E 1 E N "_WindowText" E N {153,153,153} E E
E E
48 0 0 0 0 0
EE E
@@ -67,7 +55,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 3 1 0 1 E U 1 E 75 75 55 55
4 37
@@ -82,11 +70,15 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 45 104 105 44
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 45 104 105 44
2 46
"txt_Station"
""
-1 35 133 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 37 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
@@ -95,8 +87,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 1 E 39 135 115 151
+0 2 0 "s" 0 0 0 65 0 0 39 135
1
1
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
@@ -115,7 +107,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 101 46 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 101 46 10 10
7 59
"Ellipse38"
""
@@ -130,7 +126,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 102 47 9 9
7 60
@@ -145,7 +141,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 47 46 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 47 46 10 10
7 61
"Ellipse40"
""
@@ -160,7 +160,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 48 47 9 9
7 62
@@ -175,7 +175,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 45 102 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 45 102 10 10
7 63
"Ellipse42"
""
@@ -190,7 +194,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 46 103 9 9
4 64
@@ -205,7 +209,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 74 71 74 41
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 74 71 74 41
7 50
"Ellipse29"
""
@@ -218,7 +226,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 74 35 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 74 35 10 10
7 51
"Ellipse30"
""
@@ -233,7 +245,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 75 36 9 9
4 65
@@ -248,7 +260,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 75 112 75 82
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 75 112 75 82
7 52
"Ellipse31"
""
@@ -261,7 +277,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 74 114 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 74 114 10 10
7 53
"Ellipse32"
""
@@ -276,7 +296,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 75 115 9 9
4 40
@@ -291,7 +311,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 105 104 55 54
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 105 104 55 54
7 32
"Ellipse24"
""
@@ -304,7 +328,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 104 103 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 104 103 10 10
7 33
"Ellipse25"
""
@@ -319,7 +347,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 105 104 9 9
4 38
@@ -334,7 +362,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 121 75 31 75
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 121 75 31 75
7 48
"Ellipse27"
""
@@ -347,7 +379,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 74 74 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 74 74 10 10
7 49
"Ellipse28"
""
@@ -362,7 +398,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 75 75 9 9
7 56
@@ -377,7 +413,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 114 74 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 114 74 10 10
7 57
"Ellipse36"
""
@@ -392,7 +432,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 115 75 9 9
7 54
@@ -407,7 +447,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 34 74 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 34 74 10 10
7 55
"Ellipse34"
""
@@ -422,9 +466,11 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 35 75 9 9
+1 66 0 "" 1
+0
0
LAYER, 1
1
@@ -454,6 +500,10 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 106 209 T 66 1 0 1 -80 -73
+1
+"$object""Station"
2 "Group17" 91 36 111 56
2 59 58
2 "Group18" 37 36 57 56
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
index 532dd4d82f8d0f40dd74c6f7b6b146f114449af0..de774e6ed690fde0f0dd54dff30820f6790c3a93 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station.pnl
@@ -1,8 +1,9 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,480 261 174 196 N "_3DFace" 2
+PANEL,426 108 174 196 N "_3DFace" 3
"$Station"
+"$datapoint"
"$referenceDatapoint"
"main()
{
@@ -12,52 +13,41 @@ PANEL,480 261 174 196 N "_3DFace" 2
// 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
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+}" 0
"main()
{
navPMLunloadPropertySet(baseDP);
}" 0
-E E E 1 0 0 0 145 135
+"main()
+{
+ click();
+}" 0
+ E E 1 0 0 0 145 135
"" 0 1
-E"string baseDP=\"\";
+E"#uses \"nav_usr/CS1/CS1_Common.ctl\"
-click()
-{
- aplViewNavigateTo(\"\", $referenceDatapoint, $Station + \":LOFAR\", \"\");
+string baseDP=\"\";
+
+click(){
+ aplViewNavigateTo($datapoint, $referenceDatapoint,\"_PIC_Core_\"+$Station, \"CS1/Station-CS1.pnl\");
}" 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
7 0
-"Station"
+"childStateBorder"
""
-1 70 66 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_inactive" E E
+1 70 66 E E E 1 E 1 E N "_3DText" E N {153,153,153} E E
E E
1 0 0 0 0 0
EE E
@@ -68,7 +58,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 3 1 0 1 E U 1 E 70 66 50 50
4 1
@@ -83,7 +73,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 45 80 65 70
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 45 80 65 70
4 2
"Line3"
""
@@ -96,7 +90,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 71 68 71 38
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 71 68 71 38
4 3
"Line4"
""
@@ -109,7 +107,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E 95 80 77 70
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E 95 80 77 70
7 4
"Ellipse2"
""
@@ -122,7 +124,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 70 66 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 70 66 10 10
7 5
"Ellipse3"
""
@@ -137,13 +143,13 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 71 67 10 10
2 12
"txt_Station"
""
-1 28 119 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 35 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
@@ -152,8 +158,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 1 E 37 121 116 137
+0 2 0 "s" 0 0 0 65 0 0 37 121
1
1
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
@@ -172,7 +178,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 70 35 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 70 35 10 10
7 15
"Ellipse12"
""
@@ -187,7 +197,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 71 36 10 10
7 16
@@ -202,7 +212,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 42 81 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 42 81 10 10
7 17
"Ellipse14"
""
@@ -217,7 +231,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 43 82 10 10
7 18
@@ -232,7 +246,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 98 80 10 10
+E "main()
+{
+ click();
+}" 0
+ 0 3 1 0 1 E U 1 E 98 80 10 10
7 19
"Ellipse16"
""
@@ -247,9 +265,11 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- click();
+ click();
}" 0
0 1 1 0 1 E U 1 E 99 81 10 10
+1 20 0 "" 1
+0
0
LAYER, 1
1
@@ -279,4 +299,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 129 35 T 20 1 0 1 -102 87
+1
+"$object""Station"
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_details.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_details.pnl
index 4bee44cbb65a11b8295782c52806cca64c14786f..51c2a96133863a5ef402d7536a92c8b95c2bac6d 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_details.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Station_ctrl_details.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,265 108 950 69 N "_3DFace" 1
+PANEL,422 105 950 164 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -12,31 +12,37 @@ PANEL,265 108 950 69 N "_3DFace" 1
// load propertyset from datapoint
navPMLloadPropertySet(baseDP);
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpAccessable($datapoint+\".state\")) {
- dpConnect(\"updateStationCtrl\",baseDP+ \".state\",
- baseDP + \".error\",
- baseDP + \".state:_online.._invalid\");
- } else {
- setValue(\"Station\", \"backCol\", \"_dpdoesnotexist\");
- }
+ if (!dpExists(baseDP) ){
+ LOG_ERROR(\"StationCtrl does not exist\");
+ }
+
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
+ // connect to update the txt fields of this object
+ if (dpAccessable(baseDP + \".currentAction\")) {
+ dpConnect(\"updateInfo\",baseDP+\".currentAction:_online.._value\",
+ baseDP+\".error:_online.._value\",
+ baseDP+\".error:_online.._invalid\");
+ }
}
-updateStationCtrl(string dp1, string state,
- string dp2, string error,
- string dp3, bool invalid)
+updateInfo(string dp1, string action,
+ string dp2, string error,
+ string dp3, bool invalid)
{
- string SymbolCol;
- if (invalid)
- {
- SymbolCol=\"Lofar_device_invalid\";
- } else {
- SymbolCol=\"_3DFace\";
- }
- setValue(\"Border1\", \"backCol\", SymbolCol);
- setValue(\"stateTxt\",\"text\",state);
- setValue(\"errorTxt\",\"text\",error);
-}
+
+ if (!invalid){
+ setValue(\"txt_action\",\"text\",action);
+ setValue(\"txt_error\",\"text\",error);
+ } else {
+ setValue(\"txt_action\",\"text\",\"\");
+ setValue(\"txt_error\",\"text\",\"\");
+ }
+}
+
" 0
"main()
{
@@ -54,22 +60,22 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"Border1"
+"childStateBorder"
""
1 10 60 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
+0
1
-1
-LANG:1 0
+LANG:1 18 Station Controller
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E U 1 E 10 10 940 60
+E E 0 3 1 0 1 E U 1 E 10 10 940 60
2 1
"Text4"
""
-1 17 19 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 47 23 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
2 0 0 0 0 0
EE E
@@ -78,8 +84,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 19 21 255 47
-0 2 0 "s" 0 0 0 64 0 0 19 21
+E E 0 1 1 0 1 E U 0 E 49 25 178 51
+0 2 0 "s" 0 0 0 64 0 0 49 25
1
1
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
@@ -89,7 +95,7 @@ LANG:1 17 Station Control :
2 2
"Text8"
""
-1 183 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 213 17 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
3 0 0 0 0 0
EE E
@@ -98,18 +104,18 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 185 20 222 36
-0 2 0 "s" 0 0 0 192 0 0 185 20
+E E 0 1 1 0 1 E U 0 E 215 19 259 35
+0 2 0 "s" 0 0 0 192 0 0 215 19
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
0 ""
1
-LANG:1 6 State:
+LANG:1 7 Action:
2 3
"Text1"
""
-1 183 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 213 34 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
4 0 0 0 0 0
EE E
@@ -118,8 +124,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 185 37 281 53
-0 2 0 "s" 0 0 0 64 0 0 185 37
+E E 0 1 1 0 1 E U 0 E 215 36 311 52
+0 2 0 "s" 0 0 0 64 0 0 215 36
1
1
LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
@@ -127,9 +133,9 @@ LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|
1
LANG:1 6 Error:
2 4
-"stateTxt"
+"txt_action"
""
-1 290 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 290 17 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
5 0 0 0 0 0
EE E
@@ -138,8 +144,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 292 20 937 38
-0 2 0 "s" 0 0 0 64 0 0 292 20
+E E 0 1 1 0 1 E U 0 E 292 19 937 37
+0 2 0 "s" 0 0 0 64 0 0 292 19
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -147,9 +153,9 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
1
LANG:1 0
2 8
-"errorTxt"
+"txt_error"
""
-1 290 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 290 34 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
9 0 0 0 0 0
EE E
@@ -158,14 +164,16 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 292 37 937 55
-0 2 0 "s" 0 0 0 64 0 0 292 37
+E E 0 1 1 0 1 E U 0 E 292 36 937 54
+0 2 0 "s" 0 0 0 64 0 0 292 36
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
1
LANG:1 0
+1 9 0 "" 1
+0
0
LAYER, 1
1
@@ -195,4 +203,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 236 67 T 10 1 0 1 -219 -50
+1
+"$object""StationCtrl"
0
\ No newline at end of file
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 0d937c487090fbb44e6f0c8d04e71b10d4ac9f43..cf84a62bcfae6b6419cc3005e4f794e46f7db408 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,292 131 484 325 N "_3DFace" 2
+PANEL,469 105 484 325 N "_3DFace" 2
"$Station"
"$datapoint"
"main()
@@ -71,61 +71,61 @@ PANEL,292 131 484 325 N "_3DFace" 2
}
-updateBeamCtrlTable(string dp1, string state,
+updateBeamCtrlTable(string dp1, int state,
string dp2, string error,
string dp3, bool invalid)
{
string SymbolCol;
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
+ SymbolCol=\"Lofar_invalid\";
} else {
- SymbolCol=\"Lofar_device_active\";
+ SymbolCol=getStateColor(state);
}
setValue(\"BeamCtrlLight\", \"backCol\", SymbolCol);
StationCtrlTable.updateLine(1,\"Controller\",\"BeamCtrl\",\"Status\",state,\"Error\",error);
}
-updateCalCtrlTable(string dp1, string state,
+updateCalCtrlTable(string dp1, int state,
string dp2, string error,
string dp3, bool invalid)
{
string SymbolCol;
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
+ SymbolCol=\"Lofar_invalid\";
} else {
- SymbolCol=\"Lofar_device_active\";
+ SymbolCol=getStateColor(state);
}
setValue(\"CalCtrlLight\", \"backCol\", SymbolCol);
StationCtrlTable.updateLine(1,\"Controller\",\"CalCtrl\",\"Status\",state,\"Error\",error);
}
-updateDigBoardCtrlTable(string dp1, string state,
+updateDigBoardCtrlTable(string dp1, int state,
string dp2, string error,
string dp3, bool invalid)
{
string SymbolCol;
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
+ SymbolCol=\"Lofar_invalid\";
} else {
- SymbolCol=\"Lofar_device_active\";
+ SymbolCol=getStateColor(state);
}
setValue(\"DigBoardCtrlLight\", \"backCol\", SymbolCol);
StationCtrlTable.updateLine(1,\"Controller\",\"DigBoardCtrl\",\"Status\",state,\"Error\",error);
}
-updateStationCtrlTable(string dp1, string state,
+updateStationCtrlTable(string dp1, int state,
string dp2, string error,
string dp3, bool invalid)
{
string SymbolCol;
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
+ SymbolCol=\"Lofar_invalid\";
} else {
- SymbolCol=\"Lofar_device_active\";
+ SymbolCol=getStateColor(state);
}
setValue(\"StationCtrlLight\", \"backCol\", SymbolCol);
StationCtrlTable.updateLine(1,\"Controller\",\"StationCtrl\",\"Status\",state,\"Error\",error);
@@ -355,7 +355,7 @@ LANG:1 9 <Station>
7 5
"StationCtrlLight"
""
-1 17 58 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 17 58 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E
E E
6 0 0 0 0 0
EE E
@@ -372,7 +372,7 @@ E "main()
7 6
"DigBoardCtrlLight"
""
-1 17 74 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 17 74 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E
E E
7 0 0 0 0 0
EE E
@@ -389,7 +389,7 @@ E "main()
7 7
"BeamCtrlLight"
""
-1 17 90 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 17 90 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E
E E
8 0 0 0 0 0
EE E
@@ -406,7 +406,7 @@ E "main()
7 8
"CalCtrlLight"
""
-1 17 106 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 17 106 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E
E E
9 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
index c657a0484aa08d962ddecbeecf18bbdb638c2100..c4132fb5e3c6a16750a8e42a1a757aa2993fe29b 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
@@ -1,23 +1,29 @@
V 10
1
LANG:1 17 SubrackClockBoard
-PANEL,362 111 735 210 N "_3DFace" 1
+PANEL,252 141 735 210 N "_3DFace" 1
"$datapoint"
"main()
{
- baseDP=$datapoint+\".clock\";
+ baseDP=$datapoint+\".clockBoard\";
// load propertysets from datapoints
navPMLloadPropertySet(baseDP);
+
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
// check if the requiered datapoint for this view are enabled and accessible
if (dpAccessable(baseDP+\".Vfsp\")) {
+ // connect for clock updates
dpConnect(\"updateSubrackClock\",baseDP + \".temperature\",
baseDP + \".freq\",
baseDP + \".temperature:_online.._invalid\");
+ // connect for version updates
dpConnect(\"showVersion\", baseDP +\".version:_online.._value\");
} else {
- setValue(\"ClockBoard\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
setValue(\"txt_temperature\", \"text\", \"x.x\");
setValue(\"txt_freq\", \"text\", \"x.x\");
}
@@ -27,26 +33,15 @@ updateSubrackClock(string dp1, float temperature,
string dp2, int freq,
string dp3, bool invalid)
{
- string SymbolCol;
- bool state = FALSE;
- getValue(\"detailButton\",\"state\",0,state);
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
setValue(\"txt_temperature\", \"text\", \"x.x\");
setValue(\"txt_freq\", \"text\", \"x.x\");
} else {
- SymbolCol=\"Lofar_device_active\";
setValue(\"txt_temperature\", \"text\", temperature);
setValue(\"txt_freq\", \"text\", freq);
}
- setValue(\"ClockBoard\", \"backCol\", SymbolCol);
- setValue(\"detailButton\", \"backCol\", SymbolCol);
- if (state) {
- setValue(\"lock160\",\"backCol\",SymbolCol);
- setValue(\"lock200\",\"backCol\",SymbolCol);
- }
}" 0
"main()
{
@@ -64,7 +59,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"ClockBoard"
+"childStateBorder"
""
1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -75,7 +70,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 50 70 663 140
+E E 0 3 1 0 1 E U 1 E 50 70 663 140
2 1
"Text1"
""
@@ -99,7 +94,7 @@ LANG:1 11 Clock Board
2 4
"label_Vfsp"
""
-1 107 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 107 116 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
5 0 0 0 0 0
EE E
@@ -108,8 +103,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 109 119 138 138
-0 2 0 "s" 0 0 0 66 0 0 109 119
+E E 0 1 1 0 1 E U 0 E 109 118 138 137
+0 2 0 "s" 0 0 0 66 0 0 109 118
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -119,7 +114,7 @@ LANG:1 4 Vfsp
6 5
"rect_Vfsp"
""
-1 148 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 148 134 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
6 0 0 0 0 0
EE E
@@ -128,11 +123,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 148 115 211 135
+E E 0 1 1 0 1 E U 1 E 148 114 211 134
2 6
"txt_Vfsp"
""
-1 170 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 170 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
7 0 0 0 0 0
EE E
@@ -141,8 +136,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 197 117 222 133
-0 2 0 "2.2f" 5 0 0 194 0 0 197 117
+E E 0 1 1 0 1 E U 0 E 197 116 222 132
+0 2 0 "2.2f" 5 0 0 194 0 0 197 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -152,7 +147,7 @@ LANG:1 4 0.00
2 10
"label_Vclock"
""
-1 233 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 233 116 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
11 0 0 0 0 0
EE E
@@ -161,8 +156,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 235 119 274 138
-0 2 0 "s" 0 0 0 66 0 0 235 119
+E E 0 1 1 0 1 E U 0 E 235 118 274 137
+0 2 0 "s" 0 0 0 66 0 0 235 118
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -172,7 +167,7 @@ LANG:1 5 Clock
6 11
"rect_Vclock"
""
-1 284 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 284 134 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
12 0 0 0 0 0
EE E
@@ -181,11 +176,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 284 115 347 135
+E E 0 1 1 0 1 E U 1 E 284 114 347 134
2 12
"txt_Vclock"
""
-1 306 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 306 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
13 0 0 0 0 0
EE E
@@ -194,8 +189,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 333 117 358 133
-0 2 0 "2.2f" 5 0 0 194 0 0 333 117
+E E 0 1 1 0 1 E U 0 E 333 116 358 132
+0 2 0 "2.2f" 5 0 0 194 0 0 333 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -238,7 +233,7 @@ LANG:1 4 0.00
2 20
"txt_unitVfsp"
""
-1 200 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 200 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
21 0 0 0 0 0
EE E
@@ -247,8 +242,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 202 117 211 133
-0 2 0 "s" 0 0 0 192 0 0 202 117
+E E 0 1 1 0 1 E U 0 E 202 116 211 132
+0 2 0 "s" 0 0 0 192 0 0 202 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -258,7 +253,7 @@ LANG:1 1 V
2 21
"txt_unitVclock"
""
-1 336 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 336 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
22 0 0 0 0 0
EE E
@@ -267,8 +262,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 338 117 347 133
-0 2 0 "s" 0 0 0 192 0 0 338 117
+E E 0 1 1 0 1 E U 0 E 338 116 347 132
+0 2 0 "s" 0 0 0 192 0 0 338 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -298,7 +293,7 @@ LANG:1 2
2 24
"txt_version"
""
-1 617 123 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 617 122 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
24 0 0 0 0 0
EE E
@@ -307,8 +302,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 656 125 693 139
-0 2 0 "s" 0 0 0 194 0 0 656 125
+E E 0 1 1 0 1 E U 0 E 656 124 693 138
+0 2 0 "s" 0 0 0 194 0 0 656 124
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-11,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -388,6 +383,8 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
0 ""
1
LANG:1 3 Mhz
+1 29 0 "" 1
+0
20 19
"detailButton"
""
@@ -436,10 +433,6 @@ E"main(int button, bool state)
!dpAccessable(baseDP + \".lock160:_online.._value\") ||
!dpAccessable(baseDP + \".lock200:_online.._value\"))
{
- setValue(\"rect_Vfsp\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"rect_Vclock\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"lock160\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"lock200\", \"backCol\", \"_dpdoesnotexist\");
setValue(\"txt_Vfsp\", \"visible\", FALSE);
setValue(\"txt_Vclock\", \"visible\", FALSE);
setValue(\"lock160\", \"visible\", FALSE);
@@ -448,12 +441,6 @@ E"main(int button, bool state)
}
else
{
- string aCol;
- getValue(\"ClockBoard\",\"backCol\",aCol);
- setValue(\"rect_Vfsp\", \"backCol\", \"white\");
- setValue(\"rect_Vclock\", \"backCol\", \"white\");
- setValue(\"lock160\", \"backCol\", aCol);
- setValue(\"lock200\", \"backCol\", aCol);
navPMLloadPropertySet(baseDP);
dpConnect(\"SubrackSPUDetails\", baseDP + \".Vfsp:_online.._value\",
baseDP + \".Vclock:_online.._value\",
@@ -488,7 +475,7 @@ SubrackSPUDetails(string dp1, float Vfsp,
20 29
"lock160"
""
-1 393 115 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
+1 393 114 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
E E
29 0 0 0 0 0
EE E
@@ -499,7 +486,7 @@ LANG:1 0
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
-391 113 475 137
+391 112 475 136
1
T
1
@@ -513,7 +500,7 @@ E E
EE20 30
"lock200"
""
-1 482 115 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
+1 482 114 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
E E
30 0 0 0 0 0
EE E
@@ -524,7 +511,7 @@ LANG:1 0
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
-480 113 564 137
+480 112 564 136
1
T
1
@@ -564,4 +551,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 66 132 T 31 1 0 1 576 -55
+1
+"$object""ClockBoard"
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Numbers.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Numbers.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..50221b837f1283ba7c5f4d477acf1e1a559bffde
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Numbers.pnl
@@ -0,0 +1,166 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,430 111 821 443 N "_3DFace" 1
+"$datapoint"
+"main()
+{
+
+
+
+ string aDP = $datapoint;
+ string database=dpSubStr(aDP,DPSUB_SYS);
+ string cNr = \"\";
+ string sNr = \"\";
+
+ if ( strlen(database) <= 0) {
+ database=\"MainCU\";
+ } else {
+ strreplace(database,\":\",\"\");
+ }
+
+ dyn_string dpAr= strsplit(dpSubStr(aDP,DPSUB_DP),\"_\");
+
+ for (int i = 1; i <= dynlen(dpAr);i++ ) {
+ if (strpos(dpAr[i],\"Cabinet\") > -1) {
+ cNr = substr(dpAr[i],7,strlen(dpAr[i]));
+ } else if (strpos(dpAr[i],\"Subrack\") > -1) {
+ sNr = substr(dpAr[i],7,strlen(dpAr[i]));
+ }
+ }
+
+ sscanf(cNr,\"%d\",cabinetNr);
+ sscanf(sNr,\"%d\",subrackNr);
+
+
+ setValue(\"Station_Txt\",\"text\",\"Station: \"+database);
+ setValue(\"Cabinet_Txt\",\"text\",\"Cabinet: \"+cNr);
+ setValue(\"Subrack_Txt\",\"text\",\"Subrack: \"+sNr);
+
+
+ // connect for childUpdates
+ showChildState(aDP);
+ // connect for selfUpdates
+ showSelfState(aDP);
+}" 0
+EE E E 1 0 0 0 10 98
+"" 0 1
+E"int cabinetNr = -1;
+int subrackNr = -1;" 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 0
+"childStateBorder"
+""
+1 10 98 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+ E E
+2 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 3 1 0 1 E U 1 E 10 10 194 98
+2 1
+"Subrack_Txt"
+""
+1 20 68 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+3 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 22 70 74 86
+0 2 0 "s" 0 0 0 192 0 0 22 70
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 7 Subrack
+2 2
+"Cabinet_Txt"
+""
+1 20 42 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+4 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 22 44 71 60
+0 2 0 "s" 0 0 0 192 0 0 22 44
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 7 Cabinet
+2 3
+"Station_Txt"
+""
+1 20 15 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+5 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 22 17 67 33
+0 2 0 "s" 0 0 0 192 0 0 22 17
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 7 Station
+1 4 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
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 173 17 T 1 1 0 1 0 -1
+1
+"$object""Subrack"
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl
index dc99411a9e83628a81c350d0fe1a3457429e5ff6..97da3d83eff803b8f640ae3b84ae2c13b5f155a2 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,342 95 511 593 N "_3DFace" 3
+PANEL,252 105 130 549 N "_3DFace" 3
"$RSP"
"$datapoint"
"$referenceDatapoint"
@@ -41,36 +41,17 @@ PANEL,342 95 511 593 N "_3DFace" 3
// load propertysets from datapoints
navPMLloadPropertySet(baseDP);
- // check if the requiered datapoint for this view are enabled and accessible
- if (dpAccessable(baseDP+\".state\")) {
- dpConnect(\"updateRSPBoard\",baseDP + \".state\",
- baseDP + \".state:_online.._invalid\");
- dpConnect(\"showVersion\", baseDP + \".version:_online.._value\");
- } else {
- setValue(\"RSPBoard\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
- }
-
+
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
for (int j=0; j< 8; j++) {
connectRCU(j,rspNr);
}
}
-updateRSPBoard(string dp1, string state,
- string dp2, bool invalid)
-{
- string SymbolCol;
- bool state = FALSE;
-
- if (invalid)
- {
- SymbolCol=\"Lofar_device_invalid\";
- } else {
- SymbolCol=\"Lofar_device_active\";
- }
- setValue(\"RSPBoard\", \"backCol\", SymbolCol);
- setValue(\"detailButton\", \"backCol\", SymbolCol);
-}
connectRCU(int cnt,int rspNr) {
int rcuNr= cnt + (rspNr*8);
@@ -78,7 +59,7 @@ connectRCU(int cnt,int rspNr) {
string rcuDP=baseDP+\"_\"+\"RCU\"+rcuNr;
navPMLloadPropertySet(rcuDP);
- DebugTN( \"Loading rcu: \", rcuDP);
+
// check if the required datapoint for this view are enabled and accessible
if (dpAccessable(rcuDP+\".state\")) {
dpConnect(\"updateRCU\",rcuDP + \".state\",
@@ -89,11 +70,10 @@ connectRCU(int cnt,int rspNr) {
}
}
-updateRCU(string dp1, string state,
+updateRCU(string dp1, int state,
string dp2, bool invalid)
{
string SymbolCol;
- bool state = FALSE;
string rsp=\"\";
string rcu=\"\";
int rcuNr=-1;
@@ -119,9 +99,9 @@ updateRCU(string dp1, string state,
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
+ SymbolCol=\"Lofar_invalid\";
} else {
- SymbolCol=\"Lofar_device_active\";
+ SymbolCol=getStateColor(state);
}
setValue(anRCU, \"backCol\", SymbolCol);
setValue(anRCU,\"toolTipText\",toolTip);
@@ -136,11 +116,10 @@ updateRCU(string dp1, string state,
}
}
-unloadRCU(int cnt,int rcuNr) {
+unloadRCU(int cnt,int rspNr) {
int rcuNr= cnt + (rspNr*8);
string rcuDP=baseDP+\"_\"+\"RCU\"+rcuNr;
- DebugTN( \"Unloading rcu: \", rcuDP);
- navPMLunloadPropertySet(rcuDP);
+ navPMLunloadPropertySet(rcuDP);
}" 0
E E E 1 0 0 0 20 560
"" 0 1
@@ -158,9 +137,9 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"RSPBoard"
+"childStateBorder"
""
-1 20 560 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 10 532 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
@@ -173,11 +152,11 @@ E "main()
{
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard, \"Station_RSPBoard-CS1.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 20 120 127 560
+ 0 3 1 0 1 E U 1 E 10 102 113 532
2 10
"RSPBoard_Txt"
""
-1 26 126 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 14 107 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
11 0 0 0 0 0
EE E
@@ -186,8 +165,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 28 128 55 144
-0 2 0 "s" 0 0 0 192 0 0 28 128
+E E 0 1 1 0 1 E U 0 E 16 109 43 125
+0 2 0 "s" 0 0 0 192 0 0 16 109
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -197,7 +176,7 @@ LANG:1 3 RSP
2 11
"txt_version"
""
-1 81 537 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 67 514 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
12 0 0 0 0 0
EE E
@@ -206,8 +185,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 120 539 157 553
-0 2 0 "s" 0 0 0 194 0 0 120 539
+E E 0 1 1 0 1 E U 0 E 106 516 143 530
+0 2 0 "s" 0 0 0 194 0 0 106 516
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-11,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -217,7 +196,7 @@ LANG:1 8 ver: x.x
2 13
"label_voltage25"
""
-1 40 258 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 28 239 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
14 0 0 0 0 0
EE E
@@ -226,8 +205,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 106 260 170 275
-0 2 0 "s" 0 0 0 194 0 0 106 260
+E E 0 1 1 0 1 E U 0 E 94 241 158 256
+0 2 0 "s" 0 0 0 194 0 0 94 241
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -237,7 +216,7 @@ LANG:1 12 Voltage 2.5:
2 14
"label_voltage12"
""
-1 40 200 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 28 181 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
15 0 0 0 0 0
EE E
@@ -246,8 +225,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 106 202 170 217
-0 2 0 "s" 0 0 0 194 0 0 106 202
+E E 0 1 1 0 1 E U 0 E 94 183 158 198
+0 2 0 "s" 0 0 0 194 0 0 94 183
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -257,7 +236,7 @@ LANG:1 12 Voltage 1.2:
6 15
"rect_voltage12"
""
-1 42 238 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 30 219 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
16 0 0 0 0 0
EE E
@@ -266,11 +245,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 42 218 105 238
+E E 0 1 1 0 1 E U 1 E 30 199 93 219
2 16
"txt_voltage12"
""
-1 63 219 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 51 200 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
17 0 0 0 0 0
EE E
@@ -279,8 +258,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 90 221 115 237
-0 2 0 "1.2f" 4 0 0 194 0 0 90 221
+E E 0 1 1 0 1 E U 0 E 78 202 103 218
+0 2 0 "1.2f" 4 0 0 194 0 0 78 202
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -290,7 +269,7 @@ LANG:1 4 0.00
6 17
"rect_voltage25"
""
-1 41 296 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 29 277 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
18 0 0 0 0 0
EE E
@@ -299,11 +278,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 41 276 104 296
+E E 0 1 1 0 1 E U 1 E 29 257 92 277
2 18
"txt_voltage25"
""
-1 62 276 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 50 257 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
19 0 0 0 0 0
EE E
@@ -312,8 +291,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 89 278 114 294
-0 2 0 "1.2f" 4 0 0 194 0 0 89 278
+E E 0 1 1 0 1 E U 0 E 77 259 102 275
+0 2 0 "1.2f" 4 0 0 194 0 0 77 259
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -323,7 +302,7 @@ LANG:1 4 0.00
2 19
"txt_unitVoltage12"
""
-1 91 219 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 79 200 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
20 0 0 0 0 0
EE E
@@ -332,8 +311,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 93 221 102 237
-0 2 0 "s" 0 0 0 192 0 0 93 221
+E E 0 1 1 0 1 E U 0 E 81 202 90 218
+0 2 0 "s" 0 0 0 192 0 0 81 202
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -343,7 +322,7 @@ LANG:1 1 V
2 20
"txt_unitVoltage25"
""
-1 90 276 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 78 257 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
21 0 0 0 0 0
EE E
@@ -352,8 +331,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 92 278 101 294
-0 2 0 "s" 0 0 0 192 0 0 92 278
+E E 0 1 1 0 1 E U 0 E 80 259 89 275
+0 2 0 "s" 0 0 0 192 0 0 80 259
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -363,7 +342,7 @@ LANG:1 1 V
2 21
"label_voltage33"
""
-1 40 315 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 28 296 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
22 0 0 0 0 0
EE E
@@ -372,8 +351,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 106 317 170 332
-0 2 0 "s" 0 0 0 194 0 0 106 317
+E E 0 1 1 0 1 E U 0 E 94 298 158 313
+0 2 0 "s" 0 0 0 194 0 0 94 298
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -383,7 +362,7 @@ LANG:1 12 Voltage 3.3:
6 22
"rect_voltage33"
""
-1 41 354 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 29 335 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
23 0 0 0 0 0
EE E
@@ -392,11 +371,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 41 334 104 354
+E E 0 1 1 0 1 E U 1 E 29 315 92 335
2 23
"txt_voltage33"
""
-1 62 334 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 50 315 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
24 0 0 0 0 0
EE E
@@ -405,8 +384,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 89 336 114 352
-0 2 0 "1.2f" 4 0 0 194 0 0 89 336
+E E 0 1 1 0 1 E U 0 E 77 317 102 333
+0 2 0 "1.2f" 4 0 0 194 0 0 77 317
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -416,7 +395,7 @@ LANG:1 4 0.00
2 24
"txt_unitVoltage33"
""
-1 90 333 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 78 314 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
25 0 0 0 0 0
EE E
@@ -425,8 +404,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 92 335 101 351
-0 2 0 "s" 0 0 0 192 0 0 92 335
+E E 0 1 1 0 1 E U 0 E 80 316 89 332
+0 2 0 "s" 0 0 0 192 0 0 80 316
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -436,7 +415,7 @@ LANG:1 1 V
6 33
"RCU0"
""
-1 22 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 10 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
33 0 0 0 0 0
EE E
@@ -451,11 +430,11 @@ E "main()
getValue(\"RCU0\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 22 30 34 118
+ 0 1 1 0 1 E U 1 E 10 10 22 98
6 34
"RCU1"
""
-1 35 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 23 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
34 0 0 0 0 0
EE E
@@ -470,11 +449,11 @@ E "main()
getValue(\"RCU1\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 35 30 47 118
+ 0 1 1 0 1 E U 1 E 23 10 35 98
6 35
"RCU7"
""
-1 113 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 101 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
35 0 0 0 0 0
EE E
@@ -489,11 +468,11 @@ E "main()
getValue(\"RCU7\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 113 30 125 118
+ 0 1 1 0 1 E U 1 E 101 10 113 98
6 36
"RCU2"
""
-1 48 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 36 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
36 0 0 0 0 0
EE E
@@ -508,11 +487,11 @@ E "main()
getValue(\"RCU2\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 48 30 60 118
+ 0 1 1 0 1 E U 1 E 36 10 48 98
6 37
"RCU3"
""
-1 61 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 49 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
37 0 0 0 0 0
EE E
@@ -527,11 +506,11 @@ E "main()
getValue(\"RCU3\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 61 30 73 118
+ 0 1 1 0 1 E U 1 E 49 10 61 98
6 38
"RCU4"
""
-1 74 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 62 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
38 0 0 0 0 0
EE E
@@ -546,11 +525,11 @@ E "main()
getValue(\"RCU4\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 74 30 86 118
+ 0 1 1 0 1 E U 1 E 62 10 74 98
6 39
"RCU5"
""
-1 87 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 75 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
39 0 0 0 0 0
EE E
@@ -565,11 +544,11 @@ E "main()
getValue(\"RCU5\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 87 30 99 118
+ 0 1 1 0 1 E U 1 E 75 10 87 98
6 40
"RCU6"
""
-1 100 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 88 98 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
40 0 0 0 0 0
EE E
@@ -584,11 +563,13 @@ E "main()
getValue(\"RCU6\",\"toolTipText\",rcu);
aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
}" 0
- 0 1 1 0 1 E U 1 E 100 30 112 118
+ 0 1 1 0 1 E U 1 E 88 10 100 98
+1 41 0 "" 1
+0
20 12
"detailButton"
""
-1 26 153 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+1 14 134 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
E E
13 0 0 0 0 0
EE E
@@ -599,7 +580,7 @@ LANG:1 0
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
-24 151 88 175
+12 132 76 156
1
T
1
@@ -633,9 +614,6 @@ E"main(int button, bool state)
!dpAccessable(baseDP + \".voltage12:_online.._value\") ||
!dpAccessable(baseDP + \".voltage25:_online.._value\"))
{
- setValue(\"rect_voltage12\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"rect_voltage25\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"rect_voltage33\", \"backCol\", \"_dpdoesnotexist\");
setValue(\"txt_voltage12\", \"visible\", FALSE);
setValue(\"txt_voltage25\", \"visible\", FALSE);
setValue(\"txt_voltage33\", \"visible\", FALSE);
@@ -643,9 +621,6 @@ E"main(int button, bool state)
}
else
{
- setValue(\"rect_voltage12\", \"backCol\", \"white\");
- setValue(\"rect_voltage25\", \"backCol\", \"white\");
- setValue(\"rect_voltage33\", \"backCol\", \"white\");
dpConnect(\"BoardETHDetails\", baseDP + \".voltage12:_online.._value\",
baseDP + \".voltage25:_online.._value\",
baseDP + \".voltage33:_online.._value\",
@@ -702,4 +677,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 72 493 T 40 1 0 1 -55 18
+1
+"$object""RSPBoard"
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
index 276b8929dc29e525b5bc05144848259b6957ea4e..d7f825771c129264435d025c92812e96145596a0 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 15 SubRackSPUBoard
-PANEL,362 111 745 269 N "_3DFace" 1
+PANEL,252 141 745 269 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -9,13 +9,17 @@ PANEL,362 111 745 269 N "_3DFace" 1
// load propertysets from datapoints
navPMLloadPropertySet(baseDP);
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
// check if the requiered datapoint for this view are enabled and accessible
if (dpAccessable(baseDP+\".temperature\")) {
+ // connect for SPU value updates
dpConnect(\"updateSubrackSPU\",baseDP + \".temperature\",
baseDP + \".temperature:_online.._invalid\");
} else {
- setValue(\"SPUBoard\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
setValue(\"txt_temperature\", \"text\", \"x.x\");
}
}
@@ -26,17 +30,12 @@ PANEL,362 111 745 269 N "_3DFace" 1
updateSubrackSPU(string dp1, float temperature,
string dp3, bool invalid)
{
- string SymbolCol;
if (invalid)
{
- SymbolCol=\"Lofar_device_invalid\";
setValue(\"txt_temperature\", \"text\", \"x.x\");
} else {
- SymbolCol=\"Lofar_device_active\";
setValue(\"txt_temperature\",\"text\",temperature);
}
- setValue(\"SPUBoard\", \"backCol\", SymbolCol);
- setValue(\"detailButton\", \"backCol\", SymbolCol);
}" 0
"main()
{
@@ -54,7 +53,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"SPUBoard"
+"childStateBorder"
""
1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -65,7 +64,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 50 70 663 140
+E E 0 3 1 0 1 E U 1 E 50 70 663 140
2 1
"Text1"
""
@@ -89,7 +88,7 @@ LANG:1 9 SPU Board
2 4
"label_Vhba"
""
-1 63 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 63 116 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
5 0 0 0 0 0
EE E
@@ -98,8 +97,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 65 119 138 138
-0 2 0 "s" 0 0 0 66 0 0 65 119
+E E 0 1 1 0 1 E U 0 E 65 118 138 137
+0 2 0 "s" 0 0 0 66 0 0 65 118
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -109,7 +108,7 @@ LANG:1 11 Voltage HBA
6 5
"rect_Vhba"
""
-1 148 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 148 134 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
6 0 0 0 0 0
EE E
@@ -118,11 +117,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 148 115 211 135
+E E 0 1 1 0 1 E U 1 E 148 114 211 134
2 6
"txt_Vhba"
""
-1 170 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 170 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
7 0 0 0 0 0
EE E
@@ -131,8 +130,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 197 117 222 133
-0 2 0 "2.2f" 5 0 0 194 0 0 197 117
+E E 0 1 1 0 1 E U 0 E 197 116 222 132
+0 2 0 "2.2f" 5 0 0 194 0 0 197 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -142,7 +141,7 @@ LANG:1 4 0.00
2 10
"label_Vlba"
""
-1 255 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 255 116 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
11 0 0 0 0 0
EE E
@@ -151,8 +150,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 257 119 324 133
-0 2 0 "s" 0 0 0 66 0 0 257 119
+E E 0 1 1 0 1 E U 0 E 257 118 324 132
+0 2 0 "s" 0 0 0 66 0 0 257 118
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -162,7 +161,7 @@ LANG:1 11 Voltage LBA
6 11
"rect_Vlba"
""
-1 334 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 334 134 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
12 0 0 0 0 0
EE E
@@ -171,11 +170,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 334 115 397 135
+E E 0 1 1 0 1 E U 1 E 334 114 397 134
2 12
"txt_Vlba"
""
-1 356 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 356 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
13 0 0 0 0 0
EE E
@@ -184,8 +183,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 383 117 408 133
-0 2 0 "2.2f" 5 0 0 194 0 0 383 117
+E E 0 1 1 0 1 E U 0 E 383 116 408 132
+0 2 0 "2.2f" 5 0 0 194 0 0 383 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -195,7 +194,7 @@ LANG:1 4 0.00
2 13
"label_Vdig"
""
-1 447 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 447 116 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
14 0 0 0 0 0
EE E
@@ -204,8 +203,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 449 119 516 133
-0 2 0 "s" 0 0 0 66 0 0 449 119
+E E 0 1 1 0 1 E U 0 E 449 118 516 132
+0 2 0 "s" 0 0 0 66 0 0 449 118
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -215,7 +214,7 @@ LANG:1 11 Voltage DIG
6 14
"rect_Vdig"
""
-1 526 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+1 526 134 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
E E
15 0 0 0 0 0
EE E
@@ -224,11 +223,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 526 115 589 135
+E E 0 1 1 0 1 E U 1 E 526 114 589 134
2 15
"txt_Vdig"
""
-1 548 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 548 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
16 0 0 0 0 0
EE E
@@ -237,8 +236,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 575 117 600 133
-0 2 0 "2.2f" 5 0 0 194 0 0 575 117
+E E 0 1 1 0 1 E U 0 E 575 116 600 132
+0 2 0 "2.2f" 5 0 0 194 0 0 575 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -281,7 +280,7 @@ LANG:1 4 0.00
2 20
"txt_unitVhba"
""
-1 200 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 200 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
21 0 0 0 0 0
EE E
@@ -290,8 +289,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 202 117 211 133
-0 2 0 "s" 0 0 0 192 0 0 202 117
+E E 0 1 1 0 1 E U 0 E 202 116 211 132
+0 2 0 "s" 0 0 0 192 0 0 202 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -301,7 +300,7 @@ LANG:1 1 V
2 21
"txt_unitVlba"
""
-1 386 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 386 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
22 0 0 0 0 0
EE E
@@ -310,8 +309,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 388 117 397 133
-0 2 0 "s" 0 0 0 192 0 0 388 117
+E E 0 1 1 0 1 E U 0 E 388 116 397 132
+0 2 0 "s" 0 0 0 192 0 0 388 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -321,7 +320,7 @@ LANG:1 1 V
2 22
"txt_unitVdig"
""
-1 578 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+1 578 114 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
E E
23 0 0 0 0 0
EE E
@@ -330,8 +329,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 580 117 589 133
-0 2 0 "s" 0 0 0 192 0 0 580 117
+E E 0 1 1 0 1 E U 0 E 580 116 589 132
+0 2 0 "s" 0 0 0 192 0 0 580 116
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -358,6 +357,8 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
0 ""
1
LANG:1 2 �C
+1 24 0 "" 1
+0
20 19
"detailButton"
""
@@ -407,9 +408,6 @@ E"main(int button, bool state)
!dpAccessable(baseDP + \".Vlba:_online.._value\") ||
!dpAccessable(baseDP + \".Vdig:_online.._value\"))
{
- setValue(\"rect_Vhba\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"rect_Vlba\", \"backCol\", \"_dpdoesnotexist\");
- setValue(\"rect_Vdig\", \"backCol\", \"_dpdoesnotexist\");
setValue(\"txt_Vhba\", \"visible\", FALSE);
setValue(\"txt_Vlba\", \"visible\", FALSE);
setValue(\"txt_Vdig\", \"visible\", FALSE);
@@ -417,9 +415,6 @@ E"main(int button, bool state)
}
else
{
- setValue(\"rect_Vhba\", \"backCol\", \"white\");
- setValue(\"rect_Vlba\", \"backCol\", \"white\");
- setValue(\"rect_Vdig\", \"backCol\", \"white\");
navPMLloadPropertySet(baseDP);
dpConnect(\"SubrackSPUDetails\", baseDP + \".Vhba:_online.._value\",
baseDP + \".Vlba:_online.._value\",
@@ -476,4 +471,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 620 81 T 24 1 0 1 22 -4
+1
+"$object""SPUBoard"
0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_TBBBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_TBBBoard.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..59702337e7a21fc731c7be010f1d72d272e94946
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_TBBBoard.pnl
@@ -0,0 +1,83 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,296 199 791 514 N "_3DFace" 0
+EEE E E 1 0 0 0 11 451
+"" 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
+6 0
+"childStateBorder"
+""
+1 11 439 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 3 1 0 1 E U 1 E 11 10 101 440
+2 1
+"Text3"
+""
+1 18 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 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 20 20 45 36
+0 2 0 "s" 0 0 0 192 0 0 20 20
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 3 TBB
+1 2 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
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 51 421 T 3 1 0 1 -33 -2
+1
+"$object""TBB"
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_concentratornode-CS1.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_concentratornode-CS1.pnl
index 972bded560d42c8419253f2b3142839f9ae41910..314ca315d335dc8eedcc10655ab50ba06f0f1423 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_concentratornode-CS1.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_concentratornode-CS1.pnl
@@ -1,56 +1,10 @@
V 10
1
LANG:1 16 ConcentratorNode
-PANEL,300 211 182 152 N "_3DFace" 3
-"$CnName"
-"$configDatapoint"
-"$referenceDatapoint"
-"main()
-{
- EP_setBackColor();
- setValue(\"txt_CnName\",\"text\",$CnName);
-
- $configDatapoint;
- $referenceDatapoint;
-}
-
-EP_setBackColor()
-{
- dyn_errClass err;
- string dpPrefix = \"LOFAR_PIC_WAN_\" + $CnName;
- ell_concentratorNode.toolTipText = dpPrefix;
- if( !dpAccessable( dpPrefix + \".status:_online.._value\"))
- {
- setValue(\"ell_concentratorNode\", \"backCol\", \"_dpdoesnotexist\");
- return;
- }
-
- dpConnect(\"EP_setBackColorCB\",
- dpPrefix + \".status:_online.._value\");
- err = getLastError();
- if (dynlen(err) > 0)
- {
- setValue(\"ell_concentratorNode\", \"backCol\", \"_dpdoesnotexist\");
- }
-
-}
-
-EP_setBackColorCB(string dpSource1, unsigned status)
-{
- if (status==0)
- {
- setValue(\"ell_concentratorNode\", \"backCol\", \"Lofar_device_active\");
- }
- else
- {
- setValue(\"ell_concentratorNode\", \"backCol\", \"Red\");
- }
-}" 0
-EE E E 1 -1 -1 0 25 85
+PANEL,469 105 182 152 N "_3DFace" 0
+EEE E E 1 -1 -1 0 25 85
"" 0 1
-E"
-" 0
- 2
+EE 2
"CBRef""1"
"EClose"E
""
@@ -61,7 +15,7 @@ LANG:1 6 Layer1
7 59
"ell_concentratorNode"
""
-1 60 60 E E E 1 E 1 E N "_WindowText" E N {204,204,204} E E
+1 60 60 E E E 1 E 1 E N "_3DText" E N {204,204,204} E E
E E
55 0 0 0 0 0
EE E
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-big-CS1.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-big-CS1.pnl
index 0b8128029a09621dbac38b47d95169958e1634c4..a9ec7b8985a93fd62d7884efa35cd5b1453b48c9 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-big-CS1.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-big-CS1.pnl
@@ -1,53 +1,11 @@
V 10
1
LANG:1 14 19inch_Subrack
-PANEL,294 179 182 152 N "_3DFace" 4
+PANEL,469 105 182 152 N "_3DFace" 3
"$SwitchName"
-"$configDatapoint"
"$datapoint"
"$referenceDatapoint"
-"main()
-{
- EP_setBackColor();
- setValue(\"txt_switchName\",\"text\",$SwitchName);
- $configDatapoint;
- $referenceDatapoint;
-}
-
-EP_setBackColor()
-{
- dyn_errClass err;
- string dpPrefix = \"LOFAR_PIC_WAN_\" + $SwitchName;
- rect_Switch.toolTipText = dpPrefix;
- icon_maintenance.toolTipText = dpPrefix;
- if( !dpAccessable( dpPrefix + \".status:_online.._value\"))
- {
- setValue(\"rect_Switch\", \"backCol\", \"_dpdoesnotexist\");
- return;
- }
-
- dpConnect(\"EP_setBackColorCB\",
- dpPrefix + \".status:_online.._value\");
- err = getLastError();
- if (dynlen(err) > 0)
- {
- setValue(\"rect_Switch\", \"backCol\", \"_dpdoesnotexist\");
- }
-
-}
-
-EP_setBackColorCB(string dpSource1, unsigned status)
-{
- if (status==0)
- {
- setValue(\"rect_Switch\", \"backCol\", \"Lofar_device_active\");
- }
- else
- {
- setValue(\"rect_Switch\", \"backCol\", \"Red\");
- }
-}" 0
-EE E E 1 -1 -1 0 25 85
+EEE E E 1 -1 -1 0 25 85
"" 0 1
E"
" 0
@@ -190,7 +148,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 0 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/snapshot_switch_port12.bmp" 13434828 E 45 88 113 108
+E E 0 1 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/snapshot_switch_port12.bmp" 13434828 E 45 88 113 108
6 58
"Border2"
""
@@ -203,7 +161,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 0 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/snapshot_switch_port12.bmp" 13434828 E 45 109 113 129
+E E 0 1 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/snapshot_switch_port12.bmp" 13434828 E 45 109 113 129
0
LAYER, 1
1
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-small-CS1.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-small-CS1.pnl
index eb302575efb88ef6e703029a9515340aacfd2004..544b815c38a7d268a0d146b4c3567b33938ac733 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-small-CS1.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/WAN_switch-small-CS1.pnl
@@ -1,52 +1,10 @@
V 10
1
LANG:1 14 19inch_Subrack
-PANEL,300 211 182 113 N "_3DFace" 3
+PANEL,469 105 182 113 N "_3DFace" 2
"$Station"
-"$configDatapoint"
"$referenceDatapoint"
-"main()
-{
- EP_setBackColor();
- setValue(\"txt_switchName\",\"text\",$Station);
- $configDatapoint;
- $referenceDatapoint;
-}
-
-EP_setBackColor()
-{
- dyn_errClass err;
- string dpPrefix = $Station + \":LOFAR_PIC_WAN_Switch\";
- rect_Switch.toolTipText = dpPrefix;
- icon_maintenance.toolTipText = dpPrefix;
- if( !dpAccessable( dpPrefix + \".status:_online.._value\"))
- {
- setValue(\"rect_Switch\", \"backCol\", \"_dpdoesnotexist\");
- return;
- }
-
- dpConnect(\"EP_setBackColorCB\",
- dpPrefix + \".status:_online.._value\");
- err = getLastError();
- if (dynlen(err) > 0)
- {
- setValue(\"rect_Switch\", \"backCol\", \"_dpdoesnotexist\");
- }
-
-}
-
-EP_setBackColorCB(string dpSource1, unsigned status)
-{
- if (status==0)
- {
- setValue(\"rect_Switch\", \"backCol\", \"Lofar_device_active\");
- }
- else
- {
- setValue(\"rect_Switch\", \"backCol\", \"Red\");
- }
-}" 0
-EE E E 1 -1 -1 0 25 85
+EEE E E 1 -1 -1 0 25 85
"" 0 1
E"
" 0
@@ -61,7 +19,7 @@ LANG:1 6 Layer1
6 0
"rect_Switch"
""
-1 31 63 E E E 1 E 1 E N "_WindowText" E N {204,204,204} E E
+1 31 63 E E E 1 E 1 E N "_3DText" E N {204,204,204} E E
"main()
{
stsSubRackHandleContextMenu();
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/lofar_self_state.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/lofar_self_state.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..7166d04f8b77f1e93b88ef82b5fa56703f281e66
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/lofar_self_state.pnl
@@ -0,0 +1,62 @@
+V 10
+1
+LANG:1 16 Lofar Self State
+PANEL,422 141 95 86 N "_3DFace" 1
+"$object"
+"main()
+{
+ setValue(\"light\",\"toolTipText\",$object+\" state\");
+}" 0
+EE E E 1 0 0 0 10 10
+"" 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 1
+"light"
+""
+1 17.0333 17.0333 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+2 0 0 0 0 0
+EE E
+0
+1
+LANG:1 10 self state
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E 1.071428571428571 0 1.071428571428571 -1.25 -1.25 1 E 17.5 17.5 7 7
+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/objects/nav_usr/WAN/WanIcon.pnl b/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
index 89a554236e73a3bac2c7959fb4117fa796ccba85..f90d3d0d7d6aece425bfce103c550af493f7b551 100644
--- a/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/WAN/WanIcon.pnl
@@ -1,60 +1,45 @@
V 10
1
LANG:1 7 WanIcon
-PANEL,514 322 219 205 N "_3DFace" 0
+PANEL,426 108 219 205 N "_3DFace" 2
+"$datapoint"
+"$referenceDatapoint"
"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\");
- }
+ baseDP=\"LOFAR_PIC_WAN\";
+ // connect for childUpdates
+ showChildState(baseDP);
+ // connect for selfUpdates
+ showSelfState(baseDP);
+
}
-
-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();
+ click();
}" 0
E E 1 0 0 0 20 80
"" 0 1
E"#uses \"nav_usr/STS/STS-functions.ctl\"
-string baseDP=\"LOFAR_PIC_WAN\";
+string baseDP=\"\";
-click()
-{
- aplViewNavigateTo(\"\",\"\", baseDP ,\"\");
+click(){
+ aplViewNavigateTo($datapoint,$referenceDatapoint,\"_PIC_WAN\" ,\"CS1/WAN-CS1.pnl\");
}" 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
-"WANIcon_border"
+"childStateBorder"
""
1 40 120 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E
E E
@@ -69,7 +54,7 @@ E "main()
{
click();
}" 0
- 0 1 1 0 1 E U 1 E 40 50 110 120
+ 0 3 1 0 1 E U 1 E 40 50 110 120
6 1
"Border2"
""
@@ -274,6 +259,8 @@ E "main()
click();
}" 0
0 1 1 0 1 E U 1 E 82 104 89 110
+1 14 0 "" 1
+0
0
LAYER, 1
1
@@ -303,4 +290,8 @@ LAYER, 7
1
LANG:1 6 Layer8
0
+3 0 "selfState"
+"objects\\nav_usr\\CS1\\lofar_self_state.pnl" 42 134 T 13 0.6666666666666666 0 0.6666666666666666 17 15.66666666666667
+1
+"$object""WAN"
0
\ No newline at end of file