diff --git a/.gitattributes b/.gitattributes index 946d741744356579b453de2c691253498e0ee4e2..2984b5d1a4341d5f5b84c236a55b169b10cb4ecf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -571,6 +571,8 @@ MAC/Navigator2/panels/objects/navigator_viewSelection.pnl -text MAC/Navigator2/pictures/16_empty.gif -text svneol=unset#image/gif MAC/Navigator2/pictures/16_hand_right.gif -text svneol=unset#image/gif MAC/Navigator2/pictures/CS1_core.jpg -text svneol=unset#image/jpeg +MAC/Navigator2/pictures/LOFAR20_Core.PNG -text svneol=unset#image/png +MAC/Navigator2/pictures/LOFAR20_Core.bmp -text svneol=unset#image/bmp MAC/Navigator2/pictures/LOFAR20_Core.jpg -text svneol=unset#image/jpeg MAC/Navigator2/pictures/LOFAR20_CoreInRemote.jpg -text svneol=unset#image/jpeg MAC/Navigator2/pictures/LOFAR20_Remote.jpg -text svneol=unset#image/jpeg diff --git a/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl b/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl index d71f3c4a10138db8f59d8d84266168ee367c4eda..f700a817f6e54dcae356020d30393e2fb1b37c28 100644 --- a/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl +++ b/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl @@ -78,53 +78,53 @@ LANG:1 0 1 "dashclr"N "_Transparent" E E 0 1 1 0 1 E U 2 1 0 "pictures/LOFAR20_Remote.jpg" 13434828 E 0 0 1008 744 -1 84 10 "" 2 +1 7 10 "" 2 0 -1 85 10 "1" 1 +1 8 10 "1" 1 0 -1 86 10 "" 1 +1 9 10 "" 1 0 -1 87 12 "" 2 +1 10 12 "" 2 0 -1 88 12 "1" 1 +1 11 12 "1" 1 0 -1 89 12 "" 1 +1 12 12 "" 1 0 -1 90 13 "" 2 +1 13 13 "" 2 0 -1 91 13 "1" 1 +1 14 13 "1" 1 0 -1 92 13 "" 1 +1 15 13 "" 1 0 -1 93 14 "" 2 +1 16 14 "" 2 0 -1 94 14 "1" 1 +1 17 14 "1" 1 0 -1 95 14 "" 1 +1 18 14 "" 1 0 -1 96 15 "" 2 +1 19 15 "" 2 0 -1 97 15 "1" 1 +1 20 15 "1" 1 0 -1 98 15 "" 1 +1 21 15 "" 1 0 -1 99 16 "" 2 +1 22 16 "" 2 0 -1 100 16 "1" 1 +1 23 16 "1" 1 0 -1 101 16 "" 1 +1 24 16 "" 1 0 -1 105 18 "" 2 +1 25 18 "" 2 0 -1 106 18 "1" 1 +1 26 18 "1" 1 0 -1 107 18 "" 1 +1 27 18 "" 1 0 -1 108 19 "" 2 +1 28 19 "" 2 0 -1 109 19 "1" 1 +1 29 19 "1" 1 0 -1 110 19 "" 1 +1 30 19 "" 1 0 0 LAYER, 1 @@ -180,9 +180,9 @@ LANG:1 6 Layer8 1 "$Station""RS503" 3 18 "PANEL_REF19" -"objects/Hardware\\CEP_small.pnl" 286 26 T 40 1 0 1 2 0 +"objects\\Hardware\\CEP_small.pnl" 286 26 T 40 1 0 1 5 3 0 3 19 "PANEL_REF20" -"objects/Hardware\\Core_smalll.pnl" 506 345 T 41 1 0 1 -2 0 +"objects\\Hardware\\Core_smalll.pnl" 506 345 T 41 1 0 1 -2 0 0 0 \ No newline at end of file diff --git a/MAC/Navigator2/panels/objects/Hardware/CEP_small.pnl b/MAC/Navigator2/panels/objects/Hardware/CEP_small.pnl index d083bb09bc338b869002e45fda7349820edd378a..ca5c30492e8731837f09934c645a824f3cee8967 100644 --- a/MAC/Navigator2/panels/objects/Hardware/CEP_small.pnl +++ b/MAC/Navigator2/panels/objects/Hardware/CEP_small.pnl @@ -82,7 +82,7 @@ LANG:1 0 7 2 "CEP_highLight" "" -1 127.5495487902535 21.11578083336868 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E +1 139.8188321154402 33.39678283495407 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E "main() { rClick(); diff --git a/MAC/Navigator2/panels/objects/Hardware/Core_smalll.pnl b/MAC/Navigator2/panels/objects/Hardware/Core_smalll.pnl index 626bcef50cbd5ce6e78c868eb31a5a3c132a0888..55c61ab4a82d317690745071f96156900e38bb14 100644 --- a/MAC/Navigator2/panels/objects/Hardware/Core_smalll.pnl +++ b/MAC/Navigator2/panels/objects/Hardware/Core_smalll.pnl @@ -82,7 +82,7 @@ LANG:1 0 7 2 "Core_highLight" "" -1 127.5495487902535 21.11578083336868 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E +1 139.8188321154402 32.88817776378591 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E "main() { rClick(); diff --git a/MAC/Navigator2/panels/objects/Hardware/Station_small.pnl b/MAC/Navigator2/panels/objects/Hardware/Station_small.pnl index 2bae0cad3541ed54a96c8ed3cc98a4417bf890c2..bdbdb90e0904b0b59a7c3cf0dadbe7a64cfc1f6e 100644 --- a/MAC/Navigator2/panels/objects/Hardware/Station_small.pnl +++ b/MAC/Navigator2/panels/objects/Hardware/Station_small.pnl @@ -83,7 +83,7 @@ LANG:1 0 7 2 "station_highLight" "" -1 127.5495487902535 21.11578083336868 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E +1 139.8188321154402 33.39678283495407 E E E 1 E 0 E N "_Transparent" E N "Lofar_highLight" E E "main() { rClick(); diff --git a/MAC/Navigator2/pictures/LOFAR20_Core.PNG b/MAC/Navigator2/pictures/LOFAR20_Core.PNG new file mode 100644 index 0000000000000000000000000000000000000000..daefaa80d3af24e6dcb8ed9cc322d6683d35764c Binary files /dev/null and b/MAC/Navigator2/pictures/LOFAR20_Core.PNG differ diff --git a/MAC/Navigator2/pictures/LOFAR20_Core.bmp b/MAC/Navigator2/pictures/LOFAR20_Core.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1f6f8c6c49a082040b20152a6182a052b97956ce Binary files /dev/null and b/MAC/Navigator2/pictures/LOFAR20_Core.bmp differ