comparison jnmr/testApp.cpp @ 52:13194a9dca77 tip

Added exporting of image and text data

 
 testApp::testApp(ofxArgs* args){
 	this->args = args;
 }
 
+#pragma mark -Initialise
 
 //--------------------------------------------------------------
 void testApp::setup(){
 
 	

 	lastScoreIndexSent = 0;
 	midiEvents.bestMatchIndex = 0;
 	
 	
 }
-
+#pragma mark -Update
 //--------------------------------------------------------------
 void testApp::update(){
 	if (playing){
 		midiEvents.updatePlayPosition();//this fn calls	midiEvents.bayesStruct.updateBestEstimate();
 	}

 	}
 	
 //	cout << "MIDI message [port: " << args.port << ", channel: " << args.channel << ", status: " << args.status << ", byteOne: " << pitch << ", byteTwo: " << args.byteTwo << ", timestamp: " << args.timestamp << "]" << endl;
 }
 
+#pragma mark -Draw
+
 //--------------------------------------------------------------
 void testApp::draw(){
 
 	midiEvents.drawFile();
-	
+/*	
 	string info = "Measure ";
 	info += ofToString(lastMeasureSent);
 	info += "  Last note ";
-	info += ofToString(lastScoreIndexSent);
-	
-	ofSetHexColor(0xFF0000);
-//	ofDrawBitmapString(info, 20, 20);
-	
+	info += ofToString(lastScoreIndexSent);	
+	ofDrawBitmapString(info, 20, 20);
+*/	
 	midiEvents.drawMidiFile(noteInStream.midiInputEvents);
 
 	//drawMuseScoreText();
 	
 	ofSetHexColor(0x000000);

 	
 	ratingString += extraText;  
 	verdana30.drawString(ratingString, 20, 60);
 }
 
+#pragma mark -keyInput
 //--------------------------------------------------------------
 void testApp::keyPressed(int key){
 
 	if (key == '.'){
 		midiPort++;

 		timenow *= -1;
 		timenow += ofGetElapsedTimeMillis();
 		printf("CROSS UPDATE TOOK %f", timenow);
 	}
 
-	if (key == 'x')
-		sendNoteDataByOsc(60, 0);
 	
 	if (key == OF_KEY_LEFT){
 		
 	}
 	

 	
 	if (key == 'o' || key == 'O'){
 		loadRecordedMidiFile();
 	}
 
-	
-	
+	if (key == 'v'){
+		midiEvents.bayesStruct.drawPrior = midiEvents.bayesStruct.drawPosterior;
+		midiEvents.bayesStruct.drawLikelihood = !midiEvents.bayesStruct.drawLikelihood;
+		midiEvents.bayesStruct.drawPrior = !midiEvents.bayesStruct.drawPrior;
+		midiEvents.bayesStruct.drawPosterior = !midiEvents.bayesStruct.drawPosterior;
+	}
+	
+	if (key == 'x'){
+	midiEvents.bayesStruct.drawPrior = !midiEvents.bayesStruct.drawPrior;
+	}
+	
+	if (key == 'g'){
+		midiEvents.writeAllDistributions();
+	}
 }
 
 void testApp::loadRecordedMidiFile(){
 	//open audio file
 	string *filePtr;