diff testApp.h @ 22:8c0783739337

Logs uploading. Questionnaire also.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Thu, 24 Jan 2013 18:14:40 +0000
parents fb2ef16dd013
children a4908ad8c78e
line wrap: on
line diff
--- a/testApp.h	Fri Jan 18 15:48:33 2013 +0000
+++ b/testApp.h	Thu Jan 24 18:14:40 2013 +0000
@@ -87,20 +87,21 @@
     void sendOSCParams();
     
     void showQuestionnaire();
-    void questionnaireHidden(NSArray * answers);
+    void questionnaireHidden(vector<int> answers);
     
     // stardard GUI - knbs and sliders - hides zoomer
     bool standardGUIShowing;
     void standardGUIEvent(ofxUIEventArgs &e);
     void setupStandardGui();
     ofxUICanvas *standardGUI;
+    void sliderMoved(int which, float value);
+    void setAllGUISliders(vector<int> vals);
     
     // zoom gui - the swap view button and save preset button
     void zoomGUIEvent(ofxUIEventArgs &e);
     void setupZoomGui();
     
-    void sliderMoved(int which, float value);
-    void setAllGUISliders(vector<int> vals);
+
     void sendParametersToPD();
     void sendOscShape(int ctrlin);
     void sendFiltShape(int ctrlin);
@@ -119,3 +120,7 @@
     
 };
 
+// should be off split into
+// GUI controller
+// parameter converter
+// 
\ No newline at end of file