Task #9209: Added the possibility to keep the last viewed antenna type in the station panel

.gitattributes

@@ -4067,6 +4067,7 @@ MAC/Navigator2/panels/objects/navigator_typeSelector.pnl -text
 MAC/Navigator2/panels/objects/navigator_viewSelection.pnl -text
 MAC/Navigator2/panels/objects/show_legenda.pnl -text
 MAC/Navigator2/panels/objects/swlevel.pnl -text
+MAC/Navigator2/panels/objects/systemMainLine.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/253.bmp -text svneol=unset#image/bmp

MAC/Navigator2/panels/Hardware/Station.pnl

@@ -83,7 +83,7 @@ void doAction(string aDP, string anAction) {
   
   // Reload
   if (actionString[1] == \"Reload\") {
-    redraw(arrayList.text(arrayList.number()));
+    redraw(g_activeAntennaType);
     return;
   } else if (actionString[1] == \"DistChanged\") {
     // for dist system bound hardware only, if the distsystem went offline we need to replace 
@@ -116,7 +116,7 @@ void updatePositions(string dp1, float cX,
   
   
   // Check if the update concerns the current view
-  string txt=arrayList.text(arrayList.number());
+  string txt=g_activeAntennaType;
   
   if (strpos(dp1,txt) < 0) {    //not found match
     return;
@@ -358,8 +358,9 @@ void redraw(string mode) {
 void updateField() {
   
   // Check if the update concerns the current view
-  string txt= arrayList.text(arrayList.number());
+  string txt= g_activeAntennaType;
 
+  sysName = dpSubStr(g_currentDatapoint,DPSUB_SYS);
   string dpt=txt+\"Antenna\";
   dyn_string unsortX=dpNames(sysName+\"LOFAR_PIC_\"+txt+\"*.common.deltaX;\",dpt);
   dyn_string unsortY=dpNames(sysName+\"LOFAR_PIC_\"+txt+\"*.common.deltaY;\",dpt);
@@ -509,13 +510,28 @@ LANG:1 0
 E E
 0 0 0 0 0
 1
-E "main(int button)
+"main()
+{
+  zoomFactor=1;
+  shiftValue=25;
+  shiftFactorX=0;
+  shiftFactorY=0;
+  setValue(\"shift_value\",\"text\",shiftValue);
+  if (g_activeAntennaType == \"LBA\") {
+    setValue(\"\", \"number\", 1);
+  } else {
+    setValue(\"\", \"number\", 0);
+  }
+  updateField();
+}" 0
+ "main(int button)
 {
   zoomFactor=1;
   shiftValue=25;
   shiftFactorX=0;
   shiftFactorY=0;
   setValue(\"shift_value\",\"text\",shiftValue);
+  g_activeAntennaType = arrayList.text(arrayList.number());
   updateField();
 }" 0
 

MAC/Navigator2/panels/main.pnl

@@ -302,7 +302,7 @@ LANG:1 7 swlevel
 2 25
 "PRIMITIVE_TEXT5"
 ""
-1 155 2 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 133 2 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 10 0 0 0 0 0
 E E E
@@ -312,16 +312,16 @@ LANG:1 0
 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U  0 E 155 2 196 15
-0 2 2 "0s" 0 0 0 192 0 0  155 2 1
+E E 0 1 1 2 1 E U  0 E 133 2 203 15
+0 2 2 "0s" 0 0 0 192 0 0  133 2 1
 1
 LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
 0 1
-LANG:1 6 stream
+LANG:1 11 data stream
 2 29
 "PRIMITIVE_TEXT6"
 ""
-1 160 15 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 150 15 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 14 0 0 0 0 0
 E E E
@@ -331,8 +331,8 @@ LANG:1 0
 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U  0 E 160 15 167 28
-0 2 2 "0s" 0 0 0 192 0 0  160 15 1
+E E 0 1 1 2 1 E U  0 E 150 15 157 28
+0 2 2 "0s" 0 0 0 192 0 0  150 15 1
 1
 LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
 0 1
@@ -340,7 +340,7 @@ LANG:1 1 0
 2 30
 "PRIMITIVE_TEXT7"
 ""
-1 190 15 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 180 15 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
  E E
 15 0 0 0 0 0
 E E E
@@ -350,8 +350,8 @@ LANG:1 0
 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U  0 E 190 15 197 28
-0 2 2 "0s" 0 0 0 192 0 0  190 15 1
+E E 0 1 1 2 1 E U  0 E 180 15 187 28
+0 2 2 "0s" 0 0 0 192 0 0  180 15 1
 1
 LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
 0 1
@@ -739,7 +739,7 @@ LANG:1 14 processSubtype
 2 117
 "PRIMITIVE_TEXT39"
 ""
-1 950 10 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+1 940 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
@@ -749,12 +749,12 @@ LANG:1 26 #faulty HBA & LBA Antennas
 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U  0 E 950 10 997 23
-0 2 2 "0s" 0 0 0 192 0 0  950 10 1
+E E 0 1 1 2 1 E U  0 E 940 10 1019 23
+0 2 2 "0s" 0 0 0 192 0 0  940 10 1
 1
 LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
 0 1
-LANG:1 7 streams
+LANG:1 13 input streams
 2 172
 "PRIMITIVE_TEXT40"
 ""
@@ -781,7 +781,7 @@ LANG:1 0
 4 28
 "LINE1"
 ""
-1 220 0 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
+1 210 0 E E E 1 E 1 E N {0,0,0} E N {255,255,255} E E
  E E
 13 0 0 0 0 0
 E E E
@@ -791,7 +791,7 @@ LANG:1 0
 
 1
 "dashclr"N "_Transparent"
-E E 0 2 1 2 1 E  220 0 220 660
+E E 0 2 1 2 1 E  210 0 210 660
 4 33
 "LINE2"
 ""

MAC/Navigator2/panels/objects/Hardware/AARTFAAC-URIBoard.pnl

 V 11
 1
 LANG:1 8 URIbard
+
 PANEL,-1 -1 717 319 N "_3DFace" 0
 "main()
 {

MAC/Navigator2/scripts/libs/navigator.ctl

@@ -46,13 +46,20 @@
 
 global bool       g_objectReady           = true;     // Can be used for timing by objects
 
+// store the current datapoint
 global string     g_currentDatapoint          = MainDBName+"LOFAR_PIC_Europe";
+
+// store the last chosen panel for each tab
 global string     g_lastHardwareDatapoint     = MainDBName+"LOFAR_PIC_Europe";
 global string     g_lastProcessesDatapoint    = MainDBName+"LOFAR_PermSW";
 global string     g_lastObservationsDatapoint = MainDBName+"LOFAR_ObsSW";
 global string     g_lastPipelinesDatapoint    = MainDBName+"LOFAR_ObsSW";
+
+// store the current active panel
 global string     g_activePanel               = "main.pnl";
 
+// store the last chosen antenna type
+global string     g_activeAntennaType         = "HBA"; 
 
 
 global dyn_string g_observationsList;  // holds active observations