X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkVtkBlackBoxMacros.h;h=615af269c35f018852c26bf1ec82a1021b6eebd6;hb=0d2a41be6bba99d0d60681b51d29a24d8edfcfc6;hp=bd2d0e89d8d3623df6007cf2d6ca247d03110578;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index bd2d0e8..615af26 100644
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -64,11 +64,13 @@
 
 //===========================================================================
 #define BBTK_VTK_SET_DEFAULT_VALUES()		\
-  mVtkObject = NULL;
+  mVtkObject = bbVtkObject::New();
+//  mVtkObject = NULL;
 
 //===========================================================================
 #define BBTK_VTK_INITIALIZE_PROCESSING()	\
-  mVtkObject = bbVtkObject::New();
+  mVtkObject = mVtkObject;
+//  mVtkObject = bbVtkObject::New();
 
 //===========================================================================
 #define BBTK_VTK_FINALIZE_PROCESSING()		\
@@ -91,14 +93,29 @@
 */
 
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+
 //===========================================================================
 /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)		\
-  public:								\
-  TYPE bbGetInput##NAME ()						\
-  { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \
-  void bbSetInput##NAME (TYPE d)					\
-  { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+  #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)		\
+    public:								\
+    TYPE bbGetInput##NAME ()						\
+    { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \
+    void bbSetInput##NAME (TYPE d)					\
+    { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+#else
+//===========================================================================
+/// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
+  #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)		\
+    public:								\
+    TYPE bbGetInput##NAME ()						\
+    { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \
+    void bbSetInput##NAME (TYPE d)					\
+    { if (mVtkObject) mVtkObject->SetInputData( (vtkDataObject*) d); }
+
+#endif
+
 
 //===========================================================================
 
@@ -124,6 +141,11 @@
 //===========================================================================
 
 //===========================================================================
+
+//EED 2017-01-01 Migration VTK7 					
+
+#if (VTK_MAJOR_VERSION <= 5) 						
+
 /// Declares a vtkAlgorithm-inherited AtomicBlackBox input 
 #define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)				\
   public:								\
@@ -133,6 +155,24 @@
   void bbSetInput##NAME (TYPE d)					\
   { if (mVtkObject)  mVtkObject->SetInput( (vtkDataObject*) d); }
 
+#endif 									
+
+
+
+#if (VTK_MAJOR_VERSION >= 6) 						
+
+/// Declares a vtkAlgorithm-inherited AtomicBlackBox input 
+#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)				\
+  public:								\
+  TYPE bbGetInput##NAME ()						\
+  { if (mVtkObject) return dynamic_cast<TYPE>(mVtkObject->GetInput());	\
+    return 0;}								\
+  void bbSetInput##NAME (TYPE d)					\
+  { if (mVtkObject)  mVtkObject->SetInputData( (vtkDataObject*) d); }
+
+#endif 									
+
+
 //===========================================================================
 
 //===========================================================================