Support for annotations in 4D MPR

idvr · Feb 5, 2014 · a900d45 · a900d45
1 parent 7fbd21c
commit a900d45
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/MPRController.m b/MPRController.m
@@ -3178,11 +3178,12 @@ - (BOOL) getMovieDataAvailable
 
 -(void) addMoviePixList:(NSMutableArray*) pix :(NSData*) vData
 {
+	self.maxMovieIndex++;
+
 	pixList[ maxMovieIndex] = pix;
 	volumeData[ maxMovieIndex] = vData;
 
 	self.movieRate = 20;
-	self.maxMovieIndex++;
 	[moviePosSlider setNumberOfTickMarks: maxMovieIndex+1];
 
 	[hiddenVRController addMoviePixList: pix :vData];	
@@ -3200,6 +3201,13 @@ - (void) setCurMovieIndex: (int) m
 {
 	curMovieIndex = m;
 
+    mprView1.pix.annotationsDictionary = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDictionary];
+    mprView2.pix.annotationsDictionary = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDictionary];
+    mprView3.pix.annotationsDictionary = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDictionary];
+    mprView1.pix.annotationsDBFields = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDBFields];
+    mprView2.pix.annotationsDBFields = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDBFields];
+    mprView3.pix.annotationsDBFields = [[pixList[ curMovieIndex] objectAtIndex: 0] annotationsDBFields];
+
 	mprView1.camera.movieIndexIn4D = m;
 	mprView2.camera.movieIndexIn4D = m;
 	mprView3.camera.movieIndexIn4D = m;