diff --git a/MAC/Navigator2/panels/Hardware/Station.pnl b/MAC/Navigator2/panels/Hardware/Station.pnl
index 4c93becf04881d127ec8ebe733593a806ce34306..d0a03fc96572229ab2cb2af58f43e9c6c90d411c 100644
--- a/MAC/Navigator2/panels/Hardware/Station.pnl
+++ b/MAC/Navigator2/panels/Hardware/Station.pnl
@@ -114,7 +114,6 @@ void updatePositions(string dp1, float cX,
string dp10, bool invalid) {
-
// Check if the update concerns the current view
string txt=g_activeAntennaType;
@@ -230,7 +229,6 @@ void calcViewboxSize() {
void redraw(string mode) {
-
float maxXOffsetValue=1.;
float maxYOffsetValue=1.;
float expandFactorX;
@@ -473,7 +471,7 @@ E E 0 1 1 2 1 E U 1 E 1002 23 1077 35
LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 13 Select Array:
-1 194 5 "" 2190
+1 167 5 "" 2190
0
19 53
"arrayList"
@@ -833,7 +831,7 @@ LANG:1 11 ShiftFactor
LAYER, 1
1
LANG:1 6 Layer2
-1 172 2 "" 40
+1 145 2 "" 40
0
0
LAYER, 2
diff --git a/MAC/Navigator2/panels/Observations/MainObservationFlow.pnl b/MAC/Navigator2/panels/Observations/MainObservationFlow.pnl
index 0073bd1467da0b13283a97369af22a2668f145b8..5d8e715162a7e575d9db7bbdf0811a15aea06ce2 100644
--- a/MAC/Navigator2/panels/Observations/MainObservationFlow.pnl
+++ b/MAC/Navigator2/panels/Observations/MainObservationFlow.pnl
@@ -1,29 +1,25 @@
-V 11
+V 13
1
LANG:1 0
-PANEL,-1 -1 702 92 N "_3DFace" 0
+PANEL,-1 -1 957 335 N "_3DFace" 0
E E E E E 1 -1 -1 0 0 0
""0 1
-E E 2
+E E 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
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 0 0 "" 1
-0
-1 1 0 "" 2
-0
-1 2 1 "" 1
-0
-1 3 1 "" 2
+1 5 0 "" 1
0
4 4
"LINE5"
""
-1 140 30 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 109 17 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
E E
7 0 0 0 0 0
E E E
@@ -31,34 +27,21 @@ E E E
1
LANG:1 0
-1
+2
"dashclr"N "_Transparent"
-E E 0 2 1 2 1 E 140 30 170 30
-1 5 5 "" 1
-0
-1 6 5 "" 2
-0
-1 7 2 "" 0
-0
-1 8 2 "" 1
-0
-1 9 2 "" 2
-0
-1 10 2 "" 3
-0
-1 11 2 "" 4
-0
-1 12 4 "" 0
+"antiAliased" "0"
+E E 0 2 1 2 1 E 109 17 139 17
+1 7 1 "" 1
0
-1 13 4 "" 1
+1 9 2 "" 0
0
1 14 3 "" 1
0
-1 15 3 "" 2
+1 16 4 "" 0
0
-1 16 6 "" 0
+1 18 5 "" 1
0
-1 17 6 "" 1
+1 20 6 "" 0
0
0
LAYER, 1
@@ -90,24 +73,31 @@ LAYER, 7
LANG:1 0
0
3 0 "PANEL_REF0" -1
-"objects\\Observations\\observationFlow.pnl" 110 740 T 0 1 0 1 -40 -675
+"" ""
+"objects/Observations/observationFlow.pnl" 110 740 T 0 1 0 1 -40 -675
0
3 1 "PANEL_REF1" -1
-"objects\\Hardware\\observationFlow_stations.pnl" 220 810 T 1 1 0 1 10 -745
+"" ""
+"objects/Hardware/observationFlow_stations.pnl" 220 810 T 1 1 0 1 -21 -745
0
3 2 "PANEL_REF4" -1
-"objects\\Processes\\observationFlow_cobaltInputStreams.pnl" 280 750 T 2 1 0 1 10 -746
+"" ""
+"objects/Processes/observationFlow_cobaltInputStreams.pnl" 280 750 T 2 1 0 1 -116.5 -731
0
3 3 "PANEL_REF6" -1
-"objects\\Processes\\observationFlow_cobaltNodeProcesses.pnl" 340 810 T 3 1 0 1 10.00000000000003 -745
+"" ""
+"objects/Processes/observationFlow_cobaltNodeProcesses.pnl" 340 810 T 3 1 0 1 -181.0000000000001 -691
0
3 4 "PANEL_REF5" -1
-"objects\\Processes\\observationFlow_cobaltGPUProcs.pnl" 430 750 T 4 1 0 1 10 -750
+"" ""
+"objects/Processes/observationFlow_cobaltGPUProcs.pnl" 430 750 T 4 1 0 1 -340.9999999999997 -709
0
3 5 "PANEL_REF3" -1
-"objects\\Processes\\observationFlow_cobaltLocusNodeProcesses.pnl" 500 810 T 5 1 0 1 10.00000000000003 -745
+"" ""
+"objects/Processes/observationFlow_cobaltLocusNodeProcesses.pnl" 500 810 T 5 1 0 1 -469.9999999999999 -691
0
3 6 "PANEL_REF7" -1
-"objects\\Processes\\observationFlow_cobaltOutputProc.pnl" 590 750 T 6 1 0 1 10 -738
+"" ""
+"objects/Processes/observationFlow_cobaltOutputProc.pnl" 590 750 T 6 1 0 1 -565.4999999999999 -670
0
0
diff --git a/MAC/Navigator2/panels/main.pnl b/MAC/Navigator2/panels/main.pnl
index 1f522df667f26ec495943293d177629a21d025f9..833752cd89e6bcb27c78bc47d150a509c3404576 100644
--- a/MAC/Navigator2/panels/main.pnl
+++ b/MAC/Navigator2/panels/main.pnl
@@ -98,7 +98,8 @@ void redrawObservations() {
}
addObservations();
- addObservationFlow();
+ // Since Cobalt 2.0 doesn't report to WinCC-OA anymore, we will turn this off for now
+// addObservationFlow();
// trigger that the panel values are calculated and ready
dynClear(highlight);
@@ -229,7 +230,7 @@ void addProcesses(string selectedStation) {
void addObservations() {
int xPos_AddSymbol = 0;
- int yPos_AddSymbol = 697;
+ int yPos_AddSymbol = 703;
int ref = 1;
string addPanelName = \"objects/Observations/observation_smallCEPView.pnl\";
@@ -255,8 +256,8 @@ void addObservations() {
}
void addObservationFlow() {
- int xPos_AddSymbol = 0;
- int yPos_AddSymbol = 756;
+ int xPos_AddSymbol = 770;
+ int yPos_AddSymbol = 700;
string addPanelName = \"Observations/MainObservationFlow.pnl\";
if ( addSymbol( strModuleName, // Stay in this modul
\"\", // Name of this panel
@@ -495,7 +496,7 @@ LANG:1 3 sw6
2 42
"PRIMITIVE_TEXT14"
""
-1 15 678 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 15 683 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
27 0 0 0 0 0
E E E
@@ -507,8 +508,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 15 678 66 690
-0 2 2 "0s" 0 0 0 192 0 0 15 678 1
+E E 0 1 1 2 1 E U 0 E 15 683 66 695
+0 2 2 "0s" 0 0 0 192 0 0 15 683 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -600,7 +601,7 @@ LANG:1 7 HBA LBA
2 74
"PRIMITIVE_TEXT30"
""
-1 297 678 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 297 683 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
44 0 0 0 0 0
E E E
@@ -612,8 +613,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 297 678 368 690
-0 2 2 "0s" 0 0 0 192 0 0 297 678 1
+E E 0 1 1 2 1 E U 0 E 297 683 368 695
+0 2 2 "0s" 0 0 0 192 0 0 297 683 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -621,7 +622,7 @@ LANG:1 11 Observation
2 75
"PRIMITIVE_TEXT31"
""
-1 136.9999999999999 692 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 136.9999999999999 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
45 0 0 0 0 0
E E E
@@ -633,8 +634,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 136.9999999999999 692 194 704
-0 2 2 "0s" 0 0 0 192 0 0 136.9999999999999 692 1
+E E 0 1 1 2 1 E U 0 E 136.9999999999999 697 194 709
+0 2 2 "0s" 0 0 0 192 0 0 136.9999999999999 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -642,7 +643,7 @@ LANG:1 9 startTime
2 76
"PRIMITIVE_TEXT32"
""
-1 487 692 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 487 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
46 0 0 0 0 0
E E E
@@ -654,8 +655,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 487 692 542 704
-0 2 2 "0s" 0 0 0 192 0 0 487 692 1
+E E 0 1 1 2 1 E U 0 E 487 697 542 709
+0 2 2 "0s" 0 0 0 192 0 0 487 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -663,7 +664,7 @@ LANG:1 8 stopTime
2 77
"PRIMITIVE_TEXT33"
""
-1 315 692 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 315 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
47 0 0 0 0 0
E E E
@@ -675,8 +676,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 315 692 367 704
-0 2 2 "0s" 0 0 0 192 0 0 315 692 1
+E E 0 1 1 2 1 E U 0 E 315 697 367 709
+0 2 2 "0s" 0 0 0 192 0 0 315 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -684,7 +685,7 @@ LANG:1 8 progress
2 78
"PRIMITIVE_TEXT34"
""
-1 427 692 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 427 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
48 0 0 0 0 0
E E E
@@ -696,8 +697,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 427 692 476 704
-0 2 2 "0s" 0 0 0 192 0 0 427 692 1
+E E 0 1 1 2 1 E U 0 E 427 697 476 709
+0 2 2 "0s" 0 0 0 192 0 0 427 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -747,7 +748,7 @@ LANG:1 2 BP
2 115
"PRIMITIVE_TEXT37"
""
-1 7 692 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 7 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
52 0 0 0 0 0
E E E
@@ -759,8 +760,8 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 7 692 90 704
-0 2 2 "0s" 0 0 0 192 0 0 7 692 1
+E E 0 1 1 2 1 E U 0 E 7 697 90 709
+0 2 2 "0s" 0 0 0 192 0 0 7 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
@@ -768,7 +769,7 @@ LANG:1 13 ObservationNr
2 116
"PRIMITIVE_TEXT38"
""
-1 619 688 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 619 697 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
E E
53 0 0 0 0 0
E E E
@@ -780,33 +781,12 @@ LANG:1 0
"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 619 688 712 700
-0 2 2 "0s" 0 0 0 192 0 0 619 688 1
+E E 0 1 1 2 1 E U 0 E 619 697 712 709
+0 2 2 "0s" 0 0 0 192 0 0 619 697 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 1
LANG:1 14 processSubtype
-2 117
-"PRIMITIVE_TEXT39"
-""
-1 970 10 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-54 0 0 0 0 0
-E E E
-0
-1
-LANG:1 26 #faulty HBA & LBA Antennas
-
-3
-"sizePolicy" "Fixed Fixed"
-"dashclr"N "_Transparent"
-"antiAliased" "0"
-E E 0 1 1 2 1 E U 0 E 970 10 1051 22
-0 2 2 "0s" 0 0 0 192 0 0 970 10 1
-1
-LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
-0 1
-LANG:1 13 input streams
2 172
"PRIMITIVE_TEXT40"
""
@@ -846,7 +826,7 @@ LANG:1 0
2
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 2 1 2 1 E 210 0 210 674.0000000000003
+E E 0 2 1 2 1 E 210 0 210 679
4 33
"LINE2"
""
@@ -861,11 +841,11 @@ LANG:1 0
2
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 2 1 2 1 E 625 0 625 674
+E E 0 2 1 2 1 E 625 0 625 679
4 41
"LINE4"
""
-1 5 675 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 5 680 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
E E
26 0 0 0 0 0
E E E
@@ -876,7 +856,7 @@ LANG:1 0
2
"dashclr"N "_Transparent"
"antiAliased" "0"
-E E 0 2 1 2 1 E 5 675 1015 675
+E E 0 2 1 2 1 E 5 680 1015 680
0
LAYER, 2
1
diff --git a/MAC/Navigator2/panels/navigator.pnl b/MAC/Navigator2/panels/navigator.pnl
index ef10d39821e689e1f38c79157d70c4a9a5836386..d822e3f524000e826e9979b3e70f78212e459507 100644
--- a/MAC/Navigator2/panels/navigator.pnl
+++ b/MAC/Navigator2/panels/navigator.pnl
@@ -84,8 +84,12 @@ PANEL,-1 -1 1503 998 N "_3DFace" 0
}
-
- setValue( \"PANEL_REF21.PANEL_REF0..table_top\", \"rowHeight\", 17 );
+ // *** TODO ***
+ // this panel causes an exit when used in stand_alone modus, so for now we exclde it
+ if (! g_standAlone)
+ {
+ setValue( \"tbl_alarm.PANEL_REF0..table_top\", \"rowHeight\", 17 );
+ }
@@ -461,7 +465,7 @@ LANG:1 6 Layer8
"" ""
"objects/show_legenda.pnl" 500 110 T 28 1 0 1 20 -4
0
-3 21 "PANEL_REF21" -1
+3 21 "tbl_alarm" -1
"" ""
"objects/navigator_alerts.pnl" 15.50000000000001 926.8747307968413 T 33 1 0 1 0.4999999999999929 -9.874730796841277
1
diff --git a/MAC/Navigator2/panels/objects/Hardware/Station_mainView.pnl b/MAC/Navigator2/panels/objects/Hardware/Station_mainView.pnl
index 2d103d58362a571af8ef40e172d2ebd6e1f92478..fa08fdfc2bca3e061beac298ea3c8cd44e5f86fc 100644
--- a/MAC/Navigator2/panels/objects/Hardware/Station_mainView.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/Station_mainView.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 0
PANEL,-1 -1 380 22 N "_3DFace" 1
@@ -12,9 +12,11 @@ PANEL,-1 -1 380 22 N "_3DFace" 1
E "#uses \"navPanel.ctl\"
string station = \"\";
string baseDP=\"\";" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -31,18 +33,18 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 0 E 70 80 71 93
+"antiAliased" "0"
+E E 0 1 1 2 1 E U 0 E 70 80 72 92
0 2 2 "0s" 0 0 0 192 0 0 70 80 1
1
-LANG:1 34 MS Shell Dlg 2,8,-1,5,50,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 0
1 17 1 "" 0
0
-1 18 1 "" 1
-0
1 19 2 "" 0
0
1 20 4 "" 0
@@ -55,30 +57,6 @@ LANG:1 0
0
1 24 8 "" 0
0
-1 25 9 "" 0
-0
-1 26 9 "" 2
-0
-1 27 9 "" 3
-0
-1 28 10 "" 0
-0
-1 29 10 "" 2
-0
-1 30 10 "" 3
-0
-1 31 11 "" 0
-0
-1 32 11 "" 2
-0
-1 33 11 "" 3
-0
-1 34 12 "" 0
-0
-1 35 12 "" 2
-0
-1 36 12 "" 3
-0
1 37 13 "" 0
0
1 38 14 "" 0
@@ -113,62 +91,51 @@ LAYER, 7
LANG:1 0
0
3 1 "PANEL_REF1" -1
-"objects\\Hardware\\Station_TempAndHumidity.pnl" 10 10 T 34 1 0 1 -10 -10
+"" ""
+"objects/Hardware/Station_TempAndHumidity.pnl" 10 10 T 34 1 0 1 -10 -10
1
"$station""$station"
3 2 "PANEL_REF2" -1
-"objects\\genericOnOffView.pnl" 40 0 T 35 1 0 1 40 0
+"" ""
+"objects/genericOnOffView.pnl" 40 0 T 35 1 0 1 40 0
2
"$fullDP""LOFAR_PIC_StationInfo.power48On"
"$station""$station"
3 4 "PANEL_REF4" -1
-"objects\\Hardware\\antennaBroken_Small.pnl" 80 0 T 37 1 0 1 112 0
+"" ""
+"objects/Hardware/antennaBroken_Small.pnl" 80 0 T 37 1 0 1 112 0
2
"$antennaType""HBA"
"$station""$station"
3 5 "PANEL_REF5" -1
-"objects\\Hardware\\antennaBroken_Small.pnl" 100 0 T 38 1 0 1 120 0
+"" ""
+"objects/Hardware/antennaBroken_Small.pnl" 100 0 T 38 1 0 1 120 0
2
"$antennaType""LBA"
"$station""$station"
3 6 "PANEL_REF6" -1
-"objects\\Hardware\\TBBmode_small.pnl" 60 0 T 39 1 0 1 70 0
+"" ""
+"objects/Hardware/TBBmode_small.pnl" 60 0 T 39 1 0 1 70 0
1
"$station""$station"
3 7 "PANEL_REF7" -1
-"objects\\Hardware\\APtemp_small.pnl" 40 0 T 40 U
+"" ""
+"objects/Hardware/APtemp_small.pnl" 40 0 T 40 U
1
"$station""$station"
3 8 "PANEL_REF8" -1
-"objects\\Hardware\\BPtemp_small.pnl" 60 0 T 40 U
+"" ""
+"objects/Hardware/BPtemp_small.pnl" 60 0 T 40 U
1
"$station""$station"
-3 9 "PANEL_REF9" -1
-"objects\\Processes\\stationStreamView_small.pnl" 250 0 T 41 1 0 1 50 0
-2
-"$station""$station"
-"$streamNr""0"
-3 10 "PANEL_REF10" -1
-"objects\\Processes\\stationStreamView_small.pnl" 270 0 T 42 1 0 1 50 0
-2
-"$station""$station"
-"$streamNr""1"
-3 11 "PANEL_REF11" -1
-"objects\\Processes\\stationStreamView_small.pnl" 290 0 T 43 1 0 1 50 0
-2
-"$station""$station"
-"$streamNr""2"
-3 12 "PANEL_REF12" -1
-"objects\\Processes\\stationStreamView_small.pnl" 310 0 T 44 1 0 1 50 0
-2
-"$station""$station"
-"$streamNr""3"
3 13 "PANEL_REF13" -1
-"objects\\Hardware\\AARTFAAC_small.pnl" 130 0 T 44 1 0 1 30 0
+"" ""
+"objects/Hardware/AARTFAAC_small.pnl" 130 0 T 44 1 0 1 30 0
1
"$station""$station"
3 14 "PANEL_REF14" -1
-"objects/Hardware\\powerUnit_small.pnl" 100 0 T 44 U
+"" ""
+"objects/Hardware/powerUnit_small.pnl" 100 0 T 44 U
1
"$station""$station"
0
diff --git a/MAC/Navigator2/panels/objects/Hardware/observationFlow_stations.pnl b/MAC/Navigator2/panels/objects/Hardware/observationFlow_stations.pnl
index 7b9acb55fd4b37b41942fd90943afef5b6a958af..5f471725dc9dfe1803478306eddf949cb25f764a 100644
--- a/MAC/Navigator2/panels/objects/Hardware/observationFlow_stations.pnl
+++ b/MAC/Navigator2/panels/objects/Hardware/observationFlow_stations.pnl
@@ -347,11 +347,11 @@ void observationsCallback(string dp1, bool aTrig) {
{
click();
}" 0
- 0 2 1 2 1 E 0.7222222222222223 0 0.8333333333333334 -83.88888888888893 -123.3333333333333 1 E 130 160 310 220
+ 0 2 1 2 1 E 0.55 0 0.4 -61.50000000000002 -53.99999999999998 1 E 130 160 310 220
2 2
"PRIMITIVE_TEXT1"
""
-1 50 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 35 15 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
"main()
{
rClick();
@@ -375,8 +375,8 @@ E "main()
{
click();
}" 0
- 0 1 1 2 1 E U 0 E 50 30 91 42
-0 2 2 "0s" 0 0 0 192 0 0 50 30 1
+ 0 1 1 2 1 E U 0 E 35 15 76 27
+0 2 2 "0s" 0 0 0 192 0 0 35 15 1
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 1
diff --git a/MAC/Navigator2/panels/objects/Observations/observationFlow.pnl b/MAC/Navigator2/panels/objects/Observations/observationFlow.pnl
index 6742cebf5139b73e201ce92e16346e31e9a1166f..59e0ac70a8a40330751216503bd5bdf1519711b3 100644
--- a/MAC/Navigator2/panels/objects/Observations/observationFlow.pnl
+++ b/MAC/Navigator2/panels/objects/Observations/observationFlow.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 16 childStateBorder
PANEL,-1 -1 582 91 N "_3DFace" 0
@@ -164,9 +164,11 @@ void setStates(int state, int childState) {
SymbolCol = getStateColor(state);
setValue(\"childStateBorder\", \"backCol\", SymbolCol);
}" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -191,8 +193,9 @@ E E E
1
LANG:1 43 All currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
"main()
{
dpConnect( \"observationsCallback\",true,DPNAME_NAVIGATOR + g_navigatorID +\".objectTrigger\" );
@@ -219,11 +222,11 @@ void observationsCallback(string dp1, bool aTrig) {
{
click();
}" 0
- 0 2 1 2 1 E 0.7222222222222223 0 0.8333333333333334 -83.88888888888893 -123.3333333333333 1 E 130 160 310 220
+ 0 2 1 2 1 E 0.55 0 0.4 -61.50000000000002 -53.99999999999998 1 E 130 160 310 220
2 2
"PRIMITIVE_TEXT1"
""
-1 40 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 26.49999999999997 15.00000000000002 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
"main()
{
rClick();
@@ -239,16 +242,18 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 1 1 2 1 E U 0 E 40 30 104 43
-0 2 2 "0s" 0 0 0 192 0 0 40 30 1
+ 0 1 1 2 1 E U 0 E 26.49999999999997 15.00000000000002 92.49999999999997 27.00000000000002
+0 2 2 "0s" 0 0 0 192 0 0 26.49999999999997 15.00000000000002 1
1
-LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 12 Observations
0
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
index e0a08ed2d6639fef08432901980de391c4422943..aa154d96f0121c27d9a99d724fac9d7c4571675f 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltInputStreams.pnl
@@ -1,7 +1,7 @@
-V 11
+V 13
1
LANG:1 0
-PANEL,-1 -1 273 73 N "_3DFace" 0
+PANEL,-1 -1 273 115 N "_3DFace" 0
"main()
{
baseDP = \"LOFAR_PermSW\";
@@ -348,9 +348,11 @@ void calcValues(int stream,dyn_string dps,dyn_float values)
}
" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -359,7 +361,7 @@ LANG:1 0
4 0
"streamObject0"
""
-1 10 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 10 9.999999999999998 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
"main()
{
rClick();
@@ -375,17 +377,18 @@ E E E
1
LANG:1 73 All inputbuffers involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 4 1 2 1 E 10 10 40 10
+ 0 4 1 2 1 E 10 9.999999999999998 10 40
4 1
"streamObject3"
""
-1 10 40 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 40 10 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
"main()
{
rClick();
@@ -401,17 +404,18 @@ E E E
1
LANG:1 73 All inputbuffers involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 4 1 2 1 E 10 40 40 40
+ 0 4 1 2 1 E 40 10 40 40
4 2
"streamObject1"
""
-1 10 20 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 20 9.999999999999998 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
"main()
{
rClick();
@@ -427,17 +431,18 @@ E E E
1
LANG:1 73 All inputbuffers involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 4 1 2 1 E 10 20 40 20
+ 0 4 1 2 1 E 20 9.999999999999998 20 40
4 3
"streamObject2"
""
-1 10 30 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 30 9.999999999999998 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
"main()
{
rClick();
@@ -453,13 +458,14 @@ E E E
1
LANG:1 73 All inputbuffers involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 4 1 2 1 E 10 30 40 30
+ 0 4 1 2 1 E 30 9.999999999999998 30 40
6 4
"RECTANGLE1"
""
@@ -479,13 +485,14 @@ E E E
1
LANG:1 0
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 1 1 2 1 E U 0 E 10 10 40 40
+ 0 1 1 2 1 E 1 0 1 0 -5.517100402528972e-016 0 E 10 10 40 40
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltLocusNodeProcesses.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltLocusNodeProcesses.pnl
index 71fe246a8b6d8998dfb48abd8d8ce747f93c613b..62aca48aee924f9a232dce03e4bf140eb5cc77a9 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltLocusNodeProcesses.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltLocusNodeProcesses.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 16 childStateBorder
PANEL,-1 -1 335 88 N "_3DFace" 0
@@ -215,9 +215,11 @@ void setStates(int state, int childState) {
SymbolCol = getStateColor(state);
setValue(\"childStateBorder\", \"backCol\", SymbolCol);
}" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -242,17 +244,18 @@ E E E
1
LANG:1 71 All LocusNodes involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 2 1 2 1 E 0.7222222222222223 0 0.8333333333333334 -43.8888888888889 -123.3333333333333 1 E 130 160 310 220
+ 0 2 1 2 1 E 0.55 0 0.4 -21.5 -53.99999999999998 1 E 130 160 310 220
2 2
"PRIMITIVE_TEXT1"
""
-1 70 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 53 15.00000000000002 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
"main()
{
rClick();
@@ -268,16 +271,18 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 1 1 2 1 E U 0 E 70 30 162 43
-0 2 2 "0s" 0 0 0 192 0 0 70 30 1
+ 0 1 1 2 1 E U 0 E 53 15.00000000000002 147 27.00000000000002
+0 2 2 "0s" 0 0 0 192 0 0 53 15.00000000000002 1
1
-LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 1
LANG:1 17 CEP 2 /LocusNodes
0
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltNodeProcesses.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltNodeProcesses.pnl
index 6620462b79206abe74e0c2363685c51f6403d01f..572be8dae6b50d02744b274a0d44b5238b0f7f25 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltNodeProcesses.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltNodeProcesses.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 16 childStateBorder
PANEL,-1 -1 242 91 N "_3DFace" 0
@@ -216,9 +216,11 @@ void setStates(int state, int childState) {
SymbolCol = getStateColor(state);
setValue(\"childStateBorder\", \"backCol\", SymbolCol);
}" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -243,17 +245,18 @@ E E E
1
LANG:1 69 All CEPNodes involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 2 1 2 1 E 0.7222222222222223 0 0.8333333333333334 -43.8888888888889 -123.3333333333333 1 E 130 160 310 220
+ 0 2 1 2 1 E 0.55 0 0.4 -21.5 -53.99999999999998 1 E 130 160 310 220
2 2
"PRIMITIVE_TEXT1"
""
-1 95 30 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 46 0 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
"main()
{
rClick();
@@ -269,18 +272,20 @@ E E E
1
LANG:1 0
-1
+3
+"sizePolicy" "Fixed Fixed"
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 1 1 2 1 E U 0 E 95 30 126 43
-0 2 2 "0s" 0 0 0 192 0 0 95 30 1
+ 0 1 1 2 1 E U 0 E 72 15 124 27
+0 2 2 "0s" 0 0 0 192 0 0 72 15 1
1
-LANG:1 37 MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0
+LANG:1 35 MS Shell Dlg 2,-1,11,5,50,0,0,0,0,0
0 1
-LANG:1 6 Cobalt
+LANG:1 10 Cobalt 2.0
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
index 3955168c5531526c719244a47e536f464814be6c..8e502b36ad727714b83a91cdb5e6ef479ef7b3fd 100644
--- a/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/observationFlow_cobaltOutputProc.pnl
@@ -1,4 +1,4 @@
-V 11
+V 13
1
LANG:1 0
PANEL,-1 -1 447 41 N "_3DFace" 0
@@ -218,9 +218,11 @@ void outputProcCB(dyn_string dps, dyn_dyn_bool values)
}
" 0
- 2
+ 3
"CBRef" "1"
"EClose" E
+"dpi" "96"
+0 0 0
""
DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
@@ -229,7 +231,7 @@ LANG:1 0
4 0
"outputProcsObject"
""
-1 20 20 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 35 2.999999999999996 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
"main()
{
rClick();
@@ -245,13 +247,14 @@ E E E
1
LANG:1 72 All OutputProcs involved in the currently(selected) active observations
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main()
{
click();
}" 0
- 0 4 1 2 1 E 20 20 50 20
+ 0 4 1 2 1 E 35 2.999999999999996 35 33
6 1
"RECTANGLE1"
""
@@ -271,13 +274,14 @@ E E E
1
LANG:1 0
-1
+2
"dashclr"N "_Transparent"
+"antiAliased" "0"
E "main(int x, int y)
{
click();
}" 0
- 0 1 1 2 1 E 1 0 1 10 -7 0 E 10 10 40 40
+ 0 1 1 2 1 E 1 0 1 10 -7.000000000000004 0 E 10 10 40 40
0
LAYER, 1
1
diff --git a/MAC/Navigator2/panels/objects/navigator_alerts.pnl b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
index 0b36e05372a822c0fdecd558940f0df2bd3cf31d..eed3fa4a76a9027bb9ef451df25a5270309f2b36 100644
--- a/MAC/Navigator2/panels/objects/navigator_alerts.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
@@ -28,14 +28,6 @@ PANEL,-1 -1 1213 163 N "_3DFace" 1
}
}
-void initialize() {
-// if (dpExists(DPNAME_NAVIGATOR + g_navigatorID+\".alarmsTrigger\")) {
-// dpConnect(\"alarmTrigger\",true,DPNAME_NAVIGATOR + g_navigatorID+\".alarmsTrigger\");
-// } else {
-// LOG_ERROR(\"navigator_alerts.pnl:initialize|Error connecting to alarmsTriggerpoint in navigator Instance.\");
-// }
-}
-
//void alarmTrigger(string dp1, bool T) {
// LOG_TRACE(\"navigator_alerts.pnl:initialize|alarmTrigger received.\");
// redraw_table();
@@ -57,10 +49,6 @@ void doAction(string aDP, string anAction) {
LOG_DEBUG(\"navigator_alerts.pnl:doAction|found actionString: \" + actionString);
// ChangeSelection requires 1 param and will change itsSelection and calls initTable again
- if (actionString[1] == \"Initialize\") {
- initialize();
- return;
- }
}" 0
E E E E 1 -1 -1 0 27 42
""0 1
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index 9087e4e0476e58d1e79e22710a7337f36ed8adec..e22d2a175cff39704c3f6083ca6f5650777eb63e 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -1262,6 +1262,9 @@ void navFunct_fillObservationsList() {
// check all available observations
+ if (mappinglen(g_observations) < 1)
+ return;
+
for (int i = 1; i <= dynlen(g_observations["NAME"]); i++) {
// only observations!!
if (g_observations["STATIONLIST"][i] == "[]") continue;
@@ -1911,9 +1914,9 @@ void navFunct_fillStationLists() {
// "RS306","RS307","RS308","RS309","RS310","RS311",
// "RS404","RS406","RS407","RS408","RS409","RS410","RS411","RS412","RS413",
// "RS503","RS506","RS507","RS508","RS509");
-// europeStations = makeDynString("DE601","DE602","DE603","DE604","DE605","FR606","SE607","UK608","DE609","PL610","PL611","PL612","IE613");
+// europeStations = makeDynString("DE601","DE602","DE603","DE604","DE605","FR606","SE607","UK608","DE609","PL610","PL611","PL612","IE613","LV614");
- europeStations = makeDynString("DE601","DE602","DE603","DE604","DE605","FR606","SE607","UK608","DE609","PL610","PL611","PL612","IE613");
+ europeStations = makeDynString("DE601","DE602","DE603","DE604","DE605","FR606","SE607","UK608","DE609","PL610","PL611","PL612","IE613","LV614");
superTerpStations = makeDynString("CS002","CS003","CS004","CS005","CS006","CS007");
cs0nnCoreStations = makeDynString("CS001",
"CS011","CS013","CS017",
@@ -1965,11 +1968,12 @@ bool navFunct_dpReachable(string aDP) {
if (sys == MainDBName) {
return true;
}
+
+
int iPos = dynContains ( g_connections[ "NAME" ],sys);
if (iPos <= 0 ){
return false;
}
-
// return state of the connection
return g_connections[ "UP" ][iPos];
}
diff --git a/MAC/Navigator2/scripts/libs/navigator.ctl b/MAC/Navigator2/scripts/libs/navigator.ctl
index d919a6cd0f2ddf997688849e34b63763e201e984..7946eb32fb70752044fba42fcd9b4ef5dd5d07f7 100644
--- a/MAC/Navigator2/scripts/libs/navigator.ctl
+++ b/MAC/Navigator2/scripts/libs/navigator.ctl
@@ -154,13 +154,14 @@ void navigator_handleEventInitialize()
// Do a dpQueryConnectSingle() so that we get a permanent list of claims
// we can use this to translate a claimed name into a real datapoint name
- claimManager_queryConnectClaims();
-
-
-
- // we need to wait until the claim system was able to finish all connections and callbacks
- if (!waitInitProcess("connectClaimsFinished")) {
- LOG_FATAL("navigator.ctl:navigator_handleEventInitialize|Couldn't finish claimManager_queryConnectClaims() , leaving");
+ if (!g_standAlone)
+ {
+ claimManager_queryConnectClaims();
+
+ // we need to wait until the claim system was able to finish all connections and callbacks
+ if (!waitInitProcess("connectClaimsFinished")) {
+ LOG_FATAL("navigator.ctl:navigator_handleEventInitialize|Couldn't finish claimManager_queryConnectClaims() , leaving");
+ }
}
// fill global stations lists
@@ -190,11 +191,14 @@ void navigator_handleEventInitialize()
// Do a dpQueryConnectSingle() so that we get a list of observations
// so that we can easily populate our tables with 'Planned', 'Running' and 'Finished' observations
- navFunct_queryConnectObservations();
+ if (! g_standAlone)
+ {
+ navFunct_queryConnectObservations();
- // we need to wait until all known observations have been initialized
- if (!waitInitProcess("queryConnectObservationsFinished")) {
- LOG_FATAL("navigator.ctl:navigator_handleEventInitialize|Couldn't finish queryConnectObservationsFinished() , leaving");
+ // we need to wait until all known observations have been initialized
+ if (!waitInitProcess("queryConnectObservationsFinished")) {
+ LOG_FATAL("navigator.ctl:navigator_handleEventInitialize|Couldn't finish queryConnectObservationsFinished() , leaving");
+ }
}