comparison src/testApp.cpp @ 55:2eca10a31ae2

improving printing of information, looking at how tempo is modelled

 	
 	eventMatcher.setWindowDimensions();
 	
 	outputWriter.openFile("../../../data/output.txt");
 	
+	writeKickEvents = false;
+	
 	//audioFilePlayer.loadAudioFile(infilename);
 }
 
 
 //--------------------------------------------------------------

 			int testChannel = m.getArgAsInt32(0);
 			double timeIn = m.getArgAsInt32(1); 
 			printf("\nKICK RECEIVED at time %f\n", timeIn);
 		
 			eventMatcher.newKickEvent(testChannel, timeIn);
+			
+			if (writeKickEvents){
+				writeKickEvents = false;
+				eventMatcher.writeAllDistributions();
+			}
 			
 		}
 		
 		if ( m.getAddress() == "/snare" ){
 			int testChannel = m.getArgAsInt32(0);

 	} else if (key == '+'){
 		volume += 0.05;
 		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()))) );
 
 	}
 	
 	if (key == OF_KEY_LEFT){
 //		audioFilePlayer.loadedAudio.setPosition(max(0.0, audioFilePlayer.loadedAudio.getPosition() - (audioFilePlayer.fileLoader.audioHolder.audioScaleSamples/(4.0*audioFilePlayer.fileLoader.audioHolder.audioVector.size()))));
 		
+	}
+	
+	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);

 		eventMatcher.deleteMarkers();
 	}
 	if (key == 'd'){
 		eventMatcher.deleteNearestMarker();
 	}
-//	if (key == 's'){
-//		eventMatcher.markedPoints.saveMarkers();
-//	}
+
+	
+//	
+
 
 	if (key == 's')
 		eventMatcher.markedPoints.saveFile();
 	
 	if (key == 'l')

 	}
 	
 	if (key == 'j'){
 		printf("dynamic vector scalar is %f\n", eventMatcher.bayesianStruct.posterior.scalar);
 	}
-
-	if (key == OF_KEY_RETURN){
-		eventMatcher.recordedTracks.stop();
-	}
-	
-	
+	
+	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 == 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 == 'q'){
+		eventMatcher.recordedTracks.switchScreens();
+	}
+	
+	//eventMatcher.markedPoints.saveMarkers();
 
 }
 
 //--------------------------------------------------------------
 void testApp::keyReleased  (int key){