From 7eb928e85907e7630451207b361770383829b44b Mon Sep 17 00:00:00 2001
From: Ted Moore <ted@tedmooremusic.com>
Date: Thu, 20 Jan 2022 11:10:59 -0500
Subject: [PATCH] user specified lin or log scaling

---
 release-packaging/Classes/FluidWaveform.sc | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/release-packaging/Classes/FluidWaveform.sc b/release-packaging/Classes/FluidWaveform.sc
index f89c293..27622ee 100644
--- a/release-packaging/Classes/FluidWaveform.sc
+++ b/release-packaging/Classes/FluidWaveform.sc
@@ -14,11 +14,12 @@ FluidViewer {
 }
 
 FluidWaveform : FluidViewer {
+	classvar lin = 0, log = 1;
 	var <win;
 
 	*new {
-		arg audioBuffer, indicesBuffer, featureBuffer, parent, bounds, lineWidth = 1, waveformColor, stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, normalizeFeaturesIndependently = true;
-		^super.new.init(audioBuffer,indicesBuffer, featureBuffer, parent, bounds, lineWidth, waveformColor,stackFeatures,rasterBuffer,rasterColorScheme,rasterAlpha,normalizeFeaturesIndependently);
+		arg audioBuffer, indicesBuffer, featureBuffer, parent, bounds, lineWidth = 1, waveformColor, stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, normalizeFeaturesIndependently = true, scaling = 1;
+		^super.new.init(audioBuffer,indicesBuffer, featureBuffer, parent, bounds, lineWidth, waveformColor,stackFeatures,rasterBuffer,rasterColorScheme,rasterAlpha,normalizeFeaturesIndependently,scaling);
 	}
 
 	close {
@@ -34,7 +35,7 @@ FluidWaveform : FluidViewer {
 	}
 
 	init {
-		arg audio_buf, slices_buf, feature_buf, parent_, bounds, lineWidth, waveformColor,stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, normalizeFeaturesIndependently = true;
+		arg audio_buf, slices_buf, feature_buf, parent_, bounds, lineWidth, waveformColor,stackFeatures = false, rasterBuffer, rasterColorScheme = 0, rasterAlpha = 1, normalizeFeaturesIndependently = true, scaling = 1;
 		Task{
 			var sfv, categoryCounter = 0, xpos, ypos;
 
@@ -95,9 +96,21 @@ FluidWaveform : FluidViewer {
 					arg vals;
 					fork({
 						var img = Image(rasterBuffer.numFrames,rasterBuffer.numChannels);
-/*						vals = (vals - vals.minItem) / (vals.maxItem - vals.minItem);
-						vals = (vals * 255).asInteger;*/
-						vals = (vals / vals.maxItem).ampdb.linlin(-120.0,0.0,0.0,255.0).asInteger;
+
+						scaling.switch(
+							FluidWaveform.lin,{
+								var minItem = vals.minItem;
+								vals = (vals - minItem) / (vals.maxItem - minItem);
+								vals = (vals * 255).asInteger;
+							},
+							FluidWaveform.log,{
+								vals = (vals + 1e-6).log;
+								vals = vals.linlin(0.0,vals.maxItem,0.0,255.0).asInteger;
+							},
+							{
+								"% scaling argument % is invalid.".format(thisMethod,scaling).warn;
+							}
+						);
 
 						vals.do{
 							arg val, index;