diff --git a/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
index c5f0fdb5fe427b68cebec0ad469de737bb3543f9..d620ff567da590a8e1e89d1dc6142c19a6a56045 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/software-overview.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,372 257 950 741 N "_3DFace" 0
+PANEL,299 108 950 741 N "_3DFace" 0
"main()
{
dpConnect(\"updateObservationsTable\",\"LOFAR_PermSW_MACScheduler.activeObservations:_online.._value\");
@@ -12,27 +12,6 @@ PANEL,372 257 950 741 N "_3DFace" 0
true,
\"ControllerStateQuery\",
query);
-
- // initialize the logging table with historical data:
- dyn_dyn_anytype tab;
- int z;
- time tStart;
- time tStop;
- tStop = getCurrentTime();
- tStart = tStop - 3*3600; // three hours of history
-
- query = \"SELECT ALL '_original.._value' FROM 'LOFAR_PermSW_MACScheduler.logmsg' TIMERANGE(\\\"\" +
- formatTime(\"%Y.%m.%d %H:%M:%S\",tStart) + \"\\\",\\\"\" +
- formatTime(\"%Y.%m.%d %H:%M:%S\",tStop) + \"\\\",1,0)\";
- dpQuery(query, tab);
-
- for(z=2;z<dynlen(tab);z++)
- {
- list_logMACScheduler.appendItem(tab[z][2]);
- }
-
- // connect to MACScheduler logging
- dpConnect(\"updateLogMACScheduler\",\"LOFAR_PermSW_MACScheduler.logmsg:_online.._value\");
}
" 0
EE E E 1 0 0 0 10 10
@@ -112,11 +91,69 @@ updateControllersTable(string identifier, dyn_dyn_anytype result)
}
}
-updateLogMACScheduler(string dpe, string dpv)
+showLogging()
{
- list_logMACScheduler.appendItem(dpv);
- list_logMACScheduler.selectedPos(list_logMACScheduler.itemCount()); // show last element at the top of the list
+ string dpLog;
+ if(radio_logging.number == 1)
+ dpLog = \"LOFAR_PermSW_CQN.logmsg\";
+ else if(radio_logging.number == 2)
+ dpLog = \"LOFAR_PermSW_SHM.logmsg\";
+ else
+ dpLog = \"LOFAR_PermSW_MACScheduler.logmsg\";
+
+ // disconnect from logging
+ if(dpExists(\"LOFAR_PermSW_CQN\"))
+ {
+ dpDisconnect(\"updateLogging\",\"LOFAR_PermSW_CQN.logmsg\");
+ }
+ if(dpExists(\"LOFAR_PermSW_SHM\"))
+ {
+ dpDisconnect(\"updateLogging\",\"LOFAR_PermSW_SHM.logmsg\");
+ }
+ if(dpExists(\"LOFAR_PermSW_MACScheduler\"))
+ {
+ dpDisconnect(\"updateLogging\",\"LOFAR_PermSW_MACScheduler.logmsg\");
+ }
+
+ table_logging.deleteAllLines();
+ if(dpExists(dpLog))
+ {
+ // initialize the logging table with historical data:
+ dyn_dyn_anytype tab;
+ int z;
+ time tStart;
+ time tStop;
+ tStop = getCurrentTime();
+ tStart = tStop - 3*3600; // three hours of history
+
+ string query = \"SELECT ALL '_original.._value' FROM '\" + dpLog + \"' TIMERANGE(\\\"\" +
+ formatTime(\"%Y.%m.%d %H:%M:%S\",tStart) + \"\\\",\\\"\" +
+ formatTime(\"%Y.%m.%d %H:%M:%S\",tStop) + \"\\\",1,0) LAST 100\";
+ dpQuery(query, tab);
+
+ for(z=2;z<dynlen(tab);z++)
+ {
+ addLogMessage(tab[z][2]);
+ }
+
+ // connect to logging
+ dpConnect(\"updateLogging\",dpLog);
+ }
}
+
+updateLogging(string dpe, string dpv)
+{
+ addLogMessage(dpv);
+}
+
+addLogMessage(string msg)
+{
+ dyn_string msgParts = strsplit(msg,\"|\");
+
+ table_logging.appendLine(\"time\",msgParts[1],\"level\",msgParts[2],\"source\",msgParts[3],\"message\",msgParts[4]);
+ table_logging.lineVisible(-1);
+}
+
" 0
2
"CBRef""1"
@@ -347,7 +384,7 @@ LANG:1 10 Last poll:
2 22
"Text12"
""
-1 10 282 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 20 282 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
23 0 0 0 0 0
EE E
@@ -356,8 +393,8 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 12 284 47 300
-0 2 0 "s" 0 0 0 192 0 0 12 284
+E E 0 1 1 0 1 E U 0 E 22 284 57 300
+0 2 0 "s" 0 0 0 192 0 0 22 284
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
@@ -367,7 +404,7 @@ LANG:1 6 State:
2 23
"Text13"
""
-1 11 612 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 21 612 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
24 0 0 0 0 0
EE E
@@ -376,14 +413,34 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U 0 E 12 314 44 330
-0 2 0 "s" 0 0 0 192 0 0 12 314
+E E 0 1 1 0 1 E U 0 E 22 314 54 330
+0 2 0 "s" 0 0 0 192 0 0 22 314
1
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
1
LANG:1 6 Error:
+2 28
+"Text2"
+""
+1 20 460 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+28 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U 0 E 22 462 103 478
+0 2 0 "s" 0 0 0 192 0 0 22 462
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 13 Show logging:
25 2
"TableObservations"
""
@@ -443,27 +500,6 @@ LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
0 ""
0 2 1 3 0
1 0
-17 6
-"list_logMACScheduler"
-""
-1 10 460 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
- E E
-7 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0
-0
-1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
-0 ""
-8 458 307 562
-0
-E
-E
-E
-
-3 1
17 7
"list_logCQN"
""
@@ -478,7 +514,7 @@ LANG:1 0
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
-323 278 622 562
+323 278 622 452
0
E
E
@@ -499,7 +535,7 @@ LANG:1 0
1
LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
0 ""
-638 278 942 562
+638 278 942 452
0
E
E
@@ -837,6 +873,88 @@ EP_textFieldInCB(string dp, string sNewValue)
" 0
E
+19 26
+"radio_logging"
+""
+1 30 483 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+26 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+28 481 146 535
+3
+T
+1
+LANG:1 13 MAC Scheduler
+ 0
+1
+LANG:1 0
+ E E 0 0 0 0 0
+T
+1
+LANG:1 3 CQN
+ 0
+1
+LANG:1 0
+ E E 0 0 0 0 0
+T
+1
+LANG:1 3 SHM
+ 0
+1
+LANG:1 0
+ E E 0 0 0 0 0
+ 1
+E
+"main(int button)
+{
+ showLogging();
+}" 0
+
+25 29
+"table_logging"
+""
+1 150 460 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+29 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0
+0
+1
+LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
+0 ""
+148 458 942 582
+E E 0 0 1 4 1 "time" 0 1 0 "s" 1
+LANG:1 4 time
+E1
+LANG:1 0
+ 150 "level" 0 1 0 "s" 1
+LANG:1 5 level
+E1
+LANG:1 0
+ 70 "source" 0 1 0 "s" 1
+LANG:1 6 source
+E1
+LANG:1 0
+ 200 "message" 0 1 0 "s" 1
+LANG:1 7 message
+E1
+LANG:1 0
+ 1000 26 26 "" 1 1
+LANG:1 2 #1
+8 30 1
+LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,0,0,0,0,Arial
+0 ""
+0 1 1 3 0
+1 0
0
LAYER, 1
1