X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuSliceImage.cxx;h=a354dfa3fe47d249e4101949d46ef4870980fa52;hb=d79fc05657cfa43ed1cd6937a5acaeaf70e09b45;hp=d8a4b758cdf7ba8559b6ca8e603d0508a5380147;hpb=c1b52c90d747fd4fd13a6ec2c50a4d76d88a51a5;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx
index d8a4b75..a354dfa 100644
--- a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx
+++ b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx
@@ -34,33 +34,86 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,SliceImage)
 BBTK_BLACK_BOX_IMPLEMENTATION(SliceImage,bbtk::AtomicBlackBox);
 void SliceImage::Process()
 {
-	//printf("EED 0 SliceImage::Process \n");
 	vtkImageData *imagedata=NULL;
 
 	//std::cout<<"MSJ: test SliceImage::Process()"<<this<<std::endl;
 	if ( bbGetInputIn()!=NULL )
 	{
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   	  imageReslice->SetInput( bbGetInputIn() );
+#else
+  	  imageReslice->SetInputData( bbGetInputIn() );
+#endif
+
   	  imageReslice->SetInformationInput(bbGetInputIn() );
 
-	  if (bbGetInputTypeOrientation()==2)
+	  double slice=bbGetInputSlice();
+	  if (slice<0) 
+          { 
+ 		slice=0;
+          } 
+	
+	  if (bbGetInputTypeOrientation()==3)
 	  {
-	       imageReslice->SetResliceAxesDirectionCosines(0,0,-1, 1,0,0 ,0,-1,0);  // 2=YZ
-  	       imageReslice->SetResliceAxesOrigin( bbGetInputZ()*bbGetInputIn()->GetSpacing()[0] ,0 ,0);
+		// Orientation 3 = FREE
+		// v1 = [ v1x , v1y , v1z ]
+		// v2 = [ v2x , v2y , v2z ]
+		// v3 = [ v3x , v3y , v3z ]
+		// SetResliceAxesDirectionCosines(v1x,v2x,v3x,v1y,v2y,v3y,v1z,v2z,v3z);
+	       imageReslice->SetResliceAxesDirectionCosines( bbGetInputResliceAxesDirectionCosines()[0],  // v1x
+                                                             bbGetInputResliceAxesDirectionCosines()[3],  // v2x
+                                                             bbGetInputResliceAxesDirectionCosines()[6],  // v3x
+                                                             bbGetInputResliceAxesDirectionCosines()[1],  // v1y
+                                                             bbGetInputResliceAxesDirectionCosines()[4],  // v2y
+                                                             bbGetInputResliceAxesDirectionCosines()[7],  // v3y
+                                                             bbGetInputResliceAxesDirectionCosines()[2],  // v1z
+                                                             bbGetInputResliceAxesDirectionCosines()[5],  // v2z
+                                                             bbGetInputResliceAxesDirectionCosines()[8]   // v3z
+                                                           );  
+  	       imageReslice->SetResliceAxesOrigin( slice*bbGetInputIn()->GetSpacing()[0] ,0 ,0);
+	  } else if (bbGetInputTypeOrientation()==2)
+	  {
+		// Orientation 2 = YZ
+		// v1 = [ 0 , 0 ,-1 ]
+		// v2 = [ 1 , 0 , 0 ]
+		// v3 = [ 0 ,-1 , 0 ]
+		// SetResliceAxesDirectionCosines(v1x,v2x,v3x,v1y,v2y,v3y,v1z,v2z,v3z);
+	       imageReslice->SetResliceAxesDirectionCosines(0,1,0, 0,0,-1 ,-1,0,0);  
+  	       imageReslice->SetResliceAxesOrigin( slice*bbGetInputIn()->GetSpacing()[0] ,0 ,0);
 	  } else if (bbGetInputTypeOrientation()==1) {     
-	       imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,0,-1 ,0,1,0);  // 1=XZ
-	       imageReslice->SetResliceAxesOrigin(0, bbGetInputZ()*bbGetInputIn()->GetSpacing()[1],0 );
+		// Orientation 1 = XZ
+		// v1 = [ 1 , 0 , 0 ]
+		// v2 = [ 0 , 0 , 1 ]
+		// v3 = [ 0 ,-1 , 0 ]
+		// SetResliceAxesDirectionCosines(v1x,v2x,v3x,v1y,v2y,v3y,v1z,v2z,v3z);
+	       imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,0,-1 ,0,1,0); 
+	       imageReslice->SetResliceAxesOrigin(0, slice*bbGetInputIn()->GetSpacing()[1],0 );
 	  } else    
 	  {
-	       imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1);   // 0=XY
-	       imageReslice->SetResliceAxesOrigin(0,0, bbGetInputZ()*bbGetInputIn()->GetSpacing()[2] );
+		// Orientation 0 = XY
+		// v1 = [ 1 , 0 , 0 ]
+		// v2 = [ 0 , 1 , 0 ]
+		// v3 = [ 0 , 0 , 1 ]
+		// SetResliceAxesDirectionCosines(v1x,v2x,v3x,v1y,v2y,v3y,v1z,v2z,v3z);
+	       imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1);   
+	       imageReslice->SetResliceAxesOrigin(0,0, slice*bbGetInputIn()->GetSpacing()[2] );
 	  } 
 	  imageReslice->SetOutputDimensionality(2);
 	  imageReslice->SetInterpolationModeToLinear();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	  imagedata = imageReslice->GetOutput();
 	  imagedata->Update();
 	  imagedata->UpdateInformation();	
-	  //printf("EED 1 SliceImage::Process %p\n", imagedata);
+#else
+	  imageReslice->Update();
+	  imagedata = imageReslice->GetOutput();
+#endif
+
   	}
   bbSetOutputOut( imagedata );
 }
@@ -71,8 +124,22 @@ void SliceImage::Process()
 	{
 		bbSetInputIn(NULL);
 		bbSetInputZ(0);
+		bbSetInputSlice(0);
 		bbSetInputTypeOrientation(0);
 		imageReslice=NULL;
+ 		std::vector<double> lstCos;
+                lstCos.push_back(1); // v1x
+                lstCos.push_back(0); // v1y
+                lstCos.push_back(0); // v1z
+
+                lstCos.push_back(0); // v2x
+                lstCos.push_back(1); // v2y
+                lstCos.push_back(0); // v2z
+
+                lstCos.push_back(0); // v3x
+                lstCos.push_back(0); // v3y
+                lstCos.push_back(1); // v3z
+                bbSetInputResliceAxesDirectionCosines(lstCos);
 	}
 	
 	//-----------------------------------------------------------------