From 17a4e09beb8de77886cdce85669949ef54d30953 Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Wed, 20 Dec 2006 21:47:15 +0000
Subject: [PATCH] BugID: 998
Added more Trace and debug statements to Ordina scripts
---
.../scripts/libs/nav_fw/gcf-common.ctl | 3 +
.../scripts/libs/nav_fw/gcf-util.ctl | 7 +-
.../nav_fw/gcfnav-configuration-functions.ctl | 32 +++
.../scripts/libs/nav_fw/gcfnav-functions.ctl | 27 ++-
.../libs/nav_fw/gcfnav-pmlinterface.ctl | 17 +-
.../libs/nav_fw/gcfnav-tab-functions.ctl | 8 +-
.../scripts/libs/nav_fw/gcfnav_plotrecord.ctl | 9 +
.../scripts/libs/nav_fw/gcfnav_view.ctl | 37 +++-
.../scripts/libs/nav_fw/gcfpa-com.ctl | 13 +-
.../scripts/libs/nav_fw/gcfpa-cwd.ctl | 205 +++++++++---------
.../scripts/libs/nav_fw/gcfpa-pml.ctl | 20 +-
.../scripts/libs/nav_fw/gcfpa-prep.ctl | 2 +
.../scripts/libs/nav_fw/treeView.ctl | 9 +
13 files changed, 265 insertions(+), 124 deletions(-)
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
index fbc7e4d1744..6d3338e99a1 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
@@ -31,12 +31,14 @@ global int g_distSysVarSem = 0;
void gcfStartFollowDistSystems()
{
+ LOG_DEBUG("gcfStartFollowDistSystems.");
g_distSysVarSem = 0;
dpConnect("followDistributedSystems", "_DistManager.State.SystemNums");
}
void followDistributedSystems(string dp, dyn_int value)
{
+ LOG_DEBUG("followDistributedSystems: ",value);
while (g_distSysVarSem > 0) delay(0, 10); // wait until the "semaphore" is freed by the dpAccessable method
g_distributedSystems = value;
}
@@ -51,6 +53,7 @@ void followDistributedSystems(string dp, dyn_int value)
///////////////////////////////////////////////////////////////////////////
bool dpAccessable(string dpName)
{
+ LOG_DEBUG("dpAccessable: ",dpName);
if (dpExists(dpName))
{
string dpSystemName = strrtrim(dpSubStr(dpName, DPSUB_SYS), ":");
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
index 7de7ba52fb5..830003fd9a5 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
@@ -123,7 +123,12 @@ void LOG_DEBUG(string prefix, ...) // the prefix is necessary, otherwise PVSS wo
dynAppend(message,prefix);
len = va_start(parameters); // returns the number of parameters
for(i=1;i<=len;i++)
- dynAppend(message,va_arg(parameters));
+ {
+ string blubs=va_arg(parameters);
+ if(strlen(blubs)>0)
+ dynAppend(message,blubs);
+// dynAppend(message,va_arg(parameters));
+ }
va_end(parameters);
LOG_MESSAGE(LOGLEVEL_DEBUG,LOGMESSAGE_DEBUG,message);
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
index 666d25d7d20..4417a44fb0e 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
@@ -65,6 +65,7 @@ global int g_navigatorID = 0;
///////////////////////////////////////////////////////////////////////////
void navConfigInitPathNames()
{
+ LOG_DEBUG("navConfigInitPathNames");
dyn_string pathNames;
if (_WIN32)
{
@@ -101,6 +102,7 @@ void navConfigInitPathNames()
///////////////////////////////////////////////////////////////////////////
string navConfigGetPathName(string pathName)
{
+ LOG_DEBUG("navConfigGetPathName: ",pathName);
string output;
if (_WIN32) //windows
{
@@ -149,6 +151,7 @@ int navConfigGetNavigatorID()
///////////////////////////////////////////////////////////////////////////
void navConfigSetNavigatorID(int newID)
{
+ LOG_DEBUG("navConfigSetNavigatorID: ",newID);
bool createConfiguration = false;
if (newID > 256)
{
@@ -183,6 +186,7 @@ void navConfigSetNavigatorID(int newID)
///////////////////////////////////////////////////////////////////////////
void navConfigIncreaseUseCount()
{
+ LOG_DEBUG("navConfigIncreaseUseCount");
// increase usecount
int usecount = 0;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_USECOUNT, usecount);
@@ -198,6 +202,7 @@ void navConfigIncreaseUseCount()
///////////////////////////////////////////////////////////////////////////
void navConfigDecreaseUseCount()
{
+ LOG_DEBUG("navConfigDecreaseUseCount");
// lower usecount of this navigator
int usecount = 0;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_USECOUNT, usecount);
@@ -222,6 +227,7 @@ void navConfigDecreaseUseCount()
///////////////////////////////////////////////////////////////////////////
bool navConfigCheckEnabled(string datapointName)
{
+ LOG_DEBUG("navConfigCheckEnabled: ",datapointName);
bool enabled = false;
if (dpAccessable(datapointName + "__enabled"))
{
@@ -261,6 +267,7 @@ bool navConfigCheckEnabled(string datapointName)
///////////////////////////////////////////////////////////////////////////
void navConfigSetSelectedElement(string datapointPath)
{
+ LOG_DEBUG("navConfigSetSelectedElement: ",datapointPath);
string dpSelectedElementContainer = DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_SELECTEDELEMENT;
string dpSelectedElement = datapointPath;
if (dpAccessable(dpSelectedElementContainer))
@@ -280,6 +287,7 @@ void navConfigSetSelectedElement(string datapointPath)
///////////////////////////////////////////////////////////////////////////
string navConfigGetViewsPath()
{
+ LOG_DEBUG("navConfigGetViewsPath");
string viewsPath = "nav_fw/";
dpGet(DPNAME_NAVIGATOR+ "." + ELNAME_VIEWSPATH, viewsPath);
return viewsPath;
@@ -292,6 +300,7 @@ string navConfigGetViewsPath()
///////////////////////////////////////////////////////////////////////////
string navConfigGetSelectedView()
{
+ LOG_DEBUG("navConfigGetSelectedView");
string selectedViewCaption = "List";
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_SELECTEDVIEWCAPTION, selectedViewCaption);
return selectedViewCaption;
@@ -304,6 +313,7 @@ string navConfigGetSelectedView()
///////////////////////////////////////////////////////////////////////////
void navConfigSetSelectedView(string datapoint, int viewid)
{
+ LOG_DEBUG("navConfigSetSelectedView: ", datapoint, viewid);
string dpViewConfig = navConfigGetViewConfig(datapoint);
dyn_string views = navConfigGetViews(dpViewConfig);
if (viewid <= dynlen(views))
@@ -321,6 +331,7 @@ void navConfigSetSelectedView(string datapoint, int viewid)
///////////////////////////////////////////////////////////////////////////
dyn_string navConfigGetViews(string dpViewConfig)
{
+ LOG_DEBUG("navConfigGetViews: ", dpViewConfig);
dyn_string views;
// get the views references for this resource type
dpGet(dpViewConfig + "." + ELNAME_VIEWS, views);
@@ -334,6 +345,7 @@ dyn_string navConfigGetViews(string dpViewConfig)
///////////////////////////////////////////////////////////////////////////
string navConfigGetViewCaption(string dpView)
{
+ LOG_DEBUG("navConfigGetViewCaption: ", LOG_DYN(dpView));
string caption;
dpGet(dpView + "." + ELNAME_CAPTION, caption);
return caption;
@@ -346,6 +358,7 @@ string navConfigGetViewCaption(string dpView)
///////////////////////////////////////////////////////////////////////////
string navConfigGetViewConfigPanel(string dpView)
{
+ LOG_DEBUG("navConfigGetViewConfigPanel: ", dpView);
string configPanel;
dpGet(dpView + "." + ELNAME_CONFIGPANEL, configPanel);
return configPanel;
@@ -364,6 +377,7 @@ string navConfigGetViewConfigPanel(string dpView)
///////////////////////////////////////////////////////////////////////////
bool checkForReference(string &parentDatapoint, dyn_string &reference, bool &parentDatapointIsReference)
{
+ LOG_DEBUG("checkForReference: ", parentDatapoint, LOG_DYN(reference), parentDatapointIsReference);
dyn_string refOut;
parentDatapointIsReference = FALSE;
for (int i = 1; i <= dynlen(g_referenceList); i++)
@@ -393,6 +407,7 @@ bool checkForReference(string &parentDatapoint, dyn_string &reference, bool &par
///////////////////////////////////////////////////////////////////////////
void checkForReferenceReplaceOriginal(dyn_string &resources, dyn_string reference)
{
+ LOG_DEBUG("checkForReferenceReplaceOriginal: ", resources, reference);
for (int i = 1; i <= dynlen(resources); i++)
{
strreplace(resources[i], reference[2], reference[1]);
@@ -406,6 +421,7 @@ void checkForReferenceReplaceOriginal(dyn_string &resources, dyn_string referenc
///////////////////////////////////////////////////////////////////////////
dyn_string navConfigQueryResourceRoots()
{
+ LOG_DEBUG("navConfigQueryResourceRoots");
dyn_string resourceRootsForQuery;
dyn_string resourceRoots;
int i;
@@ -430,6 +446,7 @@ dyn_string navConfigQueryResourceRoots()
///////////////////////////////////////////////////////////////////////////
dyn_string navConfigGetResources(string parentDatapoint, int depth)
{
+ LOG_DEBUG("navConfigGetResources: ", parentDatapoint, depth);
dyn_string resources;
dyn_string allResources;
dyn_string resourceRoots;
@@ -587,6 +604,7 @@ dyn_string navConfigGetResources(string parentDatapoint, int depth)
///////////////////////////////////////////////////////////////////////////
string navConfigGetEnvironment(string environmentName, string userName)
{
+ LOG_DEBUG("navConfigGetEnvironment: ", environmentName, userName);
string environment;
string environmentOutput;
string environmentType;
@@ -634,6 +652,7 @@ string navConfigGetEnvironment(string environmentName, string userName)
///////////////////////////////////////////////////////////////////////////
void navConfigfillEnvironmentList(string dp1, dyn_string environmentNames)
{
+ LOG_DEBUG("navConfigfillEnvironmentList: ", dp1, environmentNames);
setValue("", "deleteAllItems");
string selectedEnvironment;
int itemCount = 0;
@@ -665,6 +684,7 @@ void navConfigfillEnvironmentList(string dp1, dyn_string environmentNames)
///////////////////////////////////////////////////////////////////////////
string navConfigGetViewConfig(string datapointPath)
{
+ LOG_DEBUG("navConfigGetViewConfig: ", datapointPath);
string datapointType;
string dpViewConfig = "";
string dpNameTemp = datapointPath;
@@ -712,6 +732,7 @@ bool navConfigGetViewConfigElements(
dyn_string &subViews,
dyn_string &configs)
{
+ LOG_DEBUG("navConfigGetViewConfigElements: ", dpViewConfig, selectedView, selectedSubView, views, nrOfSubViews, subViews, configs);
bool success = true;
dyn_errClass err;
@@ -740,6 +761,7 @@ void navConfigSetSelectedSubView(
string datapoint,
int selectedSubView)
{
+ LOG_DEBUG("navConfigSetSelectedSubView: ", datapoint, selectedSubView);
string dpViewConfig = navConfigGetViewConfig(datapoint);
dpSet(dpViewConfig + "." + ELNAME_SELECTEDSUBVIEW, selectedSubView);
}
@@ -754,6 +776,7 @@ bool navConfigGetSubViewConfigElements(
string &subViewCaption,
string &subViewFileName)
{
+ LOG_DEBUG("navConfigGetSubViewConfigElements: ", dpSubViewConfig, subViewCaption, subViewFileName);
bool success = true;
dyn_errClass err;
@@ -777,6 +800,7 @@ bool navConfigGetSubViewConfigElements(
///////////////////////////////////////////////////////////////////////////
bool navConfigSanityCheck(string &message)
{
+ LOG_DEBUG("navConfigSanityCheck: ", message);
bool sane = true;
dyn_dyn_anytype tab;
int i;
@@ -866,6 +890,7 @@ bool navConfigSanityCheck(string &message)
///////////////////////////////////////////////////////////////////////////
void navConfigSubscribeUpdateTrigger(string callback)
{
+ LOG_DEBUG("navConfigSubscribeUpdateTrigger: ", callback);
dpConnect(callback, false, DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_TRIGGERUPDATE);
}
@@ -878,6 +903,7 @@ void navConfigSubscribeUpdateTrigger(string callback)
///////////////////////////////////////////////////////////////////////////
void navConfigTriggerNavigatorRefresh()
{
+ LOG_DEBUG("navConfigTriggerNavigatorRefresh");
dpSet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_TRIGGERUPDATE, 0);
}
@@ -894,6 +920,7 @@ void navConfigTriggerNavigatorRefresh()
///////////////////////////////////////////////////////////////////////////
void navConfigTriggerNavigatorRefreshWithDP(string newDatapoint)
{
+ LOG_DEBUG("navConfigTriggerNavigatorRefreshWithDP: ", newDatapoint);
dpSet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_NEWDATAPOINT, newDatapoint);
dpSet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_TRIGGERUPDATE, 0);
}
@@ -906,6 +933,7 @@ void navConfigTriggerNavigatorRefreshWithDP(string newDatapoint)
///////////////////////////////////////////////////////////////////////////
dyn_string environmentsAvailableToUser()
{
+ LOG_DEBUG("environmentsAvailableToUser");
dyn_string environmentGroups, environmentNames, currentUserGroupNames;
dyn_string Users_UserName, Users_GroupIds, Groups_UserName, Groups_UserId;
dyn_string environmentListAvailableToUser;
@@ -958,6 +986,7 @@ dyn_string environmentsAvailableToUser()
///////////////////////////////////////////////////////////////////////////
bool navConfigConfigSubviewPermitted()
{
+ LOG_DEBUG("navConfigConfigSubviewPermitted");
string selectedEnvironment;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_SELECTEDENVIRONMENT, selectedEnvironment);
@@ -981,6 +1010,7 @@ bool navConfigConfigSubviewPermitted()
///////////////////////////////////////////////////////////////////////////////////
dyn_string navConfigGetElementsFromDp(string datapoint, bool withoutRef = FALSE)
{
+ LOG_DEBUG("navConfigGetElementsFromDp: ", datapoint, "FALSE");
dyn_string output;
int elementIndex;
@@ -1007,6 +1037,7 @@ dyn_string navConfigGetElementsFromDp(string datapoint, bool withoutRef = FALSE)
///////////////////////////////////////////////////////////////////////////
void arrangeUserGroupMembership()
{
+ LOG_DEBUG("arrangeUserGroupMembership");
UG_selected.deleteAllItems;
UG_available.deleteAllItems;
dyn_string environmentGroups, environmentNames, UserGroups;
@@ -1030,6 +1061,7 @@ void arrangeUserGroupMembership()
navConfigAddRemoveSubView()
{
+ LOG_DEBUG("navConfigAddRemoveSubView");
dyn_errClass err;
dyn_float dfReturn; // return fields: [1] = success/failure, [2] = new nr of subviews
dyn_string dsReturn; // not used
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
index ff223b6e120..b396ce85f77 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
@@ -82,6 +82,7 @@ global int g_path_pictureconverter_index = 3;
///////////////////////////////////////////////////////////////////////////////////
void convertOriginal2ReferenceDP(string datapointOriginal, string &datapointPathRef)
{
+ LOG_DEBUG("convertOriginal2ReferenceDP: ", datapointOriginal, datapointPathRef);
if (mappingHasKey(g_datapoint2itemID, datapointOriginal))
{
datapointPathRef = datapointOriginal;
@@ -99,10 +100,10 @@ void convertOriginal2ReferenceDP(string datapointOriginal, string &datapointPath
///////////////////////////////////////////////////////////////////////////
void changeSelectedPosition(string newDatapoint)
{
+ LOG_DEBUG("changeSelectedPostion> changing selection to :",newDatapoint);
int i;
long nodeID;
dyn_string datapointPath = splitDatapointPath(newDatapoint);
- LOG_DEBUG("changeSelectedPostion> changing selection to :",newDatapoint);
string systemName = strrtrim(dpSubStr(newDatapoint, DPSUB_SYS), ":");
// if (g_datapoint == systemName)
// {
@@ -263,6 +264,7 @@ shape getTabCtrl()
///////////////////////////////////////////////////////////////////////////
long getSelectedNode()
{
+ LOG_DEBUG("getSelectedNode");
long selectedNode = 0;
shape treeCtrl = getTreeCtrl();
if (ActiveXSupported())
@@ -294,6 +296,7 @@ long getSelectedNode()
///////////////////////////////////////////////////////////////////////////
void refreshNavigator()
{
+ LOG_DEBUG("refreshNavigator");
if (!g_initializing)
{
LOG_TRACE("refreshNavigator ", g_curSelNode);
@@ -490,6 +493,7 @@ long treeAddNode(long parentId, int level, string text)
///////////////////////////////////////////////////////////////////////////
void treeAddDatapoints(dyn_string names)
{
+ LOG_DEBUG("treeAddDatapoints: ", LOG_DYN(names));
int namesIndex;
dyn_string addedDatapoints;
string systemName;
@@ -725,6 +729,7 @@ string referenceSign(string reference)
///////////////////////////////////////////////////////////////////////////
insertInternalNodeMapping(dyn_int internalNodeMapping, dyn_string fullDPname)
{
+ LOG_DEBUG("insertInternalNodeMapping: ", internalNodeMapping, fullDPname);
int length = mappinglen(g_datapoint2itemID);
int teller = 0;
int fullDPNameLength = dynlen(internalNodeMapping);
@@ -765,6 +770,7 @@ insertInternalNodeMapping(dyn_int internalNodeMapping, dyn_string fullDPname)
///////////////////////////////////////////////////////////////////////////
string buildPathFromNode(long Node)
{
+ LOG_DEBUG("buildPathFromNode: ", Node);
string datapointPath = "";
if (Node >= 1 && dynlen(g_itemID2datapoint) >= Node)
{
@@ -781,6 +787,7 @@ string buildPathFromNode(long Node)
///////////////////////////////////////////////////////////////////////////
long getNodeFromDatapoint(string dpe)
{
+ LOG_DEBUG("getNodeFromDatapoint: ", dpe);
long nodeId = 0;
string datapointName = dpSubStr(dpe, DPSUB_SYS_DP_EL); // Origiganel
@@ -810,6 +817,7 @@ long getNodeFromDatapoint(string dpe)
///////////////////////////////////////////////////////////////////////////
void insertDatapointNodeMapping(int node, string dp)
{
+ LOG_DEBUG("insertDatapointNodeMapping: ", node, dp);
for (int i = dynlen(g_itemID2datapoint); i >= node && i >= 1; i--)
{
g_itemID2datapoint[i + 1] = g_itemID2datapoint[i];
@@ -834,6 +842,7 @@ void insertDatapointNodeMapping(int node, string dp)
///////////////////////////////////////////////////////////////////////////
void AlertStatusHandler(string dpe, long status)
{
+ LOG_DEBUG("AlertStatusHandler: ", dpe, status);
if (!g_initializing)
{
LOG_TRACE("AlertStatusHandler()", dpe, status);
@@ -946,7 +955,7 @@ string stripColorTags(string text)
///////////////////////////////////////////////////////////////////////////
void Navigator_HandleEventInitialize()
{
- LOG_TRACE("Navigator_HandleEventInitialize()", "");
+ LOG_DEBUG("Navigator_HandleEventInitialize()");
// before the first thing, we check the sanity of the configuration
string sanityMessage;
@@ -1050,6 +1059,7 @@ void Navigator_HandleEventClose()
///////////////////////////////////////////////////////////////////////////
void Navigator_HandleUpdateTrigger(string dpe, int trigger)
{
+ LOG_DEBUG("Navigator_HandleUpdateTrigger: ", dpe, trigger);
string newDatapoint;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_NEWDATAPOINT, newDatapoint);
if (newDatapoint != "")
@@ -1201,6 +1211,7 @@ void InitializeTree()
///////////////////////////////////////////////////////////////////////////
void TreeCtrl_HandleEventOnSelChange(long Node)
{
+ LOG_DEBUG("TreeCtrl_HandleEventOnSelChange: ", Node);
if (g_curSelNode != Node)
{
g_curSelNode = Node;
@@ -1259,6 +1270,7 @@ TreeView_OnCollapse(unsigned pos)
///////////////////////////////////////////////////////////////////////////
void TreeCtrl_HandleEventOnCollapse(unsigned Node)
{
+ LOG_DEBUG("reeCtrl_HandleEventOnCollapse: ", Node);
int collapsedNodes = 1;
dyn_string datapoint;
int k = 1;
@@ -1317,6 +1329,7 @@ void TreeCtrl_HandleEventOnCollapse(unsigned Node)
///////////////////////////////////////////////////////////////////////////
void checkForReferenceRemoveFromList(string datapointPath)
{
+ LOG_DEBUG("checkForReferenceRemoveFromList: ", datapointPath);
dyn_string refOut;
for (int i = dynlen(g_referenceList); i >= 1; i--)
@@ -1338,6 +1351,7 @@ void TreeCtrl_HandleEventOnDrawCell(long Col, long Row, float Left, float Top, f
{
if (!g_initializing)
{
+ LOG_DEBUG("TreeCtrl_HandleEventOnDrawCell: ", Col, Row, Left, Top, Right, Bottom);
if (ActiveXSupported())
{
shape treeCtrl = getTreeCtrl();
@@ -1559,6 +1573,7 @@ TreeView_OnExpand(unsigned pos)
///////////////////////////////////////////////////////////////////////////
dyn_string splitDatapointPath(string newDatapoint)
{
+ LOG_DEBUG("splitDatapointPath: ", newDatapoint);
int i;
dyn_string datapointElement;
dyn_string datapointPath= strsplit(newDatapoint, "_");
@@ -1593,6 +1608,7 @@ dyn_string splitDatapointPath(string newDatapoint)
///////////////////////////////////////////////////////////////////////////////////
void progressBar(float Maximum, float value)
{
+ LOG_DEBUG("progressBar: ", Maximum, value);
float Minimum = 0;
int waarde;
float positie;
@@ -1635,6 +1651,7 @@ bool dpIsDistributed(string dpName)
///////////////////////////////////////////////////////////////////////////
bool checkDpPermit(string datapointPath)
{
+ LOG_DEBUG("checkDpPermit: ",datapointPath);
dyn_string treeAccess;
dyn_string treeAccessPermit;
bool permit = FALSE, dpIsReference;
@@ -1672,6 +1689,7 @@ bool checkDpPermit(string datapointPath)
dyn_string queryDatabaseForDpElements(string datapointPath)
{
+ LOG_DEBUG("queryDatabaseForDpElements: ", datapointPath);
dyn_string output;
int outputCounter = 1;
dyn_string dpes = dpNames(dpSubStr(datapointPath, DPSUB_SYS_DP) + ".**;");
@@ -1698,6 +1716,7 @@ dyn_string queryDatabaseForDpElements(string datapointPath)
///////////////////////////////////////////////////////////////////////////
dyn_string queryDatabaseForDP(string attribute, string datapointPath, bool useProgressBar)
{
+ LOG_DEBUG("queryDatabaseForDP: ", attribute, datapointPath, useProgressBar);
string tempDP;
dyn_string output;
dyn_dyn_anytype tab;
@@ -1760,6 +1779,7 @@ dyn_string queryDatabaseForDP(string attribute, string datapointPath, bool usePr
///////////////////////////////////////////////////////////////////////////
dyn_string queryDatabase(string attribute, string datapointPath, int first, int searchDepth, bool useProgressBar)
{
+ LOG_DEBUG("queryDatabase: ", attribute, datapointPath, first, searchDepth, useProgressBar);
dyn_string output;
dyn_dyn_anytype tab;
string fullDpName;
@@ -1851,6 +1871,7 @@ dyn_string queryDatabase(string attribute, string datapointPath, int first, int
///////////////////////////////////////////////////////////////////////////
dyn_string getDpTypeStructure(string dp)
{
+ LOG_DEBUG("getDpTypeStructure: ", dp);
dyn_string typeStructure = makeDynString();
if (dpAccessable(dp))
{
@@ -1901,6 +1922,7 @@ dyn_string getDpTypeStructure(string dp)
///////////////////////////////////////////////////////////////////////////
string getDpTypeFromEnabled(string dp)
{
+ LOG_DEBUG("getDpTypeFromEnabled: ", dp);
string retDpType;
if (dpAccessable(dp))
{
@@ -1947,6 +1969,7 @@ void navConfigMessageWarning(string message)
void navConfigCheckResourceRoots()
{
+ LOG_DEBUG("navConfigCheckResourceRoots");
dyn_string roots;
dpGet("__navigator.resourceRoots", roots);
string aSystemName = getSystemName();
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-pmlinterface.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-pmlinterface.ctl
index 48af6aae36f..c591cab9c0d 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-pmlinterface.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-pmlinterface.ctl
@@ -45,7 +45,7 @@ global string NAVPML_ENABLED_TEMP_AUTOLOADED = "temp-autoloaded";
///////////////////////////////////////////////////////////////////////////
void navPMLinitialize()
{
- LOG_TRACE("navPMLinitialize");
+ LOG_DEBUG("navPMLinitialize");
if (g_PAclientId == 0)
g_PAclientId = gcfInit("pmlCallback");
else
@@ -64,6 +64,7 @@ void navPMLinitialize()
void HandlePanelMessage(string dp, string msg)
{
+ LOG_DEBUG("HandlePanelMessage: ", dp, msg);
dyn_string splittedMsg = strsplit(msg, "|");
if ((dynlen(splittedMsg) == 2) && (splittedMsg[1] == "PML_UNLOAD"))
{
@@ -83,7 +84,7 @@ void HandlePanelMessage(string dp, string msg)
///////////////////////////////////////////////////////////////////////////
void navPMLterminate(bool inTerminate = false)
{
- LOG_TRACE("navPMLterminate");
+ LOG_DEBUG("navPMLterminate");
if (g_PAclientId != 0)
{
gcfLeave(g_PAclientId, inTerminate);
@@ -98,7 +99,7 @@ void navPMLterminate(bool inTerminate = false)
///////////////////////////////////////////////////////////////////////////
void navPMLloadPropertySet(string datapoint)
{
- LOG_TRACE("navPMLloadPropertySet", datapoint);
+ LOG_DEBUG("navPMLloadPropertySet", datapoint);
navPMLCorrectDp(datapoint);
if (!navPMLisAutoLoaded(datapoint))
{
@@ -113,7 +114,7 @@ void navPMLloadPropertySet(string datapoint)
///////////////////////////////////////////////////////////////////////////
bool navPMLunloadPropertySet(string datapoint)
{
- LOG_TRACE("navPMLunloadPropertySet", datapoint);
+ LOG_DEBUG("navPMLunloadPropertySet", datapoint);
navPMLCorrectDp(datapoint);
if (dpExists(datapoint))
{
@@ -134,7 +135,7 @@ bool navPMLunloadPropertySet(string datapoint)
///////////////////////////////////////////////////////////////////////////
void navPMLconfigurePropertySet(string psScope, string psApcName)
{
- LOG_TRACE("navPMLconfigurePropertySet", psScope, psApcName);
+ LOG_DEBUG("navPMLconfigurePropertySet", psScope, psApcName);
navPMLCorrectDp(psScope);
gcfConfigurePS(g_PAclientId, psScope, psApcName);
}
@@ -193,7 +194,7 @@ void pmlCallback(dyn_string response)
bool navPMLisAutoLoaded(string datapoint)
{
bool autoLoaded = false;
- LOG_TRACE("navPMLisAutoLoaded", datapoint);
+ LOG_DEBUG("navPMLisAutoLoaded", datapoint);
if (dpAccessable(datapoint))
{
// check if the propertyset is autoloaded by GCF
@@ -209,7 +210,7 @@ bool navPMLisAutoLoaded(string datapoint)
}
else
{
- LOG_TRACE("navPMLloadPropertySet -- Datapoint does not exist", datapoint);
+ LOG_DEBUG("navPMLloadPropertySet -- Datapoint does not exist", datapoint);
}
return autoLoaded;
}
@@ -222,6 +223,7 @@ bool navPMLisAutoLoaded(string datapoint)
///////////////////////////////////////////////////////////////////////////
bool navPMLisTemporary(string datapoint)
{
+ LOG_DEBUG("navPMLisTemporary: ", datapoint);
bool temporary = false;
// check if the propertyset is temporary by GCF
@@ -250,6 +252,7 @@ bool navPMLisTemporary(string datapoint)
///////////////////////////////////////////////////////////////////////////
void navPMLCorrectDp(string& dpName)
{
+ LOG_DEBUG("navPMLCorrectDp: ", dpName);
// don't use the PVSS function dpSubStr here, because the dpName could not exists, which than results in an empty string
dyn_string splittedDpName = strsplit(dpName, ".");
dpName = splittedDpName[1];
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
index 3a7e09dc627..130e2511fd1 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
@@ -48,10 +48,10 @@ global string g_selectedViewName;
///////////////////////////////////////////////////////////////////////////
void mappingClear(mapping &map)
{
- LOG_TRACE("mappingClear begin",map);
+ LOG_DEBUG("mappingClear begin",map);
while(mappinglen(map)>0)
mappingRemove(map,mappingGetKey(map,1));
- LOG_TRACE("mappingClear end",map);
+ LOG_DEBUG("mappingClear end",map);
}
///////////////////////////////////////////////////////////////////////////
@@ -155,7 +155,7 @@ void NavTabInitialize(string datapoint)
///////////////////////////////////////////////////////////////////////////
void ComboBoxViewsSelectionChanged()
{
- LOG_TRACE("ComboBoxViewsSelectionChanged()");
+ LOG_DEBUG("ComboBoxViewsSelectionChanged()");
shape viewsComboBoxCtrl = getShape(VIEW_COMBOBOX_CTRL);
shape viewTabsCtrl = getShape(VIEW_TABS_CTRL);
@@ -289,6 +289,7 @@ void ComboBoxViewsSelectionChanged()
///////////////////////////////////////////////////////////////////////////
bool ConfigTabAddSubViewClicked(string viewName, int selectedView, string selectedElementDpType, string configDatapoint, int &nrOfSubViews)
{
+ LOG_DEBUG("ConfigTabAddSubViewClicked: ", viewName, selectedView, selectedElementDpType, configDatapoint, nrOfSubViews);
bool success;
dyn_float resultFloat;
dyn_string resultString;
@@ -322,6 +323,7 @@ bool ConfigTabAddSubViewClicked(string viewName, int selectedView, string select
///////////////////////////////////////////////////////////////////////////
bool ConfigTabRemoveSubViewClicked(string viewName, int selectedView, string selectedElementDpType, string configDatapoint, int &nrOfSubViews)
{
+ LOG_DEBUG("ConfigTabRemoveSubViewClicked: ", viewName, selectedView, selectedElementDpType, configDatapoint, nrOfSubViews);
bool success;
dyn_float resultFloat;
dyn_string resultString;
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
index b71cd1ef47c..ee78b53ff79 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
@@ -57,6 +57,7 @@ main()
///////////////////////////////////////////////////////////////////////////
navViewPlotRecordMain(string dp1, string commandInput)
{
+ LOG_DEBUG("navViewPlotRecordMain: ",dp1, commandInput);
dyn_string commandInputSplit;
string cmd_command = "";
string cmd_configDatapoint = "";
@@ -167,6 +168,7 @@ navViewPlotRecordMain(string dp1, string commandInput)
///////////////////////////////////////////////////////////////////////////
dyn_string navViewPlotRecordListAddItems(dyn_string dpNamesToAdd)
{
+ LOG_DEBUG("navViewPlotRecordListAddItems: ", dpNamesToAdd);
dyn_string matchedDPs;
for(int i=1; i<=dynlen(dpNamesToAdd); i++)
{
@@ -190,6 +192,7 @@ dyn_string navViewPlotRecordListAddItems(dyn_string dpNamesToAdd)
///////////////////////////////////////////////////////////////////////////
dyn_string navViewPlotRecordGetDpNamesToRecord(string configDatapoint)
{
+ LOG_DEBUG("navViewPlotRecordGetDpNamesToRecord: ",configDatapoint);
bool plotActive;
string plotDpName;
string currentDatapoint;
@@ -242,6 +245,7 @@ dyn_string navViewPlotRecordGetDpNamesToRecord(string configDatapoint)
///////////////////////////////////////////////////////////////////////////
navViewPlotRecordControl(bool start, dyn_string newDatapoints)
{
+ LOG_DEBUG("navViewPlotRecordControl: ",start, newDatapoints);
if(start)
{
for(int i=1; i<=dynlen(newDatapoints); i++)
@@ -272,6 +276,7 @@ navViewPlotRecordControl(bool start, dyn_string newDatapoints)
///////////////////////////////////////////////////////////////////////////
navViewPlotWriteRecordDesciptionFile(string datapoint, bool startRecord)
{
+ LOG_DEBUG("navViewPlotWriteRecordDesciptionFile: ",datapoint, startRecord);
dyn_string searchMatch = dynPatternMatch("*" + datapoint + "*", recordList);
int position = dynContains(recordList, searchMatch[1]);
string configDpName = navViewPlotGetSplitPart(searchMatch[1],1);
@@ -340,6 +345,7 @@ navViewPlotWriteRecordDesciptionFile(string datapoint, bool startRecord)
///////////////////////////////////////////////////////////////////////////
string navViewPlotGetSplitPart(string datapoint, int splitNr)
{
+ LOG_DEBUG("navViewPlotGetSplitPart: ",datapoint,splitNr);
dyn_string dpSplit = strsplit(datapoint, "|");
return dpSplit[splitNr];
}
@@ -353,6 +359,7 @@ string navViewPlotGetSplitPart(string datapoint, int splitNr)
///////////////////////////////////////////////////////////////////////////
void RecordSpectrum(string dp1, string spectrum)
{
+ LOG_DEBUG("RecordSpectrum: ",dp1, spectrum);
///////////////////////////////////////////////////////////////////////////////
//Get all information from the recordList for this specific datapoint to record
////////////////////////////////////////////////////////////////////////////////
@@ -393,6 +400,7 @@ void RecordSpectrum(string dp1, string spectrum)
///////////////////////////////////////////////////////////////////////////
string navViewGetTimeString()
{
+ LOG_DEBUG("navViewGetTimeString");
time t = getCurrentTime();
string txtYear = year(t);
string txtMonth = month(t);
@@ -413,6 +421,7 @@ string navViewGetTimeString()
///////////////////////////////////////////////////////////////////////////
RecordFunction(string dp1, bool triggerRecord)
{
+ LOG_DEBUG("RecordFunction: ",dp1,triggerRecord);
string dpName;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + ".dpRecord", dpName);
if(triggerRecord)
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
index ae2f0d7a351..ce153f51653 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
@@ -44,6 +44,7 @@ global dyn_string g_ContectMenuDpAccessableErrorText = "PUSH_BUTTON, No actions
///////////////////////////////////////////////////////////////////////////
string navViewPlotGetRecordStatus(string configDatapoint, string datapoint)
{
+ LOG_DEBUG("navViewPlotGetRecordStatus: ",configDatapoint,datapoint);
string recordStatus, messageRCV;
dyn_string messageRCVsplit;
bool messageReceived = FALSE;
@@ -80,6 +81,7 @@ string navViewPlotGetRecordStatus(string configDatapoint, string datapoint)
///////////////////////////////////////////////////////////////////////////
void TrendConfigApplyTraceSettings()
{
+ LOG_DEBUG("TrendConfigApplyTraceSettings");
int ScaleMin, ScaleMax;
bool AutoScale;
string dpName, dpeName, legendName;
@@ -120,6 +122,7 @@ void TrendConfigApplyTraceSettings()
///////////////////////////////////////////////////////////////////////////
string navViewGetDpFromDpSelectionList(string dollarDatapoint)
{
+ LOG_DEBUG("navViewGetDpFromDpSelectionList: ",dollarDatapoint);
string datapoint;
if(list_system.selectedText==getSystemName())
{
@@ -151,6 +154,7 @@ string navViewGetDpFromDpSelectionList(string dollarDatapoint)
///////////////////////////////////////////////////////////////////////////
void navViewPlotChangeState()
{
+ LOG_DEBUG("navViewPlotChangeState");
if("PLAY"==PLOT_STATE || "STEP"==PLOT_STATE)
{
setValue("icon_play", "visible", TRUE);
@@ -191,6 +195,7 @@ void navViewPlotChangeState()
navViewPlotWhenActive(string dp1, int active,
string dp2, string dpName)
{
+ LOG_DEBUG("navViewPlotWhenActive: ",dp1, active, dp2, dpName);
dyn_string dp1Split = strsplit(dp1, ".");
if(1==active)
{
@@ -219,6 +224,7 @@ navViewPlotWhenActive(string dp1, int active,
///////////////////////////////////////////////////////////////////////////
string navViewRetrieveDpName(string dollarDatapoint, string dpName)
{
+ LOG_DEBUG("navViewRetrieveDpName: ",dollarDatapoint, dpName);
string systemName = dpSubStr(dpName, DPSUB_SYS);
string dpToConnect;
if(""!=systemName)
@@ -244,6 +250,7 @@ string navViewRetrieveDpName(string dollarDatapoint, string dpName)
///////////////////////////////////////////////////////////////////////////
void navViewPlotApplyChanges()
{
+ LOG_DEBUG("navViewPlotApplyChanges");
dyn_string returnValues;
returnValues[1] = setting_xrangeMin.text;
returnValues[2] = setting_xrangeMax.text;
@@ -264,6 +271,7 @@ void navViewPlotApplyChanges()
///////////////////////////////////////////////////////////////////////////
int navViewPlotConvertGnuplotOutput(int plotNumber)
{
+ LOG_DEBUG("navViewPlotConvertGnuplotOutput: ",plotNumber);
if ((access(navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".png", R_OK)==0) &&
(access(navConfigGetPathName(g_path_pictureconverter) + navConfigGetPathName("/") + "i_view32.exe", F_OK)==0))
@@ -292,6 +300,8 @@ int navViewPlotGenerateGnuPlotScriptFile(int plotNumber, string plotTitle,
int xRangeMin, int xRangeMax,
int yRangeMin, int yRangeMax)
{
+ LOG_DEBUG("navViewPlotGenerateGnuPlotScriptFile: ",plotNumber, plotTitle, xRangeMin, xRangeMax, yRangeMin, yRangeMax);
+
int blue=2, green=4, yellow=6, red=8, timeslot_size=1;
time t=getCurrentTime();
int subbandLength = 511; //starting from zero (0-511)
@@ -374,6 +384,7 @@ int navViewPlotGenerateGnuPlotScriptFile(int plotNumber, string plotTitle,
///////////////////////////////////////////////////////////////////////////
int navViewPlotGenerateGnuplotOutput(int plotNumber)
{
+ LOG_DEBUG("navViewPlotGenerateGnuplotOutput: ",plotNumber);
string wgnuplotPath = navConfigGetPathName(g_path_gnuplot) + navConfigGetPathName("/") + "wgnuplot.exe";
string plotConfigPath = navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".dem";
string plotPath = navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".png";
@@ -410,6 +421,7 @@ int navViewPlotGenerateGnuplotOutput(int plotNumber)
navViewAlertApplyCellSettings(string RowNumber, string Column)
{
+ LOG_DEBUG("navViewAlertApplyCellSettings: ",RowNumber, Column);
dyn_string ColumndpNames, ColumnTitles;
dpGet($configDatapoint + "." + $AreaNr + ".Column" + $Column + "dpNames", ColumndpNames);
@@ -431,6 +443,7 @@ navViewAlertApplyCellSettings(string RowNumber, string Column)
///////////////////////////////////////////////////////////////////////////
navViewControlDisplayText(string dp1, string textToDisplay)
{
+ LOG_DEBUG("navViewControlDisplayText: ", dp1, textToDisplay);
string timeToDisplay = getCurrentTime();
string elementName = dpGetElementName(dp1);
strreplace(elementName, ".", "");
@@ -447,6 +460,7 @@ navViewControlDisplayText(string dp1, string textToDisplay)
///////////////////////////////////////////////////////////////////////////
navViewControlDisplayStatus(string dp1, int statusNumber)
{
+ LOG_DEBUG("navViewControlDisplayStatus: ", dp1, statusNumber);
string timeToDisplay = getCurrentTime();
string elementName = dpGetElementName(dp1);
string textToDisplay;
@@ -498,6 +512,7 @@ navViewControlDisplayStatus(string dp1, int statusNumber)
///////////////////////////////////////////////////////////////////////////
navViewControlDisplayTime(string dp1, int serialTime)
{
+ LOG_DEBUG("navViewControlDisplayTime: ", dp1, serialTime);
dyn_string dpPlit = strsplit(dp1, ".");
string timeToDisplay = getCurrentTime();
string elementName = dpGetElementName(dp1);
@@ -521,7 +536,7 @@ navViewControlDisplayTime(string dp1, int serialTime)
///////////////////////////////////////////////////////////////////////////
string navViewAlertGetDpFromColumn(int Row,int Column)
{
-
+ LOG_DEBUG("navViewAlertGetDpFromColumn: ", Row, Column);
dyn_string ColumndpNames;
string connectDatapoint;
@@ -549,6 +564,7 @@ string navViewAlertGetDpFromColumn(int Row,int Column)
///////////////////////////////////////////////////////////////////////////////////
getPropertyNames(string newSelectionQuery, int newSelectionAmount, dyn_string &propNames)
{
+ LOG_DEBUG("etPropertyNames: ", newSelectionQuery, newSelectionAmount, propNames);
dyn_dyn_anytype tab;
dpQuery("SELECT '_online.._value' FROM '" + newSelectionQuery + "' FIRST " + newSelectionAmount, tab);
@@ -577,6 +593,7 @@ getPropertyNames(string newSelectionQuery, int newSelectionAmount, dyn_string &p
///////////////////////////////////////////////////////////////////////////////////
void clearListTable()
{
+ LOG_DEBUG("clearListTable");
dyn_string propNames;
dpGet($configDatapoint + ".queryResult", propNames);
for (int i = 1; i <= dynlen(propNames); i++)
@@ -595,6 +612,7 @@ void clearListTable()
///////////////////////////////////////////////////////////////////////////////////
connectTable(dyn_string propNames)
{
+ LOG_DEBUG("connectTable: ", propNames);
dpSet($configDatapoint + ".queryResult", propNames);
for(int i = 1; i <= dynlen(propNames); i++)
{
@@ -611,6 +629,7 @@ connectTable(dyn_string propNames)
///////////////////////////////////////////////////////////////////////////////////
connectActualValue(string dp1, anytype actualValue)
{
+ LOG_DEBUG("connectActualValue: ", dp1, actualValue);
dyn_string queryResult;
anytype valueString;
dpGet($configDatapoint + ".queryResult", queryResult);
@@ -649,6 +668,7 @@ connectActualValue(string dp1, anytype actualValue)
///////////////////////////////////////////////////////////////////////////////////
bool elementTypeValid(string element)
{
+ LOG_DEBUG("elementTypeValid: ", element);
if ((DPEL_CHAR == dpElementType(element)) || (DPEL_UINT == dpElementType(element)) ||
(DPEL_INT == dpElementType(element)) || (DPEL_FLOAT == dpElementType(element)) ||
(DPEL_BOOL == dpElementType(element)) || (DPEL_STRING == dpElementType(element)))
@@ -681,6 +701,7 @@ bool elementTypeValid(string element)
///////////////////////////////////////////////////////////////////////////////////
void setColumnConfig(int TableNumber, int TableNumberToDisplay, int nrOfColumns, int MaximumColumns, string Addition)
{
+ LOG_DEBUG("etColumnConfig: ", TableNumber, TableNumberToDisplay, nrOfColumns, MaximumColumns, Addition);
int k, table_x, table_y;
@@ -718,6 +739,7 @@ int ConvIndex(int i)
///////////////////////////////////////////////////////////////////////////////////
void getTableNumber(string dpName, int &TableNumber)
{
+ LOG_DEBUG("getTableNumber: ", dpName, TableNumber);
dyn_string resultaat;
resultaat = strsplit(dpName, ".");
TableNumber = resultaat[2];
@@ -732,6 +754,7 @@ void getTableNumber(string dpName, int &TableNumber)
///////////////////////////////////////////////////////////////////////////////////
void getColumnTitle(string dpName, string &ColumnTitle)
{
+ LOG_DEBUG("getColumnTitle: ", dpName, ColumnTitle);
dyn_string resultaat;
resultaat = strsplit(dpName, ".");
ColumnTitle = strrtrim(resultaat[3], "dpNames:_online");
@@ -745,6 +768,7 @@ void getColumnTitle(string dpName, string &ColumnTitle)
/////////////////////////////////////////////////////////////////////
string dpGetElementName(string DPName)
{
+ LOG_DEBUG("dpGetElementName: ", DPName);
return strltrim(dpSubStr(DPName, DPSUB_DP_EL), dpSubStr(DPName, DPSUB_DP));
}
@@ -755,6 +779,7 @@ string dpGetElementName(string DPName)
/////////////////////////////////////////////////////////////////////
int dpGetElementValueInt(string DPName, string ViewType, string SubElement, int &Value)
{
+ LOG_DEBUG("dpGetElementValueInt: ", DPName, ViewType, SubElement, Value);
return dpGet("__navigator_" +
dpTypeName(DPName) +
"_" +
@@ -771,6 +796,7 @@ int dpGetElementValueInt(string DPName, string ViewType, string SubElement, int
/////////////////////////////////////////////////////////////////////
int dpSetElementValueInt(string DPName, string ViewType, string SubElement, int Value)
{
+ LOG_DEBUG("dpSetElementValueInt: ", DPName, ViewType, SubElement, Value);
return dpSet("__navigator_" +
dpTypeName(DPName) +
"_" +
@@ -787,6 +813,7 @@ int dpSetElementValueInt(string DPName, string ViewType, string SubElement, int
/////////////////////////////////////////////////////////////////////
int dpGetElementValueString(string DPName, string ViewType, string SubElement, string &Value)
{
+ LOG_DEBUG("dpGetElementValueString: ", DPName, ViewType, SubElement, Value);
return dpGet("__navigator_" +
dpTypeName(DPName) +
"_" +
@@ -802,7 +829,8 @@ int dpGetElementValueString(string DPName, string ViewType, string SubElement, s
/////////////////////////////////////////////////////////////////////
int dpGetElementValueFloat(string DPName, string ViewType, string SubElement, float &Value)
{
-return dpGet("__navigator_" +
+ LOG_DEBUG("dpGetElementValueFloat: ", DPName, ViewType, SubElement, Value);
+ return dpGet("__navigator_" +
dpTypeName(DPName) +
"_" +
ViewType +
@@ -818,6 +846,7 @@ return dpGet("__navigator_" +
/////////////////////////////////////////////////////////////////////
void getTraceNumber(string dpName, string &TraceNumber)
{
+ LOG_DEBUG("getTraceNumber: ", dpName, TraceNumber);
string HulpString;
dyn_string split;
dyn_string HulpSplit;
@@ -835,6 +864,7 @@ void getTraceNumber(string dpName, string &TraceNumber)
/////////////////////////////////////////////////////////////////////
void getTrendNumber(string dp1, int &TrendNumber)
{
+ LOG_DEBUG("getTrendNumber: ", dp1, TrendNumber);
dyn_string split, split2, split3;
dyn_string HulpSplit;
@@ -850,6 +880,7 @@ void getTrendNumber(string dp1, int &TrendNumber)
/////////////////////////////////////////////////////////////////////
void ConnectTrace(int TraceNumber)
{
+ LOG_DEBUG("ConnectTrace: ", TraceNumber);
dpConnect("TracePlot", "__nav_SingleElement_Trend.1.Trace" + TraceNumber + ".dpName",
"__nav_SingleElement_Trend.1.Trace" + TraceNumber + ".AutoScale",
"__nav_SingleElement_Trend.1.Trace" + TraceNumber + ".ScaleMin",
@@ -866,6 +897,7 @@ void ConnectTrace(int TraceNumber)
/////////////////////////////////////////////////////////////////////
void getSubviewName(string &subViewName)
{
+ LOG_DEBUG("getSubviewName: ", subViewName);
string text ="";
string bestandsnaam;
dyn_string split;
@@ -890,6 +922,7 @@ void getSubviewName(string &subViewName)
///////////////////////////////////////////////////////////////////////////////////
void NavConfigTrendFillDpeSelection(string datapoint)
{
+ LOG_DEBUG("NavConfigTrendFillDpeSelection: ",datapoint);
string selectedDP = list_dp.selectedText;
list_dpe.deleteAllItems;
if (selectedDP != "")
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
index 490b6148e14..fd3a6962a1b 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
@@ -26,15 +26,16 @@
void sendEventToPA(string msg, string destSysName)
{
- sendEvent(destSysName + "__gcfportAPI_DPAserver.", msg);
+ LOG_DEBUG("sendEventToPA: ", msg, destSysName);
+ sendEvent(destSysName + "__gcfportAPI_DPAserver.", msg);
}
void sendEvent(string dest, string msg)
{
- //DebugTN("Msg: " + msg);
- blob event;
- blobZero(event, strlen(msg) + 1); // "+ 1" workaround for known bug in CTRL impl.
- blobSetValue(event, 0, msg, strlen(msg));
- dpSet(dest, event);
+ LOG_DEBUG("Msg: ", msg);
+ blob event;
+ blobZero(event, strlen(msg) + 1); // "+ 1" workaround for known bug in CTRL impl.
+ blobSetValue(event, 0, msg, strlen(msg));
+ dpSet(dest, event);
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
index b3bc8ec5a2f..74e1f2c81c7 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
@@ -30,140 +30,141 @@
const string GCF_WD_DP = "__gcf_wd";
main()
{
- addGlobal("gConnManList", DYN_DYN_STRING_VAR);
- addGlobal("gDistSysList", DYN_UINT_VAR);
-
- startThread("gcfConnectionWatchDog");
+ addGlobal("gConnManList", DYN_DYN_STRING_VAR);
+ addGlobal("gDistSysList", DYN_UINT_VAR);
+
+ startThread("gcfConnectionWatchDog");
}
// watchdog section start
void gcfConnectionWatchDog()
{
- LOG_INFO("GCF: Starting GCF connection watch-dog");
- retrieveManNums(getSystemId());
- dpGet("_DistManager.State.SystemNums", gDistSysList);
- for (int i = 1; i <= dynlen(gDistSysList); i++)
- {
- retrieveManNums(gDistSysList[i]);
- }
- dpConnect("distSystemChanged", FALSE, "_DistManager.State.SystemNums");
- LOG_TRACE("GCF: Watch-dog started");
+LOG_DEBUG("GCF: Starting GCF connection watch-dog");
+ retrieveManNums(getSystemId());
+ dpGet("_DistManager.State.SystemNums", gDistSysList);
+ for (int i = 1; i <= dynlen(gDistSysList); i++)
+ {
+ retrieveManNums(gDistSysList[i]);
+ }
+ dpConnect("distSystemChanged", FALSE, "_DistManager.State.SystemNums");
+ LOG_DEBUG("GCF: Watch-dog started");
}
void retrieveManNums(unsigned sysNr)
{
- LOG_TRACE("GCF: Add managers for (new) system " + getSystemName(sysNr) + ".");
- string sysName = getSystemName(sysNr);
- dyn_anytype manNums;
- dpGet(sysName + "_Connections.Ui.ManNums", manNums);
- addManagers(sysNr, manNums, "Ui");
- dpConnect("uiConnectionsChanged", FALSE, sysName + "_Connections.Ui.ManNums");
- dpGet(sysName + "_Connections.Api.ManNums", manNums);
- addManagers(sysNr, manNums, "Api");
- dpConnect("apiConnectionsChanged", FALSE, sysName + "_Connections.Api.ManNums");
+ LOG_DEBUG("GCF: Add managers for (new) system " + getSystemName(sysNr) + ".");
+ string sysName = getSystemName(sysNr);
+ dyn_anytype manNums;
+ dpGet(sysName + "_Connections.Ui.ManNums", manNums);
+ addManagers(sysNr, manNums, "Ui");
+ dpConnect("uiConnectionsChanged", FALSE, sysName + "_Connections.Ui.ManNums");
+ dpGet(sysName + "_Connections.Api.ManNums", manNums);
+ addManagers(sysNr, manNums, "Api");
+ dpConnect("apiConnectionsChanged", FALSE, sysName + "_Connections.Api.ManNums");
}
void addManagers(unsigned sysNr, dyn_anytype manNums, string manType)
{
- string systemId = (string) sysNr;
- dyn_string manItem;
-
- for (int i = 1; i <= dynlen(manNums); i++)
- {
- manItem = makeDynString(sysNr, manType, manNums[i]);
- LOG_TRACE("GCF: Add mananger: " + getSystemName(sysNr) + manType + ":" + manNums[i]);
- gConnManList[dynlen(gConnManList) + 1] = manItem;
- }
+ LOG_DEBUG("addManagers: ", sysNr, manNums, manType);
+ string systemId = (string) sysNr;
+ dyn_string manItem;
+ for (int i = 1; i <= dynlen(manNums); i++)
+ {
+ manItem = makeDynString(sysNr, manType, manNums[i]);
+ LOG_TRACE("GCF: Add mananger: " + getSystemName(sysNr) + manType + ":" + manNums[i]);
+ gConnManList[dynlen(gConnManList) + 1] = manItem;
+ }
}
void distSystemChanged(string dp, dyn_uint newDistSysList)
-{
- for (int i = 1; i <= dynlen(gDistSysList); i++)
- {
- if (!dynContains(newDistSysList, gDistSysList[i]))
- {
- remoteSystemGone(gDistSysList[i]);
- }
- }
- for (int i = 1; i <= dynlen(newDistSysList); i++)
- {
- if (!dynContains(gDistSysList, newDistSysList[i]))
- {
- dpSet(GCF_WD_DP + ".sys", "c" + newDistSysList[i] + ":");
- retrieveManNums(newDistSysList[i]);
- }
- }
- gDistSysList = newDistSysList;
+{
+ LOG_DEBUG("distSystemChanged: ", dp, newDistSysList);
+ for (int i = 1; i <= dynlen(gDistSysList); i++)
+ {
+ if (!dynContains(newDistSysList, gDistSysList[i]))
+ {
+ remoteSystemGone(gDistSysList[i]);
+ }
+ }
+ for (int i = 1; i <= dynlen(newDistSysList); i++)
+ {
+ if (!dynContains(gDistSysList, newDistSysList[i]))
+ {
+ dpSet(GCF_WD_DP + ".sys", "c" + newDistSysList[i] + ":");
+ retrieveManNums(newDistSysList[i]);
+ }
+ }
+ gDistSysList = newDistSysList;
}
void remoteSystemGone(unsigned sysNr)
{
- LOG_TRACE("GCF: System " + getSystemName(sysNr) + " gone.");
- string msg = "d" + sysNr + ":";
- dpSet(GCF_WD_DP + ".sys", msg);
- for (int i = 1; i <= dynlen(gConnManList); i++)
- {
- if (gConnManList[i][1] == sysNr)
- {
- dynRemove(gConnManList, i);
- }
- }
+ LOG_DEBUG("GCF: System " + getSystemName(sysNr) + " gone.");
+ string msg = "d" + sysNr + ":";
+ dpSet(GCF_WD_DP + ".sys", msg);
+ for (int i = 1; i <= dynlen(gConnManList); i++)
+ {
+ if (gConnManList[i][1] == sysNr)
+ {
+ dynRemove(gConnManList, i);
+ }
+ }
}
void uiConnectionsChanged(string dp, dyn_uint value)
{
- connectionsChanged(dp, value, "Ui");
+ connectionsChanged(dp, value, "Ui");
}
void apiConnectionsChanged(string dp, dyn_uint value)
{
- connectionsChanged(dp, value, "Api");
+ connectionsChanged(dp, value, "Api");
}
void connectionsChanged(string dp, dyn_uint value, string manType)
{
- string sysNr = getSystemId(dpSubStr(dp, DPSUB_SYS));
+ LOG_DEBUG("connectionsChanged: ", dp, value, manType);
+ string sysNr = getSystemId(dpSubStr(dp, DPSUB_SYS));
- dyn_string msg;
- int i, j;
- bool manNumFound = false;
- dyn_string newItem;
- for (i = 1; i <= dynlen(value); i++)
- {
- for (j = 1; j <= dynlen(gConnManList); j++)
- {
- if (gConnManList[j][1] == sysNr &&
- gConnManList[j][2] == manType &&
- value[i] == gConnManList[j][3])
- {
- manNumFound = true;
- break;
- }
- }
- if (!manNumFound)
- {
- newItem = makeDynString(sysNr, manType, value[i]);
- LOG_TRACE("GCF: Add mananger: " + getSystemName(sysNr) + manType + ":" + value[i]);
- gConnManList[dynlen(gConnManList) + 1] = newItem;
- }
- else
- {
- manNumFound = false;
- }
- }
- for (i = 1; i <= dynlen(gConnManList); i++)
- {
- if (gConnManList[i][1] == sysNr &&
- gConnManList[i][2] == manType &&
- !dynContains(value, gConnManList[i][3]))
- {
- // a (remote) manager is disconnected from PVSS so inform the local property agent
- msg = "d" + sysNr + ":" + manType + ":" + gConnManList[i][3] + ":";
- LOG_TRACE("GCF: Remove mananger: " + msg);
- dpSet(GCF_WD_DP + ".man", msg);
-
- dynRemove(gConnManList, i);
- }
- }
+ dyn_string msg;
+ int i, j;
+ bool manNumFound = false;
+ dyn_string newItem;
+ for (i = 1; i <= dynlen(value); i++)
+ {
+ for (j = 1; j <= dynlen(gConnManList); j++)
+ {
+ if (gConnManList[j][1] == sysNr &&
+ gConnManList[j][2] == manType &&
+ value[i] == gConnManList[j][3])
+ {
+ manNumFound = true;
+ break;
+ }
+ }
+ if (!manNumFound)
+ {
+ newItem = makeDynString(sysNr, manType, value[i]);
+ LOG_TRACE("GCF: Add mananger: " + getSystemName(sysNr) + manType + ":" + value[i]);
+ gConnManList[dynlen(gConnManList) + 1] = newItem;
+ }
+ else
+ {
+ manNumFound = false;
+ }
+ }
+ for (i = 1; i <= dynlen(gConnManList); i++)
+ {
+ if (gConnManList[i][1] == sysNr &&
+ gConnManList[i][2] == manType &&
+ !dynContains(value, gConnManList[i][3]))
+ {
+ // a (remote) manager is disconnected from PVSS so inform the local property agent
+ msg = "d" + sysNr + ":" + manType + ":" + gConnManList[i][3] + ":";
+ LOG_TRACE("GCF: Remove mananger: " + msg);
+ dpSet(GCF_WD_DP + ".man", msg);
+ dynRemove(gConnManList, i);
+ }
+ }
}
\ No newline at end of file
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
index d86ed566079..2a712e043e1 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
@@ -35,6 +35,7 @@ global dyn_dyn_string gPSList; // 1 == scope; 2 == ID
unsigned gcfInit(string callBackFuncName)
{
+ LOG_DEBUG("gcfInit: ", callBackFuncName);
dyn_string callBackFuncNames, IDlist;
callBackFuncNames = getDynString(gCallBackList, 1);
IDlist = getDynString(gCallBackList, 2);
@@ -61,7 +62,7 @@ unsigned gcfInit(string callBackFuncName)
void gcfLeave(unsigned ID, bool inTerminate = false)
{
- LOG_INFO("GCF: ID " + ID + " will be freed.");
+ LOG_DEBUG("GCF: ID " + ID + " will be freed.");
for (int i = 1; i <= dynlen(gCallBackList); i++)
{
@@ -103,6 +104,7 @@ void gcfLeave(unsigned ID, bool inTerminate = false)
void gcfLoadPS(unsigned ID, string psScope)
{
+ LOG_DEBUG("gcfLoadPS: ", ID, psScope);
correctScope(psScope);
LOG_TRACE("GCF: Request to load property set " + psScope);
if (idExists(ID) && isPAOnline(dpSubStr(psScope, DPSUB_SYS)))
@@ -117,6 +119,7 @@ void gcfLoadPS(unsigned ID, string psScope)
void gcfUnloadPS(unsigned ID, string psScope)
{
+ LOG_DEBUG("gcfUnloadPS: ", ID, psScope);
correctScope(psScope);
LOG_TRACE("GCF: Request to unload property set " + psScope);
if (idExists(ID) && isPAOnline(dpSubStr(psScope, DPSUB_SYS)))
@@ -132,6 +135,7 @@ void gcfUnloadPS(unsigned ID, string psScope)
void gcfConfigurePS(unsigned ID, string psScope, string psApcName)
{
+ LOG_DEBUG("gcfConfigurePS: ", ID, psScope, psApcName);
correctScope(psScope);
LOG_TRACE("GCF: Request to configure property set " + psScope + " with APC " + psApcName);
if (idExists(ID) && isPAOnline(dpSubStr(psScope, DPSUB_SYS)))
@@ -150,6 +154,7 @@ void gcfConfigurePS(unsigned ID, string psScope, string psApcName)
void gcfMainCallBack(string callBackDP, blob value)
{
+ LOG_DEBUG("gcfMainCallBack: ", callBackDP, value);
dyn_string splittedDP = strsplit(dpSubStr(callBackDP, DPSUB_DP), "_");
unsigned lastElement = dynlen(splittedDP);
unsigned ID = splittedDP[lastElement - 1];
@@ -209,6 +214,7 @@ void gcfMainCallBack(string callBackDP, blob value)
unsigned registerAction(unsigned ID, string& psScope)
{
+ LOG_DEBUG("registerAction: ", ID, psScope);
dyn_string seqNrlist = getDynString(gSeqList, 1);
unsigned seqNr = 0;
do
@@ -223,6 +229,7 @@ unsigned registerAction(unsigned ID, string& psScope)
string getPropSet(unsigned seqNr)
{
+ LOG_DEBUG("getPropSet: ", seqNr);
for (int i = 1; i <= dynlen(gSeqList); i++)
{
if (gSeqList[i][1] == seqNr)
@@ -235,6 +242,7 @@ string getPropSet(unsigned seqNr)
void unregisterAction(unsigned seqNr)
{
+ LOG_DEBUG("unregisterAction: ", seqNr);
for (int i = 1; i <= dynlen(gSeqList); i++)
{
if (gSeqList[i][1] == seqNr)
@@ -247,6 +255,7 @@ void unregisterAction(unsigned seqNr)
string findCallBackFunc(unsigned ID)
{
+ LOG_DEBUG("findCallBackFunc: ", ID);
for (int i = 1; i <= dynlen(gCallBackList); i++)
{
if (gCallBackList[i][2] == ID)
@@ -259,6 +268,7 @@ string findCallBackFunc(unsigned ID)
bool idExists(unsigned ID)
{
+ LOG_DEBUG("idExists: ", ID);
dyn_string IDlist;
IDlist = getDynString(gCallBackList, 2);
return (dynContains(IDlist, ID) > 0);
@@ -266,17 +276,20 @@ bool idExists(unsigned ID)
string buildPortId(unsigned ID)
{
+ LOG_DEBUG("buildPortId: ", ID);
string systemId = (string) getSystemId();
return systemId + ":Ui:" + myManNum() + ":" + ID + ":";
}
string buildCallBackDP(unsigned ID)
{
+ LOG_DEBUG("buildCallBackDP: ", ID);
return getSystemName() + "__gcfportUIM" + myManNum() +"_" + ID + "_DPAclient";
}
void callUserDefinedFunction(string& callBackFunc, dyn_string& response)
{
+ LOG_DEBUG("callUserDefinedFunction: ", callBackFunc, response);
if (isFunctionDefined(callBackFunc))
{
startThread(callBackFunc, response);
@@ -289,6 +302,7 @@ void callUserDefinedFunction(string& callBackFunc, dyn_string& response)
void deletePropSet(string& psScope, unsigned ID)
{
+ LOG_DEBUG("deletePropSet: ", psScope, ID);
for (int i = 1; i <= dynlen(gPSList); i++)
{
if (gPSList[i][2] == ID && gPSList[i][1] == psScope)
@@ -300,6 +314,7 @@ void deletePropSet(string& psScope, unsigned ID)
void correctScope(string& psScope)
{
+ LOG_DEBUG("correctScope: ", psScope);
if (dpExists(psScope))
{
psScope = dpSubStr(psScope, DPSUB_SYS) + dpSubStr(psScope, DPSUB_DP);
@@ -315,6 +330,7 @@ void correctScope(string& psScope)
string getDPNameOnly(string& psScope)
{
+ LOG_DEBUG("getDPNameOnly: ", psScope);
if (dpExists(psScope))
{
return dpSubStr(psScope, DPSUB_DP);
@@ -334,6 +350,7 @@ string getDPNameOnly(string& psScope)
bool isPAOnline(string sysName)
{
+ LOG_DEBUG("isPAOnline: ", sysName);
bool paOnline = dpExists(sysName + "__gcfportAPI_DPAserver");
if (!paOnline) LOG_ERROR("GCF ERROR: PA on system " + sysName + " not reachable!");
@@ -342,6 +359,7 @@ bool isPAOnline(string sysName)
void gcfWatchDog(string dp, string wdMsg)
{
+ LOG_DEBUG("gcfWatchDog: ", dp, wdMsg);
unsigned sysNr = substr(wdMsg, 1, strlen(wdMsg) - 2);
if (wdMsg[0] == 'd')
{
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
index e5c29487f4f..9dedefb319d 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
@@ -57,6 +57,7 @@ main()
deleteDPs(string type)
{
+ LOG_DEBUG("deleteDPs: ", type);
string dpName;
dyn_string names = dpNames("*",type);
int i, len;
@@ -78,6 +79,7 @@ deleteDPs(string type)
void handleType(dyn_string types, string type, int dpelType)
{
+ LOG_DEBUG("handleType: ", types, type, dpelType);
if (dynContains(types, type))
{
deleteDPs(type);
diff --git a/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl b/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
index 3f190f896f5..a05bb7a0a5a 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
@@ -56,6 +56,7 @@ const unsigned treeView_INDENT = 4;
void treeView_Init()
{
+ LOG_DEBUG("treeView_Init");
if (addGlobal("gNodeTable", DYN_DYN_ANYTYPE_VAR) == 0)
{
@@ -69,6 +70,7 @@ void treeView_Init()
int treeView_addNode(string nodeName, unsigned parentId, string nodeInfo)
{
+ LOG_DEBUG("treeView_addNode: ", nodeName, parentId, nodeInfo);
int newNodeID = 0;
dyn_anytype parentNode = makeDynAnytype();
if (parentId > 0 && parentId <= dynlen(gNodeTable))
@@ -134,6 +136,7 @@ int treeView_addNode(string nodeName, unsigned parentId, string nodeInfo)
bool treeView_deleteNode(unsigned nodeId)
{
+ LOG_DEBUG("treeView_deleteNode: ", nodeId);
dyn_unsigned allParentIds;
unsigned nodeTableIdxOfChildToRemove;
// first delete all childs too
@@ -166,6 +169,7 @@ bool treeView_updateNode(unsigned nodeId, string nodeName, anytype nodeInfo)
dyn_anytype treeView_getNode(unsigned nodeId)
{
+ LOG_DEBUG("treeView_getNode: ", nodeId);
dyn_anytype node = makeDynAnytype();
if (dynlen(gNodeTable) >= nodeId && nodeId > 0)
{
@@ -176,6 +180,7 @@ dyn_anytype treeView_getNode(unsigned nodeId)
unsigned treeView_convTreeIdx2NodeId(unsigned treeViewIdx)
{
+ LOG_DEBUG("treeView_convTreeIdx2NodeId: ", treeViewIdx);
unsigned nodeId = 0;
if (dynlen(gTreeViewItem2NodeTable) >= treeViewIdx && treeViewIdx > 0)
{
@@ -186,6 +191,7 @@ unsigned treeView_convTreeIdx2NodeId(unsigned treeViewIdx)
dyn_unsigned treeView_findNodes(string nodePattern)
{
+ LOG_DEBUG("treeView_findNodes: ", nodePattern);
dyn_unsigned foundNodeIds;
strreplace(nodePattern, "_", ".");
strreplace(nodePattern, ":", ".");
@@ -204,6 +210,7 @@ dyn_unsigned treeView_findNodes(string nodePattern)
dyn_unsigned treeView_findNodesByInfo(string nodeInfoPattern)
{
+ LOG_DEBUG("treeView_findNodesByInfo: ", nodeInfoPattern);
dyn_unsigned foundNodeIds;
dyn_string allNodeInfos = getDynString(gNodeTable, treeView_INFO);
@@ -220,6 +227,7 @@ dyn_unsigned treeView_findNodesByInfo(string nodeInfoPattern)
treeView_defaultOnCollapseNode(unsigned selNodeIdx)
{
+ LOG_DEBUG("treeView_defaultOnCollapseNode: ", selNodeIdx);
dyn_string listItems = list.items;
if (selNodeIdx > 0 && selNodeIdx <= dynlen(gTreeViewItem2NodeTable))
@@ -249,6 +257,7 @@ treeView_defaultOnCollapseNode(unsigned selNodeIdx)
treeView_defaultOnExpandNode(unsigned selNodeIdx)
{
+ LOG_DEBUG("treeView_defaultOnExpandNode: ", selNodeIdx);
dyn_string listItems = list.items;
dyn_anytype expandNode;
dyn_unsigned allParentIds = getDynUInt(gNodeTable, treeView_PARENTID);
--
GitLab