From d1a44d34955133815d2c322b600a79cceecf5a95 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Fri, 21 Sep 2012 17:02:21 +0100
Subject: beginning gui

---
 liveengine/src/testApp.h | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'liveengine/src/testApp.h')

diff --git a/liveengine/src/testApp.h b/liveengine/src/testApp.h
index 27380af..0da5eae 100755
--- a/liveengine/src/testApp.h
+++ b/liveengine/src/testApp.h
@@ -73,6 +73,8 @@ option to randomise colours on each note
 #include "ofxMidi.h"
 #include "ofxFensterManager.h"
 
+#include "ofxGui.h"
+
 
 #include "viewport.h"
 
@@ -85,6 +87,16 @@ public:
 	void draw();
 };
 
+class guiWindow: public ofxFensterListener{
+public:
+	~guiWindow();
+	ofxPanel *gui;
+	void setup();
+	void setGui(ofxPanel *panel);
+	void draw();
+};
+
+
 //#define GRAB_TEXTURE
 
 class testApp : public ofxFensterListener, public ofxMidiListener{
@@ -121,11 +133,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 
         //to be moved into svg object gui
 
-		bool debug, controlColours;
-		bool noteRandomiseColours;
-		bool transparentBlack;
-		
-		bool reversemain;
+		bool debug;
 		
 		bool fullscreenoutput;
 
@@ -139,11 +147,16 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		int xshift,yshift;
 
 		ofColor* controller_colours;
+		
+		float colShift;
 
 		viewport vp1,vp2;
 
 		previewWindow prevWin;
-
+		guiWindow guiWin;
+		
+		ofxFenster* win;
+		
 		int midiChannel;
 
 		ofxMidiIn	midiIn;
@@ -151,6 +164,18 @@ class testApp : public ofxFensterListener, public ofxMidiListener{
 		void newMidiMessage(ofxMidiEventArgs& eventArgs);
 
 		playlist list;
+		
+		ofxPanel gui;
+		ofxToggle reversemain;
+		ofxToggle controlColours;
+		ofxToggle noteRandomiseColours;
+		ofxToggle transparentBlack;
+		ofxButton resetDrawscale;
+		ofxButton resetFBscale;
+		
+		void resetDrawscalePressed(bool & pressed);
+		void resetFBscalePressed(bool & pressed);
+		
 
 };
 
-- 
cgit v1.2.3