X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=0ab9c25b1bb5231c6a80a8ff6694e21bd7e51227;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=731d4978e9df71f99fa2d2004a4633082ec760e1;hpb=088ed2b7bdbe14eb85a7245afaa693ddb7a53a97;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 731d497..0ab9c25 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -99,10 +99,16 @@ namespace bbwxvtk
     mDefaultImage->SetDimensions ( dim );
     mDefaultImage->SetSpacing(1,1,1);
     mDefaultImage->SetExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
-    mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+    mDefaultImage->SetWholeExtent(0,dim[0]-1,0,dim[1]-1,0,dim[2]-1);
     mDefaultImage->SetScalarTypeToUnsignedChar();
-    mDefaultImage->AllocateScalars();    
+    mDefaultImage->AllocateScalars();   
+#else
+    mDefaultImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);   
+#endif
+ 
     for (int i=0;i<dim[0];i++) 
       for (int j=0;j<dim[1];j++) 
         for (int k=0;k<dim[2];k++) 
@@ -195,7 +201,12 @@ namespace bbwxvtk
 	if (backImageData != mBox->bbGetInputIn()) // Don't update if just Slice changed
 	  {
 	  backImageData = mBox->bbGetInputIn();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	  backImageData->Update();
+#else
+	// ..
+#endif
 	  imageViewer->SetInput( backImageData );
 	  mUpdateCamera = true;
 	  }
@@ -272,7 +283,14 @@ namespace bbwxvtk
     {
 		int z = mBox->bbGetInputSlice();
 		int ext[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		backImageData->GetWholeExtent(ext);
+#else
+		backImageData->GetExtent(ext);
+#endif
+
 		/*
 		std::cout << "ext = "<<ext[0]<<" - "<<ext[1]<<" ; "
 			  <<ext[2]<<" - "<<ext[3]<<" ; "