diff src/testApp.cpp @ 55:2eca10a31ae2

improving printing of information, looking at how tempo is modelled

--- a/src/testApp.cpp	Tue Aug 14 21:45:25 2012 +0100
+++ b/src/testApp.cpp	Mon Dec 10 17:07:21 2012 +0000
@@ -39,6 +39,8 @@
 	
 	outputWriter.openFile("../../../data/output.txt");
 	
+	writeKickEvents = false;
+	
 	//audioFilePlayer.loadAudioFile(infilename);
 }
 
@@ -78,6 +80,11 @@
 		
 			eventMatcher.newKickEvent(testChannel, timeIn);
 			
+			if (writeKickEvents){
+				writeKickEvents = false;
+				eventMatcher.writeAllDistributions();
+			}
+			
 		}
 		
 		if ( m.getAddress() == "/snare" ){
@@ -161,10 +168,6 @@
 		volume = MIN(volume, 1);
 	}
 
-	if (key == 'q'){
-		eventMatcher.recordedTracks.switchScreens();
-	}
-	
 	if (key == OF_KEY_RIGHT){
 //		audioFilePlayer.loadedAudio.setPosition(min(1.0, audioFilePlayer.loadedAudio.getPosition() + (audioFilePlayer.fileLoader.audioHolder.audioScaleSamples/(4.0*audioFilePlayer.fileLoader.audioHolder.audioVector.size()))) );
 
@@ -175,6 +178,19 @@
 		
 	}
 	
+	if (key == OF_KEY_RETURN){
+		eventMatcher.recordedTracks.stop();
+	}
+	
+	if (key == OF_KEY_UP){
+		eventMatcher.recordedTracks.zoomOut();
+		
+	}
+	
+	if (key == OF_KEY_DOWN){
+		eventMatcher.recordedTracks.zoomIn();
+	}
+	
 	if (key == 'c'){
 		eventMatcher.useChromaDotProduct = !eventMatcher.useChromaDotProduct;
 		printf("Use dot product is %i\n", eventMatcher.useChromaDotProduct);
@@ -196,9 +212,10 @@
 	if (key == 'd'){
 		eventMatcher.deleteNearestMarker();
 	}
-//	if (key == 's'){
-//		eventMatcher.markedPoints.saveMarkers();
-//	}
+
+	
+//	
+
 
 	if (key == 's')
 		eventMatcher.markedPoints.saveFile();
@@ -217,37 +234,31 @@
 	if (key == 'j'){
 		printf("dynamic vector scalar is %f\n", eventMatcher.bayesianStruct.posterior.scalar);
 	}
-
-	if (key == OF_KEY_RETURN){
-		eventMatcher.recordedTracks.stop();
-	}
-	
-	
-	if (key == 'o'){
-		openNewAudioFileWithdialogBox();
-
-	}
-
-	if (key == 'p'){
-		eventMatcher.bayesianStruct.posterior.printArray();
-	}
-
-	
-	if (key == OF_KEY_UP){
-		eventMatcher.recordedTracks.zoomOut();
-	
-	}
-	
-	if (key == OF_KEY_DOWN){
-		eventMatcher.recordedTracks.zoomIn();
-	}
-	
-	if (key == 'k')
-		eventMatcher.drawLikelihoods = !eventMatcher.drawLikelihoods;
 	
 	if (key == 'g'){
 		eventMatcher.writeAllDistributions();
 	}
+	
+	if (key == 'h')
+		eventMatcher.drawLikelihoods = !eventMatcher.drawLikelihoods;
+	
+	if (key == 'k')
+		writeKickEvents = true;
+
+	if (key == 'o'){
+		openNewAudioFileWithdialogBox();
+		
+	}
+	
+	if (key == 'p'){
+		eventMatcher.bayesianStruct.posterior.printArray();
+	}
+	
+	if (key == 'q'){
+		eventMatcher.recordedTracks.switchScreens();
+	}
+	
+	//eventMatcher.markedPoints.saveMarkers();
 
 }