diff jnmr/BayesianArrayStructure.cpp @ 52:13194a9dca77 tip

Added exporting of image and text data
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Tue, 17 Jul 2012 22:13:10 +0100
parents 158f5f38e9d3
children
line wrap: on
line diff
--- a/jnmr/BayesianArrayStructure.cpp	Sat Mar 31 14:04:49 2012 +0100
+++ b/jnmr/BayesianArrayStructure.cpp	Tue Jul 17 22:13:10 2012 +0100
@@ -12,6 +12,9 @@
 
 #include "BayesianArrayStructure.h"
 
+int priorColor = 0xEE00CC;//230,0,170
+int posteriorColor = 0x444444;//000099;
+
 BayesianArrayStructure::BayesianArrayStructure(){
 	printf("Bayesian structure: DeFault constructor called\n");
 	usingIntegratedTempoEstimate = false;// use max index
@@ -21,7 +24,7 @@
 	relativeSpeedLikelihoodStdDev = 5.0;
 	
 	prior.createVector(1);
-	likelihood.createVector(1);
+	likelihood.createVector(1);	
 	posterior.createVector(1);
 
 	
@@ -34,6 +37,10 @@
 	crossUpdateTimeThreshold = 60;
 	priorWidth = 50;
 	
+	drawLikelihood = false;
+	drawPrior = true;
+	drawPosterior = true;
+	
 }
 
 BayesianArrayStructure::BayesianArrayStructure(int length){
@@ -566,18 +573,21 @@
 //	ofDrawBitmapString(relativeString, 100, 180);
 	
 		
+		if (drawLikelihood){
+			ofSetColor(100,100,100);//255, 255, 0);
+			likelihood.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
+		}
 		
-	ofSetColor(100,100,100);//255, 255, 0);
-	likelihood.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
-
-//	ofSetColor(0,0,200);
-	ofSetColor(230,0,170);//00,200);
-	prior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
+		if (drawPrior){	
+			ofSetHexColor(priorColor);//00,200);
+			prior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
+		}
 		
-		ofSetColor(0,0,150);	
-//	ofSetColor(200, 0, 0);
-	posterior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
-		
+		if (drawPosterior){
+			ofSetHexColor(posteriorColor);	
+			//	ofSetColor(200, 0, 0);
+			posterior.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);
+		}
 		
 //	ofSetColor(0, 200, 255);
 //	acceleration.drawConstrainedVector(startArrayIndex, endArrayIndex, startScreenPosition, endScreenPosition);