diff --git a/MAC/Navigator2/panels/objects/Observations/Observation_small.pnl b/MAC/Navigator2/panels/objects/Observations/Observation_small.pnl index 8947a555d039f621de656eb08fb483960150951d..66d255f7322a1db0f5b2b130610dfe4856335ba6 100644 --- a/MAC/Navigator2/panels/objects/Observations/Observation_small.pnl +++ b/MAC/Navigator2/panels/objects/Observations/Observation_small.pnl @@ -133,6 +133,8 @@ updateObservationsTableValues(string dp1, int state, // get the connected Observation string name = claimManager_realNameToName(dp); + string col = getStateColor(state); + dyn_string d1 = makeDynString(\" \",col); for(int i=0; i < myTable.lineCount; i++) { diff --git a/MAC/Navigator2/panels/objects/Processes/controller_small.pnl b/MAC/Navigator2/panels/objects/Processes/controller_small.pnl index 13fa3135ae8cea90f5c735ec699920b042b25980..cf39fa6b9719a5d8c33a3b276e87747815058a77 100644 --- a/MAC/Navigator2/panels/objects/Processes/controller_small.pnl +++ b/MAC/Navigator2/panels/objects/Processes/controller_small.pnl @@ -37,7 +37,7 @@ updateController(string dp1, string error, { if (! invalid) { myTable.deleteAllLines(); - myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg)); + myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg,navFunct_getLogLevel(logMsg))); } }" 0 E "main(int x, int y) diff --git a/MAC/Navigator2/panels/objects/Processes/daemon_small.pnl b/MAC/Navigator2/panels/objects/Processes/daemon_small.pnl index 3b8be8a27766dd417bc0bd8948531cfd47e00f66..bbced02f0f7874e55de8c8fb4b043b0563dcf2db 100644 --- a/MAC/Navigator2/panels/objects/Processes/daemon_small.pnl +++ b/MAC/Navigator2/panels/objects/Processes/daemon_small.pnl @@ -47,7 +47,7 @@ updateDaemon(string dp1, unsigned processID, col = \"Lofar_off\"; } myTable.deleteAllLines(); - myTable.appendLine(\"logMsg\",navFunct_getLogColor(logMsg)); + myTable.appendLine(\"logMsg\",navFunct_getLogColor(logMsg,navFunct_getLogLevel(logMsg,navFunct_getLogLevel(logMsg)))); myTable.cellBackColRC(0,\"Active\",col); }" 0 E "main(int x, int y) diff --git a/MAC/Navigator2/panels/objects/Processes/interactive_controller_small.pnl b/MAC/Navigator2/panels/objects/Processes/interactive_controller_small.pnl index 62fa814c4063e8f384392aaf9234ed3be7451832..aa57310e0e0ebd955f0b44e57c9a3e939e860feb 100644 --- a/MAC/Navigator2/panels/objects/Processes/interactive_controller_small.pnl +++ b/MAC/Navigator2/panels/objects/Processes/interactive_controller_small.pnl @@ -199,8 +199,8 @@ update(string dp1, string error, } myTable.deleteAllLines(); - myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg)); - myTable.appendLine(\"error\",oldError,\"currentAction\",oldAction,\"logMsg\",navFunct_getLogColor(oldLogMsg)); + myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg,navFunct_getLogLevel(logMsg))); + myTable.appendLine(\"error\",oldError,\"currentAction\",oldAction,\"logMsg\",navFunct_getLogColor(oldLogMsg,navFunct_getLogLevel(logMsg))); oldError = error; oldAction = currentAction; oldLogMsg = logMsg; diff --git a/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl b/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl index 0fb297b98fa7ba135e7376bcc0d46d6a8b12a38d..299b1b2e221940ea81185b240fdc228d5d19554e 100644 --- a/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl +++ b/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl @@ -190,8 +190,8 @@ update(string dp1, string error, myTable.deleteAllLines(); - myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg)); - myTable.appendLine(\"error\",oldError,\"currentAction\",oldAction,\"logMsg\",navFunct_getLogColor(oldLogMsg)); + myTable.appendLine(\"error\",error,\"currentAction\",currentAction,\"logMsg\",navFunct_getLogColor(logMsg,navFunct_getLogLevel(logMsg))); + myTable.appendLine(\"error\",oldError,\"currentAction\",oldAction,\"logMsg\",navFunct_getLogColor(oldLogMsg,navFunct_getLogLevel(logMsg))); oldError = error; oldAction = currentAction; oldLogMsg = logMsg; diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl index 094e7017b5a05c7ca701ab8b5bb30157fa5c9f6f..6124b893c49b9218fb1f4c5a4caf111f759b4128 100644 --- a/MAC/Navigator2/scripts/libs/navFunct.ctl +++ b/MAC/Navigator2/scripts/libs/navFunct.ctl @@ -81,7 +81,7 @@ #uses "GCFLogging.ctl" #uses "GCFCommon.ctl" -#uses "navigator.ctl" + global dyn_string oldActiveObservations; @@ -1956,7 +1956,7 @@ string navFunct_TempToObs(string dp){ } // returns color for loglines -dyn_string navFunct_getLogColor(string msg, string level="") { +dyn_string navFunct_getLogColor(string msg, string level ){ string col="_3DFace"; dyn_string d1=makeDynString(msg,col); string txt=msg; @@ -1970,3 +1970,19 @@ dyn_string navFunct_getLogColor(string msg, string level="") { } return makeDynString(msg,col); } + +string navFunct_getLogLevel(string aMsg) { + dyn_string msgParts; + string lvl=""; + + // we need to cut out all \r and \n from the string + strreplace(aMsg,"\r",""); + strreplace(aMsg,"\n",""); + + msgParts = strsplit(aMsg,"|"); + + if (dynlen(msgParts) >= 2) { + lvl = msgParts[2]; + } + return lvl; +}