diff --git a/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl b/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
index 81cfb3d9a560ec8861dcff9dc5778d616fc5798d..ac088613d141173c6bc6ba6e2c9759ee79d5c1bf 100644
--- a/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
+++ b/MAC/Navigator/panels/nav_fw/tools/EnablePropertySets.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,294 230 554 344 N "_3DFace" 0
+PANEL,28 141 554 344 N "_3DFace" 0
EEE E E 1 -1 -1 0 10 10
"" 0 1
EE 2
@@ -133,18 +133,20 @@ LANG:1 12 query+create
////////////////////////////////////////
//
string datapoint;
+ string dpType;
setValue(\"txt_total\", \"text\", dynlen(output));
for(int i=1; i<=dynlen(output); i++)
{
datapoint = output[i];
- if(\"__enabled\"!=substr(datapoint, strlen(datapoint)-9, strlen(datapoint)))
+ dpType = dpTypeName(datapoint);
+ if(dpType[0] == \"T\")
{
if(!dpExists(datapoint + \"__enabled\"))
{
dpCreate(datapoint + \"__enabled\", \"GCFPaPsEnabled\");
}
- dpSetWait(datapoint + \"__enabled.:_original.._value\", \"autoloaded|\" + dpTypeName(datapoint));
- DebugN(\"## \" + datapoint + \" |content: \" + \"autoloaded|\"+ dpTypeName(datapoint));
+ dpSetWait(datapoint + \"__enabled.:_original.._value\", \"autoloaded|\" + dpType);
+ DebugN(\"## \" + datapoint + \" |content: \" + \"autoloaded|\"+ dpType);
}
setValue(\"txt_current\", \"text\", i);
@@ -171,7 +173,7 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
E
"main()
{
-setValue(\"\", \"text\", getSystemName()+\"PAC*\");
+setValue(\"\", \"text\", getSystemName()+\"*\");
}" 0
E
diff --git a/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl b/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
index 81cfb3d9a560ec8861dcff9dc5778d616fc5798d..ac088613d141173c6bc6ba6e2c9759ee79d5c1bf 100644
--- a/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
+++ b/MAC/Navigator/panels/nav_fw/tools/EnableTool.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,294 230 554 344 N "_3DFace" 0
+PANEL,28 141 554 344 N "_3DFace" 0
EEE E E 1 -1 -1 0 10 10
"" 0 1
EE 2
@@ -133,18 +133,20 @@ LANG:1 12 query+create
////////////////////////////////////////
//
string datapoint;
+ string dpType;
setValue(\"txt_total\", \"text\", dynlen(output));
for(int i=1; i<=dynlen(output); i++)
{
datapoint = output[i];
- if(\"__enabled\"!=substr(datapoint, strlen(datapoint)-9, strlen(datapoint)))
+ dpType = dpTypeName(datapoint);
+ if(dpType[0] == \"T\")
{
if(!dpExists(datapoint + \"__enabled\"))
{
dpCreate(datapoint + \"__enabled\", \"GCFPaPsEnabled\");
}
- dpSetWait(datapoint + \"__enabled.:_original.._value\", \"autoloaded|\" + dpTypeName(datapoint));
- DebugN(\"## \" + datapoint + \" |content: \" + \"autoloaded|\"+ dpTypeName(datapoint));
+ dpSetWait(datapoint + \"__enabled.:_original.._value\", \"autoloaded|\" + dpType);
+ DebugN(\"## \" + datapoint + \" |content: \" + \"autoloaded|\"+ dpType);
}
setValue(\"txt_current\", \"text\", i);
@@ -171,7 +173,7 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
E
"main()
{
-setValue(\"\", \"text\", getSystemName()+\"PAC*\");
+setValue(\"\", \"text\", getSystemName()+\"*\");
}" 0
E
diff --git a/MAC/Navigator/panels/nav_usr/STS/nederland.pnl b/MAC/Navigator/panels/nav_usr/STS/nederland.pnl
index 0f4771fe8d24cf9b0b3ba289a6420b05fcc29f32..4d1f947a34b85c44a7da28d200981bb5a4ff6af1 100644
--- a/MAC/Navigator/panels/nav_usr/STS/nederland.pnl
+++ b/MAC/Navigator/panels/nav_usr/STS/nederland.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,258 138 908 687 N "_3DFace" 0
+PANEL,-4 76 908 687 N "_3DFace" 0
EEE E E 1 -1 -1 0 20 740
"" 0 1
EE 2
@@ -28,7 +28,7 @@ E E 0 1 1 0 1 E U 2 0 3 "pictures/nav_usr/STS/nederland2.bmp" 13434828 E 20 10
7 8
"Ellipse4"
""
-1 466 406 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
+1 490 180 E E E 1 E 1 E N "_WindowText" E N "Lofar_device_active" E E
E E
9 0 0 0 0 0
EE E
@@ -41,11 +41,11 @@ E "main()
{
navConfigTriggerNavigatorRefreshWithDP(\"CCU1:PIC_CEP\");
}" 0
- 0 1 1 0 1 E U 1 E 466 406 10 10
+ 0 1 1 0 1 E U 1 E 490 180 10 10
2 9
"Text1"
""
-1 450 370 E E E 1 E 1 E N "_WindowText" E N "STD_device_uncertain" E E
+1 460 140 E E E 1 E 1 E N "_WindowText" E N "STD_device_uncertain" E E
E E
10 0 0 0 0 0
EE E
@@ -54,8 +54,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 452 372 479 388
-0 2 0 "s" 0 0 0 192 0 0 452 372
+E E 0 1 1 0 1 E U 1 E 462 142 489 158
+0 2 0 "s" 0 0 0 192 0 0 462 142
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
@@ -65,7 +65,7 @@ LANG:1 3 CEP
6 10
"Border1"
""
-1 450 390 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 460 160 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
11 0 0 0 0 0
EE E
@@ -74,7 +74,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 450 370 481 390
+E E 0 1 1 0 1 E U 0 E 460 140 491 160
2 11
"Text2"
""
@@ -155,7 +155,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
-navConfigTriggerNavigatorRefreshWithDP(\"CCU1:PIC_Stations_STSLCU1\");
+navConfigTriggerNavigatorRefreshWithDP(\"CCU1:PIC_Stations_STS1\");
}" 0
0 1 1 0 1 E U 1 E 411 477 10 10
7 16
diff --git a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
index 5f5d47e53ed5e96c2c70ccc93256fcb75c81875d..1327e7446d5240d1fd89beab4e14f6c0735430cb 100644
--- a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 11 Subrack_RCU
-PANEL,360 230 139 149 N "_3DFace" 4
+PANEL,2 108 139 149 N "_3DFace" 4
"$APNr"
"$RCUNr"
"$datapoint"
@@ -96,7 +96,7 @@ LANG:1 0
"dashclr"N "_Transparent"
E "main()
{
- aplViewNavigateTo($datapoint, $referenceDatapoint, \"_Board1_AP\" + $APNr + \"_RCU\"+$RCUNr, \"Station_Subrack_RCU.pnl\");
+ aplViewNavigateTo($datapoint, $referenceDatapoint, \"_Board0_AP\" + $APNr + \"_RCU\"+$RCUNr, \"Station_Subrack_RCU.pnl\");
}" 0
0 1 1 0 1 E U 1 E 40 40 100 110
2 5