From 756c2f4ca7ad188c214c4c9f8d77ea97a84d844f Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Tue, 22 Jan 2013 12:23:50 +0000
Subject: [PATCH] Task #4044: corrected timestring
---
.../objects/Processes/SWControler_small.pnl | 17 ++++++++++-------
.../panels/objects/navigator_alerts.pnl | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl b/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
index e3699937dd1..749a465d8f9 100644
--- a/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/SWControler_small.pnl
@@ -50,15 +50,18 @@ private void reload() {
// check if the required datapoint for this view are enabled and accessible
if (navFunct_dpReachable(baseDP+\".process.startTime\")) {
- if (dpConnect(\"updateSWController\", baseDP +\".process.startTime:_online.._value\",
- baseDP +\".process.stopTime:_online.._value\",
- baseDP +\".process.stopTime:_online.._invalid\",
- baseDP +\".process.startTime:_online.._invalid\") == -1) {
- setValue(\"process\", \"backCol\", \"Lofar_dpdoesnotexist\");
- }
+ if (dpExists(baseDP+\".process.startTime\")) {
+ if (dpConnect(\"updateSWController\", baseDP +\".process.startTime:_online.._value\",
+ baseDP +\".process.stopTime:_online.._value\",
+ baseDP +\".process.stopTime:_online.._invalid\",
+ baseDP +\".process.startTime:_online.._invalid\") == -1) {
+ setValue(\"process\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ }
+ } else {
+ setValue(\"process\", \"backCol\", \"Lofar_dpdoesnotexist\");
+ }
} else {
setValue(\"process\", \"backCol\", \"Lofar_dpOffline\");
-
}
}
diff --git a/MAC/Navigator2/panels/objects/navigator_alerts.pnl b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
index a68f350d943..1bddbaba2f1 100644
--- a/MAC/Navigator2/panels/objects/navigator_alerts.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
@@ -169,7 +169,7 @@ void ackAllClicked() {
// ok rest should be possible to acknowledge
// find the entry in the table
- DebugN(\"navigator_alerts.pnl:ackAllClicked| g_alarms: \",g_alarms[\"DPNAME\"]);
+ if (g_alarms[\"DPNAME\"] == \"\") return;
if ( dynlen(g_alarms[\"DPNAME\"]) >= 1) {
iPos=dynContains(g_alarms[\"DPNAME\"],dp);
--
GitLab