From: Eduardo Davila Date: Fri, 15 May 2009 14:57:56 +0000 (+0000) Subject: . X-Git-Tag: EED.02Oct2009~47 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git . --- diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index 37d355d..5b01ea2 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -162,7 +162,7 @@ ENDIF(BBTK_USE_QT) # lib definition ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H}) #----------------------------------------------------------------------------- -TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES}) +TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES} ${BOOST_LIBRARIES}) #----------------------------------------------------------------------------- IF(UNIX) SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall) diff --git a/kernel/src/bbtkItkBlackBoxMacros.h b/kernel/src/bbtkItkBlackBoxMacros.h index ddcb7b9..4a52d99 100644 --- a/kernel/src/bbtkItkBlackBoxMacros.h +++ b/kernel/src/bbtkItkBlackBoxMacros.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkItkBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2009/04/30 14:31:31 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/05/15 15:00:24 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -102,8 +102,9 @@ <<"]"< void Process(); - void bbUserConstructor() { Init(); } - void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } - void Init(); }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(BinaryThresholdImageFilterGeneric, @@ -159,17 +153,19 @@ namespace bbitk bbtkDebugDecTab("Core",9); } - - template - void BinaryThresholdImageFilter::Init() - { - bbSetInputLowerThreshold(0); - bbSetInputUpperThreshold(100); - bbSetInputInsideValue(255); - bbSetInputOutsideValue(0); - } - void BinaryThresholdImageFilterGeneric::Init() + +////-- +// template +// void BinaryThresholdImageFilter::bbUserSetDefaultValues() +// { +// bbSetInputLowerThreshold(0); +// bbSetInputUpperThreshold(100); +// bbSetInputInsideValue(255); +// bbSetInputOutsideValue(0); +// } + + void BinaryThresholdImageFilterGeneric::bbUserSetDefaultValues() { bbSetInputLowerThreshold(0); bbSetInputUpperThreshold(100); @@ -177,6 +173,32 @@ namespace bbitk bbSetInputOutsideValue(0); } + //-- + + template + void BinaryThresholdImageFilter::bbUserInitializeProcessing() + { + } + + void BinaryThresholdImageFilterGeneric::bbUserInitializeProcessing() + { + } + +//-- + + //-- + + template + void BinaryThresholdImageFilter::bbUserFinalizeProcessing() + { + } + + void BinaryThresholdImageFilterGeneric::bbUserFinalizeProcessing() + { + } + + + } // EO namespace bbtk diff --git a/packages/itk/src/bbitkExtractImageFilter.cxx b/packages/itk/src/bbitkExtractImageFilter.cxx index 7a02070..0bc3eb4 100644 --- a/packages/itk/src/bbitkExtractImageFilter.cxx +++ b/packages/itk/src/bbitkExtractImageFilter.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkExtractImageFilter.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,6 +45,22 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ExtractImageFilterGeneric) + //----------------------------------------------------------------- + void ExtractImageFilterGeneric::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void ExtractImageFilterGeneric::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ExtractImageFilterGeneric::bbUserFinalizeProcessing() + { + } + + } // EO namespace bbitk diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx index fefb554..7b7e9d1 100644 --- a/packages/itk/src/bbitkImageProperties.cxx +++ b/packages/itk/src/bbitkImageProperties.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageProperties.cxx,v $ Language: C++ - Date: $Date: 2008/11/27 14:58:06 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,7 +45,20 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageProperties); - + //----------------------------------------------------------------- + void ImageProperties::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void ImageProperties::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ImageProperties::bbUserFinalizeProcessing() + { + } void ImageProperties::DoIt() diff --git a/packages/itk/src/bbitkImageReader.cxx b/packages/itk/src/bbitkImageReader.cxx index 4e9021f..58fd442 100644 --- a/packages/itk/src/bbitkImageReader.cxx +++ b/packages/itk/src/bbitkImageReader.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -44,9 +44,21 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageReader); - - - + //----------------------------------------------------------------- + void ImageReader::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void ImageReader::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ImageReader::bbUserFinalizeProcessing() + { + } + void ImageReader::Read() { std::string filename = bbGetInputIn(); diff --git a/packages/itk/src/bbitkImageRegion.cxx b/packages/itk/src/bbitkImageRegion.cxx index 11026e5..e2890b4 100644 --- a/packages/itk/src/bbitkImageRegion.cxx +++ b/packages/itk/src/bbitkImageRegion.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageRegion.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -42,7 +42,21 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageRegionCreator); - + /* + void ImageRegionCreator::bbUserSetDefaultValues() { } + void ImageRegionCreator::bbUserInitializeProcessing() { } + void ImageRegionCreator::bbUserFinalizeProcessing() { } + + template + void ImageRegionCreator::bbUserSetDefaultValues() { } + + template + void ImageRegionCreator::bbUserInitializeProcessing() { } + + template + void ImageRegionCreator::bbUserFinalizeProcessing() { } + */ + void ImageRegionCreator::DoIt() { const std::vector& index = bbGetInputIndex(); diff --git a/packages/itk/src/bbitkImageSeriesReader.cxx b/packages/itk/src/bbitkImageSeriesReader.cxx index 68de42d..d182265 100644 --- a/packages/itk/src/bbitkImageSeriesReader.cxx +++ b/packages/itk/src/bbitkImageSeriesReader.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageSeriesReader.cxx,v $ Language: C++ - Date: $Date: 2008/11/27 14:55:54 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -44,21 +44,27 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageSeriesReader); - void ImageSeriesReader::bbUserConstructor() - { - bbSetInputXSpacing(-1.); - bbSetInputYSpacing(-1.); - bbSetInputZSpacing(-1.); - } - - void ImageSeriesReader::bbUserCopyConstructor(bbtk::BlackBox::Pointer) - { - } - - void ImageSeriesReader::bbUserDestructor() - { - } + //----------------------------------------------------------------- + void ImageSeriesReader::bbUserSetDefaultValues() + { + bbSetInputXSpacing(-1.0); + bbSetInputYSpacing(-1.0); + bbSetInputZSpacing(-1.0); + } + + //----------------------------------------------------------------- + void ImageSeriesReader::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ImageSeriesReader::bbUserFinalizeProcessing() + { + } + + + void ImageSeriesReader::Read() { const std::vector& filenames = bbGetInputFileNames(); diff --git a/packages/itk/src/bbitkImageSeriesReader.h b/packages/itk/src/bbitkImageSeriesReader.h index 2c78ba5..5e6c44e 100644 --- a/packages/itk/src/bbitkImageSeriesReader.h +++ b/packages/itk/src/bbitkImageSeriesReader.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageSeriesReader.h,v $ Language: C++ - Date: $Date: 2008/11/27 14:55:54 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -55,14 +55,6 @@ namespace bbitk BBTK_BLACK_BOX_INTERFACE(ImageSeriesReader, bbtk::AtomicBlackBox); - //================================================================== - /// User callback called in the box contructor - virtual void bbUserConstructor(); - /// User callback called in the box copy constructor - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - /// User callback called in the box destructor - virtual void bbUserDestructor(); - //================================================================== BBTK_DECLARE_INPUT(FileNames,std::vector); BBTK_DECLARE_INPUT(XSpacing,float); BBTK_DECLARE_INPUT(YSpacing,float); diff --git a/packages/itk/src/bbitkImageWriter.cxx b/packages/itk/src/bbitkImageWriter.cxx index 71f3eb2..28dbc82 100644 --- a/packages/itk/src/bbitkImageWriter.cxx +++ b/packages/itk/src/bbitkImageWriter.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkImageWriter.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,7 +45,20 @@ namespace bbitk BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageWriter); - + //----------------------------------------------------------------- + void ImageWriter::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void ImageWriter::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ImageWriter::bbUserFinalizeProcessing() + { + } void ImageWriter::Write() { diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h index 0dae92d..f8d5a1e 100644 --- a/packages/itk/src/bbitkResampleImageFilter.h +++ b/packages/itk/src/bbitkResampleImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkResampleImageFilter.h,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:15 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:57:58 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -57,9 +57,6 @@ namespace bbitk private : inline void ProcessSwitch(); template void Process(); - void bbUserConstructor() { Init(); } - void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } - void Init(); itk::Object* mOutput; }; @@ -176,15 +173,27 @@ namespace bbitk } - void ResampleImageFilter::Init() - { - std::vector res; - res.push_back(1); - res.push_back(1); - res.push_back(1); - bbSetInputSpacing(res); - mOutput = 0; - } + //----------------------------------------------------------------- + void ResampleImageFilter::bbUserSetDefaultValues() + { + std::vector res; + res.push_back(1); + res.push_back(1); + res.push_back(1); + bbSetInputSpacing(res); + mOutput = 0; + } + + //----------------------------------------------------------------- + void ResampleImageFilter::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ResampleImageFilter::bbUserFinalizeProcessing() + { + } + } // EO namespace bbtk diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index f716663..cd5ba23 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.cxx,v $ Language: C++ - Date: $Date: 2009/04/30 14:31:33 $ - Version: $Revision: 1.23 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.24 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -133,14 +133,16 @@ namespace bbvtk }; //================================================================ - //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.23 $"); + //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.24 $"); //================================================================ BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,ImagePlanes) BBTK_BLACK_BOX_IMPLEMENTATION(ImagePlanes,bbtk::AtomicBlackBox); - void ImagePlanes::bbUserConstructor() + + + void ImagePlanes::bbUserSetDefaultValues() { bbSetOutputPlaneX(0); bbSetOutputPlaneY(0); @@ -156,18 +158,9 @@ namespace bbvtk mVtkCallback = 0; } - void ImagePlanes::bbUserCopyConstructor(bbtk::BlackBox::Pointer) - { - bbSetOutputPlaneX(0); - bbSetOutputPlaneY(0); - bbSetOutputPlaneZ(0); - bbSetOutputImageX(0); - bbSetOutputImageY(0); - bbSetOutputImageZ(0); - mVtkCallback = 0; - } - void ImagePlanes::Init() + + void ImagePlanes::bbUserInitializeProcessing() { /// CREATION DES WIDGETS @@ -219,7 +212,7 @@ namespace bbvtk } //--------------------------------------------------------------------- - void ImagePlanes::bbUserDestructor() + void ImagePlanes::bbUserFinalizeProcessing() { if (bbGetOutputPlaneX()) { @@ -250,8 +243,6 @@ namespace bbvtk { if (bbGetInputIn()!=0) { - // Create the widgets if not already done - Init(); if ( bbGetInputStatus("In") != bbtk::UPTODATE ) { @@ -296,6 +287,25 @@ namespace bbvtk bbGetOutputPlaneZ()->GetResliceOutput()->Update(); } } + + + //----------------------------------------------------------------- + void vtkImageDataPointerRelay::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void vtkImageDataPointerRelay::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void vtkImageDataPointerRelay::bbUserFinalizeProcessing() + { + } + + + }//namespace bbtk #endif // _USE_VTK_ diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index 333f7b7..4728f23 100644 --- a/packages/vtk/src/bbvtkImagePlanes.h +++ b/packages/vtk/src/bbvtkImagePlanes.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.h,v $ Language: C++ - Date: $Date: 2009/04/17 09:24:02 $ - Version: $Revision: 1.14 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.15 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -76,10 +76,7 @@ namespace bbvtk void Process(); protected: - virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - virtual void bbUserDestructor(); - void Init(); + private: class VtkCallbackType; VtkCallbackType* mVtkCallback; diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx index 5884c8a..d48505a 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.cxx,v $ Language: C++ - Date: $Date: 2009/05/14 15:40:12 $ - Version: $Revision: 1.13 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.14 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -47,39 +47,32 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,IsoSurfaceExtractor) BBTK_BLACK_BOX_IMPLEMENTATION(IsoSurfaceExtractor,bbtk::AtomicBlackBox); - void IsoSurfaceExtractor::bbUserConstructor() + void IsoSurfaceExtractor::bbUserSetDefaultValues() { printf("EED %p IsoSurfaceExtractor::bbUserConstructor \n", this); - Init(); - std::vector colour; - colour.push_back(1.0); - colour.push_back(1.0); - colour.push_back(0.5); - bbSetInputColour(colour); - } - void IsoSurfaceExtractor::bbUserCopyConstructor(bbtk::BlackBox::Pointer from) - { - Init(); + firsttime=true; + std::vector colour; + colour.push_back(1.0); + colour.push_back(1.0); + colour.push_back(0.5); + bbSetInputColour(colour); + + bbSetInputIn(NULL); + // bbSetInputInVtkObject(NULL); + bbSetInputRenderer(NULL); + bbSetInputTransform(NULL); + bbSetInputIsovalue(400); + bbSetInputOpacity(1); + + marchingcubes = NULL; + polydatamapper = NULL; + vtkactor = NULL; } - void IsoSurfaceExtractor::bbUserDestructor() - { - marchingcubes->Delete(); - polydatamapper->Delete(); - vtkactor->Delete(); - } - void IsoSurfaceExtractor::Init() - { - firsttime=true; - - bbSetInputIn(NULL); - // bbSetInputInVtkObject(NULL); - bbSetInputRenderer(NULL); - bbSetInputTransform(NULL); - bbSetInputIsovalue(400); - bbSetInputOpacity(1); - + //--------------------------------------------------------------------- + void IsoSurfaceExtractor::bbUserInitializeProcessing() + { marchingcubes = vtkMarchingCubes::New(); polydatamapper = vtkPolyDataMapper::New(); vtkactor = vtkActor::New(); @@ -89,8 +82,36 @@ namespace bbvtk polydatamapper->ScalarVisibilityOff(); polydatamapper->ImmediateModeRenderingOn(); -} + } + //--------------------------------------------------------------------- + void IsoSurfaceExtractor::bbUserFinalizeProcessing() + { + if (marchingcubes!=NULL) + { + marchingcubes->Delete(); + marchingcubes=NULL; + } + + + if (polydatamapper!=NULL) + { + polydatamapper->Delete(); + polydatamapper=NULL; + } + + if (vtkactor!=NULL) + { + vtkactor->Delete(); + vtkactor=NULL; + } + + + + + } + + //--------------------------------------------------------------------- void IsoSurfaceExtractor::DoProcess() diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h index 554ca8c..0b67d59 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.h,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:23 $ - Version: $Revision: 1.11 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.12 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -89,10 +89,6 @@ namespace bbvtk void DoProcess(); protected: - virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - virtual void bbUserDestructor(); - void Init(); }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor,bbtk::AtomicBlackBox); diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index a398952..0e737bd 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.cxx,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:23 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -52,20 +52,21 @@ namespace bbvtk - void MIPCreator::bbUserConstructor() + //--------------------------------------------------------------------- + void MIPCreator::bbUserSetDefaultValues() { - Init(); - bbSetInputShift(0); - bbSetInputScale(1.); + bbSetInputShift(0); + bbSetInputScale(1.0); + mCast = NULL; + mMIP = NULL; + mMapper = NULL; + mVolume = NULL; } - void MIPCreator::bbUserCopyConstructor(bbtk::BlackBox::Pointer) - { - Init(); - } - - void MIPCreator::Init() - { - + + //--------------------------------------------------------------------- + void MIPCreator::bbUserInitializeProcessing() + { + // Create the pipeline mCast = vtkImageShiftScale::New(); mCast->SetOutputScalarTypeToUnsignedChar(); @@ -87,12 +88,33 @@ namespace bbvtk bbSetOutputOut(mVolume); } - void MIPCreator::bbUserDestructor() + //--------------------------------------------------------------------- + void MIPCreator::bbUserFinalizeProcessing() { - mCast->Delete(); - mMIP->Delete(); - mMapper->Delete(); - mVolume->Delete(); + if (mCast!=NULL) + { + mCast->Delete(); + mCast=NULL; + } + + if (mMIP!=NULL) + { + mMIP->Delete(); + mMIP=NULL; + } + + if (mMapper!=NULL) + { + mMapper->Delete(); + mMapper=NULL; + } + + if (mVolume!=NULL) + { + mVolume->Delete(); + mVolume=NULL; + } + } //--------------------------------------------------------------------- @@ -100,7 +122,7 @@ namespace bbvtk void MIPCreator::Process() { mCast->SetInput( bbGetInputIn() ); - mCast->SetScale( bbGetInputScale() / 100. ); + mCast->SetScale( bbGetInputScale() / 100.0 ); mCast->SetShift( -bbGetInputShift() ); mMapper->Update(); diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h index 16ffc10..55ec756 100644 --- a/packages/vtk/src/bbvtkMIPCreator.h +++ b/packages/vtk/src/bbvtkMIPCreator.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.h,v $ Language: C++ - Date: $Date: 2008/12/16 12:48:10 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -81,15 +81,11 @@ namespace bbvtk void Process(); protected: - virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - virtual void bbUserDestructor(); - void Init(); private: - vtkImageShiftScale* mCast; - vtkVolumeRayCastMIPFunction* mMIP; - vtkVolumeRayCastMapper* mMapper; - vtkVolume* mVolume; + vtkImageShiftScale *mCast; + vtkVolumeRayCastMIPFunction *mMIP; + vtkVolumeRayCastMapper *mMapper; + vtkVolume *mVolume; }; //================================================================= diff --git a/packages/vtk/src/bbvtkMarchingCubes.cxx b/packages/vtk/src/bbvtkMarchingCubes.cxx index ee36d17..53d8874 100644 --- a/packages/vtk/src/bbvtkMarchingCubes.cxx +++ b/packages/vtk/src/bbvtkMarchingCubes.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMarchingCubes.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.4 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,6 +45,23 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,MarchingCubes) BBTK_BLACK_BOX_IMPLEMENTATION(MarchingCubes,bbtk::AtomicBlackBox); + + //----------------------------------------------------------------- + void MarchingCubes::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void MarchingCubes::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void MarchingCubes::bbUserFinalizeProcessing() + { + } + + } // EO namespace bbvtk diff --git a/packages/vtk/src/bbvtkPiecewiseFunction.cxx b/packages/vtk/src/bbvtkPiecewiseFunction.cxx index 67e2198..c62709b 100644 --- a/packages/vtk/src/bbvtkPiecewiseFunction.cxx +++ b/packages/vtk/src/bbvtkPiecewiseFunction.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkPiecewiseFunction.cxx,v $ Language: C++ - Date: $Date: 2008/12/16 12:48:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -49,12 +49,9 @@ namespace bbvtk BBTK_BLACK_BOX_IMPLEMENTATION(PiecewiseFunction,bbtk::AtomicBlackBox); - - - - void PiecewiseFunction::bbUserConstructor() + //--------------------------------------------------------------------- + void PiecewiseFunction::bbUserSetDefaultValues() { - Init(); // Identity function std::vector x,y; x.push_back(0); @@ -63,20 +60,24 @@ namespace bbvtk y.push_back(1); bbSetInputX(x); bbSetInputY(y); - } - void PiecewiseFunction::bbUserCopyConstructor(bbtk::BlackBox::Pointer) - { - Init(); + bbSetOutputOut(0); } - void PiecewiseFunction::Init() + + //--------------------------------------------------------------------- + void PiecewiseFunction::bbUserInitializeProcessing() { bbSetOutputOut(vtkPiecewiseFunction::New()); } - void PiecewiseFunction::bbUserDestructor() + //--------------------------------------------------------------------- + void PiecewiseFunction::bbUserFinalizeProcessing() { - bbGetOutputOut()->Delete(); + if (bbGetOutputOut()!=NULL) + { + bbGetOutputOut()->Delete(); + bbSetOutputOut(0); + } } //--------------------------------------------------------------------- diff --git a/packages/vtk/src/bbvtkPiecewiseFunction.h b/packages/vtk/src/bbvtkPiecewiseFunction.h index 1fb9eba..ebb23f6 100644 --- a/packages/vtk/src/bbvtkPiecewiseFunction.h +++ b/packages/vtk/src/bbvtkPiecewiseFunction.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkPiecewiseFunction.h,v $ Language: C++ - Date: $Date: 2008/12/16 12:48:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -75,10 +75,6 @@ namespace bbvtk void Process(); protected: - virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - virtual void bbUserDestructor(); - void Init(); }; //================================================================= diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx index 550110a..5c33b54 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkSegmentationConnectivity.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -48,45 +48,74 @@ namespace bbvtk bbtk::AtomicBlackBox); - void SegmentationConnectivity::bbUserConstructor() + // -------------------------------------------------------------- + void SegmentationConnectivity::bbUserSetDefaultValues() { - bbSetInputIn(NULL); - std::vector position; - position.push_back(0); - position.push_back(0); - position.push_back(0); - bbSetInputPositionXYZ(position); - std::vector threshold; - threshold.push_back(0); - threshold.push_back(0); - bbSetInputThresholdMinMax(threshold); - bbSetOutputOut(NULL); - thresh2 = vtkImageThreshold::New(); - thresh2->SetInValue(255); - thresh2->SetOutputScalarTypeToUnsignedShort(); - thresh2->SetOutValue(0); - cast2 = vtkImageCast::New(); - cast2->SetInput(thresh2->GetOutput()); - cast2->SetOutputScalarTypeToUnsignedChar(); - connect2 = vtkImageSeedConnectivity::New(); - connect2->SetInput(cast2->GetOutput()); - connect2->SetInputConnectValue(255); - connect2->SetOutputConnectedValue(255); - connect2->SetOutputUnconnectedValue(0); - cast4 = vtkImageCast::New(); - cast4->SetInput(connect2->GetOutput()); - cast4->SetOutputScalarTypeToUnsignedShort(); + thresh2 = NULL; + cast2 = NULL; + connect2 = NULL; + cast4 = NULL; + + bbSetInputIn(NULL); + std::vector position; + position.push_back(0); + position.push_back(0); + position.push_back(0); + bbSetInputPositionXYZ(position); + std::vector threshold; + threshold.push_back(0); + threshold.push_back(0); + bbSetInputThresholdMinMax(threshold); + bbSetOutputOut(NULL); } - - - void SegmentationConnectivity::bbUserDestructor() + + // -------------------------------------------------------------- + void SegmentationConnectivity::bbUserInitializeProcessing() + { + thresh2 = vtkImageThreshold::New(); + thresh2->SetInValue(255); + thresh2->SetOutputScalarTypeToUnsignedShort(); + thresh2->SetOutValue(0); + cast2 = vtkImageCast::New(); + cast2->SetInput(thresh2->GetOutput()); + cast2->SetOutputScalarTypeToUnsignedChar(); + connect2 = vtkImageSeedConnectivity::New(); + connect2->SetInput(cast2->GetOutput()); + connect2->SetInputConnectValue(255); + connect2->SetOutputConnectedValue(255); + connect2->SetOutputUnconnectedValue(0); + cast4 = vtkImageCast::New(); + cast4->SetInput(connect2->GetOutput()); + cast4->SetOutputScalarTypeToUnsignedShort(); + } + + // -------------------------------------------------------------- + void SegmentationConnectivity::bbUserFinalizeProcessing() { - thresh2->Delete(); - cast2->Delete(); - connect2->Delete(); - cast4->Delete(); + if (thresh2!=NULL) + { + thresh2->Delete(); + thresh2=NULL; + } + if (cast2!=NULL) + { + cast2->Delete(); + cast2=NULL; + } + if (connect2!=NULL) + { + connect2->Delete(); + connect2=NULL; + } + if (cast4!=NULL) + { + cast4->Delete(); + cast4=NULL; + } + } + // -------------------------------------------------------------- void SegmentationConnectivity::DoProcess() { vtkImageData *imagedata = bbGetInputIn(); diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.h b/packages/vtk/src/bbvtkSegmentationConnectivity.h index e3618a9..d111364 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.h +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkSegmentationConnectivity.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -72,8 +72,6 @@ namespace bbvtk void DoProcess(); protected: - virtual void bbUserConstructor(); - virtual void bbUserDestructor(); private: vtkImageCast *cast2; diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index 0d53007..be42242 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -7,84 +7,90 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,Transform); BBTK_BLACK_BOX_IMPLEMENTATION(Transform,bbtk::AtomicBlackBox); + + + // -------------------------------------------------------------- + + void Transform::bbUserSetDefaultValues() + { + bbSetInputIn(NULL); + + vecScale.push_back(1); // scale x + vecScale.push_back(1); // scale y + vecScale.push_back(1); // scale z + bbSetInputScale(vecScale); + + vecRotateWXYZ.push_back(0); //angle + vecRotateWXYZ.push_back(1); //vx + vecRotateWXYZ.push_back(0); //vy + vecRotateWXYZ.push_back(0); //vz + bbSetInputRotateWXYZ(vecRotateWXYZ); + + vecTranslate.push_back(0); //tx + vecTranslate.push_back(0); //ty + vecTranslate.push_back(0); //tz + bbSetInputTranslate(vecTranslate); + + vecSpacing.push_back(1); //spacing x + vecSpacing.push_back(1); //spacing y + vecSpacing.push_back(1); //spacing z + bbSetInputTranslate(vecSpacing); + + result = NULL; + } + + // -------------------------------------------------------------- + void Transform::bbUserInitializeProcessing() + { + bbUserFinalizeProcessing(); + result = vtkTransform::New(); + } + + + // -------------------------------------------------------------- + void Transform::bbUserFinalizeProcessing() + { + if (result!=NULL) + { + result->Delete(); + result=NULL; + } + + } + + + // -------------------------------------------------------------- void Transform::Process() { - if (result!=NULL) - { - result->Delete(); - } - result = vtkTransform::New(); - - - if (bbGetInputIn()!=NULL) + bbUserInitializeProcessing(); + if (bbGetInputIn()!=NULL) { - result->Concatenate( bbGetInputIn()->GetMatrix() ); + result->Concatenate( bbGetInputIn()->GetMatrix() ); } - - - if (bbGetInputScale().size()>=3) + + if (bbGetInputScale().size()>=3) { - result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); + result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); } - if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) + if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) { - double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; - double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1]; - double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2]; - result->Translate(tx,ty,tz); + double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; + double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1]; + double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2]; + result->Translate(tx,ty,tz); } - if (bbGetInputRotateWXYZ().size()>=4) + if (bbGetInputRotateWXYZ().size()>=4) { - result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); + result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); } - result->Update(); + result->Update(); - bbSetOutputOut(result); + bbSetOutputOut(result); } - - void Transform::bbUserConstructor() - { - bbSetInputIn(NULL); - - vecScale.push_back(1); // scale x - vecScale.push_back(1); // scale y - vecScale.push_back(1); // scale z - bbSetInputScale(vecScale); - - vecRotateWXYZ.push_back(0); //angle - vecRotateWXYZ.push_back(1); //vx - vecRotateWXYZ.push_back(0); //vy - vecRotateWXYZ.push_back(0); //vz - bbSetInputRotateWXYZ(vecRotateWXYZ); - - vecTranslate.push_back(0); //tx - vecTranslate.push_back(0); //ty - vecTranslate.push_back(0); //tz - bbSetInputTranslate(vecTranslate); - - vecSpacing.push_back(1); //spacing x - vecSpacing.push_back(1); //spacing y - vecSpacing.push_back(1); //spacing z - bbSetInputTranslate(vecSpacing); - - result = NULL; - } - /* - void Transform::bbUserCopyConstructor() - { - - - } - */ - void Transform::bbUserDestructor() - { - - - } } // EO namespace bbvtk diff --git a/packages/vtk/src/bbvtkTransform.h b/packages/vtk/src/bbvtkTransform.h index 85b979b..760cce4 100644 --- a/packages/vtk/src/bbvtkTransform.h +++ b/packages/vtk/src/bbvtkTransform.h @@ -14,14 +14,6 @@ namespace bbvtk public bbtk::AtomicBlackBox { BBTK_BLACK_BOX_INTERFACE(Transform,bbtk::AtomicBlackBox); - //================================================================== - /// User callback called in the box contructor - virtual void bbUserConstructor(); - /// User callback called in the box copy constructor - //virtual void bbUserCopyConstructor(); - /// User callback called in the box destructor - virtual void bbUserDestructor(); - //================================================================== BBTK_DECLARE_INPUT(In,vtkLinearTransform *); BBTK_DECLARE_INPUT(Scale,std::vector); BBTK_DECLARE_INPUT(RotateWXYZ,std::vector); @@ -31,10 +23,10 @@ namespace bbvtk BBTK_PROCESS(Process); void Process(); - std::vector vecScale; - std::vector vecRotateWXYZ; - std::vector vecTranslate; - std::vector vecSpacing; + std::vector vecScale; + std::vector vecRotateWXYZ; + std::vector vecTranslate; + std::vector vecSpacing; vtkTransform *result; }; diff --git a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx index dabc868..844b924 100644 --- a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx +++ b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx @@ -9,58 +9,67 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,VecImageGaussianSmooth) BBTK_BLACK_BOX_IMPLEMENTATION(VecImageGaussianSmooth,bbtk::AtomicBlackBox); -void VecImageGaussianSmooth::Process() -{ - vtkImageGaussianSmooth *vtkimagegaussiansmooth; - int i,size = (int)VecVtkimagegaussiansmooth.size(); - for (i=0 ; iDelete(); + + + //--------------------------------------------------------------------- + void VecImageGaussianSmooth::bbUserSetDefaultValues() + { + bbSetInputStdDevX(2); + bbSetInputStdDevY(2); + bbSetInputStdDevZ(2); + bbSetInputiImage(0); } - VecVtkimagegaussiansmooth.clear(); - VecResult.clear(); - - double stdvX=bbGetInputStdDevX(); - double stdvY=bbGetInputStdDevY(); - double stdvZ=bbGetInputStdDevZ(); - size=(int)bbGetInputIn().size(); - for (i=0 ; iSetInput( bbGetInputIn()[i] ); - vtkimagegaussiansmooth->SetStandardDeviation( stdvX,stdvY, stdvZ ); - vtkimagegaussiansmooth->Update(); - VecResult.push_back( vtkimagegaussiansmooth->GetOutput() ); - VecVtkimagegaussiansmooth.push_back(vtkimagegaussiansmooth); - } //for i - bbSetOutputOut(VecResult); - if (bbGetInputiImage() < (int)VecResult.size()) + void VecImageGaussianSmooth::bbUserInitializeProcessing() { - bbSetOutputOutImage(VecResult[bbGetInputiImage()]); - } //if + } -} - -void VecImageGaussianSmooth::bbUserConstructor() -{ - - bbSetInputStdDevX(2); - bbSetInputStdDevY(2); - bbSetInputStdDevZ(2); - - bbSetInputiImage(0); - -} + //--------------------------------------------------------------------- + void VecImageGaussianSmooth::bbUserFinalizeProcessing() + { + int i,size = (int)VecVtkimagegaussiansmooth.size(); + for (i=0 ; iDelete(); + } + VecVtkimagegaussiansmooth.clear(); + } + + + + //--------------------------------------------------------------------- + + void VecImageGaussianSmooth::Process() + { + bbUserFinalizeProcessing(); + + vtkImageGaussianSmooth *vtkimagegaussiansmooth; + VecResult.clear(); -void VecImageGaussianSmooth::bbUserCopyConstructor(bbtk::BlackBox::Pointer) -{ -} + double stdvX=bbGetInputStdDevX(); + double stdvY=bbGetInputStdDevY(); + double stdvZ=bbGetInputStdDevZ(); + + int i,size=(int)bbGetInputIn().size(); + for (i=0 ; iSetInput( bbGetInputIn()[i] ); + vtkimagegaussiansmooth->SetStandardDeviation( stdvX,stdvY, stdvZ ); + vtkimagegaussiansmooth->Update(); + VecResult.push_back( vtkimagegaussiansmooth->GetOutput() ); + VecVtkimagegaussiansmooth.push_back(vtkimagegaussiansmooth); + } //for i + + bbSetOutputOut(VecResult); + if (bbGetInputiImage() < (int)VecResult.size()) + { + bbSetOutputOutImage(VecResult[bbGetInputiImage()]); + } //if + + } -void VecImageGaussianSmooth::bbUserDestructor() -{ -} } // EO namespace bbvtk diff --git a/packages/vtk/src/bbvtkVecImageGaussianSmooth.h b/packages/vtk/src/bbvtkVecImageGaussianSmooth.h index d5fc226..c6fc5a4 100644 --- a/packages/vtk/src/bbvtkVecImageGaussianSmooth.h +++ b/packages/vtk/src/bbvtkVecImageGaussianSmooth.h @@ -15,14 +15,6 @@ class /*BBTK_EXPORT*/ VecImageGaussianSmooth public bbtk::AtomicBlackBox { BBTK_BLACK_BOX_INTERFACE(VecImageGaussianSmooth,bbtk::AtomicBlackBox); -//================================================================== -/// User callback called in the box contructor -virtual void bbUserConstructor(); -/// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); -/// User callback called in the box destructor -virtual void bbUserDestructor(); -//================================================================== BBTK_DECLARE_INPUT(In,std::vector); BBTK_DECLARE_INPUT(StdDevX,double); BBTK_DECLARE_INPUT(StdDevY,double); diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx index d175944..ebe70c1 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx @@ -9,153 +9,149 @@ namespace bbvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,VecIsoSurfaceExtractor) BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); -void VecIsoSurfaceExtractor::Process() -{ - double r,g,b; - vtkMarchingCubes *marchingcubes; - vtkPolyDataMapper *polydatamapper; - vtkActor *vtkactor; - - int i,size; - - - size = VecVtkactor.size(); - for( i=0 ; i colour; + // 1- red + colour.push_back(1.0); + colour.push_back(0.0); + colour.push_back(0.0); + // 2- blue + colour.push_back(0.0); + colour.push_back(0.0); + colour.push_back(1.0); + // 3- yellow + colour.push_back(1.0); + colour.push_back(1.0); + colour.push_back(0.0); + // 4- green + colour.push_back(0.0); + colour.push_back(1.0); + colour.push_back(0.0); + // 5- + colour.push_back(0.0); + colour.push_back(1.0); + colour.push_back(1.0); + + // 6- + colour.push_back(0.5); + colour.push_back(0.5); + colour.push_back(0.5); + + bbSetInputColour(colour); + bbSetInputTransform(NULL); + bbSetInputOpacity(1); + + bbSetInputRenderer(NULL); + bbSetInputIsovalue(128); + bbSetInputOpacity(1); + } + + //----------------------------------------------------------- + void VecIsoSurfaceExtractor::bbUserInitializeProcessing() + { + // bbSetInputIn(NULL); + // bbSetInputInVtkObject(NULL); + + } + + //----------------------------------------------------------- + void VecIsoSurfaceExtractor::bbUserFinalizeProcessing() + { + int i,size = VecMarchingcubes.size(); + for (i=0;iRemoveActor( VecVtkactor[i] ); VecMarchingcubes[i]->Delete(); VecPolydatamapper[i]->Delete(); VecVtkactor[i]->Delete(); } + VecMarchingcubes.clear(); + VecPolydatamapper.clear(); + VecVtkactor.clear(); } - VecMarchingcubes.clear(); - VecPolydatamapper.clear(); - VecVtkactor.clear(); - - - size = bbGetInputIn().size(); - for( i=0 ; iSetInput(marchingcubes->GetOutput()); - vtkactor->SetMapper(polydatamapper); - - polydatamapper->ScalarVisibilityOff(); - polydatamapper->ImmediateModeRenderingOn(); - - VecMarchingcubes.push_back(marchingcubes); - VecPolydatamapper.push_back(polydatamapper); - VecVtkactor.push_back(vtkactor); - } // for i - - - for( i=0 ; iSetInput( bbGetInputIn()[i] ); - marchingcubes->SetValue(0, bbGetInputIsovalue() ); - marchingcubes->Update(); - - if ( (i*3+1)<(int)(bbGetInputColour().size()) ){ - r = bbGetInputColour()[0+i*3]; - g = bbGetInputColour()[1+i*3]; - b = bbGetInputColour()[2+i*3]; - } else { - r = bbGetInputColour()[0]; - g = bbGetInputColour()[1]; - b = bbGetInputColour()[2]; - } - vtkactor->GetProperty()->SetColor( r,g,b ); - - vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() ); - - if ( bbGetInputTransform()!=NULL ) - { - vtkactor->SetUserTransform( bbGetInputTransform() ); - } + + //----------------------------------------------------------- + void VecIsoSurfaceExtractor::Process() + { + double r,g,b; + vtkMarchingCubes *marchingcubes; + vtkPolyDataMapper *polydatamapper; + vtkActor *vtkactor; + + int i,size; - // Interface Update - if (bbGetInputRenderer()!=NULL ) + size = VecVtkactor.size(); + for( i=0 ; iAddActor( vtkactor ); + if (bbGetInputRenderer()!=NULL ) + { + bbGetInputRenderer()->RemoveActor( VecVtkactor[i] ); + VecMarchingcubes[i]->Delete(); + VecPolydatamapper[i]->Delete(); + VecVtkactor[i]->Delete(); + } } - } // for i - - - bbSetOutputOut( VecVtkactor ); -} - -void VecIsoSurfaceExtractor::bbUserConstructor() -{ - Init(); - std::vector colour; - // 1- red - colour.push_back(1.0); - colour.push_back(0.0); - colour.push_back(0.0); - // 2- blue - colour.push_back(0.0); - colour.push_back(0.0); - colour.push_back(1.0); - // 3- yellow - colour.push_back(1.0); - colour.push_back(1.0); - colour.push_back(0.0); - // 4- green - colour.push_back(0.0); - colour.push_back(1.0); - colour.push_back(0.0); - // 5- - colour.push_back(0.0); - colour.push_back(1.0); - colour.push_back(1.0); - - // 6- - colour.push_back(0.5); - colour.push_back(0.5); - colour.push_back(0.5); - - - bbSetInputColour(colour); - bbSetInputTransform(NULL); - bbSetInputOpacity(1); -} - -void VecIsoSurfaceExtractor::bbUserCopyConstructor(bbtk::BlackBox::Pointer) -{ - Init(); -} - -void VecIsoSurfaceExtractor::bbUserDestructor() -{ - int i,size = VecMarchingcubes.size(); - for (i=0;iDelete(); - VecPolydatamapper[i]->Delete(); - VecVtkactor[i]->Delete(); + VecMarchingcubes.clear(); + VecPolydatamapper.clear(); + VecVtkactor.clear(); + + + size = bbGetInputIn().size(); + for( i=0 ; iSetInput(marchingcubes->GetOutput()); + vtkactor->SetMapper(polydatamapper); + + polydatamapper->ScalarVisibilityOff(); + polydatamapper->ImmediateModeRenderingOn(); + + VecMarchingcubes.push_back(marchingcubes); + VecPolydatamapper.push_back(polydatamapper); + VecVtkactor.push_back(vtkactor); + } // for i + + + for( i=0 ; iSetInput( bbGetInputIn()[i] ); + marchingcubes->SetValue(0, bbGetInputIsovalue() ); + marchingcubes->Update(); + + if ( (i*3+1)<(int)(bbGetInputColour().size()) ){ + r = bbGetInputColour()[0+i*3]; + g = bbGetInputColour()[1+i*3]; + b = bbGetInputColour()[2+i*3]; + } else { + r = bbGetInputColour()[0]; + g = bbGetInputColour()[1]; + b = bbGetInputColour()[2]; + } + vtkactor->GetProperty()->SetColor( r,g,b ); + + vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() ); + + if ( bbGetInputTransform()!=NULL ) + { + vtkactor->SetUserTransform( bbGetInputTransform() ); + } + + // Interface Update + if (bbGetInputRenderer()!=NULL ) + { + bbGetInputRenderer()->AddActor( vtkactor ); + } + } // for i + + bbSetOutputOut( VecVtkactor ); } - VecMarchingcubes.clear(); - VecPolydatamapper.clear(); - VecVtkactor.clear(); -} - - -void VecIsoSurfaceExtractor::Init() -{ -// bbSetInputIn(NULL); - // bbSetInputInVtkObject(NULL); - bbSetInputRenderer(NULL); - bbSetInputIsovalue(128); - bbSetInputOpacity(1); - -} } diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h index 060eb14..c26a6c2 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h @@ -20,15 +20,7 @@ class /*BBTK_EXPORT*/ VecIsoSurfaceExtractor public bbtk::AtomicBlackBox { BBTK_BLACK_BOX_INTERFACE(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox); -//================================================================== -/// User callback called in the box contructor -virtual void bbUserConstructor(); -/// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); -/// User callback called in the box destructor -virtual void bbUserDestructor(); -//================================================================== - BBTK_DECLARE_INPUT(In,std::vector); + BBTK_DECLARE_INPUT(In,std::vector); // BBTK_DECLARE_INPUT(InVtkObject,vtkObject *); BBTK_DECLARE_INPUT(Isovalue,double); BBTK_DECLARE_INPUT(Opacity,double); diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx index d9de17f..0273d3c 100644 --- a/packages/vtk/src/bbvtkVolumeRenderer.cxx +++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkVolumeRenderer.cxx,v $ Language: C++ - Date: $Date: 2008/12/16 12:48:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -52,18 +52,16 @@ namespace bbvtk - void VolumeRenderer::bbUserConstructor() + void VolumeRenderer::bbUserSetDefaultValues() { - Init(); - bbSetInputColorFunction(0); - bbSetInputOpacityFunction(0); + mRayCastFunction = NULL; + mMapper = NULL; + mVolume = NULL; + bbSetInputColorFunction(0); + bbSetInputOpacityFunction(0); } - void VolumeRenderer::bbUserCopyConstructor(bbtk::BlackBox::Pointer) - { - Init(); - } - - void VolumeRenderer::Init() + + void VolumeRenderer::bbUserInitializeProcessing() { // Create the pipeline @@ -75,25 +73,34 @@ namespace bbvtk // mMIP->SetMaximizeMethodToScalarValue(); mRayCastFunction = vtkVolumeRayCastCompositeFunction::New(); - mMapper = vtkVolumeRayCastMapper::New(); - mMapper->SetVolumeRayCastFunction(mRayCastFunction); - - + mMapper->SetVolumeRayCastFunction(mRayCastFunction); mVolume = vtkVolume::New(); - mVolume->SetMapper(mMapper); + mVolume->SetMapper(mMapper); // mMapper->ScalarVisibilityOff(); // mMapper->ImmediateModeRenderingOn(); - bbSetOutputOut(mVolume); } - void VolumeRenderer::bbUserDestructor() + //--------------------------------------------------------------------- + void VolumeRenderer::bbUserFinalizeProcessing() { - mRayCastFunction->Delete(); - mMapper->Delete(); - mVolume->Delete(); + if (mRayCastFunction!=NULL) + { + mRayCastFunction->Delete(); + mRayCastFunction=NULL; + } + if (mMapper!=NULL) + { + mMapper->Delete(); + mMapper=NULL; + } + if (mVolume!=NULL) + { + mVolume->Delete(); + mVolume=NULL; + } } //--------------------------------------------------------------------- @@ -120,7 +127,9 @@ namespace bbvtk } if (changed) mMapper->Update(); - + + bbSetOutputOut(mVolume); + } }//namespace bbtk diff --git a/packages/vtk/src/bbvtkVolumeRenderer.h b/packages/vtk/src/bbvtkVolumeRenderer.h index cc2998e..fc46e65 100644 --- a/packages/vtk/src/bbvtkVolumeRenderer.h +++ b/packages/vtk/src/bbvtkVolumeRenderer.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkVolumeRenderer.h,v $ Language: C++ - Date: $Date: 2008/12/16 12:48:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:01 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -85,10 +85,7 @@ namespace bbvtk void Process(); protected: - virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - virtual void bbUserDestructor(); - void Init(); + private: vtkVolumeProperty * mVolumeProperty; vtkVolumeRayCastCompositeFunction * mRayCastFunction; diff --git a/packages/wx/src/bbwxCheckBox.cxx b/packages/wx/src/bbwxCheckBox.cxx index 33f6a61..501a8bd 100644 --- a/packages/wx/src/bbwxCheckBox.cxx +++ b/packages/wx/src/bbwxCheckBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxCheckBox.cxx,v $ Language: C++ - Date: $Date: 2009/01/13 09:57:13 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -176,13 +176,25 @@ namespace bbwx BBTK_BLACK_BOX_IMPLEMENTATION(CheckBox,bbtk::WxBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CheckBox); - //-------------------------------------------------------------------------- - void CheckBox::bbUserConstructor() - { - bbSetInputIn(false); - bbSetOutputOut(false); - } - + + //----------------------------------------------------------------- + void CheckBox::bbUserSetDefaultValues() + { + bbSetInputIn(false); + bbSetOutputOut(false); + } + + //----------------------------------------------------------------- + void CheckBox::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void CheckBox::bbUserFinalizeProcessing() + { + } + + //-------------------------------------------------------------------------- void CheckBox::Process() { diff --git a/packages/wx/src/bbwxCheckBox.h b/packages/wx/src/bbwxCheckBox.h index 778016a..b2b902a 100644 --- a/packages/wx/src/bbwxCheckBox.h +++ b/packages/wx/src/bbwxCheckBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxCheckBox.h,v $ Language: C++ - Date: $Date: 2009/01/13 09:57:13 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -79,7 +79,7 @@ namespace bbwx void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); + }; //================================================================= diff --git a/packages/wx/src/bbwxColourSelector.cxx b/packages/wx/src/bbwxColourSelector.cxx index e5c1a78..adef925 100644 --- a/packages/wx/src/bbwxColourSelector.cxx +++ b/packages/wx/src/bbwxColourSelector.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelector.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:32 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -50,10 +50,22 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourSelector); BBTK_BLACK_BOX_IMPLEMENTATION(ColourSelector,bbtk::AtomicBlackBox); - void ColourSelector::bbUserConstructor() - { - } - + //----------------------------------------------------------------- + void ColourSelector::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void ColourSelector::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ColourSelector::bbUserFinalizeProcessing() + { + } + + //----------------------------------------------------------------- void ColourSelector::Process() { bbtkDebugMessageInc("Core",9,"ColourSelector::Process() [" diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h index 4c19eae..77e4c6a 100644 --- a/packages/wx/src/bbwxColourSelector.h +++ b/packages/wx/src/bbwxColourSelector.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelector.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -70,7 +70,7 @@ namespace bbwx BBTK_PROCESS(Process); void Process(); protected: - virtual void bbUserConstructor(); + }; //================================================================= diff --git a/packages/wx/src/bbwxColourSelectorButton.cxx b/packages/wx/src/bbwxColourSelectorButton.cxx index f61de88..042b494 100644 --- a/packages/wx/src/bbwxColourSelectorButton.cxx +++ b/packages/wx/src/bbwxColourSelectorButton.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelectorButton.cxx,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -136,16 +136,26 @@ void wxColourPickerCtrlWidget::UpdateBox() BBTK_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourSelectorButton); - void ColourSelectorButton::bbUserConstructor() - { - // Default input value - bbSetInputIn("1 1 1"); - // Initial output value = the same than input - bbSetOutputOut("1 1 1"); - // IMPORTANT : Initialize output widget to null pointer to test it after - bbSetOutputWidget(0); - } - + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserSetDefaultValues() + { + // Default input value + bbSetInputIn("1 1 1"); + // Initial output value = the same than input + bbSetOutputOut("1 1 1"); + // IMPORTANT : Initialize output widget to null pointer to test it after + bbSetOutputWidget(0); + } + + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserFinalizeProcessing() + { + } void ColourSelectorButton::Process() { diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h index 3e6a81e..029daa1 100644 --- a/packages/wx/src/bbwxColourSelectorButton.h +++ b/packages/wx/src/bbwxColourSelectorButton.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelectorButton.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -75,7 +75,7 @@ namespace bbwx void Process(); void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); + }; //================================================================= diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index e216d99..5ad78e5 100644 --- a/packages/wx/src/bbwxCommandButton.cxx +++ b/packages/wx/src/bbwxCommandButton.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxCommandButton.cxx,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.14 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.15 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -188,18 +188,29 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,CommandButton); BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox); - void CommandButton::bbUserConstructor() - { - bbSetInputIn(""); - bbSetInputLabel(""); - std::vector lstColour; - lstColour.push_back(0.75); - lstColour.push_back(0.75); - lstColour.push_back(0.75); - bbSetInputColour(lstColour); - bbSetOutputWidget(0); - } - +//----------------------------------------------------------------- + void CommandButton::bbUserSetDefaultValues() + { + bbSetInputIn(""); + bbSetInputLabel(""); + std::vector lstColour; + lstColour.push_back(0.75); + lstColour.push_back(0.75); + lstColour.push_back(0.75); + bbSetInputColour(lstColour); + bbSetOutputWidget(0); + } + + //----------------------------------------------------------------- + void CommandButton::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void CommandButton::bbUserFinalizeProcessing() + { + } + void CommandButton::Process() { @@ -229,6 +240,7 @@ namespace bbwx } } + void CommandButton::UpdateLabel() { CommandButtonWidget* wxwidget = (CommandButtonWidget*)bbGetOutputWidget(); diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h index ccbb0e0..2490e8b 100644 --- a/packages/wx/src/bbwxCommandButton.h +++ b/packages/wx/src/bbwxCommandButton.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxCommandButton.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -71,7 +71,6 @@ namespace bbwx BBTK_CREATE_WIDGET(CreateWidget); void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); private: diff --git a/packages/wx/src/bbwxDirectorySelector.cxx b/packages/wx/src/bbwxDirectorySelector.cxx index 848bb75..aeba9e6 100644 --- a/packages/wx/src/bbwxDirectorySelector.cxx +++ b/packages/wx/src/bbwxDirectorySelector.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxDirectorySelector.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:32 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -46,35 +46,48 @@ namespace bbwx { - BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,DirectorySelector); - - - BBTK_BLACK_BOX_IMPLEMENTATION(DirectorySelector,bbtk::AtomicBlackBox); - - - void DirectorySelector::Process() - { - bbtkDebugMessageInc("Core",9,"DirectorySelector::Process() [" - <ShowModal()==wxID_OK) - { - bbSetOutputOut( bbtk::wx2std (FD->GetPath()) ); - bbSetInputDefaultDir( bbtk::wx2std (FD->GetPath()) ); - } - else - { - bbSetOutputOut(""); - bbSetInputDefaultDir(""); - } - - bbtkDebugDecTab("Core",9); - } + BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,DirectorySelector); + BBTK_BLACK_BOX_IMPLEMENTATION(DirectorySelector,bbtk::AtomicBlackBox); + + //----------------------------------------------------------------- + void DirectorySelector::bbUserSetDefaultValues() + { + } + + //----------------------------------------------------------------- + void DirectorySelector::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void DirectorySelector::bbUserFinalizeProcessing() + { + } + + //----------------------------------------------------------------- + void DirectorySelector::Process() + { + bbtkDebugMessageInc("Core",9,"DirectorySelector::Process() [" + <ShowModal()==wxID_OK) + { + bbSetOutputOut( bbtk::wx2std (FD->GetPath()) ); + bbSetInputDefaultDir( bbtk::wx2std (FD->GetPath()) ); + } + else + { + bbSetOutputOut(""); + bbSetInputDefaultDir(""); + } + + bbtkDebugDecTab("Core",9); + } diff --git a/packages/wx/src/bbwxFileSelector.cxx b/packages/wx/src/bbwxFileSelector.cxx index d14b274..8f1e78a 100644 --- a/packages/wx/src/bbwxFileSelector.cxx +++ b/packages/wx/src/bbwxFileSelector.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxFileSelector.cxx,v $ Language: C++ - Date: $Date: 2009/03/11 13:34:58 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -48,11 +48,25 @@ namespace bbwx { BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,FileSelector); - - BBTK_BLACK_BOX_IMPLEMENTATION(FileSelector,bbtk::AtomicBlackBox); + //----------------------------------------------------------------- + void FileSelector::bbUserSetDefaultValues() + { + bbSetInputOpenSave("Open"); + } + + //----------------------------------------------------------------- + void FileSelector::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void FileSelector::bbUserFinalizeProcessing() + { + } + void FileSelector::Process() { bbtkDebugMessageInc("Core",9,"FileSelector::Process() [" @@ -101,11 +115,6 @@ namespace bbwx bbtkDebugDecTab("Core",9); } - - void FileSelector::bbUserConstructor() - { - bbSetInputOpenSave("Open"); - } diff --git a/packages/wx/src/bbwxFileSelector.h b/packages/wx/src/bbwxFileSelector.h index 32faca1..5566fae 100644 --- a/packages/wx/src/bbwxFileSelector.h +++ b/packages/wx/src/bbwxFileSelector.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxFileSelector.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -76,7 +76,6 @@ namespace bbwx void Process(); protected: - virtual void bbUserConstructor(); }; //================================================================= diff --git a/packages/wx/src/bbwxInputText.cxx b/packages/wx/src/bbwxInputText.cxx index cc7c724..48ba722 100644 --- a/packages/wx/src/bbwxInputText.cxx +++ b/packages/wx/src/bbwxInputText.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxInputText.cxx,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -149,16 +149,27 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,InputText); BBTK_BLACK_BOX_IMPLEMENTATION(InputText,bbtk::WxBlackBox); - - - void InputText::bbUserConstructor() - { - bbSetInputTitle(""); - bbSetInputIn(""); - bbSetOutputWidget(0); - } + //----------------------------------------------------------------- + void InputText::bbUserSetDefaultValues() + { + bbSetInputTitle(""); + bbSetInputIn(""); + bbSetOutputWidget(0); + } + + //----------------------------------------------------------------- + void InputText::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void InputText::bbUserFinalizeProcessing() + { + } + + //----------------------------------------------------------------- void InputText::Process() { InputTextWidget *w=(InputTextWidget *)bbGetOutputWidget(); diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h index e6d5b43..af23565 100644 --- a/packages/wx/src/bbwxInputText.h +++ b/packages/wx/src/bbwxInputText.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxInputText.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -73,7 +73,7 @@ namespace bbwx void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); + }; //================================================================= diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx index 22739ba..d9043f9 100644 --- a/packages/wx/src/bbwxLayoutLine.cxx +++ b/packages/wx/src/bbwxLayoutLine.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutLine.cxx,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -47,20 +47,32 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx, LayoutLine); BBTK_BLACK_BOX_IMPLEMENTATION(LayoutLine,bbtk::WxBlackBox); - void LayoutLine::bbUserConstructor() - { - bbSetInputOrientation("VERTICAL"); - bbSetInputWidget1(NULL); - bbSetInputWidget2(NULL); - bbSetInputWidget3(NULL); - bbSetInputWidget4(NULL); - bbSetInputWidget5(NULL); - bbSetInputWidget6(NULL); - bbSetInputWidget7(NULL); - bbSetInputWidget8(NULL); - bbSetInputWidget9(NULL); - } - + //----------------------------------------------------------------- + void LayoutLine::bbUserSetDefaultValues() + { + bbSetInputOrientation("VERTICAL"); + bbSetInputWidget1(NULL); + bbSetInputWidget2(NULL); + bbSetInputWidget3(NULL); + bbSetInputWidget4(NULL); + bbSetInputWidget5(NULL); + bbSetInputWidget6(NULL); + bbSetInputWidget7(NULL); + bbSetInputWidget8(NULL); + bbSetInputWidget9(NULL); + } + + //----------------------------------------------------------------- + void LayoutLine::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void LayoutLine::bbUserFinalizeProcessing() + { + } + + void LayoutLine::Process() { } diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h index 39ff236..010fe20 100644 --- a/packages/wx/src/bbwxLayoutLine.h +++ b/packages/wx/src/bbwxLayoutLine.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutLine.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:23 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -84,7 +84,6 @@ namespace bbwx void OnShowWidget(); protected: - virtual void bbUserConstructor(); void TryInsertWindow(wxWindow *parent, wxWindow *w,wxBoxSizer *sizer); }; diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx index 6427085..ff32fc4 100644 --- a/packages/wx/src/bbwxLayoutSplit.cxx +++ b/packages/wx/src/bbwxLayoutSplit.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutSplit.cxx,v $ Language: C++ - Date: $Date: 2009/04/15 15:45:55 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -46,14 +46,25 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,LayoutSplit); BBTK_BLACK_BOX_IMPLEMENTATION(LayoutSplit,bbtk::WxBlackBox); - void LayoutSplit::bbUserConstructor() - { - bbSetInputOrientation("VERTICAL"); - bbSetInputProportion(50); - bbSetInputWidget1(NULL); - bbSetInputWidget2(NULL); - } - + //----------------------------------------------------------------- + void LayoutSplit::bbUserSetDefaultValues() + { + bbSetInputOrientation("VERTICAL"); + bbSetInputProportion(50); + bbSetInputWidget1(NULL); + bbSetInputWidget2(NULL); + } + + //----------------------------------------------------------------- + void LayoutSplit::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void LayoutSplit::bbUserFinalizeProcessing() + { + } + void LayoutSplit::Process() { } diff --git a/packages/wx/src/bbwxLayoutSplit.h b/packages/wx/src/bbwxLayoutSplit.h index 0182754..7e5effa 100644 --- a/packages/wx/src/bbwxLayoutSplit.h +++ b/packages/wx/src/bbwxLayoutSplit.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutSplit.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:24 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -76,7 +76,6 @@ namespace bbwx void OnShowWidget(); protected: - virtual void bbUserConstructor(); }; //================================================================= diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx index ddd037f..fd94191 100644 --- a/packages/wx/src/bbwxLayoutTab.cxx +++ b/packages/wx/src/bbwxLayoutTab.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutTab.cxx,v $ Language: C++ - Date: $Date: 2008/11/26 12:18:32 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -51,8 +51,9 @@ namespace bbwx BBTK_BLACK_BOX_IMPLEMENTATION(LayoutTab,bbtk::WxBlackBox); - void LayoutTab::bbUserConstructor() - { + //----------------------------------------------------------------- + void LayoutTab::bbUserSetDefaultValues() + { bbSetInputOrientation("TOP"); bbSetInputWidget1(NULL); bbSetInputWidget2(NULL); @@ -64,7 +65,19 @@ namespace bbwx bbSetInputWidget8(NULL); bbSetInputWidget9(NULL); } - + + //----------------------------------------------------------------- + void LayoutTab::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void LayoutTab::bbUserFinalizeProcessing() + { + } + + + //----------------------------------------------------------------- void LayoutTab::TryInsertWindow(wxNotebook *book, const std::string& input ) { wxWindow* w = bbCreateWidgetOfInput(input,book); //panel); diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h index f0e2c48..04db62d 100644 --- a/packages/wx/src/bbwxLayoutTab.h +++ b/packages/wx/src/bbwxLayoutTab.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutTab.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:24 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -85,7 +85,6 @@ namespace bbwx void OnShowWidget(); protected: - virtual void bbUserConstructor(); void TryInsertWindow(wxNotebook *book, const std::string& input); }; diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index 203fd9e..904d982 100644 --- a/packages/wx/src/bbwxRadioButton.cxx +++ b/packages/wx/src/bbwxRadioButton.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxRadioButton.cxx,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:24 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/15 14:58:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -179,24 +179,34 @@ namespace bbwx BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,RadioButton); BBTK_BLACK_BOX_IMPLEMENTATION(RadioButton,bbtk::WxBlackBox); - - void RadioButton::bbUserConstructor() - { - bbSetInputIn(0); - bbSetOutputOut( bbGetInputIn() ); - bbSetInputIn0(""); - bbSetInputIn1(""); - bbSetInputIn2(""); - bbSetInputIn3(""); - bbSetInputIn4(""); - bbSetInputIn5(""); - bbSetInputIn6(""); - bbSetInputIn7(""); - bbSetInputIn8(""); - bbSetInputIn9(""); - } - + //----------------------------------------------------------------- + void RadioButton::bbUserSetDefaultValues() + { + bbSetInputIn(0); + bbSetOutputOut( bbGetInputIn() ); + bbSetInputIn0(""); + bbSetInputIn1(""); + bbSetInputIn2(""); + bbSetInputIn3(""); + bbSetInputIn4(""); + bbSetInputIn5(""); + bbSetInputIn6(""); + bbSetInputIn7(""); + bbSetInputIn8(""); + bbSetInputIn9(""); + } + + //----------------------------------------------------------------- + void RadioButton::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void RadioButton::bbUserFinalizeProcessing() + { + } + void RadioButton::Process() { bbtkDebugMessageInc("Core",9,"RadioButton::Process()"<