xform working in audioplot

3 files changed, 9 insertions, 5 deletions

diff --git a/gistanalysis/notes b/gistanalysis/notes
index 0a8ec94..eb389b4 100644
--- a/gistanalysis/notes
+++ b/gistanalysis/notes
@@ -104,3 +104,4 @@ fix transformer within audioplotter
 audioplot mirror & random sampling
 get some content for ambulance
 
+seems to be a bug when closing while the mic is live
diff --git a/gui/src/AudioPlotter.cpp b/gui/src/AudioPlotter.cpp
index dba6765..e78e8ba 100644
--- a/gui/src/AudioPlotter.cpp
+++ b/gui/src/AudioPlotter.cpp
@@ -12,15 +12,17 @@ colourPolyline Audioplotter::compute_chaos(colourPolyline& poly,float colourFade
     }
     return tempPoly;
 }
-vector <colourPolyline> Audioplotter::output(float scale,float decay){
+vector <colourPolyline> Audioplotter::output(float plotscale,float plotdecay){
 
         ofMatrix4x4 x = ofMatrix4x4::newIdentityMatrix();
         x.translate((-ofGetWidth()/2)+((ofVec2f)translate).x,(-ofGetHeight()/2)+((ofVec2f)translate).y,0);
         x.rotate(rotate,0,0,1);
-        //x.scale(((ofVec2f)scale).x,((ofVec2f)scale).y,1.0f);
+
+        x.scale(((ofVec2f)scale).x,((ofVec2f)scale).y,1.0f);
+
         x.translate((ofGetWidth()/2),(ofGetHeight()/2),0);
     //destructive or non?
-            float fadefactor=decay<0.0f?1.0f-(1.0f/history_size):decay;
+            float fadefactor=plotdecay<0.0f?1.0f-(1.0f/history_size):plotdecay;
 
             vector <colourPolyline> outdata;
 
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index 0c5ed9c..af03943 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -90,9 +90,9 @@ void ofApp::setup(){
 	drawgui.add(xf_scale_max.setup("scale max", 2.0, 0.0, 3.0));
 
 	audiogui.setup("audio","",10,600); 
-	audiogui.add(useMic.set("mic",true));
+	audiogui.add(useMic.set("mic",false));
 	audiogui.add(useFft.set("fft",false));
-	audiogui.add(scalePlot.set("scale plot", 0.1f, 0.0f, 1.0f ));
+	audiogui.add(scalePlot.set("plotscale", 0.1f, 0.0f, 1.0f )); //parameters are recognised by name only?
     audiogui.add(decayPlot.set("decay", 0.9f, 0.0f, 1.0f ));
     audiogui.add(plotter.joined.set("joined",true));
     audiogui.add(plotter.bars.set("bars",true));
@@ -868,6 +868,7 @@ void ofApp::drawOutput(ofEventArgs & args){
 
 //--------------------------------------------------------------
 void ofApp::exit() {
+	audiogui.clear();
 
 }