1 files changed, 7 insertions, 33 deletions
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;
     }
 }
 //--------------------------------------------------------------