added some error checks and warnings

release-packaging/Classes/FluidPlotter.sc

@@ -33,14 +33,8 @@ FluidPlotter {
 		ymin = ymin_;
 		ymax = ymax_;
 
-		if(dict_.isNil,{this.dictNotProperlyFormatted});
-		if(dict_.size != 2,{this.dictNotProperlyFormatted});
-		if(dict_.at("data").isNil,{this.dictNotProperlyFormatted});
-		if(dict_.at("cols").isNil,{this.dictNotProperlyFormatted});
-		if(dict_.at("cols") != 2,{this.dictNotProperlyFormatted});
-
 		this.createCatColors;
-		this.dict_(dict_);
+		if(dict_.notNil,{this.dict_(dict_)});
 		this.createPlotWindow(bounds,parent_,mouseMoveAction,dict_);
 		this.background_(Color.white);
 	}
@@ -54,14 +48,18 @@ FluidPlotter {
 
 	setCategories_ {
 		arg labelSetDict;
-		dict_internal.keysValuesDo({
+		if(dict_internal.notNil,{
-			arg id, pt;
+			dict_internal.keysValuesDo({
-			var col, cat = labelSetDict.at("data").at(id)[0].interpret;
+				arg id, pt;
-			if(cat > (catColors.size-1),{"FluidPlotter:setCategories_ FluidPlotter doesn't have that many category colors. You can use the method 'setColor_' to set colors for individual points.".warn});
+				var col, cat = labelSetDict.at("data").at(id)[0].interpret;
-			col = catColors[cat];
+				if(cat > (catColors.size-1),{"FluidPlotter:setCategories_ FluidPlotter doesn't have that many category colors. You can use the method 'setColor_' to set colors for individual points.".warn});
-			pt.color_(col);
+				col = catColors[cat];
+				pt.color_(col);
+			});
+			this.refresh;
+		},{
+			"FluidPlotter::setCategories_ FluidPlotter cannot receive setCategories. It has no data. First set a dictionary.".warn;
 		});
-		this.refresh;
 	}
 
 	setSizeMultiplier_ {
@@ -113,11 +111,18 @@ FluidPlotter {
 
 	dict_ {
 		arg d;
+
+		if(d.isNil,{^this.dictNotProperlyFormatted});
+		if(d.size != 2,{^this.dictNotProperlyFormatted});
+		if(d.at("data").isNil,{^this.dictNotProperlyFormatted});
+		if(d.at("cols").isNil,{^this.dictNotProperlyFormatted});
+		if(d.at("cols") != 2,{^this.dictNotProperlyFormatted});
+
 		dict = d;
 		dict_internal = Dictionary.new;
 		dict.at("data").keysValuesDo({
 			arg k, v;
-/*			k.postln;
+			/*			k.postln;
 			v.postln;*/
 			dict_internal.put(k,FluidPlotterPoint(k,v[0],v[1],Color.black,1));
 		});
@@ -170,31 +175,33 @@ FluidPlotter {
 		userView = UserView(parent,Rect(xpos,ypos,bounds.width,bounds.height));
 
 		userView.drawFunc_({
-			dict_internal.keysValuesDo({
+			if(dict_internal.notNil,{
-				arg key, pt;
+				dict_internal.keysValuesDo({
-				var pointSize_, scaledx, scaledy, color;
+					arg key, pt;
-
+					var pointSize_, scaledx, scaledy, color;
-/*				key.postln;
+
-				pt.postln;
+					/*				key.postln;
-				pt.x.postln;
+					pt.postln;
-				pt.y.postln;*/
+					pt.x.postln;
-
+					pt.y.postln;*/
-				if(key == highlightIdentifier,{
+
-					pointSize_ = pointSize * 2.3 * pt.sizeMultiplier
+					if(key == highlightIdentifier,{
-				},{
+						pointSize_ = pointSize * 2.3 * pt.sizeMultiplier
-					pointSize_ = pointSize * pt.sizeMultiplier
+					},{
+						pointSize_ = pointSize * pt.sizeMultiplier
+					});
+
+					scaledx = pt.x.linlin(xmin,xmax,0,userView.bounds.width,nil) - (pointSize_/2);
+					scaledy = pt.y.linlin(ymax,ymin,0,userView.bounds.height,nil) - (pointSize_/2);
+
+					shape.switch(
+						\square,{Pen.addRect(Rect(scaledx,scaledy,pointSize_,pointSize_))},
+						\circle,{Pen.addOval(Rect(scaledx,scaledy,pointSize_,pointSize_))}
+					);
+
+					Pen.color_(pt.color);
+					Pen.draw;
 				});
-
-				scaledx = pt.x.linlin(xmin,xmax,0,userView.bounds.width,nil) - (pointSize_/2);
-				scaledy = pt.y.linlin(ymax,ymin,0,userView.bounds.height,nil) - (pointSize_/2);
-
-				shape.switch(
-					\square,{Pen.addRect(Rect(scaledx,scaledy,pointSize_,pointSize_))},
-					\circle,{Pen.addOval(Rect(scaledx,scaledy,pointSize_,pointSize_))}
-				);
-
-				Pen.color_(pt.color);
-				Pen.draw;
 			});
 		});
 

test/FluidPlotter_test.scd

@@ -1,5 +1,6 @@
 (
 ~dummy_data = {
+	arg xmin = 20, xmax = 20000, ymin = -130, ymax = 0;
 	Dictionary.newFrom([
 		"cols",2,
 		"data",Dictionary.newFrom(Array.fill(200,{
@@ -8,7 +9,7 @@
 			if((i % 2) == 0,{
 				return = "example-%".format((i/2).asInteger);
 			},{
-				return = [exprand(20,20000),rrand(-130,0)];
+				return = [rrand(xmin,xmax),rrand(ymin,ymax)];
 			});
 			// return.postln;
 			return;
@@ -54,6 +55,7 @@ d = ~dummy_data.value;
 
 ~fp.setColor_("example-7",Color.red);
 
+~fp.background_(Color.white)
 ~fp.background_(Color.red)
 
 ~fp.close;
@@ -67,7 +69,7 @@ s.waitForBoot{
 
 		s.sync;
 
-		ds.load(~fp.dict,{
+		ds.load(~dummy_data.(),{
 			kmeans.fitPredict(ds,labelset,{
 				labelset.dump({
 					arg lsdict;
@@ -103,4 +105,11 @@ w = Window("test",Rect(50,50,800,600)).front;
 	[view, x, y, modifiers].dopostln;
 	"".postln;
 },xmin:20,xmax:20000,ymin:-130,ymax:0);
-)
+)
+
+(
+Window.closeAll;
+~fp = FluidPlotter(bounds:Rect(100,100,500,500))
+)
+
+~fp.dict_(~dummy_data.(0.01,1,0.0,1.0).postln);