From 0e5980580a736707cc8e8d46e3e38cad214c05e8 Mon Sep 17 00:00:00 2001
From: Ted Moore <ted@tedmooremusic.com>
Date: Thu, 28 Oct 2021 18:14:30 +0100
Subject: [PATCH] FluidPlotter and test file

highlight method sets color
---
 release-packaging/Classes/FluidPlotter.sc | 170 ++++++++++++++++++++++
 test/FluidPlotter_test.scd                |  73 ++++++++++
 2 files changed, 243 insertions(+)
 create mode 100644 release-packaging/Classes/FluidPlotter.sc
 create mode 100644 test/FluidPlotter_test.scd

diff --git a/release-packaging/Classes/FluidPlotter.sc b/release-packaging/Classes/FluidPlotter.sc
new file mode 100644
index 0000000..f9fa27e
--- /dev/null
+++ b/release-packaging/Classes/FluidPlotter.sc
@@ -0,0 +1,170 @@
+FluidPlotter {
+	var <parent, <userView, <xmin, <xmax, <ymin, <ymax, <pointSize = 4, colors, dict, shape = \circle, catColors;
+
+	*new {
+		arg parent, bounds, dict, mouseMoveAction,xmin = 0,xmax = 1,ymin = 0,ymax = 1;
+		^super.new.init(parent, bounds, dict, mouseMoveAction,xmin,xmax,ymin,ymax);
+	}
+
+	init {
+		arg parent_, bounds, dict_, mouseMoveAction, xmin_ = 0,xmax_ = 1,ymin_ = 0,ymax_ = 1;
+
+		parent = parent_;
+		xmin = xmin_;
+		xmax = xmax_;
+		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.createPlotWindow(bounds,parent_,mouseMoveAction,dict_);
+	}
+
+	createCatColors {
+		catColors = "1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf".clump(6).do({
+			arg hex;
+			Color.newHex(hex);
+		});
+	}
+
+	setCategories_ {
+		arg labelSetDict;
+		labelSetDict.postln;
+	}
+
+	setColor_ {
+		arg identifier, color;
+		if(dict.at("data").at(identifier).notNil,{
+			colors.put(identifier,color);
+			this.refresh;
+		},{
+			"FluidPlotter::setColor_ identifier not found".warn;
+		});
+	}
+
+	shape_ {
+		arg sh;
+		shape = sh;
+		this.refresh;
+	}
+
+	background_ {
+		arg bg;
+
+	}
+
+	refresh {
+		userView.refresh;
+	}
+
+	pointSize_ {
+		arg ps;
+		pointSize = ps;
+		this.refresh;
+	}
+
+	dict_ {
+		arg d;
+		dict = d;
+		colors = Dictionary.newFrom(dict.at("data").keys.collect({
+			arg key;
+			[key,Color.black];
+		}).asArray.flatten);
+		this.refresh;
+	}
+
+	xmin_ {
+		arg val;
+		xmin = val;
+		this.refresh;
+	}
+
+	xmax_ {
+		arg val;
+		xmax = val;
+		this.refresh;
+	}
+
+	ymin_ {
+		arg val;
+		ymin = val;
+		this.refresh;
+	}
+
+	ymax_ {
+		arg val;
+		ymax = val;
+		this.refresh;
+	}
+
+	highlight_ {
+		arg identifier, color;
+		var found = false;
+		colors.keys.do{
+			arg key;
+			if(key == identifier,{
+				colors.put(key,color);
+				found = true;
+			},{
+				colors.put(key,Color.black);
+			});
+		};
+		if(found,{
+			this.refresh;
+		},{
+			"FluidPlotter::highlight_ identifier not found".warn;
+		});
+	}
+
+	dictNotProperlyFormatted {
+		"FluidPlotter: The dictionary passed in is not properly formatted.".error;
+	}
+
+	createPlotWindow {
+		arg bounds,parent_, mouseMoveAction,dict_;
+		var xpos, ypos;
+
+		if(parent_.isNil,{xpos = 0; ypos = 0},{xpos = bounds.left; ypos = bounds.top});
+
+		parent = parent_ ? Window("FluidPlotter",bounds);
+		userView = UserView(parent,Rect(xpos,ypos,bounds.width,bounds.height));
+
+		userView.drawFunc_({
+			dict.at("data").keysValuesDo({
+				arg key, pt;
+				var scaledx = pt[0].linlin(xmin,xmax,0,userView.bounds.width) - (pointSize/2);
+				var scaledy = pt[1].linlin(ymin,ymax,0,userView.bounds.height) - (pointSize/2);
+				var color = colors.at(key);
+
+				shape.switch(
+					\square,{Pen.addRect(Rect(scaledx,scaledy,pointSize,pointSize))},
+					\circle,{Pen.addOval(Rect(scaledx,scaledy,pointSize,pointSize))}
+				);
+
+				Pen.color_(color);
+				Pen.draw;
+			});
+		});
+
+		userView.mouseMoveAction_({
+			arg view, x, y, modifiers;
+			x = x.linlin(pointSize/2,userView.bounds.width-(pointSize/2),xmin,xmax);
+			y = y.linlin(pointSize/2,userView.bounds.height-(pointSize/2),ymin,ymax);
+			mouseMoveAction.(this,x,y,modifiers);
+		});
+
+		if(parent_.isNil,{parent.front;});
+
+		this.dict_(dict_);
+	}
+
+	close {
+		parent.close;
+	}
+}
\ No newline at end of file
diff --git a/test/FluidPlotter_test.scd b/test/FluidPlotter_test.scd
new file mode 100644
index 0000000..904f3b6
--- /dev/null
+++ b/test/FluidPlotter_test.scd
@@ -0,0 +1,73 @@
+(
+~dummy_data = {
+	Dictionary.newFrom([
+		"cols",2,
+		"data",Dictionary.newFrom(Array.fill(200,{
+			arg i;
+			var return;
+			if((i % 2) == 0,{
+				return = "example-%".format((i/2).asInteger);
+			},{
+				return = [exprand(20,20000),rrand(-130,0)];
+			});
+			// return.postln;
+			return;
+		}))
+	]);
+};
+)
+
+(
+Window.closeAll;
+// self window
+d = ~dummy_data.value;
+// d.postln;
+~fp = FluidPlotter(bounds:Rect(200,200,600,600),dict:d,mouseMoveAction:{
+	arg view, x, y, modifiers;
+	[view, x, y, modifiers].dopostln;
+	"".postln;
+},xmin:20,xmax:20000,ymin:-130,ymax:0);
+)
+
+~fp.pointSize_(6)
+
+(
+10.do({
+	~fp.setColor_("example-%".format(rrand(0,99)),Color.yellow);
+});
+)
+
+~fp.highlight_("example-90",Color.red);
+
+~fp.dict_(~dummy_data.value);
+
+~fp.ymin_(-50)
+
+~fp.shape_(\square)
+
+
+// with parent
+(
+Window.closeAll;
+d = Dictionary.newFrom([
+	"cols",2,
+	"data",Dictionary.newFrom(Array.fill(200,{
+		arg i;
+		var return;
+		if((i%2) == 0,{
+			return = "exmaple-%".format((i/2).asInteger);
+		},{
+			return = [exprand(20,20000),rrand(-130,0)];
+		});
+		return;
+	}))
+]);
+w = Window("test",Rect(50,50,800,600)).front;
+~fp = FluidPlotter(w,Rect(50,50,400,400),dict:d,mouseMoveAction:{
+	arg view, x, y, modifiers;
+	[view, x, y, modifiers].dopostln;
+	"".postln;
+},xmin:20,xmax:20000,ymin:-130,ymax:0);
+)
+
+~fp.setColor_("example-7",Color.red);
\ No newline at end of file