From 2a8ea12a32c0330b43f175f28dda7b5204a5f5db Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Tue, 4 Mar 2008 10:55:17 +0000
Subject: [PATCH] Bug 1164: Step 4 changes for multiple Beams
---
.../nav_usr/CS1/observation-overview.pnl | 48 +++---
.../objects/nav_usr/CS1/Beam_ctrl_details.pnl | 93 ++++++-----
.../objects/nav_usr/CS1/Cal_ctrl_details.pnl | 14 +-
.../nav_usr/CS1/DigBoard_ctrl_details.pnl | 156 +++++++++---------
.../nav_usr/CS1/Station_ctrl_details.pnl | 30 ++--
5 files changed, 174 insertions(+), 167 deletions(-)
diff --git a/MAC/Navigator/panels/nav_usr/CS1/observation-overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/observation-overview.pnl
index 9397d6ab43d..6d1a9f07722 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/observation-overview.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/observation-overview.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,331 66 959 765 N "_3DFace" 1
+PANEL,377 112 959 765 N "_3DFace" 1
"$datapoint"
EEE E E 1 0 0 0 10 10
"" 0 1
@@ -51,43 +51,43 @@ LANG:1 31 Observation Controller Details
0
1 9 1 "" 1
0
-1 10 1 "" 2
+1 10 1 "" 9
0
-1 11 1 "" 3
+1 11 1 "" 11
0
-1 12 1 "" 4
+1 12 1 "" 12
0
-1 13 1 "" 8
+1 13 1 "" 14
0
-1 14 1 "" 9
+1 14 1 "" 13
0
-1 15 1 "" 11
+1 15 1 "0" 1
0
-1 16 1 "" 12
+1 16 1 "" 16
0
-1 17 1 "" 14
+1 17 1 "" 17
0
-1 18 1 "" 13
+1 18 1 "" 18
0
-1 19 1 "0" 1
+1 19 1 "" 19
0
-1 29 6 "" 0
+1 20 6 "" 0
0
-1 30 6 "" 1
+1 21 6 "" 1
0
-1 32 7 "" 0
+1 23 7 "" 0
0
-1 33 7 "" 1
+1 24 7 "" 1
0
-1 35 8 "" 0
+1 26 8 "" 0
0
-1 36 8 "" 1
+1 27 8 "" 1
0
-1 31 6 "" 15
+1 22 6 "" 15
0
-1 34 7 "" 15
+1 25 7 "" 15
0
-1 37 8 "" 15
+1 28 8 "" 15
0
0
LAYER, 1
@@ -123,19 +123,19 @@ LANG:1 6 Layer8
1
"$datapoint""$datapoint"
3 1 ""
-"objects\\nav_usr\\CS1\\DigBoard_ctrl_details.pnl" 264 133 T 15 1 0 1 -254 50
+"objects\\nav_usr\\CS1\\DigBoard_ctrl_details.pnl" 264 133 T 15 1 0 1 -254 40
1
"$datapoint""$datapoint"
3 6 ""
-"objects\\nav_usr\\CS1\\Cal_ctrl_details.pnl" 87 292 T 19 1 0 1 -77 164
+"objects\\nav_usr\\CS1\\Cal_ctrl_details.pnl" 87 292 T 19 1 0 1 -77 114
1
"$datapoint""$datapoint"
3 7 ""
-"objects\\nav_usr\\CS1\\Beam_ctrl_details.pnl" 137 493 T 20 1 0 1 -127 154
+"objects\\nav_usr\\CS1\\Beam_ctrl_details.pnl" 137 493 T 20 1 0 1 -127 104
1
"$datapoint""$datapoint"
3 8 ""
-"objects\\nav_usr\\CS1\\TBB_ctrl_details.pnl" 66 643 T 21 1 0 1 -56 191
+"objects\\nav_usr\\CS1\\TBB_ctrl_details.pnl" 66 643 T 21 1 0 1 -56 165
1
"$datapoint""$datapoint"
0
\ No newline at end of file
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 d1202bd13a2..002bb40aa4d 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,296 208 1057 342 N "_3DFace" 1
+PANEL,415 170 1057 342 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -47,9 +47,15 @@ updateBeamCtrlTable(string dpe, dyn_dyn_anytype tab)
for (int z = 2; z <= dynlen(tab); z++)
{
string obsName = getObsName(tab[z]);
- beamControlTable.appendLine(\"Observation\",obsName);
string dpPrefix = baseDP + obsName + \"_BeamCtrl\";
+ // get nr of beams for this observation
+ dyn_string beamNames;
+ dpGet(dpPrefix+\".beamName\",beamNames);
+ for (int beam=1; beam <= dynlen(beamNames); beam ++) {
+ beamControlTable.appendLine(\"Observation\",obsName,\"BeamName\",beamNames[beam]);
+ }
+
for(int i=0; i<10 && !dpAccessable(dpPrefix);i++)
{
delay(0,250);
@@ -62,8 +68,8 @@ updateBeamCtrlTable(string dpe, dyn_dyn_anytype tab)
dpPrefix + \".subArray:_online.._value\",
dpPrefix + \".angle1:_online.._value\",
dpPrefix + \".angle2:_online.._value\",
- dpPrefix + \".angleTimes:_online.._value\",
- dpPrefix + \".beamID:_online.._value\",
+ dpPrefix + \".directionType:_online.._value\",
+ dpPrefix + \".beamName:_online.._value\",
dpPrefix + \".state:_online.._invalid\");
}
}
@@ -71,15 +77,16 @@ updateBeamCtrlTable(string dpe, dyn_dyn_anytype tab)
updateBeamCtrlTableValues(string dp1, int state,
string dp2, bool connected,
- string dp3, string subbandList,
- string dp4, string beamletList,
+ string dp3, dyn_string subbandList,
+ string dp4, dyn_string beamletList,
string dp5, string subArray,
- string dp6, string angle1,
- string dp7, string angle2,
- string dp8, string angleTimes,
- string dp9, int beamID,
+ string dp6, dyn_float angle1,
+ string dp7, dyn_float angle2,
+ string dp8, dyn_string directionType,
+ string dp9, dyn_string beamName,
string dp10, bool invalid)
{
+
string stateCol=\"\";
if (invalid)
@@ -88,22 +95,24 @@ updateBeamCtrlTableValues(string dp1, int state,
} else {
stateCol=getStateColor(state);
}
- for(int i=0; i < beamControlTable.lineCount; i++)
- {
- if(getObsName(dp1) == beamControlTable.cellValueRC(i,\"Observation\"))
- {
- beamControlTable.cellBackColRC(i, \"Status\", stateCol);
- beamControlTable.cellValueRC(i,\"SubbandList\",subbandList);
- beamControlTable.cellValueRC(i,\"BeamletList\",beamletList);
- beamControlTable.cellValueRC(i,\"SubArray\",subArray);
- beamControlTable.cellValueRC(i,\"Angle1\",angle1);
- beamControlTable.cellValueRC(i,\"Angle2\",angle2);
- beamControlTable.cellValueRC(i,\"AngleTimes\",angleTimes);
- beamControlTable.cellValueRC(i,\"BeamID\",beamID);
- if (connected) {
- beamControlTable.cellBackColRC(i, \"Connected\", \"green\");
- } else {
- beamControlTable.cellBackColRC(i, \"Connected\", \"red\");
+ for(int i=0; i < beamControlTable.lineCount; i++){
+ for (int b=0; b< dynlen(beamName); b++){
+ if(getObsName(dp1) == beamControlTable.cellValueRC(i+b,\"Observation\") &&
+ beamName[b+1] == beamControlTable.cellValueRC(i+b,\"BeamName\") ){
+
+ beamControlTable.cellBackColRC(i+b, \"Status\", stateCol);
+ if (connected) {
+ beamControlTable.cellBackColRC(i+b, \"Connected\", \"green\");
+ } else {
+ beamControlTable.cellBackColRC(i+b, \"Connected\", \"red\");
+ }
+ beamControlTable.cellValueRC(i+b,\"SubArray\",subArray);
+ beamControlTable.cellValueRC(i+b,\"BeamName\",beamName[b+1]);
+ beamControlTable.cellValueRC(i+b,\"Angle1\",angle1[b+1]);
+ beamControlTable.cellValueRC(i+b,\"Angle2\",angle2[b+1]);
+ beamControlTable.cellValueRC(i+b,\"DirectionType\",directionType[b+1]);
+ beamControlTable.cellValueRC(i+b,\"SubbandList\",subbandList[b+1]);
+ beamControlTable.cellValueRC(i+b,\"BeamletList\",beamletList[b+1]);
}
}
}
@@ -124,7 +133,7 @@ LANG:1 6 Layer1
6 0
"Border1"
""
-1 10 200 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 10 220 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
@@ -133,7 +142,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 2 1 0 1 E U 1 E 10 10 940 200
+E E 0 2 1 0 1 E U 1 E 10 10 940 220
2 1
"Text4"
""
@@ -157,7 +166,7 @@ LANG:1 14 Beam Control :
25 15
"beamControlTable"
""
-1 28 -167 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 28 -196 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
16 0 0 0 0 0
EE E
@@ -168,7 +177,7 @@ LANG:1 0
1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
0 ""
-17 45 933 192
+17 45 933 212
E "main(int row, string column, string value)
{
@@ -188,11 +197,15 @@ LANG:1 10 Connected?
LANG:1 11 Observation
E1
LANG:1 0
- 200 "BeamID" 0 1 0 "s" 1
-LANG:1 4 B-ID
+ 142 "SubArray" 0 1 0 "s" 1
+LANG:1 8 SubArray
+E1
+LANG:1 0
+ 145 "BeamName" 0 1 0 "s" 1
+LANG:1 4 Beam
E1
LANG:1 6 BeamID
- 40 "Angle1" 0 1 0 "s" 1
+ 65 "Angle1" 0 1 0 "s" 1
LANG:1 7 Angle 1
E1
LANG:1 0
@@ -200,23 +213,19 @@ LANG:1 0
LANG:1 7 Angel 2
E1
LANG:1 0
- 55 "AngleTimes" 0 1 0 "s" 1
-LANG:1 11 Angle Times
-E1
-LANG:1 0
- 83 "SubArray" 0 1 0 "s" 1
-LANG:1 8 SubArray
+ 55 "DirectionType" 0 1 0 "s" 1
+LANG:1 13 DirectionType
E1
LANG:1 0
- 142 "SubbandList" 0 1 0 "s" 1
+ 90 "SubbandList" 0 1 0 "s" 1
LANG:1 11 SubbandList
E1
LANG:1 0
- 142 "BeamletList" 0 1 0 "s" 1
+ 150 "BeamletList" 0 1 0 "s" 1
LANG:1 11 BeamletList
E1
LANG:1 0
- 135 16 16 "" 1 1
+ 150 16 16 "" 1 1
LANG:1 2 #1
8 30 1
LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
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 09facfe3729..1da76e2d527 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,382 110 1145 286 N "_3DFace" 1
+PANEL,377 110 1145 286 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -62,7 +62,6 @@ updateCalCtrlTable(string dpe, dyn_dyn_anytype tab)
dpConnect(\"updateCalCtrlTableValues\",dpPrefix + \".state:_online.._value\",
dpPrefix + \".connected:_online.._value\",
- dpPrefix + \".obsname:_online.._value\",
dpPrefix + \".antennaArray:_online.._value\",
dpPrefix + \".filter:_online.._value\",
dpPrefix + \".nyquistzone:_online.._value\",
@@ -74,12 +73,11 @@ updateCalCtrlTable(string dpe, dyn_dyn_anytype tab)
updateCalCtrlTableValues(string dp1, int state,
string dp2, bool connected,
- string dp3, string obsname,
- string dp4, string antennaArray,
- string dp5, string filter,
- string dp6, int nyquistzone,
- string dp7, string rcus,
- string dp8, bool invalid)
+ string dp3, string antennaArray,
+ string dp4, string filter,
+ string dp5, int nyquistzone,
+ string dp6, string rcus,
+ string dp7, bool invalid)
{
string stateCol=\"\";
if (invalid)
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 f5b9588ccef..3dd53db38a6 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,489 117 950 124 N "_3DFace" 1
+PANEL,358 389 950 124 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -65,7 +65,7 @@ LANG:1 6 Layer1
6 0
"childStateBorder"
""
-1 10 100 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+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
@@ -74,11 +74,11 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 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 60
2 1
"Text4"
""
-1 47 41 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 47 27 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
2 0 0 0 0 0
EE E
@@ -87,189 +87,189 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 0 E 49 29 198 55
+0 2 0 "s" 0 0 0 64 0 0 49 29
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 18 DigBoard Control :
-2 2
-"Text8"
+2 9
+"Text9"
""
-1 221 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 221 34 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-3 0 0 0 0 0
+10 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 223 20 267 36
-0 2 0 "s" 0 0 0 192 0 0 223 20
+E E 0 1 1 0 1 E U 0 E 223 36 319 52
+0 2 0 "s" 0 0 0 64 0 0 223 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
0 ""
1
-LANG:1 7 Action:
-2 3
-"Text1"
+LANG:1 10 Connected:
+7 11
+"txt_connected"
""
-1 221 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 306 43 E E E 1 E 1 E N "_WindowText" E N "red" E E
E E
-4 0 0 0 0 0
+12 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 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
-0 ""
-1
-LANG:1 6 Error:
-2 4
-"txt_action"
+E E 0 1 1 0 1 E U 1 E 306 43 5 5
+2 12
+"Text3"
""
-1 299 18 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 360 33 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-5 0 0 0 0 0
+13 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 301 20 567 38
-0 2 0 "s" 0 0 0 64 0 0 301 20
+E E 0 1 1 0 1 E U 0 E 362 35 401 51
+0 2 0 "s" 0 0 0 192 0 0 362 35
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
+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 0
-2 8
-"txt_error"
+LANG:1 6 Clock:
+2 14
+"Text5"
""
-1 299 35 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 586 32 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-9 0 0 0 0 0
+15 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 301 37 907 58
-0 2 0 "s" 0 0 0 64 0 0 301 37
+E E 0 1 1 0 1 E U 0 E 588 34 644 51
+0 2 0 "s" 0 0 0 64 0 0 588 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
+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 0
-2 9
-"Text9"
+LANG:1 4 Mhz.
+2 13
+"txt_clock"
""
-1 221 54 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 468 33 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-10 0 0 0 0 0
+14 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 223 56 319 72
-0 2 0 "s" 0 0 0 64 0 0 223 56
+E E 0 1 1 0 1 E U 0 E 470 35 526 51
+0 2 0 "s" 0 0 0 192 0 0 470 35
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 10 Connected:
-7 11
-"txt_connected"
+LANG:1 8 00000000
+1 15 0 "" 1
+0
+2 16
+"Text8"
""
-1 334 64 E E E 1 E 1 E N "_WindowText" E N "red" E E
+1 221 11 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-12 0 0 0 0 0
+16 0 0 0 0 0
EE E
0
1
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 1 E 334 64 5 5
-2 12
-"Text3"
+E E 0 1 1 0 1 E U 0 E 223 13 267 29
+0 2 0 "s" 0 0 0 192 0 0 223 13
+ 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 Action:
+2 17
+"Text1"
""
-1 221 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 513 11 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
-13 0 0 0 0 0
+17 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 223 75 262 91
-0 2 0 "s" 0 0 0 192 0 0 223 75
+E E 0 1 1 0 1 E U 0 E 515 13 561 29
+0 2 0 "s" 0 0 0 64 0 0 515 13
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 Clock:
-2 14
-"Text5"
+LANG:1 6 Error:
+2 18
+"txt_action"
""
-1 447 72 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 278 11 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
-15 0 0 0 0 0
+18 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 449 74 505 91
-0 2 0 "s" 0 0 0 64 0 0 449 74
+E E 0 1 1 0 1 E U 0 E 280 13 476 29
+0 2 0 "s" 0 0 0 64 0 0 280 13
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
+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 Mhz.
-2 13
-"txt_clock"
+LANG:1 0
+2 19
+"txt_error"
""
-1 329 73 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 588 11 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
E E
-14 0 0 0 0 0
+19 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 331 75 387 91
-0 2 0 "s" 0 0 0 192 0 0 331 75
+E E 0 1 1 0 1 E U 0 E 590 13 826 29
+0 2 0 "s" 0 0 0 64 0 0 590 13
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
+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 8 00000000
-1 15 0 "" 1
-0
+LANG:1 0
0
LAYER, 1
1
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 fda370b0674..96ee91571b6 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,489 117 950 164 N "_3DFace" 1
+PANEL,377 112 950 164 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -56,7 +56,7 @@ LANG:1 6 Layer1
6 0
"childStateBorder"
""
-1 10 60 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+1 10 50 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
1 0 0 0 0 0
EE E
@@ -65,7 +65,7 @@ EE E
LANG:1 18 Station Controller
1
"dashclr"N "_Transparent"
-E E 0 3 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 50
2 1
"Text4"
""
@@ -89,7 +89,7 @@ LANG:1 17 Station Control :
2 2
"Text8"
""
-1 213 17 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 183 25 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,8 +98,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 0 E 185 27 229 43
+0 2 0 "s" 0 0 0 192 0 0 185 27
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
@@ -109,7 +109,7 @@ LANG:1 7 Action:
2 3
"Text1"
""
-1 213 34 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 475 25 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 +118,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 0 E 477 27 523 43
+0 2 0 "s" 0 0 0 64 0 0 477 27
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
@@ -129,7 +129,7 @@ LANG:1 6 Error:
2 4
"txt_action"
""
-1 290 17 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
+1 240 25 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 +138,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 0 E 242 27 438 43
+0 2 0 "s" 0 0 0 64 0 0 242 27
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
@@ -149,7 +149,7 @@ LANG:1 0
2 8
"txt_error"
""
-1 290 34 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E
+1 550 25 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,8 +158,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-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
+E E 0 1 1 0 1 E U 0 E 552 27 788 43
+0 2 0 "s" 0 0 0 64 0 0 552 27
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
--
GitLab