diff --git a/MAC/Navigator/panels/nav_fw/alert_config_table.pnl b/MAC/Navigator/panels/nav_fw/alert_config_table.pnl
index a25aed4cc9997aaf8b8ff176c127ff8051ffca8f..cd1e19fcab4a176f7bb719f53ce5751ecc65cf90 100644
--- a/MAC/Navigator/panels/nav_fw/alert_config_table.pnl
+++ b/MAC/Navigator/panels/nav_fw/alert_config_table.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,388 212 950 471 N "_3DFace" 3
+PANEL,304 275 950 471 N "_3DFace" 3
"$AreaNr"
"$configDatapoint"
"$datapoint"
@@ -78,7 +78,8 @@ ArrangeConfigTableContent(string dp1, dyn_string ColumnTitles,
" 0
EE E E 1 -1 -1 0 -180 -147
"" 0 1
-EE 2
+E"#uses \"nav_fw/gcf-util.ctl\"" 0
+ 2
"CBRef""1"
"EClose"E
""
@@ -154,7 +155,7 @@ E
break;
case 2:
setValue (\"Table1\", \"cellBackCol\", \"white\");
- DebugN(\"navViewAlertGetDpFromColumn(Row,Column):\"+navViewAlertGetDpFromColumn(Row,Column));
+ LOG_DEBUG(\"navViewAlertGetDpFromColumn(Row,Column):\",navViewAlertGetDpFromColumn(Row,Column));
ChildPanelOnCentralModal(\"nav_fw/alert_config_table_cell.pnl\",
\"Select DP\", makeDynString(\"$Row:\" + Row,
\"$Column:\" + Column,
diff --git a/MAC/Navigator/panels/nav_fw/alert_view.pnl b/MAC/Navigator/panels/nav_fw/alert_view.pnl
index 4fa3a5b26ec1ea5339e3a62a1f1cf12a3eeccc12..206422df48374760c468118458a6df2a42322f55 100644
--- a/MAC/Navigator/panels/nav_fw/alert_view.pnl
+++ b/MAC/Navigator/panels/nav_fw/alert_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 5 panel
-PANEL,269 267 1006 750 N "_3DFace" 2
+PANEL,304 275 1006 750 N "_3DFace" 2
"$configDatapoint"
"$datapoint"
"main()
@@ -274,6 +274,7 @@ EE E E 1 -1 -1 0 0 0
"" 0 1
E"#uses \"nav_fw/gcfnav-functions.ctl\"
#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcf-util.ctl\"
dyn_string dpAlertList;" 0
2
"CBRef""1"
@@ -774,11 +775,11 @@ LANG:0 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
getValue(\"\", \"currentCell\", Row, Column);
dpGet($configDatapoint + \".1.Column\" + Column + \"dpNames\", ColumndpNames);
string newDatapoint = $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)];
- DebugTN(\"newDatapoint: \" + newDatapoint);
+ LOG_DEBUG(\"newDatapoint: \" + newDatapoint);
if (dpExists(newDatapoint))
{
- DebugTN(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
- DebugTN(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
+ LOG_DEBUG(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
+ LOG_DEBUG(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
navConfigTriggerNavigatorRefreshWithDP(dpSubStr(newDatapoint, DPSUB_SYS_DP));
}
}" 0
@@ -872,11 +873,11 @@ LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
getValue(\"\", \"currentCell\", Row, Column);
dpGet($configDatapoint + \".2.Column\" + Column + \"dpNames\", ColumndpNames);
string newDatapoint = $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)];
- DebugN(\"newDatapoint: \" + newDatapoint);
+ LOG_DEBUG(\"newDatapoint: \" + newDatapoint);
if (dpExists(newDatapoint))
{
- DebugN(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
- DebugN(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
+ LOG_DEBUG(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
+ LOG_DEBUG(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
navConfigTriggerNavigatorRefreshWithDP(dpSubStr(newDatapoint, DPSUB_SYS_DP));
}
@@ -971,11 +972,11 @@ LANG:1 106 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
getValue(\"\", \"currentCell\", Row, Column);
dpGet($configDatapoint + \".3.Column\" + Column + \"dpNames\", ColumndpNames);
string newDatapoint = $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)];
- DebugN(\"newDatapoint: \" + newDatapoint);
+ LOG_DEBUG(\"newDatapoint: \" + newDatapoint);
if (dpExists(newDatapoint))
{
- DebugN(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
- DebugN(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
+ LOG_DEBUG(\"Jumping to: \"+ $datapoint + \"_\" + ColumndpNames[ConvIndex(Row)]);
+ LOG_DEBUG(\"altered: \" + dpSubStr(newDatapoint, DPSUB_SYS_DP));
navConfigTriggerNavigatorRefreshWithDP(dpSubStr(newDatapoint, DPSUB_SYS_DP));
}
diff --git a/MAC/Navigator/panels/nav_fw/bar_config.pnl b/MAC/Navigator/panels/nav_fw/bar_config.pnl
index c338d9d50bcb8f9bec171f6d5ce87fde9e53981c..e34ca037179bca9d68c6e2e4084b88c428b247b1 100644
--- a/MAC/Navigator/panels/nav_fw/bar_config.pnl
+++ b/MAC/Navigator/panels/nav_fw/bar_config.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,271 105 950 730 N "_3DFace" 5
+PANEL,304 275 950 730 N "_3DFace" 5
"$configDatapoint"
"$datapoint"
"$selectedElementDpType"
@@ -40,7 +40,9 @@ PANEL,271 105 950 730 N "_3DFace" 5
}" 0
EE E E 1 -1 -1 0 10 231
"" 0 1
-E"float minClipValue=0;
+E"#uses \"nav_fw/gcf-util.ctl\"
+
+float minClipValue=0;
float maxClipValue=0;
float warnLevel=0;
float alertLevel=0;
@@ -499,17 +501,17 @@ LANG:1 0
1
"dashclr"N "_Transparent"
E E 0 1 1 0 1 E U 1 E 400 340 550 370
-1 116 0 "" 57
+1 115 0 "" 57
0
-1 120 1 "" 0
+1 116 1 "" 0
0
-1 121 1 "" 4
+1 117 1 "" 4
0
-1 122 1 "" 1
+1 118 1 "" 1
0
-1 123 1 "" 2
+1 119 1 "" 2
0
-1 124 1 "" 3
+1 120 1 "" 3
0
14 51
"setWarnLevel"
@@ -699,7 +701,7 @@ LANG:1 5 Color
}
int ok=colorEditor(aColor);
if (ok == -1) {
- DebugN(\"Color chooser failed.\");
+ LOG_WARN(\"Color chooser failed.\");
} else {
setValue(\"theBar_left_cfg\",\"color\",aColor);
newNormalColor=aColor;
@@ -733,7 +735,7 @@ LANG:1 5 Color
}
int ok=colorEditor(aColor);
if (ok == -1) {
- DebugN(\"Color chooser failed.\");
+ LOG_WARN(\"Color chooser failed.\");
} else {
setValue(\"theBar_mid_cfg\",\"color\",aColor);
newFirstLevelColor=aColor;
@@ -766,7 +768,7 @@ LANG:1 5 Color
}
int ok=colorEditor(aColor);
if (ok == -1) {
- DebugN(\"Color chooser failed.\");
+ LOG_WARN(\"Color chooser failed.\");
} else {
setValue(\"theBar_right_cfg\",\"color\",aColor);
newSecondLevelColor=aColor;
@@ -805,11 +807,11 @@ LANG:1 5 Reset
newSecondLevelColor=\"\";
}" 0
E E E
-1 117 0 "" 54
+1 121 0 "" 54
0
-1 118 0 "" 55
+1 122 0 "" 55
0
-1 119 0 "" 58
+1 123 0 "" 58
0
0
LAYER, 1
diff --git a/MAC/Navigator/panels/nav_fw/config-list.pnl b/MAC/Navigator/panels/nav_fw/config-list.pnl
index b4ed6ed2075ccc1824b70c3d3a1c64f3e6eb5657..b4daaaae83a2f4b38064740cb18b4e12bb2e5a56 100644
--- a/MAC/Navigator/panels/nav_fw/config-list.pnl
+++ b/MAC/Navigator/panels/nav_fw/config-list.pnl
@@ -1,14 +1,14 @@
V 10
1
LANG:1 14 ConfigListView
-PANEL,689 141 950 740 N "_3DFace" 4
+PANEL,304 275 950 740 N "_3DFace" 4
"$configDatapoint"
"$selectedElementDpType"
"$selectedView"
"$viewName"
"main()
{
- DebugTN(\"ListViewConfig: $selectedView,$selectedElementDpType,$configDatapoint:\",$selectedView,$selectedElementDpType,$configDatapoint);
+ LOG_TRACE(\"ListViewConfig: $selectedView,$selectedElementDpType,$configDatapoint:\",$selectedView,$selectedElementDpType,$configDatapoint);
if(isDollarDefined(\"$configDatapoint\"))
{
if(dpExists($configDatapoint+\".dummy\") && dpExists($configDatapoint+\".dummy2\"))
@@ -33,7 +33,9 @@ UpdateDummy(string dpeDummy,int dummy, string dpeDummy2,string dummy2)
}" 0
EE E E 1 -1 -1 0 20 40
"" 0 1
-EE 2
+E"#uses \"nav_fw/gcf-util.ctl\"
+" 0
+ 2
"CBRef""1"
"EClose"E
""
@@ -41,7 +43,7 @@ DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
1
LANG:1 6 Layer1
-1 57 0 "" 57
+1 0 0 "" 57
0
2 59
"PRIMITIVE_TEXT1"
@@ -83,19 +85,19 @@ LANG:1 98 -adobe-helvetica-medium-r-normal-*-*-80-100-100-*-*-iso8859-1|-11,0,0,
0 ""
1
LANG:1 7 Dummy 2
-1 54 0 "" 54
+1 1 0 "" 54
18 "font" 0 0 1
LANG:1 60 -adobe-helvetica-medium-r-normal-*-*-100-75-75-*-*-iso8859-1
0
""
0
-1 55 0 "" 55
+1 2 0 "" 55
18 "font" 0 0 1
LANG:1 60 -adobe-helvetica-medium-r-normal-*-*-100-75-75-*-*-iso8859-1
0
""
0
-1 62 0 "" 58
+1 3 0 "" 58
0
14 58
"textFieldDummy"
diff --git a/MAC/Navigator/panels/nav_fw/configTabEnvironment.pnl b/MAC/Navigator/panels/nav_fw/configTabEnvironment.pnl
index 92f539677bddf33aceea490110f29cc9db87d937..096b3380ec5d80f15cbe42e71eda8426eca9aaaf 100644
--- a/MAC/Navigator/panels/nav_fw/configTabEnvironment.pnl
+++ b/MAC/Navigator/panels/nav_fw/configTabEnvironment.pnl
@@ -1,10 +1,11 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,299 106 730 540 N "_3DFace" 0
+PANEL,435 286 730 540 N "_3DFace" 0
EEE E E 1 -1 -1 0 80 120
"" 0 1
-E"#uses \"nav_fw/gcfnav-functions.ctl\"" 0
+E"#uses \"nav_fw/gcfnav-functions.ctl\"
+#uses \"nav_fw/gcf-util.ctl\"" 0
2
"CBRef""1"
"EClose"E
@@ -323,7 +324,7 @@ LANG:1 6 Create
{
list_usernames.selectedPos=list_usernames.itemCount;
-DebugN(\"set focus\");
+LOG_TRACE(\"set focus\");
}" 0
E E
0
@@ -746,7 +747,7 @@ LANG:1 5 Apply
else
{
GroupsForEnvironment = GroupsForEnvironment +\"|\" +items[i];
- DebugN(\"i\"+i+\": \"+GroupsForEnvironment);
+ LOG_TRACE(\"i\"+i+\": \"+GroupsForEnvironment);
}
}
//dpGet(DPNAME_NAVIGATOR + g_navigatorID + \".\" + ELNAME_SELECTEDENVIRONMENT, selectedEnvironment);
@@ -893,8 +894,7 @@ LANG:1 14 getEnvironment
}
}
}
- DebugN(\"environmentListAvailableToUser\");
- DebugN(environmentListAvailableToUser);
+ LOG_TRACE(\"environmentListAvailableToUser\",environmentListAvailableToUser);
}" 0
E E E
diff --git a/MAC/Navigator/panels/nav_fw/config_view.pnl b/MAC/Navigator/panels/nav_fw/config_view.pnl
index 2008ded981397f959f3fe01934242e3e5231eafc..75fdcacd6c16a27a110060e1e7922ba53240818a 100644
--- a/MAC/Navigator/panels/nav_fw/config_view.pnl
+++ b/MAC/Navigator/panels/nav_fw/config_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 8 (NoName)
-PANEL,553 438 950 740 N "_3DFace" 1
+PANEL,304 198 950 740 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -29,7 +29,9 @@ PANEL,553 438 950 740 N "_3DFace" 1
EE E E 1 -1 -1 0 684 1565
"" 0 1
E"#uses \"nav_fw/gcfnav-functions.ctl\"
-#uses \"nav_fw/gcfnav_view.ctl\"" 0
+#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcf-util.ctl\"
+" 0
2
"CBRef""1"
"EClose"E
@@ -79,10 +81,10 @@ LANG:1 5 dpGet
{
anytype content;
dpGet($datapoint + \":_alert_hdl.._orig_hdl\", content);
-DebugN(\"content:\"+content);
+LOG_DEBUG(\"content:\"+content);
-DebugN(\"Accessable?: \"+dpAccessable($datapoint + \":_alert_hdl.._orig_hdl\"));
-//getSystemName()+"_mp_TLcuPicLFA.status:_alert_hdl.._orig_hdl"
+LOG_DEBUG(\"Accessable?: \"+dpAccessable($datapoint + \":_alert_hdl.._orig_hdl\"));
+//getSystemName()+\"_mp_TLcuPicLFA.status:_alert_hdl.._orig_hdl\"
}" 0
E E E
13 2
@@ -109,7 +111,7 @@ anytype content;
dpSet($datapoint + \":_alert_hdl..orig_hdl\", \"TRUE\");
dpGet($datapoint + \":_alert_hdl.._orig_hdl\", content);
-DebugN(\"content:\"+content);
+LOG_DEBUG(\"content:\"+content);
}" 0
E E E
0
diff --git a/MAC/Navigator/panels/nav_fw/list_view.pnl b/MAC/Navigator/panels/nav_fw/list_view.pnl
index 1fd03e472a0badadfe2eb5f509eb5bf7df5a9cfb..eae628a901e53db9ec842cc7500182dedf193ce1 100644
--- a/MAC/Navigator/panels/nav_fw/list_view.pnl
+++ b/MAC/Navigator/panels/nav_fw/list_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 17 NavigatorListView
-PANEL,460 303 950 740 N "_3DFace" 2
+PANEL,391 228 950 740 N "_3DFace" 2
"$configDatapoint"
"$datapoint"
"main()
@@ -115,7 +115,9 @@ loadTable(string dp1, bool customList,
E E E 1 -1 -1 0 20 40
"" 0 1
E"#uses \"nav_fw/gcfnav-pmlinterface.ctl\"
-#uses \"nav_fw/gcfnav_view.ctl\"" 0
+#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcf-util.ctl\"
+" 0
2
"CBRef""1"
"EClose"E
@@ -350,7 +352,7 @@ E "main(int row, string column, string value)
dpGet($configDatapoint + \".queryResult\", queryResult);
currentDp = queryResult[ConvIndex(row)];
strreplace(currentDp, \":_online.._value\", \"\");
- DebugN(\"## currentDp: \" + currentDp);
+ LOG_TRACE(\"## currentDp: \" + currentDp);
if(elementTypeValid(currentDp))
{
dpSet(currentDp, value);
diff --git a/MAC/Navigator/panels/nav_fw/navigator.pnl b/MAC/Navigator/panels/nav_fw/navigator.pnl
index e7f3e5a522fab4ed1b91f3f1a6c3a444f233b5e8..bce65a175e0f68f69f5362b4ee4fd04edcd17485 100644
--- a/MAC/Navigator/panels/nav_fw/navigator.pnl
+++ b/MAC/Navigator/panels/nav_fw/navigator.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 15 LOFAR Navigator
-PANEL,28 141 1272 960 N "_3DFace" 0
+PANEL,391 228 1272 960 N "_3DFace" 0
"main()
{
gcfStartFollowDistSystems();
@@ -80,7 +80,7 @@ E E E 1 -1 -1 0 10 570
E"// global functions. All event handlers are implemented here
#uses \"nav_fw/gcfnav-functions.ctl\"
-
+#uses \"nav_fw/gcfnav_view.ctl\"
" 0
2
"CBRef""1"
@@ -778,7 +778,7 @@ E
default:
- DebugN(\"No case found\");
+ LOG_DEBUG(\"No shortcut command found\");
}
diff --git a/MAC/Navigator/panels/nav_fw/navigator_newsubview.pnl b/MAC/Navigator/panels/nav_fw/navigator_newsubview.pnl
index 1e430a7cd76ce052f3c3d1cc44805ed6e322cc62..cffb164c4693ffd54ca2a545d25bf072f550bc13 100644
--- a/MAC/Navigator/panels/nav_fw/navigator_newsubview.pnl
+++ b/MAC/Navigator/panels/nav_fw/navigator_newsubview.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 18 Add Remove subview
-PANEL,545 331 429 103 N "_3DFace" 4
+PANEL,391 228 429 103 N "_3DFace" 4
"$addView"
"$selectedElementDpType"
"$selectedView"
@@ -11,7 +11,7 @@ PANEL,545 331 429 103 N "_3DFace" 4
//Date: 25-1-2005 By: AdB
//several changes, because this version only works with
// new and not existing subviews!
- //DebugTN(\"New SubView: $addView,$viewName,$selectedView,$configDatapoint,$selectedElementDpType:\",$addView,$viewName,$selectedView,$configDatapoint,$selectedElementDpType);
+ //LOG_TRACE(\"New SubView: $addView,$viewName,$selectedView,$configDatapoint,$selectedElementDpType:\",$addView,$viewName,$selectedView,$configDatapoint,$selectedElementDpType);
int selectedSubView;
dyn_int nrOfSubViews;
@@ -86,7 +86,9 @@ PANEL,545 331 429 103 N "_3DFace" 4
}" 0
EE E E 1 -1 -1 0 40 11
"" 0 1
-E"#uses \"nav_fw/gcfnav-configuration-functions.ctl\"" 0
+E"#uses \"nav_fw/gcfnav-configuration-functions.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
+" 0
2
"CBRef""1"
"EClose"E
@@ -274,7 +276,7 @@ LANG:1 0
string viewsPath;
dpGet(\"__navigator.\" + ELNAME_VIEWSPATH, viewsPath);
viewsPath = getPath(PANELS_REL_PATH) + viewsPath;
- DebugTN(viewsPath);
+ LOG_TRACE(viewsPath);
string fileName;
fileSelector(fileName,viewsPath,true,\"*.pnl\");
diff --git a/MAC/Navigator/panels/nav_fw/plot_config_config_dp.pnl b/MAC/Navigator/panels/nav_fw/plot_config_config_dp.pnl
index d00356d6635c4464c4d13d5baaa1003c271af82d..402c488e5be0de307cb92a5a9963c1019bd06096 100644
--- a/MAC/Navigator/panels/nav_fw/plot_config_config_dp.pnl
+++ b/MAC/Navigator/panels/nav_fw/plot_config_config_dp.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 19 Trace configuration
-PANEL,398 334 710 349 N "_3DFace" 4
+PANEL,307 228 710 349 N "_3DFace" 4
"$PlotNr"
"$configDatapoint"
"$datapoint"
@@ -10,7 +10,9 @@ EEE E E 1 -1 -1 0 190 250
"" 0 1
E"//Include of ctl file
#uses \"nav_fw/gcfnav_view.ctl\"
-#uses \"nav_fw/gcf-common.ctl\"" 0
+#uses \"nav_fw/gcf-common.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
+" 0
2
"CBRef""1"
"EClose"E
@@ -591,11 +593,11 @@ LANG:1 6 Cancel
PanelOff();
}" 0
E E E
-1 67 1 "" 0
+1 95 1 "" 0
0
-1 68 1 "" 1
+1 96 1 "" 1
0
-1 69 1 "" 2
+1 97 1 "" 2
0
20 70
"btn_Active"
@@ -626,7 +628,7 @@ E E
{
bool plotActive;
dpGet($configDatapoint + \".\" + $PlotNr + \".active\", plotActive);
- DebugN(\"plotActive:\"+plotActive);
+ LOG_TRACE(\"plotActive:\"+plotActive);
btn_Active.state(0) = plotActive;
diff --git a/MAC/Navigator/panels/nav_fw/plot_view.pnl b/MAC/Navigator/panels/nav_fw/plot_view.pnl
index 61058c562320000f1252913010c262133817d6c3..dfcedc898728d7546ffc8ee52d7112d14768aa69 100644
--- a/MAC/Navigator/panels/nav_fw/plot_view.pnl
+++ b/MAC/Navigator/panels/nav_fw/plot_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 4 view
-PANEL,272 201 950 740 N "_3DFace" 2
+PANEL,307 228 950 740 N "_3DFace" 2
"$configDatapoint"
"$datapoint"
"main()
@@ -198,6 +198,8 @@ void navViewPlotMain()
E E E 1 -1 -1 0 18 10
"" 0 1
E"#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
+
int local_plotSizeX;
int local_plotSizeY;
string PICTURE_PATH = PROJ_PATH + \"pictures/\";
@@ -259,12 +261,12 @@ void navViewPlotContextMenu()
case 1: // PAUSE
PLOT_STATE=\"PAUSE\";
navViewPlotChangeState();
- DebugN(\"case 1 - pause\");
+ LOG_TRACE(\"case 1 - pause\");
break;
case 2: // PLAY
PLOT_STATE=\"PLAY\";
navViewPlotChangeState();
- DebugN(\"case 2 - play\");
+ LOG_TRACE(\"case 2 - play\");
break;
case 3:
dpSetWait($datapoint + \"_Board0_Maintenance.status:_original.._value\", 0);
@@ -280,21 +282,21 @@ void navViewPlotContextMenu()
void navViewPlotChangeState()
{
- DebugN(\"function entered\");
- DebugN(\"PLOT_STATE:\"+PLOT_STATE);
+ LOG_TRACE(\"function entered\");
+ LOG_TRACE(\"PLOT_STATE:\"+PLOT_STATE);
if(\"PLAY\"==PLOT_STATE)
{
setValue(\"icon_play\", \"visible\", TRUE);
setValue(\"icon_pause1\", \"visible\", FALSE);
setValue(\"icon_pause2\", \"visible\", FALSE);
- DebugN(\"play\");
+ LOG_TRACE(\"play\");
}
else if (\"PAUSE\"==PLOT_STATE)
{
setValue(\"icon_play\", \"visible\", FALSE);
setValue(\"icon_pause1\", \"visible\", TRUE);
setValue(\"icon_pause2\", \"visible\", TRUE);
- DebugN(\"pause\");
+ LOG_TRACE(\"pause\");
}
else
{
@@ -473,8 +475,7 @@ void navViewPlotContextMenu()
delay(1);
dyn_string rcv;
dpGet(\"__navigator.recordRCV\", rcv);
- DebugN(\"##### RCV ####\");
- DebugN(rcv);//$showDatapoints
+ LOG_TRACE(\"##### RCV ####\",rcv);
dpGet(\"__navigator.viewsPath\", viewsPath);
ChildPanelOnCentralModal(viewsPath + \"plot_view_display_recordings.pnl\",
@@ -591,7 +592,7 @@ LANG:1 0
"main()
{
string recordStatus = navViewPlotGetRecordStatus($configDatapoint, $datapoint);
- //DebugN(\"recordStatus:\"+recordStatus);
+ //LOG_TRACE(\"recordStatus:\"+recordStatus);
setValue(\"\", \"visible\",(recordStatus==\"recording\"));
/*
if(recordStatus==\"recording\")
diff --git a/MAC/Navigator/panels/nav_fw/trend_config.pnl b/MAC/Navigator/panels/nav_fw/trend_config.pnl
index 6d99ab55aafd4263d4d9cb961fc9ed30ebd35926..8485a5e5e12dfff5e2dc2af32b091e2f88401d6c 100644
--- a/MAC/Navigator/panels/nav_fw/trend_config.pnl
+++ b/MAC/Navigator/panels/nav_fw/trend_config.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 12 trend_config
-PANEL,272 201 879 700 N "_3DFace" 5
+PANEL,307 228 879 700 N "_3DFace" 5
"$configDatapoint"
"$datapoint"
"$selectedElementDpType"
@@ -11,6 +11,7 @@ EEE E E 1 -1 -1 0 20 20
"" 0 1
E"//Include of ctl file
#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
" 0
2
"CBRef""1"
@@ -20,9 +21,9 @@ DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
LAYER, 0
1
LANG:1 6 Layer1
-1 17 4 "" 0
+1 0 4 "" 0
0
-1 18 4 "" 2
+1 1 4 "" 2
0
2 4
"Text3"
@@ -60,17 +61,17 @@ LANG:1 37 Selected trend-plot view(s) for type:
0
1 15 3 "" 2
0
-1 20 5 "" 0
+1 17 5 "" 0
0
-1 21 5 "" 2
+1 18 5 "" 2
0
-1 23 6 "" 0
+1 20 6 "" 0
0
-1 24 6 "" 2
+1 21 6 "" 2
0
-1 26 7 "" 0
+1 23 7 "" 0
0
-1 27 7 "" 2
+1 24 7 "" 2
0
4 68
"Line1"
@@ -168,33 +169,33 @@ LANG:1 5 Title
0
1 118 16 "" 2
0
-1 120 17 "" 0
+1 119 17 "" 0
0
-1 121 17 "" 2
+1 120 17 "" 2
0
-1 123 18 "" 0
+1 121 18 "" 0
0
-1 124 18 "" 2
+1 122 18 "" 2
0
-1 126 19 "" 0
+1 123 19 "" 0
0
-1 127 19 "" 2
+1 124 19 "" 2
0
-1 129 20 "" 0
+1 125 20 "" 0
0
-1 130 20 "" 2
+1 126 20 "" 2
0
-1 132 21 "" 0
+1 127 21 "" 0
0
-1 133 21 "" 2
+1 128 21 "" 2
0
-1 135 22 "" 0
+1 129 22 "" 0
0
-1 136 22 "" 2
+1 130 22 "" 2
0
-1 138 23 "" 0
+1 131 23 "" 0
0
-1 139 23 "" 2
+1 132 23 "" 2
0
4 149
"Line7"
@@ -404,37 +405,37 @@ LANG:1 0
1
"dashclr"N "_Transparent"
E E 0 1 1 0 1 E 61 145 10 145
-1 181 30 "" 1
+1 170 30 "" 1
0
-1 182 30 "" 2
+1 171 30 "" 2
0
-1 183 26 "" 1
+1 172 26 "" 1
0
-1 184 26 "" 2
+1 173 26 "" 2
0
-1 185 27 "" 1
+1 174 27 "" 1
0
-1 186 27 "" 2
+1 175 27 "" 2
0
-1 187 28 "" 1
+1 176 28 "" 1
0
-1 188 28 "" 2
+1 177 28 "" 2
0
-1 192 32 "" 1
+1 178 32 "" 1
0
-1 193 32 "" 2
+1 179 32 "" 2
0
-1 195 33 "" 1
+1 180 33 "" 1
0
-1 196 33 "" 2
+1 181 33 "" 2
0
-1 198 34 "" 1
+1 182 34 "" 1
0
-1 199 34 "" 2
+1 183 34 "" 2
0
-1 189 31 "" 1
+1 184 31 "" 1
0
-1 190 31 "" 2
+1 185 31 "" 2
0
2 202
"txt_Dedicated_panel"
@@ -587,35 +588,35 @@ LANG:1 0
1
"dashclr"N "_Transparent"
E E 0 1 1 0 1 E 72 471 10 471
-1 218 36 "" 57
+1 214 36 "" 57
0
-1 227 37 "" 0
+1 215 37 "" 0
0
-1 228 37 "" 4
+1 216 37 "" 4
0
-1 228 37 "" 1
+1 217 37 "" 1
0
-1 229 37 "" 2
+1 218 37 "" 2
0
-1 230 37 "" 3
+1 219 37 "" 3
0
-1 18 4 "" 1
+1 2 4 "" 1
0
-1 162 24 "" 0
+1 7 0 "" 1
0
-1 6 0 "" 1
+1 10 1 "" 1
0
-1 9 1 "" 1
+1 13 2 "" 1
0
-1 12 2 "" 1
+1 16 3 "" 1
0
-1 15 3 "" 1
+1 19 5 "" 1
0
-1 21 5 "" 1
+1 22 6 "" 1
0
-1 24 6 "" 1
+1 25 7 "" 1
0
-1 27 7 "" 1
+1 220 24 "" 0
0
19 72
"RadioButton2"
@@ -679,13 +680,13 @@ LANG:1 0
dpGet($configDatapoint + \".DedicatedPanelName:_online.._value\", DedicatedPanelName);
if (\"\" == DedicatedPanelName)
{
- dpSet(getSystemName() +\"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_subview_Trend_\" + subViewName + \".filename\", \"error_no_panel.pnl\");
- DebugN(\"dpSet error panel\");
- }
- else
- {
- dpSet(getSystemName() +\"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_subview_Trend_\" + subViewName + \".filename\", DedicatedPanelName);
- }
+ dpSet(getSystemName() +\"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_subview_Trend_\" + subViewName + \".filename\", \"error_no_panel.pnl\");
+ LOG_WARN(\"Dedicated panel not found\");
+ }
+ else
+ {
+ dpSet(getSystemName() +\"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_subview_Trend_\" + subViewName + \".filename\", DedicatedPanelName);
+ }
}
else if (!Standard && !Trend2Active && !Dedicated)
{
@@ -745,12 +746,12 @@ LANG:1 0
dpSet($configDatapoint + \".Dedicated\", TRUE);
// Transport dedicated panel-name to subview
dpGet($configDatapoint + \".DedicatedPanelName:_online.._value\", DedicatedPanelName);
- DebugN(\"1. DedicatedPanelName: \" + DedicatedPanelName);
- DebugN(\"1. subViewName: \"+subViewName);
+ LOG_TRACE(\"1. DedicatedPanelName: \" + DedicatedPanelName);
+ LOG_TRACE(\"1. subViewName: \"+subViewName);
if (\"\" == DedicatedPanelName)
{
dpSet(getSystemName() +\"__nav\"+navConfigGetEnvironment(\"\",\"\")+\"_subview_Trend_\" + subViewName + \".filename\", navConfigGetViewsPath() + \"error_no_panel.pnl\");
- DebugN(\"dpSet error panel\");
+ LOG_TRACE(\"dpSet error panel\");
}
else
{
@@ -761,39 +762,39 @@ LANG:1 0
}
}" 0
-1 119 16 "" 1
+1 221 16 "" 1
0
-1 122 17 "" 1
+1 222 17 "" 1
0
-1 125 18 "" 1
+1 223 18 "" 1
0
-1 128 19 "" 1
+1 224 19 "" 1
0
-1 131 20 "" 1
+1 225 20 "" 1
0
-1 134 21 "" 1
+1 226 21 "" 1
0
-1 137 22 "" 1
+1 227 22 "" 1
0
-1 140 23 "" 1
+1 228 23 "" 1
0
-1 163 25 "" 0
+1 229 25 "" 0
0
-1 175 26 "" 0
+1 230 26 "" 0
0
-1 176 27 "" 0
+1 231 27 "" 0
0
-1 177 28 "" 0
+1 232 28 "" 0
0
-1 180 30 "" 0
+1 233 30 "" 0
0
-1 194 32 "" 0
+1 234 32 "" 0
0
-1 197 33 "" 0
+1 235 33 "" 0
0
-1 200 34 "" 0
+1 236 34 "" 0
0
-1 191 31 "" 0
+1 237 31 "" 0
0
14 204
"txt_fileName"
@@ -899,11 +900,11 @@ LANG:1 4 Load
}" 0
-1 219 36 "" 54
+1 238 36 "" 54
0
-1 220 36 "" 55
+1 239 36 "" 55
0
-1 221 36 "" 58
+1 240 36 "" 58
0
0
LAYER, 1
diff --git a/MAC/Navigator/panels/nav_fw/trend_view.pnl b/MAC/Navigator/panels/nav_fw/trend_view.pnl
index a0b8ff0e3f61a82b555fc7eb6f59a62c12b0fd46..0244b35ac3bce1db848c5264dc0adc846f5a2178 100644
--- a/MAC/Navigator/panels/nav_fw/trend_view.pnl
+++ b/MAC/Navigator/panels/nav_fw/trend_view.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 10 trend_view
-PANEL,233 201 954 748 N "_3DFace" 2
+PANEL,307 228 954 748 N "_3DFace" 2
"$configDatapoint"
"$datapoint"
"main()
@@ -79,7 +79,7 @@ ArrangeTrendPlots(string dp1, bool StandardTrend, string dp2, bool Trend2Active,
}
else
{
- DebugN(\"####### This is an illegal DPE type #################\");
+ LOG_ERROR(\"####### This is an illegal DPE type #################\",hulp);
}
}
@@ -149,7 +149,7 @@ ArrangeTrendPlots(string dp1, bool StandardTrend, string dp2, bool Trend2Active,
{
string DedicatedPanelName;
dpGet($configDatapoint + \".DedicatedPanelName\", DedicatedPanelName);
- DebugN(\"Load dedicated_trend.panel: \" + DedicatedPanelName);
+ LOG_TRACE(\"Load dedicated_trend.panel: \" + DedicatedPanelName);
}
}
@@ -294,7 +294,7 @@ void TracePlot (string dp1, string dpName, string dp2, bool AutoScale,
}
else
{
- //DebugN(\"Trend dpName2Connect:\"+dpName);
+ //LOG_TRACE(\"Trend dpName2Connect:\"+dpName);
if (dpGetElementName($datapoint)!=\"\") //SelectedItem is a datapoint element
{
navPMLloadPropertySet(dpSubStr($datapoint, DPSUB_SYS_DP));
@@ -340,6 +340,7 @@ EE E E 1 -1 -1 0 20 30
"" 0 1
E"//Include of ctl file
#uses \"nav_fw/gcfnav_view.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
" 0
2
"CBRef""1"
diff --git a/MAC/Navigator/panels/nav_fw/trend_view_trace_config.pnl b/MAC/Navigator/panels/nav_fw/trend_view_trace_config.pnl
index bd4023b4e3cbc401ca3862fafdd2238c80f05084..46cff4443de047a28afe2ea98ea7f7c98e6c6f9e 100644
--- a/MAC/Navigator/panels/nav_fw/trend_view_trace_config.pnl
+++ b/MAC/Navigator/panels/nav_fw/trend_view_trace_config.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 19 Trace configuration
-PANEL,255 161 697 398 N "_3DFace" 5
+PANEL,307 228 697 398 N "_3DFace" 5
"$TraceNr"
"$TrendNr"
"$configDatapoint"
@@ -42,6 +42,8 @@ E"//Include of ctl file
#uses \"nav_fw/gcfnav_view.ctl\"
#uses \"nav_fw/gcf-common.ctl\"
#uses \"nav_fw/gcfnav-functions.ctl\"
+#uses \"nav_fw/gcfnav_view.ctl\"
+
string traceColor=\"\";
string newTraceColor=\"\";" 0
2
@@ -668,11 +670,11 @@ LANG:1 6 Cancel
PanelOff();
}" 0
E E E
-1 67 1 "" 0
+1 76 1 "" 0
0
-1 68 1 "" 1
+1 77 1 "" 1
0
-1 69 1 "" 2
+1 78 1 "" 2
0
13 77
"btn_traceColor"
@@ -703,7 +705,7 @@ LANG:1 4 Auto
int ok=colorEditor(aColor);
if (ok == -1) {
- DebugN(\"Color chooser failed.\");
+ LOG_WARN(\"Color chooser failed.\");
} else {
setValue(\"btn_traceColor\",\"backCol\",aColor);
setValue(\"btn_traceColor\",\"text\",aColor);