fixed rounding bug

5 files changed, 43 insertions, 45 deletions

diff --git a/gistanalysis/addons.make b/gistanalysis/addons.make
index e66c6c6..7ac7b4a 100644
--- a/gistanalysis/addons.make
+++ b/gistanalysis/addons.make
@@ -1,7 +1,8 @@
-ofxGist
-ofxOpenALSoundPlayer
-ofxHistoryPlot
 ofxHelios
 ofxMidi
 ofxGui
+ofxXMLSettings
+ofxGist
+ofxOpenALSoundPlayer
+ofxHistoryPlot
 ofxAChaoslib
diff --git a/gistanalysis/notes b/gistanalysis/notes
index d7ab8ad..ad7d756 100644
--- a/gistanalysis/notes
+++ b/gistanalysis/notes
@@ -80,7 +80,7 @@ n- scriptable transforms
 - some kind of svg thing for ambulance with audio animation
 
 scale isn't scaling from centre - move evrything to centre and use centre feature of ofxHelios
-add a master scale
+X add a master scale
 X rotate isn't working at all
 set modifiers for transformations to animate
 need to hook up midi
@@ -92,4 +92,15 @@ need to hook up midi
 4. animate origin and output seperately - tv hold effects
 5. hook up to midi - get controller 
 
+restore from old project? 
+don't need concept of output pos but could use concept of output scale
+make new project with bones of that project? np - add in positioning interface?
+
+X get audio working in gui project
+-> get audio input with fft
+fix plotting bug not filling width 
+is it being clipped?
+fix transformer within audioplotter
+audioplot mirror & random sampling
+get some content for ambulance
 
diff --git a/gistanalysis/src/main.cpp b/gistanalysis/src/main.cpp
index 88fea88..980f11b 100644
--- a/gistanalysis/src/main.cpp
+++ b/gistanalysis/src/main.cpp
@@ -18,7 +18,7 @@ int main(int argc, char *argv[]){
 	mainWindow->setVerticalSync(false);
 
 	settings.width = 600;
-	settings.height = 900;
+	settings.height = 1160;
 	settings.setPosition(ofVec2f(0,0));
 	settings.resizable = true;
 
diff --git a/gistanalysis/src/ofApp.cpp b/gistanalysis/src/ofApp.cpp
index 43c6f29..5b75d26 100644
--- a/gistanalysis/src/ofApp.cpp
+++ b/gistanalysis/src/ofApp.cpp
@@ -73,7 +73,6 @@ void ofApp::setup(){
     chaosgui.add(plotter.chaos_p.set("p", 7.7f, 0.0f, 10.0f));
 
     lasergui.setup("laser","",230,200);
-    lasergui.add(drawWarpFrame.set("show warp", false));
     lasergui.add(intensity.set("intensity", 30, 0, 255));
     lasergui.add(subdivide.set("subdivide", 15, 1, 100));
     lasergui.add(blank_num.set("blank points", 8, 0, 32));
@@ -364,16 +363,15 @@ void ofApp::drawOutput(ofEventArgs & args){
         pnum+=shape.size();
     }
 
-    if (drawWarpFrame){
-        lineTransformer::drawWarpFrame(warpframe);
-    }
+ //   if (drawWarpFrame){
+ //       lineTransformer::drawWarpFrame(warpframe);
+ //   }
 
 //LASER
 
     laser.set_subdivide(subdivide);
     laser.set_blanknum(blank_num);
     laser.set_maxangle(max_angle);
-
     laser.set_intensity(intensity);
     
     //int num=laser.draw(lines,30);
@@ -498,35 +496,11 @@ void ofApp::outputKeyPressed(ofKeyEventArgs &args){
 }
 //--------------------------------------------------------------
 void ofApp::keyPressed(int key){
-    if(key =='f'){
-        ofToggleFullscreen();
-    }
-    
-    if(key =='m'){
-        useMic = !useMic;
-        
-        if(!useMic){
-            player.play();
-        }else{
-            player.stop();
+    switch(key){
+        case '`':{
+            bShowPositionInterface=!bShowPositionInterface;
+            break;
         }
-        
-        
-        gist.clearHistory();
-    }
-    
-    if(key ==' '){
-        isPaused = !isPaused;
-        player.setPaused(isPaused);
-    }
-    
-    if(key =='r'){
-        gist.clearHistory();
-    }
-    
-    
-    if(key =='c'){
-        showMFCC = !showMFCC;
     }
 }
 //--------------------------------------------------------------
diff --git a/gistanalysis/src/ofApp.h b/gistanalysis/src/ofApp.h
index 11ddbb6..780b042 100644
--- a/gistanalysis/src/ofApp.h
+++ b/gistanalysis/src/ofApp.h
@@ -2,22 +2,23 @@
 
 #include "ofMain.h"
 #include "ofxHelios.h"
-#include "ofxAChaoslib.h"
 #include "lineTransformer.h"
 
+#include "ofxMidi.h"
+#include "ofxGui.h"
+#include "ofxXmlSettings.h"
+
+#include "ofxGist.h"
 //This is included only as a way of getting buffer out of loaded sound.
 //There are many other ways you can do that.
 //This player includes a version of kissFFT. You can remove the one included in Gist.
 //https://github.com/borg/ofxOpenALSoundPlayer
 #include "ofxOpenALSoundPlayer.h"
-#include "ofxMidi.h"
-#include "ofxGui.h"
-
 //Slightly modified to add a dynamic getVariable method to be able to plot based on
 //gist feature list
 //https://github.com/local-projects/ofxHistoryPlot
 #include "ofxHistoryPlot.h"
-#include "ofxGist.h"
+#include "ofxAChaoslib.h"
 
 //audioplot draws from 0 to ofGetWidth
 //change to -ofGetWidth/2 to ofGetWidth/2
@@ -247,19 +248,30 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 
         ofxPanel lasergui;
         ofParameter<int> intensity;
+        ofParameter<int> points;
         ofParameter<int> subdivide;
         ofParameter<int> blank_num;
         ofParameter<float> max_angle;
 
         //======================================= //positioning interface
 
-        ofParameter<bool> drawWarpFrame;
+        bool bShowPositionInterface;
+        bool bOutputSelected;
+        ofPoint outputSelectionPoint;
+        ofPoint outputPosition;
+        ofPoint outputOffset;
+        float outputScale;
+        float outputOffsetScale;
+
+        //======================================= //warping interface
 
         glm::vec2 warpframe[4];
         int select_warpframe;
         
-        float outputScale;
 
+        //======================================= //saving settings
+
+        ofxXmlSettings XML;
 
     
 };