diff --git a/MAC/Navigator/panels/nav_fw/panel_config.pnl b/MAC/Navigator/panels/nav_fw/panel_config.pnl index 4e01b2f242407b6d13d5e746d2a8ae889c967efd..5ea28bb51d672deeb628753fca99067fa0e6e92a 100644 --- a/MAC/Navigator/panels/nav_fw/panel_config.pnl +++ b/MAC/Navigator/panels/nav_fw/panel_config.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 8 (NoName) -PANEL,360 230 950 740 N "_3DFace" 5 +PANEL,299 108 950 740 N "_3DFace" 5 "$configDatapoint" "$datapoint" "$selectedElementDpType" diff --git a/MAC/Navigator/panels/nav_usr/CEP/CEP_fysical_view.pnl b/MAC/Navigator/panels/nav_usr/CEP/CEP_fysical_view.pnl index ce8ff5c600e05b97eed604035c84f00d7d192bf0..c9df41a4c8abac85afc5e62eb3b049bcdddedbe2 100644 --- a/MAC/Navigator/panels/nav_usr/CEP/CEP_fysical_view.pnl +++ b/MAC/Navigator/panels/nav_usr/CEP/CEP_fysical_view.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 11 SwitchRect2 -PANEL,272 100 1094 839 N "_3DFace" 0 +PANEL,293 76 1094 839 N "_3DFace" 0 EEE E E 1 0 0 0 20 680 "" 0 1 EE 2 @@ -12,27 +12,10 @@ 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 107 -"CEPFrame" -"" -1 20 680 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E - E E -108 0 0 0 0 0 -EE E -1 -1 -LANG:1 0 -0 -E E 0 1 1 0 1 E U 0 E 20 60 890 680 -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 16 Fysical CEP View 4 111 "Line82" "" -1 40 100 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 20 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 112 0 0 0 0 0 EE E @@ -41,11 +24,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 550 100 40 100 +E E 0 1 1 0 1 E 530 10 20 10 9 113 "Arc2" "" -1 293 335 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 273 245 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 114 0 0 0 0 0 EE E @@ -54,12 +37,12 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 40 100 510 470 - 0 40 570 550 100 0 +E E 0 1 1 0 1 E U 0 E 20 10 510 470 + 0 20 480 530 10 0 6 114 "Door" "" -1 30 340 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 10 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 115 0 0 0 0 0 EE E @@ -68,11 +51,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 30 180 50 340 +E E 0 1 1 0 1 E U 0 E 10 90 30 250 4 115 "Line83" "" -1 40 100 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 20 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 116 0 0 0 0 0 EE E @@ -81,11 +64,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 40 180 40 100 +E E 0 1 1 0 1 E 20 90 20 10 4 116 "Line84" "" -1 40 340 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 20 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 117 0 0 0 0 0 EE E @@ -94,11 +77,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 40 570 40 340 +E E 0 1 1 0 1 E 20 480 20 250 6 118 "BGL1" "" -1 150 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 130 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 119 0 0 0 0 0 EE E @@ -107,11 +90,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 150 190 190 230 +E E 0 1 1 0 1 E U 1 E 130 100 170 140 6 119 "BGL6" "" -1 350 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 330 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 120 0 0 0 0 0 EE E @@ -120,11 +103,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 350 190 390 230 +E E 0 1 1 0 1 E U 1 E 330 100 370 140 6 120 "BGL5" "" -1 310 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 290 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 121 0 0 0 0 0 EE E @@ -133,11 +116,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 310 190 350 230 +E E 0 1 1 0 1 E U 1 E 290 100 330 140 6 121 "BGL4" "" -1 270 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 250 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 122 0 0 0 0 0 EE E @@ -146,11 +129,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 270 190 310 230 +E E 0 1 1 0 1 E U 1 E 250 100 290 140 6 122 "BGL3" "" -1 230 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 210 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 123 0 0 0 0 0 EE E @@ -159,11 +142,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 230 190 270 230 +E E 0 1 1 0 1 E U 1 E 210 100 250 140 6 123 "BGL2" "" -1 190 230 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 170 140 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 124 0 0 0 0 0 EE E @@ -172,11 +155,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 190 190 230 230 +E E 0 1 1 0 1 E U 1 E 170 100 210 140 6 124 "BGL_frontend" "" -1 110 300 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E +1 90 210 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E E E 125 0 0 0 0 0 EE E @@ -185,11 +168,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 110 260 150 300 +E E 0 1 1 0 1 E U 1 E 90 170 130 210 6 143 "BGLFiberSwitch" "" -1 110 450 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E +1 90 360 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E E E 144 0 0 0 0 0 EE E @@ -198,11 +181,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 110 410 150 450 +E E 0 1 1 0 1 E U 1 E 90 320 130 360 10 154 "CoolingUnits" "" -1 60 522 E E E 1 E 1 E N "_WindowText" E N "gelb" E E +1 40 432 E E E 1 E 1 E N "_WindowText" E N "gelb" E E E E 155 0 0 0 0 0 EE E @@ -211,18 +194,18 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 7 60 522 -210 494 -350 420 -370 448 -220 522 -50 560 -50 522 +E E 0 1 1 0 1 E U 1 E 7 40 432 +190 404 +330 330 +350 358 +200 432 +30 470 +30 432 1 6 155 "Output_StorageRoom" "" -1 570 310 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 550 220 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 156 0 0 0 0 0 EE E @@ -231,11 +214,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 570 100 850 310 +E E 0 1 1 0 1 E U 0 E 550 10 830 220 2 168 "Text9" "" -1 50 110 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 30 20 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 169 0 0 0 0 0 EE E @@ -244,8 +227,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 52 112 208 128 -0 2 0 "s" 0 0 0 192 0 0 52 112 +E E 0 1 1 0 1 E U 0 E 32 22 188 38 +0 2 0 "s" 0 0 0 192 0 0 32 22 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 @@ -255,7 +238,7 @@ LANG:1 24 Computerroom Zernikeborg 6 185 "AuxProcRoom" "" -1 570 480 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 550 390 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 186 0 0 0 0 0 EE E @@ -264,110 +247,91 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 570 350 850 480 -1 198 0 "" 0 +E E 0 1 1 0 1 E U 0 E 550 260 830 390 +1 186 0 "" 0 0 -1 200 2 "" 0 +1 187 2 "" 0 0 -1 201 3 "" 0 +1 188 3 "" 0 0 -1 202 4 "" 0 +1 189 4 "" 0 0 -1 203 5 "" 0 +1 190 5 "" 0 0 -1 204 6 "" 0 +1 191 6 "" 0 0 -1 205 7 "" 0 +1 192 7 "" 0 0 -1 206 8 "" 0 +1 193 8 "" 0 0 -1 207 9 "" 0 +1 194 9 "" 0 0 -1 208 10 "" 0 +1 195 10 "" 0 0 -1 209 11 "" 0 +1 196 11 "" 0 0 -1 210 12 "" 0 +1 197 12 "" 0 0 -1 211 13 "" 0 +1 198 13 "" 0 0 -1 212 14 "" 0 +1 199 14 "" 0 0 -1 213 15 "" 0 +1 200 15 "" 0 0 -1 214 16 "" 0 +1 201 16 "" 0 0 -1 215 17 "" 0 +1 202 17 "" 0 0 -1 216 18 "" 0 +1 203 18 "" 0 0 -1 217 19 "" 0 +1 204 19 "" 0 0 -1 218 20 "" 0 +1 205 20 "" 0 0 -1 219 21 "" 0 +1 206 21 "" 0 0 -1 220 22 "" 0 +1 207 22 "" 0 0 -1 221 23 "" 0 +1 208 23 "" 0 0 -1 222 24 "" 0 +1 209 24 "" 0 0 -1 223 25 "" 0 +1 210 25 "" 0 0 -1 224 26 "" 0 +1 211 26 "" 0 0 -1 225 27 "" 0 +1 212 27 "" 0 0 -1 226 28 "" 0 +1 213 28 "" 0 0 -1 227 29 "" 0 +1 214 29 "" 0 0 -1 228 30 "" 0 +1 215 30 "" 0 0 -1 229 31 "" 0 +1 216 31 "" 0 0 -1 230 32 "" 0 +1 217 32 "" 0 0 -1 231 33 "" 0 +1 218 33 "" 0 0 -1 232 34 "" 0 +1 219 34 "" 0 0 -1 233 35 "" 0 +1 220 35 "" 0 0 -1 234 36 "" 0 +1 221 36 "" 0 0 -1 235 37 "" 0 +1 222 37 "" 0 0 -1 236 38 "" 0 +1 223 38 "" 0 0 -1 237 39 "" 0 +1 224 39 "" 0 0 -1 238 40 "" 0 +1 225 40 "" 0 0 -1 239 41 "" 0 +1 226 41 "" 0 0 -1 240 42 "" 0 +1 227 42 "" 0 0 -13 108 -"Button2" -"" -1 740 530 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E - E E -109 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 "" -738 528 852 562 -T -1 -LANG:1 12 Goto Logical -E E E E 0 LAYER, 1 1 @@ -398,173 +362,173 @@ LAYER, 7 LANG:1 6 Layer8 0 3 0 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 160 260 T 199 1 0 1 60 80 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 160 260 T 199 1 0 1 40 -10 1 "$datapoint""CEP_PIC_Room0_Row0_Rack0" 3 2 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 220 290 T 200 1 0 1 40 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 220 290 T 200 1 0 1 20 -40 1 "$datapoint""CEP_PIC_Room0_Row0_Rack1" 3 3 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 260 280 T 201 1 0 1 40 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 260 280 T 201 1 0 1 20 -30 1 "$datapoint""CEP_PIC_Room0_Row0_Rack2" 3 4 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 290 280 T 202 1 0 1 50 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 290 280 T 202 1 0 1 30 -30 1 "$datapoint""CEP_PIC_Room0_Row0_Rack3" 3 5 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 350 270 T 203 1 0 1 30 70 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 350 270 T 203 1 0 1 10 -20 1 "$datapoint""CEP_PIC_Room0_Row0_Rack4" 3 6 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 390 280 T 204 1 0 1 30 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 390 280 T 204 1 0 1 10 -30 1 "$datapoint""CEP_PIC_Room0_Row0_Rack5" 3 7 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 140 350 T 205 1 0 1 40 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 140 350 T 205 1 0 1 20 -30 1 "$datapoint""CEP_PIC_Room0_Row1_Rack0" 3 8 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 180 350 T 206 1 0 1 40 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 180 350 T 206 1 0 1 20 -30 1 "$datapoint""CEP_PIC_Room0_Row1_Rack1" 3 9 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 230 360 T 207 1 0 1 30 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 230 360 T 207 1 0 1 10 -40 1 "$datapoint""CEP_PIC_Room0_Row1_Rack2" 3 10 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 260 350 T 208 1 0 1 40 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 260 350 T 208 1 0 1 20 -30 1 "$datapoint""CEP_PIC_Room0_Row1_Rack3" 3 11 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 310 350 T 209 1 0 1 30 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 310 350 T 209 1 0 1 10 -30 1 "$datapoint""CEP_PIC_Room0_Row1_Rack4" 3 12 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 340 340 T 210 1 0 1 40 70 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 340 340 T 210 1 0 1 20 -20 1 "$datapoint""CEP_PIC_Room0_Row1_Rack5" 3 13 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 680 140 T 211 1 0 1 -20 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 680 140 T 211 1 0 1 -40 -40 1 "$datapoint""CEP_PIC_Room1_Row0_Rack0" 3 14 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 140 T 212 1 0 1 -30 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 140 T 212 1 0 1 -50 -40 1 "$datapoint""CEP_PIC_Room1_Row0_Rack1" 3 15 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 140 T 213 1 0 1 -30 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 140 T 213 1 0 1 -50 -40 1 "$datapoint""CEP_PIC_Room1_Row0_Rack2" 3 16 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 790 140 T 214 1 0 1 -10 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 790 140 T 214 1 0 1 -30 -40 1 "$datapoint""CEP_PIC_Room1_Row0_Rack3" 3 17 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 830 130 T 215 1 0 1 -10 60 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 830 130 T 215 1 0 1 -30 -30 1 "$datapoint""CEP_PIC_Room1_Row0_Rack4" 3 18 "" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 880 140 T 216 1 0 1 -20 50 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 880 140 T 216 1 0 1 -40 -40 1 "$datapoint""CEP_PIC_Room1_Row0_Rack5" 3 19 "Group27" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 217 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 217 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack0" 3 20 "Group28" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 218 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 218 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack1" 3 21 "Group29" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 219 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 219 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack2" 3 22 "Group30" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 220 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 220 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack3" 3 23 "Group31" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 221 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 221 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack4" 3 24 "Group32" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 222 1 0 1 10 140 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 222 1 0 1 -10 50 1 "$datapoint""CEP_PIC_Room1_Row1_Rack5" 3 25 "Group39" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 223 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 223 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack0" 3 26 "Group40" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 224 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 224 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack1" 3 27 "Group41" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 225 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 225 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack2" 3 28 "Group42" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 226 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 226 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack3" 3 29 "Group43" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 227 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 227 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack4" 3 30 "Group44" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 228 1 0 1 10 200 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 228 1 0 1 -10 110 1 "$datapoint""CEP_PIC_Room1_Row2_Rack5" 3 31 "Group57" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 229 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 110 T 229 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack0" 3 32 "Group58" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 230 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 110 T 230 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack1" 3 33 "Group59" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 231 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 110 T 231 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack2" 3 34 "Group60" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 232 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 110 T 232 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack3" 3 35 "Group61" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 233 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 110 T 233 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack4" 3 36 "Group62" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 234 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 110 T 234 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row0_Rack5" 3 37 "Group63" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 170 T 235 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 650 170 T 235 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack0" 3 38 "Group64" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 170 T 236 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 690 170 T 236 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack1" 3 39 "Group65" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 170 T 237 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 730 170 T 237 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack2" 3 40 "Group66" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 170 T 238 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 770 170 T 238 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack3" 3 41 "Group67" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 170 T 239 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 810 170 T 239 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack4" 3 42 "Group68" -"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 170 T 240 1 0 1 10 330 +"objects\\nav_usr\\CEP\\CEP_rack_topview.pnl" 850 170 T 240 1 0 1 -10 240 1 "$datapoint""CEP_PIC_Room2_Row1_Rack5" -2 "BorgComputerRoom" 40 100 550 570 +2 "BorgComputerRoom" 20 10 530 480 4 116 115 113 111 0 \ No newline at end of file diff --git a/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl b/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl index 6099fdf1b8520f238373dfd29bf4e07bfe6adcc4..61bc7ea57900aeeb0c3b935f899e24940b45aacb 100644 --- a/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl +++ b/MAC/Navigator/panels/nav_usr/CEP/CEP_logical_view.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 11 SwitchRect2 -PANEL,265 103 1094 839 N "_3DFace" 0 +PANEL,299 222 1094 839 N "_3DFace" 0 EEE E E 1 0 0 0 130 470 "" 0 1 EE 2 @@ -15,7 +15,7 @@ LANG:1 6 Layer1 6 0 "SwitchRect1" "" -1 110 550 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E +1 72 480 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E E E 1 0 0 0 0 0 EE E @@ -24,11 +24,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 110 220 160 550 +E E 0 1 1 0 1 E U 1 E 72 150 102 480 6 2 "SwitchRect2" "" -1 350 550 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E +1 256 480 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E E E 3 0 0 0 0 0 EE E @@ -37,11 +37,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 350 220 399 550 +E E 0 1 1 0 1 E U 1 E 256 150 286 480 6 8 "AuxProcRect" "" -1 190 640 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E +1 63 570 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E E E 9 0 0 0 0 0 EE E @@ -50,11 +50,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 190 580 850 640 +E E 0 1 1 0 1 E U 1 E 63 510 723 570 4 9 "Line1" "" -1 70 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 51 180 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 10 0 0 0 0 0 EE E @@ -63,11 +63,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 250 70 250 +E E 0 1 1 0 1 E 71 180 51 180 4 18 "Line7" "" -1 100 240 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 19 0 0 0 0 0 EE E @@ -76,11 +76,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 250 100 240 +E E 0 1 1 0 1 E 72 180 67 172 4 19 "Line8" "" -1 100 260 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 188 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 20 0 0 0 0 0 EE E @@ -89,11 +89,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 100 260 110 250 +E E 0 1 1 0 1 E 67 188 72 180 4 20 "Line9" "" -1 80 389 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 61 319 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 21 0 0 0 0 0 EE E @@ -102,11 +102,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 389 80 389 +E E 0 1 1 0 1 E 71 319 61 319 4 21 "Line10" "" -1 100 379 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 311 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 22 0 0 0 0 0 EE E @@ -115,11 +115,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 389 100 379 +E E 0 1 1 0 1 E 72 319 67 311 4 22 "Line11" "" -1 100 399 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 327 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 23 0 0 0 0 0 EE E @@ -128,11 +128,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 100 399 110 389 +E E 0 1 1 0 1 E 67 327 72 319 4 26 "Line15" "" -1 70 530 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 49 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 27 0 0 0 0 0 EE E @@ -141,11 +141,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 530 70 530 +E E 0 1 1 0 1 E 71 460 49 460 4 27 "Line16" "" -1 100 520 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 452 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 28 0 0 0 0 0 EE E @@ -154,11 +154,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 110 530 100 520 +E E 0 1 1 0 1 E 72 460 67 452 4 28 "Line17" "" -1 100 540 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 67 468 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 29 0 0 0 0 0 EE E @@ -167,11 +167,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 100 540 110 530 +E E 0 1 1 0 1 E 67 468 72 460 4 29 "Line18" "" -1 158 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 102 180 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 30 0 0 0 0 0 EE E @@ -180,11 +180,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 188 250 158 250 +E E 0 1 1 0 1 E 112 180 102 180 4 30 "Line19" "" -1 179 240 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 31 0 0 0 0 0 EE E @@ -193,11 +193,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 189 250 179 240 +E E 0 1 1 0 1 E 113 180 108 172 4 31 "Line20" "" -1 179 260 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 188 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 32 0 0 0 0 0 EE E @@ -206,11 +206,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 179 260 189 250 +E E 0 1 1 0 1 E 108 188 113 180 4 32 "Line21" "" -1 158 389 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 102 319 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 33 0 0 0 0 0 EE E @@ -219,11 +219,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 188 389 158 389 +E E 0 1 1 0 1 E 112 319 102 319 4 33 "Line22" "" -1 179 379 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 311 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 34 0 0 0 0 0 EE E @@ -232,11 +232,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 189 389 179 379 +E E 0 1 1 0 1 E 113 319 108 311 4 34 "Line23" "" -1 179 399 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 327 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 35 0 0 0 0 0 EE E @@ -245,11 +245,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 179 399 189 389 +E E 0 1 1 0 1 E 108 327 113 319 4 35 "Line24" "" -1 158 530 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 102 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 36 0 0 0 0 0 EE E @@ -258,11 +258,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 188 530 158 530 +E E 0 1 1 0 1 E 112 460 102 460 4 36 "Line25" "" -1 179 520 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 452 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 37 0 0 0 0 0 EE E @@ -271,11 +271,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 189 530 179 520 +E E 0 1 1 0 1 E 113 460 108 452 4 37 "Line26" "" -1 179 540 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 108 468 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 38 0 0 0 0 0 EE E @@ -284,245 +284,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 179 540 189 530 -4 38 -"Line27" -"" -1 320 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -39 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 250 320 250 -4 39 -"Line28" -"" -1 340 240 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -40 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 250 340 240 -4 40 -"Line29" -"" -1 340 260 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -41 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 340 260 350 250 -4 44 -"Line33" -"" -1 320 389 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -45 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 389 320 389 -4 45 -"Line34" -"" -1 340 379 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -46 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 389 340 379 -4 46 -"Line35" -"" -1 340 399 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -47 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 340 399 350 389 -4 47 -"Line36" -"" -1 320 530 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -48 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 530 320 530 -4 48 -"Line37" -"" -1 340 520 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -49 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 350 530 340 520 -4 49 -"Line38" -"" -1 340 540 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -50 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 340 540 350 530 -4 50 -"Line39" -"" -1 399 250 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -51 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 250 399 250 -4 51 -"Line40" -"" -1 419 240 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -52 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 250 419 240 -4 52 -"Line41" -"" -1 419 260 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -53 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 419 260 429 250 -4 56 -"Line45" -"" -1 399 389 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -57 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 389 399 389 -4 57 -"Line46" -"" -1 419 379 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -58 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 389 419 379 -4 58 -"Line47" -"" -1 419 399 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -59 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 419 399 429 389 -4 59 -"Line48" -"" -1 399 530 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -60 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 530 399 530 -4 60 -"Line49" -"" -1 419 520 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -61 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 429 530 419 520 -4 61 -"Line50" -"" -1 419 540 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E - E E -62 0 0 0 0 0 -EE E -0 -1 -LANG:1 0 -1 -"dashclr"N "_Transparent" -E E 0 1 1 0 1 E 419 540 429 530 +E E 0 1 1 0 1 E 108 468 113 460 7 86 "Stations" "" -1 55 384 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E +1 36 314 E E E 1 E 1 E N "_WindowText" E N "Lofar_background_dark" E E E E 87 0 0 0 0 0 EE E @@ -531,11 +297,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 55 385 25 165 +E E 0 1 1 0 1 E U 1 E 36 315 25 165 2 88 "Text2" "" -1 29 388 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 10 308 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 89 0 0 0 0 0 EE E @@ -544,35 +310,18 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 31 390 87 406 -0 2 0 "s" 0 0 0 64 0 0 31 390 +E E 0 1 1 0 1 E U 0 E 12 310 60 326 +0 2 0 "s" 0 0 0 192 0 0 12 310 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 8 Stations -30 107 -"CEPFrame" -"" -1 20 710 E E E 1 E 1 E N "_3DText" E N "_Transparent" E E - E E -108 0 0 0 0 0 -EE E -1 -1 -LANG:1 0 -0 -E E 0 1 1 0 1 E U 0 E 20 60 1000 710 -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 16 Logical CEP View 2 109 "Text8" "" -1 460 600 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 333 530 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 110 0 0 0 0 0 EE E @@ -581,8 +330,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 462 602 638 618 -0 2 0 "s" 0 0 0 64 0 0 462 602 +E E 0 1 1 0 1 E U 0 E 335 532 511 548 +0 2 0 "s" 0 0 0 64 0 0 335 532 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 @@ -592,7 +341,7 @@ LANG:1 27 Auxilary Processing Cluster 6 110 "Border1" "" -1 429 260 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 190 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 111 0 0 0 0 0 EE E @@ -601,11 +350,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 220 680 260 +E E 0 1 1 0 1 E U 1 E 302 150 553 190 6 111 "Border2" "" -1 429 318 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 248 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 112 0 0 0 0 0 EE E @@ -614,11 +363,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 278 680 318 +E E 0 1 1 0 1 E U 1 E 302 208 553 248 6 112 "Border3" "" -1 429 377 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 307 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 113 0 0 0 0 0 EE E @@ -627,11 +376,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 337 680 377 +E E 0 1 1 0 1 E U 1 E 302 267 553 307 6 113 "Border4" "" -1 429 436 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 366 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 114 0 0 0 0 0 EE E @@ -640,11 +389,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 396 680 436 +E E 0 1 1 0 1 E U 1 E 302 326 553 366 6 114 "Border5" "" -1 429 494 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 424 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 115 0 0 0 0 0 EE E @@ -653,11 +402,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 454 680 494 +E E 0 1 1 0 1 E U 1 E 302 384 553 424 6 115 "Border6" "" -1 429 550 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E +1 302 480 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_BG" E E E E 116 0 0 0 0 0 EE E @@ -666,11 +415,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 429 510 680 550 +E E 0 1 1 0 1 E U 1 E 302 440 553 480 2 116 "Text1" "" -1 523 234 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 164 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 117 0 0 0 0 0 EE E @@ -679,8 +428,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 236 596 252 -0 2 0 "s" 0 0 0 192 0 0 525 236 +E E 0 1 1 0 1 E U 0 E 398 166 469 182 +0 2 0 "s" 0 0 0 192 0 0 398 166 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 @@ -690,7 +439,7 @@ LANG:1 10 BG/L Rack1 2 117 "Text4" "" -1 523 291 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 221 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 118 0 0 0 0 0 EE E @@ -699,8 +448,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 293 596 309 -0 2 0 "s" 0 0 0 192 0 0 525 293 +E E 0 1 1 0 1 E U 0 E 398 223 469 239 +0 2 0 "s" 0 0 0 192 0 0 398 223 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 @@ -710,7 +459,7 @@ LANG:1 10 BG/L Rack2 2 118 "Text6" "" -1 523 348 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 278 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 119 0 0 0 0 0 EE E @@ -719,8 +468,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 350 596 366 -0 2 0 "s" 0 0 0 192 0 0 525 350 +E E 0 1 1 0 1 E U 0 E 398 280 469 296 +0 2 0 "s" 0 0 0 192 0 0 398 280 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 @@ -730,7 +479,7 @@ LANG:1 10 BG/L Rack3 2 119 "Text7" "" -1 523 406 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 336 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 120 0 0 0 0 0 EE E @@ -739,8 +488,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 408 596 424 -0 2 0 "s" 0 0 0 192 0 0 525 408 +E E 0 1 1 0 1 E U 0 E 398 338 469 354 +0 2 0 "s" 0 0 0 192 0 0 398 338 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 @@ -750,7 +499,7 @@ LANG:1 10 BG/L Rack4 2 120 "Text9" "" -1 523 464 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 394 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 121 0 0 0 0 0 EE E @@ -759,8 +508,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 466 596 482 -0 2 0 "s" 0 0 0 192 0 0 525 466 +E E 0 1 1 0 1 E U 0 E 398 396 469 412 +0 2 0 "s" 0 0 0 192 0 0 398 396 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 @@ -770,7 +519,7 @@ LANG:1 10 BG/L Rack5 2 121 "Text10" "" -1 523 520 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 396 450 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 122 0 0 0 0 0 EE E @@ -779,8 +528,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 525 522 596 538 -0 2 0 "s" 0 0 0 192 0 0 525 522 +E E 0 1 1 0 1 E U 0 E 398 452 469 468 +0 2 0 "s" 0 0 0 192 0 0 398 452 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 @@ -790,7 +539,7 @@ LANG:1 10 BG/L Rack6 7 122 "Ellipse1" "" -1 700 110 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E +1 573 40 E E E 1 E 1 E N "_WindowText" E N "Lofar_cep_Switch" E E E E 123 0 0 0 0 0 EE E @@ -799,11 +548,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 700 110 110 30 +E E 0 1 1 0 1 E U 1 E 573 40 110 30 2 123 "Text11" "" -1 603 102 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 476 32 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 124 0 0 0 0 0 EE E @@ -812,8 +561,8 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 605 104 801 130 -0 2 0 "s" 0 0 0 64 0 0 605 104 +E E 0 1 1 0 1 E U 0 E 478 34 674 60 +0 2 0 "s" 0 0 0 64 0 0 478 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 @@ -823,7 +572,7 @@ LANG:1 29 Central LOFAR Ethernet Switch 4 132 "Line2" "" -1 250 190 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 183 120 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 133 0 0 0 0 0 EE E @@ -832,11 +581,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 250 190 590 120 +E E 0 1 1 0 1 E 183 120 463 50 4 133 "Line3" "" -1 559 190 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 432 120 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 134 0 0 0 0 0 EE E @@ -845,11 +594,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 559 190 650 140 +E E 0 1 1 0 1 E 432 120 523 70 4 134 "Line4" "" -1 700 560 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 573 490 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 135 0 0 0 0 0 EE E @@ -858,11 +607,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 700 560 700 140 +E E 0 1 1 0 1 E 573 490 573 70 4 135 "Line5" "" -1 780 190 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 653 120 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 136 0 0 0 0 0 EE E @@ -871,7 +620,7 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 780 190 740 140 +E E 0 1 1 0 1 E 653 120 613 70 1 136 0 "" 1 0 1 137 0 "" 2 @@ -886,15 +635,15 @@ E E 0 1 1 0 1 E 780 190 740 140 0 1 142 0 "" 8 0 -1 143 0 "" 9 +1 143 0 "" 10 0 -1 144 0 "" 10 +1 144 0 "" 11 0 -1 145 0 "" 11 +1 145 0 "" 12 0 -1 146 0 "" 12 +1 146 0 "0" 0 0 -1 147 0 "" 13 +1 147 0 "0" 1 0 1 148 1 "" 1 0 @@ -910,15 +659,15 @@ E E 0 1 1 0 1 E 780 190 740 140 0 1 154 1 "" 8 0 -1 155 1 "" 9 +1 155 1 "" 10 0 -1 156 1 "" 10 +1 156 1 "" 11 0 -1 157 1 "" 11 +1 157 1 "" 12 0 -1 158 1 "" 12 +1 158 1 "0" 0 0 -1 159 1 "" 13 +1 159 1 "0" 1 0 1 160 2 "" 1 0 @@ -934,20 +683,20 @@ E E 0 1 1 0 1 E 780 190 740 140 0 1 166 2 "" 8 0 -1 167 2 "" 9 +1 167 2 "" 10 0 -1 168 2 "" 10 +1 168 2 "" 11 0 -1 169 2 "" 11 +1 169 2 "" 12 0 -1 170 2 "" 12 +1 170 2 "0" 0 0 -1 171 2 "" 13 +1 171 2 "0" 1 0 4 174 "Line6" "" -1 920 190 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 793 120 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 141 0 0 0 0 0 EE E @@ -956,50 +705,265 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E 920 190 790 130 -1 181 5 "" 0 +E E 0 1 1 0 1 E 793 120 663 60 +1 175 5 "" 0 0 -1 182 5 "" 1 +1 176 5 "" 1 0 -1 183 6 "" 0 +1 177 6 "" 0 0 -1 184 6 "" 1 +1 178 6 "" 1 0 -1 185 7 "" 0 +1 179 7 "" 0 0 -1 186 7 "" 1 +1 180 7 "" 1 0 -1 187 8 "" 0 +1 181 8 "" 0 0 -1 188 8 "" 1 +1 182 8 "" 1 0 -1 189 9 "" 0 +1 183 9 "" 0 0 -1 190 9 "" 1 +1 184 9 "" 1 0 -1 191 10 "" 0 +1 185 10 "" 0 0 -1 192 10 "" 1 +1 186 10 "" 1 0 -13 108 -"Button2" +4 187 +"Line12" "" -1 740 660 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E +1 244 180 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E -109 0 0 0 0 0 +149 0 0 0 0 0 EE E 0 1 LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 254 180 244 180 +4 188 +"Line13" +"" +1 251 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +150 0 0 0 0 0 +EE E 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 "" -738 658 852 692 -T +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 256 180 251 172 +4 189 +"Line14" +"" +1 251 188 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +151 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 251 188 256 180 +4 190 +"Line27" +"" +1 244 319 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +152 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 254 319 244 319 +4 191 +"Line28" +"" +1 251 311 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +153 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 256 319 251 311 +4 192 +"Line29" +"" +1 251 327 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +154 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 251 327 256 319 +4 193 +"Line30" +"" +1 244 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +155 0 0 0 0 0 +EE E +0 1 -LANG:1 12 Goto Fysical -E E E E +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 254 460 244 460 +4 194 +"Line31" +"" +1 251 452 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +156 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 256 460 251 452 +4 195 +"Line32" +"" +1 251 468 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +157 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 251 468 256 460 +4 196 +"Line33" +"" +1 286 180 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +158 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 296 180 286 180 +4 197 +"Line34" +"" +1 293 172 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +159 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 298 180 293 172 +4 198 +"Line35" +"" +1 293 188 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +160 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 293 188 298 180 +4 199 +"Line36" +"" +1 286 319 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +161 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 296 319 286 319 +4 200 +"Line37" +"" +1 293 311 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +162 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 298 319 293 311 +4 201 +"Line38" +"" +1 293 327 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +163 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 293 327 298 319 +4 202 +"Line42" +"" +1 286 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +164 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 296 460 286 460 +4 203 +"Line43" +"" +1 293 452 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +165 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 298 460 293 452 +4 204 +"Line44" +"" +1 293 468 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +166 0 0 0 0 0 +EE E +0 +1 +LANG:1 0 +1 +"dashclr"N "_Transparent" +E E 0 1 1 0 1 E 293 468 298 460 0 LAYER, 1 1 @@ -1030,39 +994,39 @@ LAYER, 7 LANG:1 6 Layer8 0 3 0 "" -"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 260 450 T 137 1 0 1 -81 120 +"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 260 450 T 137 1 0 1 -157 50 1 "$clusterType""Input" 3 1 "" -"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 970 420 T 138 1 0 1 -260 150 +"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 970 420 T 138 1 0 1 -387 80 1 "$clusterType""Output" 3 2 "" -"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 930 350 T 138 1 0 1 -80 220 +"objects\\nav_usr\\CEP\\Cep_logical_cluster.pnl" 930 350 T 138 1 0 1 -207 150 1 "$clusterType""Offline" 3 5 "" -"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 240 200 T 144 1 0 1 -20 30 +"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 240 200 T 144 1 0 1 -96 -40 1 "$FESNType""Input" 3 6 "" -"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 550 200 T 145 1 0 1 -20 30 +"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 550 200 T 145 1 0 1 -147 -40 1 "$FESNType""BG/L" 3 7 "" -"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 760 210 T 146 1 0 1 -10 20 +"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 760 210 T 146 1 0 1 -137 -50 1 "$FESNType""Output" 3 8 "" -"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 910 200 T 147 1 0 1 -24 29 +"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 910 200 T 147 1 0 1 -151 -41 1 "$FESNType""Offline" 3 9 "" -"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 700 570 T 148 1 0 1 -32 30 +"objects\\nav_usr\\CEP\\CEP_fesn_node.pnl" 700 570 T 148 1 0 1 -159 -40 1 "$FESNType""Aux" 3 10 "" -"objects\\nav_usr\\CEP\\CEP_internal_switch.pnl" 450 620 T 149 1 0 1 -199 -10 +"objects\\nav_usr\\CEP\\CEP_internal_switch.pnl" 450 620 T 149 1 0 1 -326 -80 1 "$switchType""Aux" 0 \ No newline at end of file diff --git a/MAC/Navigator/panels/nav_usr/CS1/Station-CS1.pnl b/MAC/Navigator/panels/nav_usr/CS1/Station-CS1.pnl index 277f08b1b4539840eac345ff1d05ddd5608d3332..93d80f7b33b8a6d2d31eb7bd05c417f24e0fd121 100644 --- a/MAC/Navigator/panels/nav_usr/CS1/Station-CS1.pnl +++ b/MAC/Navigator/panels/nav_usr/CS1/Station-CS1.pnl @@ -19,7 +19,7 @@ LANG:1 6 Layer1 6 2032 "Border1" "" -1 10 563 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E +1 2 541 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E E E 816 0 0 0 0 0 EE E @@ -28,7 +28,7 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/station-sized.bmp" 13434828 E 10 10 981 565 +E E 0 1 1 0 1 E U 2 0 3 "pictures/nav_usr/CS1/station-sized.bmp" 13434828 E 2 10 935 543 1 2033 57 "" 0 0 1 2034 57 "" 2 @@ -803,7 +803,7 @@ LAYER, 7 LANG:1 6 Layer8 0 3 57 "Rack5_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 172 T 727 1 0 1 -195 158 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 172 T 727 1 0 1 -226 158 6 "$RSPBoardNr""0" "$RackNr""2" @@ -812,7 +812,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 52 "Rack4_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 172 T 722 1 0 1 -61 -25 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 172 T 722 1 0 1 -92 -25 6 "$RSPBoardNr""0" "$RackNr""2" @@ -821,7 +821,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 47 "Rack3_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 172 T 717 1 0 1 -11 158 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 172 T 717 1 0 1 -34 158 6 "$RSPBoardNr""0" "$RackNr""1" @@ -830,7 +830,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 42 "Rack2_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 172 T 712 1 0 1 123 -25 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 172 T 712 1 0 1 100 -25 6 "$RSPBoardNr""0" "$RackNr""1" @@ -839,7 +839,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 33 "Rack1_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 203 166 T 698 1 0 1 -135 164 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 203 166 T 698 1 0 1 -147 164 6 "$RSPBoardNr""0" "$RackNr""0" @@ -848,7 +848,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 26 "Rack0_Subrack0" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 198 167 T 692 1 0 1 -130 -20 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 198 167 T 692 1 0 1 -142 -20 6 "$RSPBoardNr""0" "$RackNr""0" @@ -857,7 +857,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 27 "Rack0_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 179 281 T 693 1 0 1 -111 -92 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 179 281 T 693 1 0 1 -123 -92 6 "$RSPBoardNr""1" "$RackNr""0" @@ -866,7 +866,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 28 "Rack0_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 218 262 T 694 1 0 1 -150 -31 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 218 262 T 694 1 0 1 -162 -31 6 "$RSPBoardNr""2" "$RackNr""0" @@ -875,7 +875,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 31 "Rack1_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 234 219 T 696 1 0 1 -166 153 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 234 219 T 696 1 0 1 -178 153 6 "$RSPBoardNr""1" "$RackNr""0" @@ -884,7 +884,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 34 "Rack1_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 211 311 T 699 1 0 1 -143 103 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 211 311 T 699 1 0 1 -155 103 6 "$RSPBoardNr""2" "$RackNr""0" @@ -893,7 +893,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 35 "Rack1_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 190 340 T 700 1 0 1 -122 116 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 190 340 T 700 1 0 1 -134 116 6 "$RSPBoardNr""3" "$RackNr""0" @@ -902,7 +902,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 41 "Rack2_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 236 T 711 1 0 1 123 -47 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 236 T 711 1 0 1 100 -47 6 "$RSPBoardNr""1" "$RackNr""1" @@ -911,7 +911,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 43 "Rack2_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 300 T 713 1 0 1 123 -69 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 300 T 713 1 0 1 100 -69 6 "$RSPBoardNr""2" "$RackNr""1" @@ -920,7 +920,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 44 "Rack2_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 364 T 714 1 0 1 123 -91 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 165 364 T 714 1 0 1 100 -91 6 "$RSPBoardNr""3" "$RackNr""1" @@ -929,7 +929,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 46 "Rack3_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 236 T 716 1 0 1 -11 136 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 236 T 716 1 0 1 -34 136 6 "$RSPBoardNr""1" "$RackNr""1" @@ -938,7 +938,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 48 "Rack3_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 300 T 718 1 0 1 -11 114 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 300 T 718 1 0 1 -34 114 6 "$RSPBoardNr""2" "$RackNr""1" @@ -947,7 +947,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 49 "Rack3_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 364 T 719 1 0 1 -11 92 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 299 364 T 719 1 0 1 -34 92 6 "$RSPBoardNr""3" "$RackNr""1" @@ -956,7 +956,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 51 "Rack4_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 236 T 721 1 0 1 -61 -47 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 236 T 721 1 0 1 -92 -47 6 "$RSPBoardNr""1" "$RackNr""2" @@ -965,7 +965,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 53 "Rack4_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 300 T 723 1 0 1 -61 -69 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 300 T 723 1 0 1 -92 -69 6 "$RSPBoardNr""2" "$RackNr""2" @@ -974,7 +974,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 54 "Rack4_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 364 T 724 1 0 1 -61 -91 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 567 364 T 724 1 0 1 -92 -91 6 "$RSPBoardNr""3" "$RackNr""2" @@ -983,7 +983,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 56 "Rack5_Subrack1" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 236 T 726 1 0 1 -195 136 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 236 T 726 1 0 1 -226 136 6 "$RSPBoardNr""1" "$RackNr""2" @@ -992,7 +992,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 58 "Rack5_Subrack2" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 300 T 728 1 0 1 -195 114 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 300 T 728 1 0 1 -226 114 6 "$RSPBoardNr""2" "$RackNr""2" @@ -1001,7 +1001,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 59 "Rack5_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 364 T 729 1 0 1 -195 92 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 701 364 T 729 1 0 1 -226 92 6 "$RSPBoardNr""3" "$RackNr""2" @@ -1010,7 +1010,7 @@ LANG:1 6 Layer8 "$datapoint""$datapoint" "$referenceDatapoint""$referenceDatapoint" 3 29 "Rack0_Subrack3" -"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 177 312 T 695 1 0 1 -109 -39 +"objects\\nav_usr\\CS1\\STS_19inch_Subrack-CS1.pnl" 177 312 T 695 1 0 1 -121 -39 6 "$RSPBoardNr""3" "$RackNr""0" diff --git a/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl b/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl index da1e24366352e735cf8cb66e89f87183baed7697..d63201fbe9f508c116f4dd7ff008cb1d267bbf50 100644 --- a/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl +++ b/MAC/Navigator/panels/nav_usr/CS1/cs1-main.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 8 (NoName) -PANEL,300 247 950 741 N "_3DFace" 0 +PANEL,296 186 950 741 N "_3DFace" 0 EEE E E 1 0 0 0 10 10 "" 0 1 EE 2 @@ -48,7 +48,7 @@ E E 0 3 2 0 1 E 940 50 10 50 7 128 "Ellipse1" "" -1 540 220 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E +1 535 185 E E E 1 E 1 E N "_WindowText" E N {255,154,44} E E E E 40 0 0 0 0 0 EE E @@ -57,11 +57,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E U 1 E 540 220 150 150 +E E 0 3 1 0 1 E U 1 E 535 185 125 125 4 137 "Line2" "" -1 540 140 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E +1 537 131 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E E E 49 0 0 0 0 0 EE E @@ -70,11 +70,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E 540 190 540 140 +E E 0 3 1 0 1 E 537 161 537 131 4 138 "Line3" "" -1 15860 420 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E +1 9280 342 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E E E 50 0 0 0 0 0 EE E @@ -83,11 +83,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E 460 280 530 230 +E E 0 3 1 0 1 E 480 230 520 190 4 139 "Line4" "" -1 31750 690 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E +1 12250 466 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E E E 51 0 0 0 0 0 EE E @@ -96,11 +96,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E 630 280 550 230 +E E 0 3 1 0 1 E 580 220 550 190 7 129 "Ellipse2" "" -1 540 110 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E +1 534 104 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E E E 41 0 0 0 0 0 EE E @@ -109,11 +109,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E U 1 E 540 110 30 30 +E E 0 3 1 0 1 E U 1 E 534 104 24 24 7 130 "Ellipse3" "" -1 542 112 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E +1 536 106 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E E E 42 0 0 0 0 0 EE E @@ -122,11 +122,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 0 1 0 1 E U 1 E 542 112 30 30 +E E 0 1 1 0 1 E U 1 E 536 106 24 24 7 131 "Ellipse4" "" -1 540 220 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E +1 534 184 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E E E 43 0 0 0 0 0 EE E @@ -135,11 +135,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E U 1 E 540 220 30 30 +E E 0 3 1 0 1 E U 1 E 534 184 24 24 7 132 "Ellipse5" "" -1 542 222 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E +1 536 186 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E E E 44 0 0 0 0 0 EE E @@ -148,11 +148,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 0 1 0 1 E U 1 E 542 222 30 30 +E E 0 1 1 0 1 E U 1 E 536 186 24 24 7 133 "Ellipse6" "" -1 630 280 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E +1 594 234 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E E E 45 0 0 0 0 0 EE E @@ -161,11 +161,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E U 1 E 630 280 30 30 +E E 0 3 1 0 1 E U 1 E 594 234 24 24 7 134 "Ellipse7" "" -1 632 282 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E +1 596 236 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E E E 46 0 0 0 0 0 EE E @@ -174,11 +174,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 0 1 0 1 E U 1 E 632 282 30 30 +E E 0 1 1 0 1 E U 1 E 596 236 24 24 7 135 "Ellipse8" "" -1 450 280 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E +1 474 234 E E E 1 E 1 E N "_WindowText" E N {0,0,0} E E E E 47 0 0 0 0 0 EE E @@ -187,11 +187,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 3 1 0 1 E U 1 E 450 280 30 30 +E E 0 3 1 0 1 E U 1 E 474 234 24 24 7 136 "Ellipse9" "" -1 452 282 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E +1 476 236 E E E 1 E 1 E N {234,216,232} E N {234,216,232} E E E E 48 0 0 0 0 0 EE E @@ -200,7 +200,7 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 0 1 0 1 E U 1 E 452 282 30 30 +E E 0 1 1 0 1 E U 1 E 476 236 24 24 0 LAYER, 1 1 @@ -230,12 +230,12 @@ LAYER, 7 1 LANG:1 6 Layer8 0 -2 "Group8" 510 80 572 142 +2 "Group8" 510 80 560 130 2 130 129 -2 "Group9" 510 190 572 252 +2 "Group9" 510 160 560 210 2 132 131 -2 "Group10" 600 250 662 312 +2 "Group10" 570 210 620 260 2 134 133 -2 "Group11" 420 250 482 312 +2 "Group11" 450 210 500 260 2 136 135 0 \ No newline at end of file diff --git a/MAC/Navigator/panels/objects/nav_fw/navigator_config_tab.pnl b/MAC/Navigator/panels/objects/nav_fw/navigator_config_tab.pnl index 78c1e55570f3db95f18b6de8cbdd88155bf70b86..759a7bbd892658761f47d4a9cee81ccebd3c4d87 100644 --- a/MAC/Navigator/panels/objects/nav_fw/navigator_config_tab.pnl +++ b/MAC/Navigator/panels/objects/nav_fw/navigator_config_tab.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 9 ConfigTab -PANEL,450 76 946 43 N "_3DFace" 4 +PANEL,299 108 946 43 N "_3DFace" 4 "$configDatapoint" "$selectedElementDpType" "$selectedView" @@ -10,7 +10,11 @@ PANEL,450 76 946 43 N "_3DFace" 4 { string viewConfigDpName = \"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_\" + $selectedElementDpType + \"_viewconfig\"; dyn_int nrOfSubViews; - //DebugN(\"viewConfigDpName:\"+viewConfigDpName); + if(!dpAccessable(viewConfigDpName)) + { + viewConfigDpName = \"__nav_default_viewconfig\"; + } + DebugN(\"viewConfigDpName:\"+viewConfigDpName); if(dpAccessable(viewConfigDpName)) { dpGet(viewConfigDpName + \".nrOfSubViews\",nrOfSubViews); @@ -36,6 +40,10 @@ NavConfigSubviewUR(string dp1, string selectedEnvironment) // disable remove button if only one subview exists string viewConfigDpName = \"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_\" + $selectedElementDpType + \"_viewconfig\"; dyn_int nrOfSubViews; + if(!dpAccessable(viewConfigDpName)) + { + viewConfigDpName = \"__nav_default_viewconfig\"; + } dpGet(viewConfigDpName + \".nrOfSubViews\",nrOfSubViews); bool accessPermit = ((selectedEnvironment==\"Personal\") || (selectedEnvironment!=\"Personal\" && getUserPermission(UR_ADDREMOVESYSTEMSUBVIEW))); if(accessPermit) diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/STS_19inch_Subrack-CS1.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/STS_19inch_Subrack-CS1.pnl index e9666e02e0bb841f3b2dae9ed578187114c3b063..14936af23b7968f6fccc9db7c80f2596d26f1061 100644 --- a/MAC/Navigator/panels/objects/nav_usr/CS1/STS_19inch_Subrack-CS1.pnl +++ b/MAC/Navigator/panels/objects/nav_usr/CS1/STS_19inch_Subrack-CS1.pnl @@ -12,6 +12,7 @@ PANEL,293 76 182 113 N "_3DFace" 6 { EP_setBackColor(); // setValue(\"text_SubrackNr\", \"text\", $SubrackNr ); + setValue(\"txt_boardName\",\"text\",\"C\"+$RackNr+\".S\"+$SubrackNr+\".B\"+$RSPBoardNr); $configDatapoint; $referenceDatapoint; } @@ -36,7 +37,7 @@ EP_setBackColor() !dpAccessable( dpPrefix + \".AP3.status:_online.._value\") || !dpAccessable( dpPrefix + \".BP.status:_online.._value\")) { - setValue(\"\", \"color\", \"_dpdoesnotexist\"); + setValue(\"rect_Subrack\", \"backCol\", \"_dpdoesnotexist\"); return; } @@ -104,7 +105,7 @@ EP_setBackColorCB(string dpSource1, unsigned AP0_RCU0_stat, int AP0_health, AP1_health, AP2_health, AP3_health; int BP_health; int Subrack_health; - int SR_health; // Subrack_maintenance status + int SR_health = 1; // Subrack_maintenance status //Calculate the Error/Health value for each variable if ((AP0_RCU0_stat)==0) AP0_RCU0_health=1; else AP0_RCU0_health=0; if ((AP0_RCU1_stat)==0) AP0_RCU1_health=1; else AP0_RCU1_health=0; @@ -413,7 +414,7 @@ E E 0 1 1 0 1 E 1.25 0 1.25 -38.625 -15.625 1 E 154.5 62.5 2 2 6 44 "LED_1" "" -1 47 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 47 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 43 0 0 0 0 0 EE E @@ -422,11 +423,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 47 42 54 49 +E E 0 1 1 0 1 E U 1 E 47 52 54 59 6 45 "LED_2" "" -1 55 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 55 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 44 0 0 0 0 0 EE E @@ -435,11 +436,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 55 42 62 49 +E E 0 1 1 0 1 E U 1 E 55 52 62 59 6 46 "LED_3" "" -1 63 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 63 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 45 0 0 0 0 0 EE E @@ -448,11 +449,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 63 42 70 49 +E E 0 1 1 0 1 E U 1 E 63 52 70 59 6 47 "LED_4" "" -1 71 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 71 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 46 0 0 0 0 0 EE E @@ -461,11 +462,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 71 42 78 49 +E E 0 1 1 0 1 E U 1 E 71 52 78 59 6 48 "LED_5" "" -1 79 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 79 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 47 0 0 0 0 0 EE E @@ -474,11 +475,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 79 42 86 49 +E E 0 1 1 0 1 E U 1 E 79 52 86 59 6 49 "LED_6" "" -1 87 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 87 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 48 0 0 0 0 0 EE E @@ -487,11 +488,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 87 42 94 49 +E E 0 1 1 0 1 E U 1 E 87 52 94 59 6 50 "LED_8" "" -1 103 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 103 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 49 0 0 0 0 0 EE E @@ -500,11 +501,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 103 42 110 49 +E E 0 1 1 0 1 E U 1 E 103 52 110 59 6 51 "LED_7" "" -1 95 49 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E +1 95 59 E E E 1 E 1 E N {255,0,0} E N {255,0,0} E E E E 50 0 0 0 0 0 EE E @@ -513,11 +514,11 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 1 E 95 42 102 49 +E E 0 1 1 0 1 E U 1 E 95 52 102 59 6 54 "Border1" "" -1 46 49 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 46 59 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E E E 52 0 0 0 0 0 EE E @@ -526,7 +527,7 @@ EE E LANG:1 0 1 "dashclr"N "_Transparent" -E E 0 1 1 0 1 E U 0 E 46 42 111 49 +E E 0 1 1 0 1 E U 0 E 46 52 111 59 6 55 "icon_maintenance" "" @@ -561,6 +562,26 @@ LANG:1 0 1 "dashclr"N "_Transparent" E E 0 1 1 0 1 E 1.25 0 1.25 -8.875 -7.375 1 E 35.5 29.5 2 2 +2 56 +"txt_boardName" +"" +1 45 31 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +53 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 47 33 108 49 +0 2 0 "s" 0 0 0 64 0 0 47 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 8 Cx.Sx.Bx 0 LAYER, 1 1 diff --git a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_Board.pnl b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_Board.pnl index a04490685a3eff80c29254c7dea8b23600b837ea..756fb06ef27c1f19a98207530fac73a8627fbaa3 100644 --- a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_Board.pnl +++ b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_Board.pnl @@ -1,7 +1,7 @@ V 10 1 LANG:1 8 (NoName) -PANEL,299 108 417 182 N "_3DFace" 1 +PANEL,435 286 417 182 N "_3DFace" 1 "$datapoint" "main() { @@ -301,7 +301,7 @@ LANG:1 4 0.00 2 22 "txt_unitVoltage15" "" -1 382 80 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 382 80 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E E E 21 0 0 0 0 0 EE E @@ -321,7 +321,7 @@ LANG:1 1 V 2 23 "txt_unitVoltage33" "" -1 382 103 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E +1 382 103 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E E E 22 0 0 0 0 0 EE E diff --git a/MAC/Navigator/pictures/nav_usr/CS1/station-sized.bmp b/MAC/Navigator/pictures/nav_usr/CS1/station-sized.bmp index dfc11e6caf10361104d755013500208b828c583a..002472bcc40a2d79b9f95450d50c589eaa53aa81 100644 Binary files a/MAC/Navigator/pictures/nav_usr/CS1/station-sized.bmp and b/MAC/Navigator/pictures/nav_usr/CS1/station-sized.bmp differ diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl index 05ee1366b56cd464b0bbcddeaba8ddfc314b9a10..031408382bae33096a9ae330f8796ed7efe2667a 100644 --- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl +++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl @@ -240,14 +240,23 @@ void ComboBoxViewsSelectionChanged() if(dpAccessable(g_datapoint+"__enabled")) { datapointTypeName = getDpTypeFromEnabled(g_datapoint); + DebugTN("get typename from enabled",g_datapoint,datapointTypeName); } else if(dpAccessable(g_datapoint)) { datapointTypeName = dpTypeName(g_datapoint); + DebugTN("get typename not from enabled but it is accessible ",g_datapoint,datapointTypeName); } else { + // cut system name myself. Necessary for datapoint parts that are not datapoints themselves datapointTypeName = g_datapoint; + int sepPos = strpos(datapointTypeName, ":"); + if (sepPos >= 0) + { + datapointTypeName = substr(datapointTypeName, sepPos + 1); + } + DebugTN("datapoint is not enabled and not accessible",g_datapoint,datapointTypeName); } // Load the config panel in the viewTabsCtrl