diff --git a/MAC/Navigator2/panels/Processes/MACScheduler.pnl b/MAC/Navigator2/panels/Processes/MACScheduler.pnl
index dd539c4f8d7be8e0ff6565e022f305a7b6be161c..700135b1626990037ca1df51e4c2e9b36b5917f6 100644
--- a/MAC/Navigator2/panels/Processes/MACScheduler.pnl
+++ b/MAC/Navigator2/panels/Processes/MACScheduler.pnl
@@ -1,4 +1,4 @@
-V 10
+V 11
1
LANG:1 0
PANEL,-1 -1 1013 750 N "_3DFace" 0
@@ -150,7 +150,7 @@ updateOTDB(string dp1, bool connected,
setValue(\"txt_OTDBpollinterval\", \"backCol\", \"Lofar_invalid\");
} else {
setValue(\"txt_OTDBconnected\", \"backCol\", \"Lofar_dpOffline\");
- setValue(\"txt_OTDBlastPoll\", \"backCol\", \"Lofar_idpOffline\");
+ setValue(\"txt_OTDBlastPoll\", \"backCol\", \"Lofar_dpOffline\");
setValue(\"txt_OTDBpollinterval\", \"backCol\", \"Lofar_dpOffline\");
}
}
@@ -268,9 +268,8 @@ LANG:1 0
"dashclr"N "_Transparent"
E E 0 0 1 0 1 E 2.28571428571429 0 0.487179487179487 -38.5714285714286 172.384615384615 0 E 30 303 451 421
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 1
LANG:1 4 OTDB
2 13
"PRIMITIVE_TEXT7"
@@ -285,12 +284,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 40 344 105 358
+E E 0 1 1 2 1 E U 1 E 40 344 105 357
0 2 2 "0s" 0 0 0 192 0 0 40 344 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 10 Connected:
2 14
"PRIMITIVE_TEXT8"
@@ -305,12 +303,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 349 344 421 358
+E E 0 1 1 2 1 E U 1 E 349 344 421 357
0 2 2 "0s" 0 0 0 192 0 0 349 344 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 14 Poll Interval:
2 15
"PRIMITIVE_TEXT9"
@@ -325,12 +322,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 665 344 718 358
+E E 0 1 1 2 1 E U 1 E 665 344 718 357
0 2 2 "0s" 0 0 0 192 0 0 665 344 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 10 Last Poll:
14 16
"txt_OTDBconnected"
@@ -345,9 +341,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 115 341 339 362
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 115 341 339 362
2 "0s" 0 0 0 0 0 -1 E E E
14 17
"txt_OTDBpollinterval"
@@ -362,9 +357,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 428 338 652 359
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 428 338 652 359
2 "0s" 0 0 0 0 0 -1 E E E
14 18
"txt_OTDBlastPoll"
@@ -379,9 +373,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 728 341 952 362
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 728 341 952 362
2 "0s" 0 0 0 0 0 -1 E E E
17 19
"PlannedObservationList"
@@ -396,9 +389,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 28 418 322 722
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 28 418 322 722
0
E
@@ -419,12 +411,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 100 390 228 404
+E E 0 1 1 2 1 E U 1 E 100 390 228 403
0 2 2 "0s" 0 0 0 192 0 0 100 390 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 21 Planned Observations:
17 32
"ActiveObservationList"
@@ -439,9 +430,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 358 418 652 722
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 358 418 652 722
0
E
@@ -462,12 +452,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 430 392 548 406
+E E 0 1 1 2 1 E U 1 E 430 392 548 405
0 2 2 "0s" 0 0 0 192 0 0 430 392 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 20 Active Observations:
17 34
"FinishedObservationList"
@@ -482,9 +471,8 @@ LANG:1 0
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 688 420 982 722
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 688 420 982 722
0
E
@@ -505,12 +493,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E U 1 E 760 392 889 406
+E E 0 1 1 2 1 E U 1 E 760 392 889 405
0 2 2 "0s" 0 0 0 192 0 0 760 392 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 22 Finished Observations:
0
LAYER, 1
@@ -541,8 +528,8 @@ LAYER, 7
1
LANG:1 0
0
-3 0 "PANEL_REF1"
+3 0 "PANEL_REF1" -1
"objects\\Processes\\controller_top.pnl" 49 92 T 0 1 0 1 1.4432899320127e-014 -40
1
"$ctrlName""MACScheduler"
-0
\ No newline at end of file
+0
diff --git a/MAC/Navigator2/panels/main.pnl b/MAC/Navigator2/panels/main.pnl
index 894b4c84532bdd2e5af3c2e42dbe4d8a46da5113..6e3543608440157ace313004f7d6bef8edaeace4 100644
--- a/MAC/Navigator2/panels/main.pnl
+++ b/MAC/Navigator2/panels/main.pnl
@@ -1,44 +1,379 @@
-V 10
-1
-LANG:1 0
-PANEL,1 1 1250 770 N "_3DFace" 0
-E E E E E 1 -1 -1 0 -1 -1
-""0 1
-E E 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
-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
-0
\ No newline at end of file
+V 11
+1
+LANG:1 0
+PANEL,-1 -1 1010 745 N "_3DFace" 0
+"main()
+{
+ // Initialise the Panel
+ navPanel_initPanel(\"fw_viewBox\");
+
+ baseDP=g_currentDatapoint;
+
+ strPanelName = \"antennaField\";
+ strModuleName = myModuleName();
+
+ stationList = makeDynString(\"CS001\",\"CS002\",\"CS003\",\"CS004\",\"CS005\",\"CS006\",\"RS007\",
+ \"CS011\",\"CS013\",\"CS017\",
+ \"CS021\",\"CS024\",\"CS026\",\"CS028\",
+ \"CS030\",\"CS031\",\"CS032\",
+ \"RS101\",\"RS103\",\"RS201\",\"RS301\",\"RS302\",\"RS401\",\"RS501\",
+ \"RS106\",
+ \"RS205\",\"rs208\",\"RS210\",
+ \"RS305\",\"RS306\",\"RS307\",\"RS310\",
+ \"RS406\",\"RS407\",\"RS409\",
+ \"RS503\",\"RS508\",\"RS509\",
+ \"DE601\",\"DE602\",\"DE603\",\"DE604\",\"RS605\",\"FR606\",\"SE607\",\"UK608\",
+ \"CCU001\",\"MCU001\");
+
+ redraw();
+
+}
+
+//
+// Callback for dpConnect to action point.
+// If there is an action required this point will tell so
+//
+void doAction(string aDP, string anAction) {
+ LOG_DEBUG(\"swlevel.pnl:doAction| Action required. found: \" + anAction);
+ // split action into essentials
+ dyn_string actionString;
+ if (!navFunct_splitAction(anAction,actionString)) {
+ return;
+ }
+
+ LOG_DEBUG(\"swlevel.pnl:doAction|found actionString: \" + actionString);
+
+ // Reload
+ if (actionString[1] == \"Reload\") {
+ redraw(arrayList.text(arrayList.number()));
+ return;
+ } else if (actionString[1] == \"DistChanged\") {
+ // for dist system bound hardware only, if the distsystem went offline we need to replace
+ // the screen with a broken connection screen.
+ if (!g_initializing) {
+
+ // check if this syst is in the connectionlist and down
+ int iPos=dynContains(g_connections[\"NAME\"],sysName);
+ if (iPos > 0) {
+ if (!g_connections[\"UP\"][iPos]) {
+ navPanel_setEvent(\"invalid DP\",\"ChangePanel\");
+ }
+ }
+ }
+ return;
+ }
+}
+" 0
+ E E E E 1 -1 -1 0 20 30
+""0 1
+E "#uses \"navPanel.ctl\"
+
+dyn_string stationList;
+dyn_string SWLevelRefNames;
+dyn_string datastreamRefNames;
+string strPanelName;
+string strModuleName;
+string baseDP=\"\";
+
+void clearSWLevelRefNames() {
+ // remove all symbols because new ones will be added
+ for (int i=1; i <= dynlen(SWLevelRefNames); i++) {
+ removeSymbol(strModuleName,\"\",SWLevelRefNames[i]);
+ }
+ dynClear(SWLevelRefNames);
+}
+
+void clearDatastreamRefNames() {
+ // remove all symbols because new ones will be added
+ for (int i=1; i <= dynlen(datastreamRefNames); i++) {
+ removeSymbol(strModuleName,\"\",datastreamRefNames[i]);
+ }
+ dynClear(datastreamRefNames);
+}
+
+void redraw() {
+
+ navFunct_clearGlobalLists();
+
+ string addPanelName = \"objects/swlevel.pnl\";
+
+ if (dynlen(SWLevelRefNames) > 0) {
+ clearSWLevelRefNames();
+ }
+
+ if (dynlen(datastreamRefNames) > 0) {
+ clearDatastreamRefNames();
+ }
+
+ int xPos_AddSymbol = 0;
+ int yPos_AddSymbol = 18;
+ int ref = 1;
+ string addPanelName = \"objects/swlevel.pnl\";
+ //loop over list and prepare panel with all stations and swlevel objects
+ for (int i=1; i<= dynlen(stationList); i++) {
+
+ SWLevelRefNames[i]=\"stationSW\"+(i);
+
+ if ( addSymbol( strModuleName, // Stay in this modul
+ \"\", // Name of this panel
+ addPanelName, // Panel to add
+ SWLevelRefNames[ref], // Ref of the addedPanel
+ makeDynString( \"$station:\" + stationList[i]) , // Define all $values
+ xPos_AddSymbol, // Xpos of the AddedSymbol
+ yPos_AddSymbol, // Ypos of the AddedSymbol
+ 0, // angle
+ 1 ,1 // zoomX , zoomY
+ ) < 0 ) {
+ LOG_ERROR(\"swlevel.pnl:redraw|Error Appending swlevel for: \" + stationList[i] + \" in this panel.\");
+ }
+ yPos_AddSymbol += 10;
+ ref++;
+ }
+
+ xPos_AddSymbol = 150;
+ yPos_AddSymbol = 18;
+ ref = 1;
+ addPanelName = \"objects/datastreamLevel.pnl\";
+ //loop over list and prepare panel with all datastreamobjects
+ for (int i=1; i<= dynlen(stationList); i++) {
+ //skip CCU and MCU machines
+ if (strpos(stationList[i],\"MCU\") >=0 ||strpos(stationList[i],\"CCU\") >=0) continue;
+
+ datastreamRefNames[i]=\"datastream\"+(i);
+
+ if ( addSymbol( strModuleName, // Stay in this modul
+ \"\", // Name of this panel
+ addPanelName, // Panel to add
+ datastreamRefNames[ref], // Ref of the addedPanel
+ makeDynString( \"$station:\" + stationList[i]) , // Define all $values
+ xPos_AddSymbol, // Xpos of the AddedSymbol
+ yPos_AddSymbol, // Ypos of the AddedSymbol
+ 0, // angle
+ 1 ,1 // zoomX , zoomY
+ ) < 0 ) {
+ LOG_ERROR(\"swlevel.pnl:redraw|Error datastream for : \" + stationList[i] + \" in this panel.\");
+ }
+ yPos_AddSymbol += 10;
+ ref++;
+ }
+ // trigger that the panel values are calculated and ready
+ dynClear(highlight);
+ dynClear(strHighlight);
+
+ // set panel to ready
+ g_objectReady=true;
+
+ navPanel_setEvent(\"swlevel.pnl\",\"Update\");
+}" 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 4
+"PRIMITIVE_TEXT4"
+""
+1 65 10 E E E 1 E 1 E N "_WindowText" E N "_Window" E E
+ E E
+4 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 65 10 107 23
+0 2 2 "0s" 0 0 0 192 0 0 65 10 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 7 swlevel
+6 21
+"RECTANGLE1"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N "green" E E
+ E E
+6 0 0 0 0 0
+E E E
+0
+1
+LANG:1 7 Level 6
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -10 60 1 E 140 140 150 210
+6 22
+"RECTANGLE2"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N "yellow" E E
+ E E
+7 0 0 0 0 0
+E E E
+0
+1
+LANG:1 9 Level 2-5
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -10 110 1 E 140 140 150 210
+6 23
+"RECTANGLE3"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N {255,170,0} E E
+ E E
+8 0 0 0 0 0
+E E E
+0
+1
+LANG:1 7 Level 1
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -10 160 1 E 140 140 150 210
+6 24
+"RECTANGLE4"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N "red" E E
+ E E
+9 0 0 0 0 0
+E E E
+0
+1
+LANG:1 7 Level 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 0.7142857142857143 -10 210 1 E 140 140 150 210
+2 25
+"PRIMITIVE_TEXT5"
+""
+1 155 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
+0
+1
+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
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 6 stream
+6 26
+"RECTANGLE5"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N "green" E E
+ E E
+11 0 0 0 0 0
+E E E
+0
+1
+LANG:1 13 datastream on
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 75 -40 1 E 140 140 150 210
+6 27
+"RECTANGLE6"
+""
+1 140 140 E E E 1 E 1 E N {0,0,0} E N "red" E E
+ E E
+12 0 0 0 0 0
+E E E
+0
+1
+LANG:1 14 datastream off
+
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 2 1 E 1 0 1.428571428571429 75 60 1 E 140 140 150 210
+4 28
+"LINE1"
+""
+1 230 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
+0
+1
+LANG:1 0
+
+1
+"dashclr"N "_Transparent"
+E E 0 2 1 2 1 E 230 0 230 540
+2 29
+"PRIMITIVE_TEXT6"
+""
+1 160 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
+0
+1
+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
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+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
+ E E
+15 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 190 15 197 28
+0 2 2 "0s" 0 0 0 192 0 0 190 15 1
+1
+LANG:1 34 MS Shell Dlg 2,8,-1,5,75,0,0,0,0,0
+0 1
+LANG:1 1 1
+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
+0
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 731168174963be207b0842b5ba2954ca7cef5567..23827d8ea01a8ae8b5b5cc047bf0be86418f05ca 100644
--- a/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl
+++ b/MAC/Navigator2/panels/objects/Processes/station_interactive_controller_small.pnl
@@ -30,9 +30,6 @@ void updateTrigger( string dp1, string objectName,
if (objectName == panelName) {
LOG_TRACE(\"station_interactive_controller_small.pnl:main|updateTrigger: \"+$name+\" objectName: \"+objectName+\" panelName: \"+panelName);
- DebugN(\"station_interactive_controller_small.pnl:main|updateTrigger: \"+$name+\" objectName: \"+objectName+\" panelName: \"+panelName);
- DebugN(\"databaselevel:\",$databaselevel);
- DebugN(\"paramList:\",paramList);
string observation=\"\";
string station = \"\";
if (dynlen(paramList) > 0) {
diff --git a/MAC/Navigator2/panels/objects/navigator_alerts.pnl b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
index 8dc7a5bb415233bf9553d6b76cf8866abf77cc7e..2187a053dfecc8e64c23db05472cb1921be148a8 100644
--- a/MAC/Navigator2/panels/objects/navigator_alerts.pnl
+++ b/MAC/Navigator2/panels/objects/navigator_alerts.pnl
@@ -1,4 +1,4 @@
-V 10
+V 11
1
LANG:1 0
PANEL,-1 -1 1058 126 N "_3DFace" 1
@@ -169,12 +169,14 @@ void ackAllClicked() {
// ok rest should be possible to acknowledge
// find the entry in the table
- iPos=dynContains(g_alarms[\"DPNAME\"],dp);
+ if ( dynlen(g_alarms[\"DPNAME\"]) >= 1) {
+ iPos=dynContains(g_alarms[\"DPNAME\"],dp);
- if (iPos < 1) {
- LOG_ERROR(\"navigator_alerts.pnl:ackAllClicked|Strange, couldn't find chosen entry in alarm global list: \" + dp);
- } else {
- acknowledgeAlarm(iPos,getCurrentTime(),dp,message,0);
+ if (iPos < 1) {
+ LOG_ERROR(\"navigator_alerts.pnl:ackAllClicked|Strange, couldn't find chosen entry in alarm global list: \" + dp);
+ } else {
+ acknowledgeAlarm(iPos,getCurrentTime(),dp,message,0);
+ }
}
}
}
@@ -419,10 +421,9 @@ LANG:0 0
E E 0 1 1 0 1 E U 0 E 990 30 1031.999999999996 46
0 2 2 "4d" 4 0 0 64 0 0 990 30 1
2
-LANG:1 87 -*-Arial-bold-r-normal-*-13-*-100-100-*-*-iso8859-1|-13,0,0,0,758,0,0,0,0,0,0,0,0,Arial
+LANG:1 26 Arial,-1,13,5,75,0,0,0,0,0
LANG:0 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 ""
-2
+0 2
LANG:1 1 0
LANG:0 1 0
25 11
@@ -446,9 +447,8 @@ LANG:1 0
0
1
-LANG:1 96 -*-Arial Black-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,Arial Black
-0 ""
- 8 8 962 92
+LANG:1 32 Arial Black,-1,11,5,50,0,0,0,0,0
+0 8 8 962 92
E"main(int row, string column, string value)
{
click(row);
@@ -488,14 +488,13 @@ LANG:1 2 #3
LANG:1 2 #4
10 10
1
-LANG:1 96 -*-Arial Black-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,Arial Black
-0 ""
-0 1 0 1 7
+LANG:1 32 Arial Black,-1,11,5,50,0,0,0,0,0
+0 0 1 0 1 7
1 0
2 16
"PRIMITIVE_TEXT1"
""
-1 970 10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 968 -10 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
E E
28 0 0 0 0 0
E E E
@@ -505,12 +504,11 @@ LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 1 1 2 1 E 1 0 1.666666666666667 -2 -26.66666666666667 1 E 972 22 1025 36
+E E 0 1 1 2 1 E 1 0 1.666666666666667 -2 -26.66666666666667 1 E 972 22 1025 35
0 2 2 "0s" 0 0 0 192 0 0 972 22 1
1
-LANG:1 101 -*-MS Shell Dlg-bold-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,758,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
-1
+LANG:1 33 MS Shell Dlg,-1,11,5,75,0,0,0,0,0
+0 1
LANG:1 9 # Alarms:
13 17
"ack_all_button"
@@ -525,9 +523,8 @@ LANG:1 22 Acknowledge all alarms
0
1
-LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg
-0 ""
- 968 58 1032 84
+LANG:1 33 MS Shell Dlg,-1,11,5,50,0,0,0,0,0
+0 968 58 1032 84
T
1
@@ -566,4 +563,4 @@ LAYER, 7
1
LANG:1 0
0
-0
\ No newline at end of file
+0