X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkVtkBlackBoxMacros.h;h=cdbd65540454cef4db8a8cfb7c8c63a5e6944580;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=ce87d7e37c2ccc56472c16322767a65d7283360a;hpb=f20c3308a0d420bbc81089fad47108fa4f25aa17;p=bbtk.git

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index ce87d7e..cdbd655 100644
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVtkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2009/02/27 11:20:25 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -48,106 +48,51 @@
 //===========================================================================
 
 //===========================================================================
-#define BBTK_VTK_DISABLE_GARBAGE_COLLECTOR				\
-  public:								\
-  virtual void Register(vtkObjectBase* o) {}				\
-  virtual void UnRegister(vtkObjectBase* o) {}				\
-  protected:								\
-  virtual void ReportReferences(vtkGarbageCollector* collector) {}
-
-/*
-	
-  public:				   \
-  virtual void Register(vtkObjectBase* o) {} \
-     {
-     this->RegisterInternal(o, 1);
-     }
-   virtual void UnRegister(vtkObjectBase* o)
-     {
-     this->UnRegisterInternal(o, 1);
-     }
-
-  protected:
-
-   virtual void ReportReferences(vtkGarbageCollector* collector)
-     {
-     // Report references held by this object that may be in a loop.
-     this->Superclass::ReportReferences(collector);
-     vtkGarbageCollectorReport(collector, this->OtherObject, "Other Object");
-     }
-*/
-//===========================================================================
-
-//===========================================================================
-#define BBTK_VTK_DELETE()						\
-  void bbDelete() {							\
-    for (int i=0; i<vtkParent::GetNumberOfInputPorts();++i)		\
-      vtkParent::SetInput(i,0);						\
-    bbGetOutputOut()->SetSource(NULL);					\
-    /*std::cout << "VTK : bbDelete() "<<std::endl;*/			\
-    /*std::cout << "Use count = "<<GetUseCount()<<std::endl;*/		\
-    /*std::cout << "VTK count = "<<GetReferenceCount()<<std::endl;*/	\
-    /*    vtkParent::SetReferenceCount(1); GetUseCount());*/		\
-    /*delete this;	*/						\
-    vtkParent::Delete();						\
-  }
+#define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKOBJECT)	\
+  BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX);			\
+  typedef VTKOBJECT bbVtkObject;					\
+  bbVtkObject* bbGetVtkObject() { return mVtkObject; }			\
+  private:								\
+  bbVtkObject *mVtkObject;						
 
-//    bbmDescriptorPointer.reset();		
 //===========================================================================
+#define BBTK_VTK_SET_DEFAULT_VALUES()		\
+  mVtkObject = NULL;
 
 //===========================================================================
-#define BBTK_VTK_NEW(CLASS,VTKPARENT)					\
-  inline static Pointer New(const std::string& name)			\
-  {									\
-    /*vtkDebugLeaks::ConstructClass(#VTKPARENT);*/			\
-    bbtkDebugMessage("object",1,"##> "<<#CLASS				\
-		     <<"::New(\""<<name<<"\")"<<std::endl);		\
-    Pointer p = MakeBlackBoxPointer(new Self(name));			\
-    bbtkDebugMessage("object",1,"<## "<<#CLASS				\
-		     <<"::New(\""<<name<<"\")"<<std::endl);		\
-    return p;								\
-  }									\
-//===========================================================================
+#define BBTK_VTK_INITIALIZE_PROCESSING()	\
+  mVtkObject = bbVtkObject::New();
 
 //===========================================================================
-#define BBTK_VTK_CLONE(CLASS,VTKPARENT)					\
-  inline bbtk::BlackBox::Pointer bbClone(const std::string& name)	\
-  {									\
-    /*vtkDebugLeaks::ConstructClass(#VTKPARENT);*/			\
-    bbtkDebugMessage("object",1,"##> "<<#CLASS				\
-		     <<"::bbClone(\""<<name<<"\")"<<std::endl);		\
-    Pointer p = MakeBlackBoxPointer(new Self(*this,name));		\
-    bbtkDebugMessage("object",1,"<## "<<#CLASS				\
-		     <<"::bbClone(\""<<name<<"\")"<<std::endl);		\
-    return p;								\
-  }									
-
+#define BBTK_VTK_FINALIZE_PROCESSING()		\
+  if (mVtkObject) { mVtkObject->Delete(); mVtkObject = NULL; }
 
