From 5a19b045e1d608f39ced74c0d3c50de6bd3bfdaf Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Thu, 22 Nov 2012 14:35:21 +0000
Subject: [PATCH] Task #3877: added missing panels
---
.gitattributes | 1 +
.../objects/Processes/SWControler_small.pnl | 2 -
.../objects/Processes/stationSWLevelView.pnl | 183 ++++++++++++++++++
MAC/Navigator2/panels/objects/swlevel.pnl | 2 -
4 files changed, 184 insertions(+), 4 deletions(-)
create mode 100644 MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl
diff --git a/.gitattributes b/.gitattributes
index 90aa49cc0d5..480aa08abf1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3230,6 +3230,7 @@ MAC/Navigator2/panels/objects/Processes/daemon_big.pnl -text
MAC/Navigator2/panels/objects/Processes/daemon_small.pnl -text
MAC/Navigator2/panels/objects/Processes/interactive_controller_small.pnl -text
MAC/Navigator2/panels/objects/Processes/lofar_Proc_state.pnl -text
+MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl -text
MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl -text
MAC/Navigator2/panels/objects/Reports/SystemHD.pnl -text
MAC/Navigator2/panels/objects/Reports/SystemOverview.pnl -text
diff --git a/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl b/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
index 6205f372621..4de6348f2cd 100644
--- a/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
@@ -35,14 +35,12 @@ PANEL,-1 -1 388 166 N "_3DFace" 2
private void observationChanged(string dp1, dyn_string observations,
string dp2, bool invalid) {
- DebugN(\"Observations: \" + observations);
// for now the object will only show the controller for the first observation
if (dynlen(observations) >= 1) {
firstObservation = observations[1];
// get real name from claimmanager
obsDP=claimManager_nameToRealName(\"LOFAR_ObsSW_\"+firstObservation);
baseDP = station+\":\"+obsDP+\"_\"+$name;
- DebugN(\"baseDP: \"+baseDP);
reload();
}
}
diff --git a/MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl b/MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl
new file mode 100644
index 00000000000..932c6f11710
--- /dev/null
+++ b/MAC/Navigator2/panels/objects/Processes/stationSWLevelView.pnl
@@ -0,0 +1,183 @@
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 765 50 N "_3DFace" 1
+"$station"
+"main()
+{
+ station = $station;
+}" 0
+ E E E E 1 -1 -1 0 0 0
+""0 1
+E "#uses \"navPanel.ctl\"
+string station = \"\";
+string baseDP=\"\";" 0
+ 2
+"CBRef" "1"
+"EClose" E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0
+1
+LANG:1 0
+2 16
+"PRIMITIVE_TEXT1"
+""
+1 70 80 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+16 0 0 0 0 0
+E E E
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E U 0 E 70 80 71 93
+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
+0 1
+LANG:1 0
+1 17 1 "" 0
+0
+1 18 2 "" 0
+0
+1 19 3 "" 0
+0
+1 20 4 "" 0
+0
+1 21 5 "" 0
+0
+1 22 6 "" 0
+0
+1 23 7 "" 0
+0
+1 24 8 "" 0
+0
+1 25 9 "" 0
+0
+1 26 10 "" 0
+0
+1 27 11 "" 0
+0
+1 28 12 "" 0
+0
+1 29 13 "" 0
+0
+1 30 14 "" 0
+0
+1 31 15 "" 0
+0
+1 32 16 "" 0
+0
+0
+LAYER, 1
+1
+LANG:1 0
+0
+LAYER, 2
+1
+LANG:1 0
+0
+LAYER, 3
+1
+LANG:1 0
+0
+LAYER, 4
+1
+LANG:1 0
+0
+LAYER, 5
+1
+LANG:1 0
+0
+LAYER, 6
+1
+LANG:1 0
+0
+LAYER, 7
+1
+LANG:1 0
+0
+3 1 "PANEL_REF1" -1
+"objects\\Processes\\SWControler_small.pnl" 0 0 T 18 U
+2
+"$name""PermSW_SoftwareMonitor"
+"$station""$station"
+3 2 "PANEL_REF2" -1
+"objects\\Processes\\SWControler_small.pnl" 20 0 T 19 1 0 1 -4 0
+2
+"$name""PermSW_Daemons_LogProcessor"
+"$station""$station"
+3 3 "PANEL_REF3" -1
+"objects\\Processes\\SWControler_small.pnl" 30 0 T 20 1 0 1 2 0
+2
+"$name""PermSW_Daemons_ServiceBroker"
+"$station""$station"
+3 4 "PANEL_REF4" -1
+"objects\\Processes\\SWControler_small.pnl" 50 0 T 21 1 0 1 -2 0
+2
+"$name""PermSW_Daemons_SASGateway"
+"$station""$station"
+3 5 "PANEL_REF5" -1
+"objects\\Processes\\SWControler_small.pnl" 90 0 T 22 U
+2
+"$name""PermSW_RSPDriver"
+"$station""$station"
+3 6 "PANEL_REF6" -1
+"objects\\Processes\\SWControler_small.pnl" 110 0 T 23 1 0 1 -4 0
+2
+"$name""PermSW_TBBDriver"
+"$station""$station"
+3 7 "PANEL_REF7" -1
+"objects\\Processes\\SWControler_small.pnl" 140 0 T 24 U
+2
+"$name""PermSW_CalServer"
+"$station""$station"
+3 8 "PANEL_REF8" -1
+"objects\\Processes\\SWControler_small.pnl" 160 0 T 25 1 0 1 -4 0
+2
+"$name""PermSW_BeamServer"
+"$station""$station"
+3 9 "PANEL_REF9" -1
+"objects\\Processes\\SWControler_small.pnl" 190 0 T 26 U
+2
+"$name""PermSW_HardwareMonitor"
+"$station""$station"
+3 10 "PANEL_REF10" -1
+"objects\\Processes\\SWControler_small.pnl" 230 0 T 27 U
+2
+"$name""PermSW_SHMInfoServer"
+"$station""$station"
+3 11 "PANEL_REF11" -1
+"objects\\Processes\\SWControler_small.pnl" 270 0 T 28 U
+2
+"$name""PermSW_CTStartDaemon"
+"$station""$station"
+3 12 "PANEL_REF12" -1
+"objects\\Processes\\SWControler_small.pnl" 290 0 T 29 1 0 1 -4 0
+2
+"$name""PermSW_StationControl"
+"$station""$station"
+3 13 "PANEL_REF13" -1
+"objects\\Processes\\SWControler_small.pnl" 300 0 T 30 1 0 1 2 0
+2
+"$name""PermSW_ClockControl"
+"$station""$station"
+3 14 "PANEL_REF14" -1
+"objects\\Processes\\SWControler_small.pnl" 350 0 T 31 1 0 1 -32 0
+2
+"$name""CalibrationControl"
+"$station""$station"
+3 15 "PANEL_REF15" -1
+"objects\\Processes\\SWControler_small.pnl" 340 0 T 32 1 0 1 -6 0
+2
+"$name""BeamControl"
+"$station""$station"
+3 16 "PANEL_REF16" -1
+"objects\\Processes\\SWControler_small.pnl" 360 0 T 33 1 0 1 -10 0
+2
+"$name""TBBControl"
+"$station""$station"
+0
diff --git a/MAC/Navigator2/panels/objects/swlevel.pnl b/MAC/Navigator2/panels/objects/swlevel.pnl
index 9862b8576df..ce3170d7499 100644
--- a/MAC/Navigator2/panels/objects/swlevel.pnl
+++ b/MAC/Navigator2/panels/objects/swlevel.pnl
@@ -64,9 +64,7 @@ showLevels()
formatTime(\"%Y.%m.%d %H:%M:%S\",tStop) + \"\\\",1,0) LAST 15\";
}
- LOG_DEBUG(\"swlevel.pnl:showLevelsQuery: \" + query);
dpQuery(query, tab);
- LOG_DEBUG(\"swlevel.pnl:showLevels|Found: \" + tab + \" length: \" + dynlen(tab));
for(z=2;z<dynlen(tab);z++) {
--
GitLab