From ba0191046e30c7060a8ce00e48c58ba962c4a514 Mon Sep 17 00:00:00 2001 From: Sidi Liang <1467329765@qq.com> Date: Tue, 22 Jun 2021 02:10:06 +0800 Subject: [PATCH] Nasal: improve Debugger, change InformationNode to Variable --- Nasal/library.nas | 2 +- Nasal/node_setup.nas | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Nasal/library.nas b/Nasal/library.nas index c19e75a..69341ab 100644 --- a/Nasal/library.nas +++ b/Nasal/library.nas @@ -64,7 +64,7 @@ var Debugger = { _debugLevel: 0, debugPrint: func(info, debugLevel){ - if(debugLevel = me._debugLevel) print(me.name ~ ": " ~ info); + if(debugLevel <= me._debugLevel) print(me.name ~ ": " ~ info); }, setDebugLevel: func(debugLevel){ me._debugLevel = debugLevel; diff --git a/Nasal/node_setup.nas b/Nasal/node_setup.nas index 46487e8..7a3ea23 100644 --- a/Nasal/node_setup.nas +++ b/Nasal/node_setup.nas @@ -2,11 +2,11 @@ #//Sidi Liang, 2021 io.include("library.nas"); -var informationNodeDebug = Debugger.new("Information Node"); -informationNodeDebug.setDebugLevel(2); +var universalVariableDebug = Debugger.new("Information Node"); +universalVariableDebug.setDebugLevel(2); -var InformationNode = { - #//testingInformationNode = InformationNode.new("test", "testing", "This is a node for testing", 0, 1, 1, "/systems/testingNode"); +var Variable = { + #//testingVariable = Variable.new("test", "testing", "This is a node for testing", 0, 1, 1, "/systems/testingNode"); new: func(name, value = 0, note = nil, readOnly = 0, usePropertyTree = 0, listenPropertyTree = 1, property = nil){ var m = {parents:[InformationNode]}; m._name = name; @@ -31,7 +31,7 @@ var InformationNode = { me._value = me._propertyNode.getValue(); return 1; }else{ - informationNodeDebug.debugPrint("Error when updating "~me._name~" from property: Cannot write to a read only node", 1); + universalVariableDebug.debugPrint("Error when updating "~me._name~" from property: Cannot write to a read only node", 1); return 0; } }, @@ -41,7 +41,7 @@ var InformationNode = { if(me._usePropertyTree) me._propertyNode.setValue(value); return 1; }else{ - informationNodeDebug.debugPrint("Error when writing to "~me._name~" : Cannot write to a read only node", 1); + universalVariableDebug.debugPrint("Error when writing to "~me._name~" : Cannot write to a read only node", 1); return 0; } }, @@ -58,14 +58,14 @@ var InformationNode = { me._usePropertyTree = value; if(!value and me._listenPropertyTree){ removeListener(me._propertyListener); - informationNodeDebug.debugPrint(me._name~" : listener removed", 2); + universalVariableDebug.debugPrint(me._name~" : listener removed", 2); }else if(value and me._listenPropertyTree){ me._propertyListener = setlistener(property, func m._updateValueFromProperty, 0, 1); - informationNodeDebug.debugPrint(me._name~" : listener (re)added", 2); + universalVariableDebug.debugPrint(me._name~" : listener (re)added", 2); } return 1; }else{ - informationNodeDebug.debugPrint("Error when (dis)enabling property tree of "~me._name~" : property node not initialized", 1); + universalVariableDebug.debugPrint("Error when (dis)enabling property tree of "~me._name~" : property node not initialized", 1); return 0; } },