diff --git a/MAC/Navigator2/panels/Hardware/LOFAR_Core.pnl b/MAC/Navigator2/panels/Hardware/LOFAR_Core.pnl
index c59f7ea5c855d7074531de5f4336d8d765ff2074..f41c8441c0ddde59e8b30a4e88a1fa009a726f1d 100644
--- a/MAC/Navigator2/panels/Hardware/LOFAR_Core.pnl
+++ b/MAC/Navigator2/panels/Hardware/LOFAR_Core.pnl
@@ -19,9 +19,9 @@ void prepareHardwareList() {
dynAppend(g_stationList,\"CS006\");
dynAppend(g_stationList,\"CS007\");
// dynAppend(g_stationList,\"CS010\");
-// dynAppend(g_stationList,\"CS011\");
+ dynAppend(g_stationList,\"CS011\");
// dynAppend(g_stationList,\"CS012\");
-// dynAppend(g_stationList,\"CS013\");
+ dynAppend(g_stationList,\"CS013\");
// dynAppend(g_stationList,\"CS014\");
// dynAppend(g_stationList,\"CS016\");
dynAppend(g_stationList,\"CS017\");
@@ -32,9 +32,9 @@ void prepareHardwareList() {
// dynAppend(g_stationList,\"CS023\");
dynAppend(g_stationList,\"CS024\");
dynAppend(g_stationList,\"CS026\");
-// dynAppend(g_stationList,\"CS028\");
+ dynAppend(g_stationList,\"CS028\");
dynAppend(g_stationList,\"CS030\");
-// dynAppend(g_stationList,\"CS031\");
+ dynAppend(g_stationList,\"CS031\");
dynAppend(g_stationList,\"CS032\");
dynAppend(g_stationList,\"CS101\");
dynAppend(g_stationList,\"CS103\");
@@ -225,6 +225,30 @@ E E 0 1 1 0 1 E 1 0 1.021505376344086 0 0 2 1 0 "pictures/LOFAR_Core.jpg" 1343
0
1 66 50 "" 1
0
+1 67 51 "" 2
+0
+1 68 51 "1" 1
+0
+1 69 51 "" 1
+0
+1 70 52 "" 2
+0
+1 71 52 "1" 1
+0
+1 72 52 "" 1
+0
+1 73 53 "" 2
+0
+1 74 53 "1" 1
+0
+1 75 53 "" 1
+0
+1 76 54 "" 2
+0
+1 77 54 "1" 1
+0
+1 78 54 "" 1
+0
0
LAYER, 1
1
@@ -255,83 +279,99 @@ LAYER, 7
LANG:1 6 Layer8
0
3 13 "PANEL_REF14"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 34 0.7424242424242424 0 0.7407407407407407 158.1779915092959 -2.858441326074111
+"objects\\Hardware\\Station_small.pnl" 457 486 T 34 0.7424242424242424 0 0.7407407407407407 88.17799150929585 -22.85844132607411
1
"$Station""CS002"
3 20 "PANEL_REF21"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 42 0.7424242424242424 0 0.7407407407407407 138.1779915092959 -22.85844132607411
+"objects\\Hardware\\Station_small.pnl" 457 486 T 42 0.7424242424242424 0 0.7407407407407407 78.17799150929585 -52.85844132607411
1
"$Station""CS003"
3 21 "PANEL_REF22"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 43 0.7424242424242424 0 0.7407407407407407 138.1779915092959 17.1415586739259
+"objects\\Hardware\\Station_small.pnl" 457 486 T 43 0.7424242424242424 0 0.7407407407407407 78.17799150929585 -2.8584413260741
1
"$Station""CS004"
3 22 "PANEL_REF23"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 44 0.7424242424242424 0 0.7072354607860037 168.1779915092959 36.28356605800217
+"objects\\Hardware\\Station_small.pnl" 457 486 T 44 0.7424242424242424 0 0.7072354607860037 98.17799150929591 24.00673939508379
1
"$Station""CS005"
3 23 "PANEL_REF24"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 45 0.7424242424242424 0 0.7407407407407407 179.7121212121212 4.000000000000011
+"objects\\Hardware\\Station_small.pnl" 457 486 T 45 0.7424242424242424 0 0.7407407407407407 118.1779915092959 -12.8584413260741
1
"$Station""CS006"
3 24 "PANEL_REF25"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 46 0.7424242424242424 0 0.7407407407407407 168.1779915092959 -12.8584413260741
+"objects\\Hardware\\Station_small.pnl" 457 486 T 46 0.7424242424242424 0 0.7407407407407407 108.1779915092959 -32.8584413260741
1
"$Station""CS007"
3 25 "PANEL_REF26"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 47 0.7424242424242424 0 0.7407407407407407 328.1779915092959 47.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 47 0.7424242424242424 0 0.7407407407407407 298.1779915092959 37.14155867392589
1
"$Station""CS201"
3 26 "PANEL_REF27"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 48 0.7424242424242424 0 0.7407407407407407 128.1779915092959 217.1415586739258
+"objects\\Hardware\\Station_small.pnl" 457 486 T 48 0.7424242424242424 0 0.7407407407407407 68.17799150929585 247.1415586739259
1
"$Station""CS301"
3 27 "PANEL_REF28"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 49 0.7424242424242424 0 0.7407407407407407 538.1779915092959 -32.85844132607414
+"objects\\Hardware\\Station_small.pnl" 457 486 T 49 0.7424242424242424 0 0.7407407407407407 558.1779915092959 -62.85844132607414
1
"$Station""CS103"
3 28 "PANEL_REF29"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 50 0.7424242424242424 0 0.7407407407407407 58.17799150929585 -52.8584413260741
+"objects\\Hardware\\Station_small.pnl" 457 486 T 50 0.7424242424242424 0 0.7407407407407407 -21.82200849070415 -92.8584413260741
1
"$Station""CS021"
3 29 "PANEL_REF30"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 51 0.7424242424242424 0 0.7407407407407407 48.17799150929585 -172.8584413260741
+"objects\\Hardware\\Station_small.pnl" 457 486 T 51 0.7424242424242424 0 0.7407407407407407 -41.82200849070415 -232.8584413260741
1
"$Station""CS030"
3 30 "PANEL_REF31"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 52 0.7424242424242424 0 0.7407407407407407 -21.82200849070415 27.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 52 0.7424242424242424 0 0.7407407407407407 -121.8220084907042 17.14155867392589
1
"$Station""CS401"
3 31 "PANEL_REF32"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 53 0.7424242424242424 0 0.7407407407407407 38.17799150929585 57.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 53 0.7424242424242424 0 0.7407407407407407 -51.82200849070415 57.14155867392589
1
"$Station""CS032"
3 34 "PANEL_REF35"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 55 0.7424242424242424 0 0.7407407407407407 -91.82200849070415 287.1415586739258
+"objects\\Hardware\\Station_small.pnl" 457 486 T 55 0.7424242424242424 0 0.7407407407407407 -201.8220084907042 337.1415586739259
1
"$Station""CS302"
3 35 "PANEL_REF36"
-"objects\\Hardware\\Station_small.pnl" 417 67 T 56 0.7241379310344828 0 0.7241379310344828 145.8090754622689 58.91252373813093
+"objects\\Hardware\\Station_small.pnl" 417 67 T 56 0.7241379310344828 0 0.7241379310344828 65.80907546226885 -21.08747626186907
1
"$Station""CS501"
3 38 "PANEL_REF39"
-"objects\\Hardware\\Station_small.pnl" 617 167 T 59 0.7241379310344828 0 0.7241379310344828 180.9814892553723 76.49873063468266
+"objects\\Hardware\\Station_small.pnl" 617 167 T 59 0.7241379310344828 0 0.7241379310344828 150.9814892553723 6.49873063468263
1
"$Station""CS101"
3 43 "PANEL_REF44"
-"objects\\Hardware\\Station_small.pnl" 577 317 T 64 0.7241379310344828 0 0.7241379310344828 179.9470064967516 107.8780409795103
+"objects\\Hardware\\Station_small.pnl" 577 317 T 64 0.7241379310344828 0 0.7241379310344828 139.9470064967516 87.87804097951025
1
"$Station""CS017"
3 44 "PANEL_REF45"
-"objects\\Hardware\\Station_small.pnl" 657 307 T 65 0.7241379310344828 0 0.7241379310344828 182.015972013993 105.1194202898551
+"objects\\Hardware\\Station_small.pnl" 657 307 T 65 0.7241379310344828 0 0.7241379310344828 152.015972013993 75.1194202898551
1
"$Station""CS026"
3 49 "PANEL_REF50"
-"objects\\Hardware\\Station_small.pnl" 447 447 T 70 0.7241379310344828 0 0.7241379310344828 154.0849375312344 123.7401099450275
+"objects\\Hardware\\Station_small.pnl" 447 447 T 70 0.7241379310344828 0 0.7241379310344828 84.0849375312344 123.7401099450276
1
"$Station""CS001"
3 50 "PANEL_REF51"
-"objects\\Hardware\\Station_small.pnl" 527 527 T 71 0.7241379310344828 0 0.7241379310344828 166.1539030484758 135.8090754622688
+"objects\\Hardware\\Station_small.pnl" 527 527 T 71 0.7241379310344828 0 0.7241379310344828 116.1539030484758 155.8090754622688
1
"$Station""CS024"
+3 51 "PANEL_REF52"
+"objects/Hardware\\Station_small.pnl" 487 357 T 71 0.7241379310344828 0 0.7241379310344828 135.1400566383475 99.40935056281384
+1
+"$Station""CS011"
+3 52 "PANEL_REF53"
+"objects/Hardware\\Station_small.pnl" 387 257 T 72 0.7241379310344828 0 0.7241379310344828 107.5538497417958 71.8231436662621
+1
+"$Station""CS013"
+3 53 "PANEL_REF54"
+"objects/Hardware\\Station_small.pnl" 517 47 T 73 0.7241379310344828 0 0.7241379310344828 143.3952823588206 13.39528235882057
+1
+"$Station""CS028"
+3 54 "PANEL_REF55"
+"objects/Hardware\\Station_small.pnl" 277 257 T 74 0.7241379310344828 0 0.7241379310344828 77.20902215558886 71.82314366626211
+1
+"$Station""CS031"
0
\ No newline at end of file
diff --git a/MAC/Navigator2/panels/Hardware/LOFAR_Europe.pnl b/MAC/Navigator2/panels/Hardware/LOFAR_Europe.pnl
index 00ee6d0b0c76b5efd00682454a2ee77ea5f454d6..f7417ef213986ee24047882fe450c7ecda4b4e05 100644
--- a/MAC/Navigator2/panels/Hardware/LOFAR_Europe.pnl
+++ b/MAC/Navigator2/panels/Hardware/LOFAR_Europe.pnl
@@ -173,41 +173,41 @@ LAYER, 7
LANG:1 6 Layer8
0
3 10 "PANEL_REF11"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 29 0.7424242424242424 0 0.7407407407407407 428.1779915092959 77.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 29 0.7424242424242424 0 0.7407407407407407 298.1779915092959 97.14155867392589
1
"$Station""DE603"
3 12 "PANEL_REF13"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 33 0.7424242424242424 0 0.7407407407407407 418.1779915092959 247.1415586739259
+"objects\\Hardware\\Station_small.pnl" 457 486 T 33 0.7424242424242424 0 0.7407407407407407 298.1779915092959 277.1415586739259
1
"$Station""DE602"
3 13 "PANEL_REF14"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 34 0.7424242424242424 0 0.7407407407407407 476.7121212121213 -15.99999999999999
+"objects\\Hardware\\Station_small.pnl" 457 486 T 34 0.7424242424242424 0 0.7407407407407407 348.1779915092959 -12.8584413260741
1
"$Station""DE604"
3 14 "PANEL_REF15"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 35 0.7424242424242424 0 0.7407407407407407 408.1779915092959 -341
+"objects\\Hardware\\Station_small.pnl" 457 486 T 35 0.7424242424242424 0 0.7407407407407407 278.1779915092959 -352.8584413260741
1
"$Station""SE607"
3 15 "PANEL_REF16"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 36 0.7424242424242424 0 0.7407407407407407 29.71212121212118 325.0000000000001
+"objects\\Hardware\\Station_small.pnl" 457 486 T 36 0.7424242424242424 0 0.7407407407407407 -101.8220084907042 357.1415586739259
1
"$Station""FR606"
3 16 "PANEL_REF17"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 37 0.7424242424242424 0 0.7407407407407407 235.7121212121212 124
+"objects\\Hardware\\Station_small.pnl" 457 486 T 37 0.7424242424242424 0 0.7407407407407407 98.17799150929585 137.1415586739259
1
"$Station""DE601"
3 20 "PANEL_REF21"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 41 0.7424242424242424 0 0.7407407407407407 -101.8220084907042 67.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 41 0.7424242424242424 0 0.7407407407407407 -241.8220084907042 77.14155867392589
1
"$Station""UK608"
3 21 "PANEL_REF22"
-"objects\\Hardware\\Core_smalll.pnl" 366 255 T 42 1 0 1 197.0175438596491 50.27073383942945
+"objects\\Hardware\\Core_smalll.pnl" 366 255 T 42 1 0 1 64 58.99999999999999
0
3 22 "PANEL_REF23"
-"objects\\Hardware\\Remote_smalll.pnl" 346 224 T 43 1.035395506309634 0 1 187.3976351626213 60.09720699874146
+"objects\\Hardware\\Remote_smalll.pnl" 346 224 T 43 1.035395506309634 0 1 54.75315481686661 68
0
3 23 "PANEL_REF24"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 44 0.7424242424242424 0 0.7407407407407407 218.1779915092959 97.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 44 0.7424242424242424 0 0.7407407407407407 88.17799150929591 117.1415586739259
1
"$Station""DE605"
0
\ No newline at end of file
diff --git a/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl b/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl
index e990e6b698941d137f7686aa9b7d49febd35584a..a7172cf7059d9ea690893a7ed42693cf0bc5fc5f 100644
--- a/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl
+++ b/MAC/Navigator2/panels/Hardware/LOFAR_Remote.pnl
@@ -247,65 +247,65 @@ LAYER, 7
LANG:1 6 Layer8
0
3 10 "PANEL_REF11"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 29 0.7424242424242424 0 0.7407407407407407 370.7121212121213 -14.99999999999999
+"objects\\Hardware\\Station_small.pnl" 457 486 T 29 0.7424242424242424 0 0.7407407407407407 258.1779915092959 -12.8584413260741
1
"$Station""RS106"
3 12 "PANEL_REF13"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 33 0.7424242424242424 0 0.7407407407407407 348.1779915092959 107.1415586739259
+"objects\\Hardware\\Station_small.pnl" 457 486 T 33 0.7424242424242424 0 0.7407407407407407 238.1779915092959 117.1415586739259
1
"$Station""RS208"
3 14 "PANEL_REF15"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 35 0.7424242424242424 0 0.7407407407407407 278.1779915092959 -22.85844132607411
+"objects\\Hardware\\Station_small.pnl" 457 486 T 35 0.7424242424242424 0 0.7407407407407407 178.1779915092959 -22.85844132607411
1
"$Station""RS306"
3 15 "PANEL_REF16"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 36 0.7424242424242424 0 0.7407407407407407 258.1779915092959 27.14155867392589
+"objects\\Hardware\\Station_small.pnl" 457 486 T 36 0.7424242424242424 0 0.7407407407407407 158.1779915092959 37.14155867392589
1
"$Station""RS307"
3 16 "PANEL_REF17"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 37 0.7424242424242424 0 0.7407407407407407 328.1779915092959 -62.85844132607411
+"objects\\Hardware\\Station_small.pnl" 457 486 T 37 0.7424242424242424 0 0.7407407407407407 208.1779915092959 -52.85844132607411
1
"$Station""RS503"
3 18 "PANEL_REF19"
-"objects\\Hardware\\CEP_small.pnl" 286 26 T 40 1 0 1 259.5617391304348 90.08554865424429
+"objects\\Hardware\\CEP_small.pnl" 286 26 T 40 1 0 1 149.5617391304348 100.0855486542443
0
3 19 "PANEL_REF20"
-"objects\\Hardware\\Core_smalll.pnl" 506 345 T 41 1 0 1 163 -27.00000000000001
+"objects\\Hardware\\Core_smalll.pnl" 506 345 T 41 1 0 1 53 -24.00000000000001
0
3 20 "PANEL_REF21"
-"objects\\Hardware\\Station_small.pnl" 457 486 T 41 0.7424242424242424 0 0.7407407407407407 308.1779915092959 -362.8584413260741
+"objects\\Hardware\\Station_small.pnl" 457 486 T 41 0.7424242424242424 0 0.7407407407407407 198.1779915092959 -342.8584413260741
1
"$Station""RS509"
3 21 "PANEL_REF22"
-"objects\\Hardware\\Station_small.pnl" 757 157 T 41 0.7241379310344828 0 0.7241379310344828 149.6021789105447 3.740109945027477
+"objects\\Hardware\\Station_small.pnl" 757 157 T 41 0.7241379310344828 0 0.7241379310344828 29.60217891054469 23.74010994502748
1
"$Station""RS508"
3 22 "PANEL_REF23"
-"objects\\Hardware\\Station_small.pnl" 257 337 T 42 0.7241379310344828 0 0.7241379310344828 101.6711444277861 23.39528235882064
+"objects\\Hardware\\Station_small.pnl" 257 337 T 42 0.7241379310344828 0 0.7241379310344828 21.6711444277861 33.39528235882058
1
"$Station""RS410"
3 24 "PANEL_REF25"
-"objects\\Hardware\\Station_small.pnl" 477 317 T 44 0.7241379310344828 0 0.7241379310344828 122.3607996001999 27.87804097951029
+"objects\\Hardware\\Station_small.pnl" 477 317 T 44 0.7241379310344828 0 0.7241379310344828 32.3607996001999 37.87804097951029
1
"$Station""RS409"
3 27 "PANEL_REF28"
-"objects\\Hardware\\Station_small.pnl" 687 267 T 47 0.7241379310344828 0 0.7241379310344828 140.2918340829585 14.08493753123437
+"objects\\Hardware\\Station_small.pnl" 687 267 T 47 0.7241379310344828 0 0.7241379310344828 30.2918340829585 24.08493753123437
1
"$Station""RS407"
3 30 "PANEL_REF31"
-"objects\\Hardware\\Station_small.pnl" 667 337 T 50 0.7241379310344828 0 0.7241379310344828 154.7745927036482 23.39528235882064
+"objects\\Hardware\\Station_small.pnl" 667 337 T 50 0.7241379310344828 0 0.7241379310344828 44.77459270364821 33.39528235882058
1
"$Station""RS406"
3 32 "PANEL_REF33"
-"objects\\Hardware\\Station_small.pnl" 747 347 T 52 0.7241379310344828 0 0.7241379310344828 146.8435582208896 46.15390304847577
+"objects\\Hardware\\Station_small.pnl" 747 347 T 52 0.7241379310344828 0 0.7241379310344828 36.84355822088949 56.15390304847583
1
"$Station""RS104"
3 33 "PANEL_REF34"
-"objects\\Hardware\\Station_small.pnl" 677 377 T 53 0.7241379310344828 0 0.7241379310344828 157.5332133933034 34.42976511744132
+"objects\\Hardware\\Station_small.pnl" 677 377 T 53 0.7241379310344828 0 0.7241379310344828 47.5332133933033 44.42976511744132
1
"$Station""RS404"
3 34 "PANEL_REF35"
-"objects\\Hardware\\Station_small.pnl" 737 447 T 54 0.7241379310344828 0 0.7241379310344828 144.0849375312344 33.74010994502753
+"objects\\Hardware\\Station_small.pnl" 737 447 T 54 0.7241379310344828 0 0.7241379310344828 34.08493753123429 33.74010994502753
1
"$Station""RS205"
3 40 "PANEL_REF41"
@@ -313,11 +313,11 @@ LANG:1 6 Layer8
1
"$Station""RS310"
3 41 "PANEL_REF42"
-"objects\\Hardware\\Station_small.pnl" 367 497 T 61 0.7241379310344828 0 0.7241379310344828 122.015972013993 47.53321339330336
+"objects\\Hardware\\Station_small.pnl" 367 497 T 61 0.7241379310344828 0 0.7241379310344828 42.01597201399299 57.53321339330336
1
"$Station""RS310"
3 42 "PANEL_REF43"
-"objects/Hardware\\Station_small.pnl" 617 697 T 61 0.7241379310344828 0 0.7241379310344828 182.2068965517241 200.2758620689655
+"objects\\Hardware\\Station_small.pnl" 617 697 T 61 0.7241379310344828 0 0.7241379310344828 80.98148925537228 192.7056271864067
1
"$Station""RS210"
0
\ No newline at end of file
diff --git a/MAC/Navigator2/panels/Observations/Observation_overview.pnl b/MAC/Navigator2/panels/Observations/Observation_overview.pnl
index e7cdaba2278d5080d5ca625d4334431689798438..d835129207b08b59081ea10638344ff43e6c27a4 100644
--- a/MAC/Navigator2/panels/Observations/Observation_overview.pnl
+++ b/MAC/Navigator2/panels/Observations/Observation_overview.pnl
@@ -123,7 +123,7 @@ updateObservationControl(string dp1, int claimPeriod,
beamTable.enabled(false);
}
- if (runState == \"running\") {
+ if (strtolower(runState) == \"running\") {
Abort_Observation.visible(true);
Abort_Observation.enabled(true);
} else {
diff --git a/MAC/Navigator2/panels/Test/test.pnl b/MAC/Navigator2/panels/Test/test.pnl
index 4f237f882059f9e1a2a8970f5af828125989b77b..2e5debee4ccbe722ff69286caccd5004776d47c1 100644
--- a/MAC/Navigator2/panels/Test/test.pnl
+++ b/MAC/Navigator2/panels/Test/test.pnl
@@ -3,7 +3,11 @@ V 10
LANG:1 0
LANG:6 0
PANEL,-1 -1 500 396 N "_3DFace" 0
-E E E E E 1 -1 -1 0 50 30
+"main()
+{
+ DebugN(\"MainPanel started\");
+}" 0
+ E E E E 1 -1 -1 0 50 30
""0 1
E E 2
"CBRef" "1"
@@ -13,21 +17,21 @@ DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
1
LANG:1 0
-1 19 6 "" 0
+1 28 6 "" 0
0
-1 20 6 "3" 0
+1 29 6 "3" 0
0
-1 21 6 "3" 2
+1 30 6 "3" 2
0
-1 22 6 "" 5
+1 31 6 "" 5
0
-1 23 7 "" 0
+1 32 7 "" 0
0
-1 24 7 "3" 0
+1 33 7 "3" 0
0
-1 25 7 "3" 2
+1 34 7 "3" 2
0
-1 26 7 "" 5
+1 35 7 "" 5
0
13 9
"PUSH_BUTTON1"
@@ -140,7 +144,7 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-*-80-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
+LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
0 ""
348 288 472 314
diff --git a/MAC/Navigator2/panels/Test/test2.pnl b/MAC/Navigator2/panels/Test/test2.pnl
index 10b9f500b877fe251fdcda311f5b5bef9504fb5e..5293a48580081ba1fa5f67025a7e65019e4c2a04 100644
--- a/MAC/Navigator2/panels/Test/test2.pnl
+++ b/MAC/Navigator2/panels/Test/test2.pnl
@@ -20,9 +20,8 @@ string itsDP;" 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
-2
+1
LANG:1 0
-LANG:6 0
6 0
"RECTANGLE1"
""
@@ -40,10 +39,13 @@ LANG:6 0
"main()
{
setValue( \"OBJECT.TEXT\", \"text\", $panel );
+ DebugN(\"testpanel\"+$panel+\" opened\");
}" 0
E 0 1 1 2 1 E 2.857142857142857 0 4.666666666666667 -130 -366.6666666666667 1 E 70 100 140 130
1 6 3 "" 0
0
+1 7 3 "" 2
+0
2 5
"panelName"
""
@@ -69,39 +71,32 @@ LANG:1 4 name
LANG:6 4 name
0
LAYER, 1
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 2
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 3
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 4
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 5
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 6
-2
+1
LANG:1 0
-LANG:6 0
0
LAYER, 7
-2
+1
LANG:1 0
-LANG:6 0
0
3 3 "OBJECT"
"Test\\testclick.pnl" 100 210 T 3 U
diff --git a/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl b/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
index 1b74e40f3ac05c3061894b656cc721bd3812d0e6..b7dfe9f5db00c740071c330b4830983fea763b04 100644
--- a/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/ObsSW_Main.pnl
@@ -108,7 +108,7 @@ LANG:1 5 ObsSW
29 4
"stationTree"
""
-1 1182 -113.812949640288 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 1180 -113.812949640288 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
7 0 0 0 0 0
E E E
@@ -125,7 +125,7 @@ LANG:1 19 Active Observations
"backgroundOrigin" "enum 0"
"selectionMode" "enum 0"
"frameShadow" "enum 48"
- 822 20 992 376
+ 820 20 990 376
10 TreeWidget
7
0 "expanded" "(string id)"
diff --git a/MAC/Navigator2/panels/objects/lofar_logger.pnl b/MAC/Navigator2/panels/objects/lofar_logger.pnl
index 4fbf0dbdc626b12b3ea6372d81ca3ae36679dd6d..b09f254cb71195f375890700489c790a399ae493 100644
--- a/MAC/Navigator2/panels/objects/lofar_logger.pnl
+++ b/MAC/Navigator2/panels/objects/lofar_logger.pnl
@@ -498,7 +498,7 @@ LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,
"main()
{
- dyn_string libraries = getFileNames(PROJ_PATH+\"/scripts/\",\"*.ctl\");
+ dyn_string libraries = getFileNames(PROJ_PATH+\"/scripts/libs/\",\"*.ctl\");
Library_box.deleteAllItems();
Library_box.items(libraries);
Library_box.text(libraries[1]);
diff --git a/MAC/Navigator2/panels/objects/navigator_alerts.pnl b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
index 49b6634ae44b8a1d03abb35b7c0dde666f17c883..8dc7a5bb415233bf9553d6b76cf8866abf77cc7e 100644
--- a/MAC/Navigator2/panels/objects/navigator_alerts.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
@@ -151,7 +151,7 @@ void ackAllClicked() {
for (int row=alarmTable.lineCount()-1;row>=0;row--) {
dyn_anytype result = alarmTable.getLineN(row);
- string dp = navFunct_ObsToTemp(result[2])+\".status.state\";
+ string dp = navFunct_ObsToTemp(result[2])+\".status.state\";
string message = result[3];
int status=-1;
if (result[4] == \"ACK\") {
diff --git a/MAC/Navigator2/panels/objects/navigator_typeSelector.pnl b/MAC/Navigator2/panels/objects/navigator_typeSelector.pnl
index e3d14bdc570d2a4887cb248b9834fe1443cf66d5..1f3b3f61b9d7c5d0f915da56d8368aafd08a433c 100644
--- a/MAC/Navigator2/panels/objects/navigator_typeSelector.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_typeSelector.pnl
@@ -41,7 +41,7 @@ PANEL,-1 -1 260 496 N "_3DFace" 2
}
void initialize() {
- LOG_TRACE(\"navigator_typeSelector.pnl:Initialize| \"+$name+\" start\");
+ LOG_DEBUG(\"navigator_typeSelector.pnl:Initialize| \"+$name+\" start\");
changeSelection(itsSelection);
if (!connected) {
@@ -55,7 +55,7 @@ void initialize() {
// If there is an action required this point will tell so
//
void doAction(string aDP, string anAction) {
- LOG_TRACE(\"navigator_typeSelector.pnl:doAction| found:\" + anAction);
+ LOG_DEBUG(\"navigator_typeSelector.pnl:doAction| found:\" + anAction);
// split action into essentials
dyn_string actionString;
@@ -98,16 +98,12 @@ void doAction(string aDP, string anAction) {
return;
}
- if (! connected) {
- dpConnect( \"doHighlight\",false,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
- connected = true;
- }
}
void doHighlight(string dp1,bool aTrigger) {
- LOG_TRACE(\"navigator_typeSelector.pnl:doHighlight| entered\");
+ LOG_DEBUG(\"navigator_typeSelector.pnl:doHighlight| entered\");
// highlight contains the names of the items in the treelist that should be highlighted.
@@ -154,12 +150,6 @@ void selectTreeItems(shape tree,string parent) {
LOG_DEBUG(\"navigator_typeSelector.pnl:selectTreeItems|Entered select: \"+highlight+\" parent: \"+parent);
- // check if parent exists.
- // sometimes this routine is called faster then the update was ready
- // so we need to avoid unknown parents in the just updated tree
- if (parent != \"\" && !tree.itemExists(parent)) {
- return;
- }
dyn_string ids = tree.children(parent);
@@ -397,8 +387,8 @@ E E E
LANG:1 8 hardware
2
-"allColumnsShowFocus" "bool TRUE"
"selectionMode" "enum 0"
+"allColumnsShowFocus" "bool TRUE"
10 30 212 378
10 TreeWidget
7
diff --git a/MAC/Navigator2/pictures/LOFAR_Core.jpg b/MAC/Navigator2/pictures/LOFAR_Core.jpg
index fc42bf797f3d973442085dc6e7e3c5ffc4928248..73676fcccc774d5e2505ff26e7c3515d1ce14fde 100644
Binary files a/MAC/Navigator2/pictures/LOFAR_Core.jpg and b/MAC/Navigator2/pictures/LOFAR_Core.jpg differ
diff --git a/MAC/Navigator2/pictures/LOFAR_Europe.jpg b/MAC/Navigator2/pictures/LOFAR_Europe.jpg
index 19b0b5f7ec9086621eb42bb2a5e5bcda2268a4e2..3c7f70c0db356c283a61f0c754e87a3391871ba1 100644
Binary files a/MAC/Navigator2/pictures/LOFAR_Europe.jpg and b/MAC/Navigator2/pictures/LOFAR_Europe.jpg differ
diff --git a/MAC/Navigator2/pictures/LOFAR_Remote.jpg b/MAC/Navigator2/pictures/LOFAR_Remote.jpg
index de211f2a13f7b99b3b692003e76c45ed453672e5..aabea00a90eb2025c6b596833a73e80953428b1b 100644
Binary files a/MAC/Navigator2/pictures/LOFAR_Remote.jpg and b/MAC/Navigator2/pictures/LOFAR_Remote.jpg differ