+/*
 //===========================================================================
-#define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT)	\
-  BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENTBLACKBOX);		\
-  typedef VTKPARENT vtkParent;						\
-  BBTK_VTK_DELETE();							\
-  public :								\
-  BBTK_VTK_NEW(CLASS,VTKPARENT);					\
-  BBTK_VTK_CLONE(CLASS,VTKPARENT);					
+#define BBTK_VTK_DELETE()						\
+  int bbDelete() {							\
+    for (int i=0; i<mVtkObject->GetNumberOfInputPorts();++i)		\
+    mVtkObject->SetInput(i,0);						\
+    bbGetOutputOut()->SetSource(NULL);					\
+    int refs = mVtkObject->GetReferenceCount()-1;					\
+    mVtkObject->Delete();						\
+    return refs;							\
+  }
 
-//  BBTK_VTK_DISABLE_GARBAGE_COLLECTOR
+//    bbmDescriptorPointer.reset();		
 //===========================================================================
+*/
 
-#define BBTK_VTK_UNREGISTER(O) 
-
-//O->UnRegister(this);
 
 //===========================================================================
 /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
 #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)		\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }		\
+  { if (mVtkObject) return mVtkObject->GetImageDataInput(0); return 0; } \
   void bbSetInput##NAME (TYPE d)					\
-  { vtkParent::SetInput( (vtkDataObject*) d);				\
-    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }				
+  { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+
 //===========================================================================
 
 //===========================================================================
@@ -155,10 +100,10 @@
 #define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)		\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }		\
+  { if (mVtkObject) return mVtkObject->GetPolyDataInput(0); return 0; } \
   void bbSetInput##NAME (TYPE d)					\
-  { vtkParent::SetInput( (vtkDataObject*) d);				\
-    BBTK_VTK_UNREGISTER(d);/*bbSetModifiedStatus();*/ }						       
+  { if (mVtkObject) mVtkObject->SetInput( (vtkDataObject*) d); }
+
 //===========================================================================
 
 //===========================================================================
@@ -166,20 +111,20 @@
 #define BBTK_DECLARE_VTK_OUTPUT(NAME,TYPE)				\
   public:								\
   TYPE bbGetOutput##NAME ()						\
-  { return vtkParent::GetOutput(); }					\
-  void bbSetOutput##NAME (TYPE d)					\
-  { /*vtkParent::GetOutput() = d;*/ }					
+  { if (mVtkObject) return mVtkObject->GetOutput(); return 0; }		\
+  void bbSetOutput##NAME (TYPE d) 					\
+  { }					
 //===========================================================================
 
 //===========================================================================
 /// Declares a vtkAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)			\
+#define BBTK_DECLARE_VTK_INPUT(NAME,TYPE)				\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return dynamic_cast<TYPE>(vtkParent::GetInput()); }			\
+  { if (mVtkObject) return dynamic_cast<TYPE>(mVtkObject->GetInput());	\
+    return 0;}								\
   void bbSetInput##NAME (TYPE d)					\
-  { vtkParent::SetInput( (vtkDataObject*) d);				\
-   BBTK_VTK_UNREGISTER(d);/*vtkParent::GetOutput() = d;*/ }
+  { if (mVtkObject)  mVtkObject->SetInput( (vtkDataObject*) d); }
 
 //===========================================================================
 
@@ -191,12 +136,30 @@
 #define BBTK_DECLARE_VTK_PARAM(NAME,TYPE)			\
   public:								\
   TYPE bbGetInput##NAME ()						\
-  { return vtkParent::Get##NAME(); }					\
+  { if (mVtkObject) return mVtkObject->Get##NAME(); return 0; }		\
   void bbSetInput##NAME (TYPE d)					\
-  { vtkParent::Set##NAME(d);						\
-    /*bbSetModifiedStatus();*/ }
+  { if (mVtkObject) mVtkObject->Set##NAME(d);				\
+  }
 //===========================================================================
 
+//===========================================================================
+/// Declares an AtomicBlackBox input corresponding to an 
+/// inherited vtk parameter
+/// which was declared by vtkSetMacro/vtkGetMacro
+/// The NAME **MUST** be the same than the vtk parameter name
+/*
+#define BBTK_DECLARE_VTK_2_PARAM(NAME,TYPE)		\
+  public:								\
+  TYPE bbGetInput##NAME ()						\
+  {
+  TO DO : HOW TO RECOMPOSE A VECTOR ?
+  { return mVtkObject->Get##NAME(); }					\
+  void bbSetInput##NAME (TYPE d)					\
+  { 
+  mVtkObject->Set##NAME(d[0],d[1]);		\
+}
+*/
+//===========================================================================
 
 
 //============================================================================
@@ -206,11 +169,11 @@
   public:								\
   inline void bbUserProcess()						\
   {									\
-    bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()	\
-		     <<"]"<<std::endl);					\
-    vtkParent::Update();						\
-    bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()	\
-		     <<"]"<<std::endl);					\
+    bbtkBlackBoxDebugMessage("process",1,"**> Processing..."		\
+			     <<std::endl);				\
+    mVtkObject->Update();						\
+    bbtkBlackBoxDebugMessage("process",2,"<** Processing"		\
+			     <<std::endl);				\
   }
 //============================================================================