diff --git a/release-packaging/Classes/FluidDataSet.sc b/release-packaging/Classes/FluidDataSet.sc index 2bffa0a..cccfdd7 100644 --- a/release-packaging/Classes/FluidDataSet.sc +++ b/release-packaging/Classes/FluidDataSet.sc @@ -24,6 +24,7 @@ FluidDataSet : FluidManipulationClient { } init {|name| + this.baseinit(FluidManipulationClient.prServerString(name)); id = name; this.cache; } diff --git a/release-packaging/Classes/FluidDataSetQuery.sc b/release-packaging/Classes/FluidDataSetQuery.sc index fa16da4..c66a121 100644 --- a/release-packaging/Classes/FluidDataSetQuery.sc +++ b/release-packaging/Classes/FluidDataSetQuery.sc @@ -8,6 +8,7 @@ FluidDataSetQuery : FluidManipulationClient { init {|uid| id = uid; + this.baseinit(uid); } addColumn{|column, action| diff --git a/release-packaging/Classes/FluidLabelSet.sc b/release-packaging/Classes/FluidLabelSet.sc index 585c008..cd715fa 100644 --- a/release-packaging/Classes/FluidLabelSet.sc +++ b/release-packaging/Classes/FluidLabelSet.sc @@ -22,6 +22,7 @@ FluidLabelSet : FluidManipulationClient { } init { |name| + this.baseinit(FluidManipulationClient.prServerString(name)); id = name; this.cache; } diff --git a/release-packaging/Classes/FluidManipulationClient.sc b/release-packaging/Classes/FluidManipulationClient.sc index 62e4d79..5449e07 100644 --- a/release-packaging/Classes/FluidManipulationClient.sc +++ b/release-packaging/Classes/FluidManipulationClient.sc @@ -53,7 +53,7 @@ FluidManipulationClient { if(server.serverRunning.not,{ (this.asString + "– server not running").error; ^nil }); - ^super.newCopyArgs(server ?? {Server.default}).baseinit(objectID,*args) + ^super.newCopyArgs(server ?? {Server.default});//.baseinit(objectID,*args) } makeDef { |defName,objectID,args| @@ -135,7 +135,7 @@ FluidManipulationClient { FluidDataClient : FluidManipulationClient { - classvar synthControls; + var synthControls; var 0 and: synthControls.isNil) {synthControls = params.unlace[0]}; ^super.new(server, uid, *params) !? { |inst| inst.init(uid, params) } } init { |uid, params| id = uid; + params = params ?? {[]}; + if(params.size > 0 and: synthControls.isNil) {synthControls = params.unlace[0]}; parameters = ().putPairs(params); parameterDefaults = parameters.copy; this.makePropertyMethods; + this.baseinit(uid,*params); } makePropertyMethods{ @@ -204,10 +205,20 @@ FluidRTDataClient : FluidDataClient *new1{|server, params| + params = params ?? {[]}; + ^super.new1(server,params) + } + + + init { |uid, params| + id = uid; params = params ?? {[]}; if(params.size > 0) {synthControls = params.unlace[0]}{synthControls=[]}; params = params ++ [\inBus,Bus.control,\outBus,Bus.control,\inBuffer,-1,\outBuffer,-1]; - ^super.new1(server,params) + parameters = ().putPairs(params); + parameterDefaults = parameters.copy; + this.makePropertyMethods; + this.baseinit(uid,*params); } makeDef {|defName,uid,args| diff --git a/release-packaging/HelpSource/Guides/FluidDataTools.schelp b/release-packaging/HelpSource/Guides/FluidDataTools.schelp index 0c5c754..01589f3 100644 --- a/release-packaging/HelpSource/Guides/FluidDataTools.schelp +++ b/release-packaging/HelpSource/Guides/FluidDataTools.schelp @@ -12,6 +12,7 @@ section:: Containers Map id labels to data points, or to other labels link::Classes/FluidDataSet:: + link::Classes/FluidLabelSet::