X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkVtkBlackBoxMacros.h;h=0bf9acc1a4756efcfcdc6c5f65349bda5e0101ef;hb=620982e33be3ad63c78dc1e6d7cfcf8af1cb0c14;hp=8b1c8abb92f22bd338b2bd6ccb181d34f73b71a0;hpb=b8fe96fbebd153e92de1f1bfcad48ad009365df5;p=bbtk.git diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h index 8b1c8ab..0bf9acc 100644 --- a/kernel/src/bbtkVtkBlackBoxMacros.h +++ b/kernel/src/bbtkVtkBlackBoxMacros.h @@ -1,32 +1,39 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # This software is governed by the CeCILL-B license under French law and + # abiding by the rules of distribution of free software. You can use, + # modify and/ or redistribute the software under the terms of the CeCILL-B + # license as circulated by CEA, CNRS and INRIA at the following URL + # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html + # or in the file LICENSE.txt. + # + # As a counterpart to the access to the source code and rights to copy, + # modify and redistribute granted by the license, users are provided only + # with a limited warranty and the software's author, the holder of the + # economic rights, and the successive licensors have only limited + # liability. + # + # The fact that you are presently reading this means that you have had + # knowledge of the CeCILL-B license and that you accept its terms. + # ------------------------------------------------------------------------ */ + + +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkVtkBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2009/05/14 14:43:34 $ - Version: $Revision: 1.10 $ + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.15 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -* or in the file LICENSE.txt. -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ + @@ -48,103 +55,53 @@ //=========================================================================== //=========================================================================== -#define BBTK_VTK_DISABLE_GARBAGE_COLLECTOR \ - public: \ - virtual void Register(vtkObjectBase* o) {} \ - virtual void UnRegister(vtkObjectBase* o) {} \ - protected: \ - virtual void ReportReferences(vtkGarbageCollector* collector) {} +#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; + +//=========================================================================== +#define BBTK_VTK_SET_DEFAULT_VALUES() \ + mVtkObject = bbVtkObject::New(); +// mVtkObject = NULL; -/* - - 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_INITIALIZE_PROCESSING() \ + mVtkObject = mVtkObject; +// mVtkObject = bbVtkObject::New(); +//=========================================================================== +#define BBTK_VTK_FINALIZE_PROCESSING() \ + if (mVtkObject) { mVtkObject->Delete(); mVtkObject = NULL; } + +/* //=========================================================================== #define BBTK_VTK_DELETE() \ int bbDelete() { \ - for (int i=0; iGetNumberOfInputPorts();++i) \ + mVtkObject->SetInput(i,0); \ bbGetOutputOut()->SetSource(NULL); \ - int refs = GetReferenceCount()-1; \ - vtkParent::Delete(); \ + int refs = mVtkObject->GetReferenceCount()-1; \ + mVtkObject->Delete(); \ return refs; \ } // bbmDescriptorPointer.reset(); //=========================================================================== +*/ -//=========================================================================== -#define BBTK_VTK_NEW(CLASS,VTKPARENT) \ - inline static Pointer New(const std::string& name) \ - { \ - /*vtkDebugLeaks::ConstructClass(#VTKPARENT);*/ \ - bbtkDebugMessage("object",1,"##> "<<#CLASS \ - <<"::New(\""< "<<#CLASS \ - <<"::bbClone(\""<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); } + //=========================================================================== //=========================================================================== @@ -152,10 +109,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); } + //=========================================================================== //=========================================================================== @@ -163,20 +120,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(vtkParent::GetInput()); } \ + { if (mVtkObject) return dynamic_cast(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); } //=========================================================================== @@ -188,9 +145,9 @@ #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); \ + { if (mVtkObject) mVtkObject->Set##NAME(d); \ } //=========================================================================== @@ -205,10 +162,10 @@ TYPE bbGetInput##NAME () \ { TO DO : HOW TO RECOMPOSE A VECTOR ? - { return vtkParent::Get##NAME(); } \ + { return mVtkObject->Get##NAME(); } \ void bbSetInput##NAME (TYPE d) \ { - vtkParent::Set##NAME(d[0],d[1]); \ + mVtkObject->Set##NAME(d[0],d[1]); \ } */ //=========================================================================== @@ -221,11 +178,14 @@ public: \ inline void bbUserProcess() \ { \ - bbtkDebugMessage("process",1,"**> Processing ["< Processing..." \ + <Update(); \ +printf("EED Process %s\n", bbGetFullName().c_str() ); \ + vtkIndent indent(2); \ + mVtkObject->PrintSelf(std::cout, indent ); \ + bbtkBlackBoxDebugMessage("process",2,"<** Processing" \ + <