]> Creatis software - bbtk.git/commitdiff
.
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 15 May 2009 14:57:56 +0000 (14:57 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 15 May 2009 14:57:56 +0000 (14:57 +0000)
59 files changed:
kernel/src/CMakeLists.txt
kernel/src/bbtkItkBlackBoxMacros.h
packages/gdcmvtk/CMakeLists.txt
packages/itk/src/bbitkBinaryThresholdImageFilter.cxx
packages/itk/src/bbitkBinaryThresholdImageFilter.h
packages/itk/src/bbitkExtractImageFilter.cxx
packages/itk/src/bbitkImageProperties.cxx
packages/itk/src/bbitkImageReader.cxx
packages/itk/src/bbitkImageRegion.cxx
packages/itk/src/bbitkImageSeriesReader.cxx
packages/itk/src/bbitkImageSeriesReader.h
packages/itk/src/bbitkImageWriter.cxx
packages/itk/src/bbitkResampleImageFilter.h
packages/vtk/src/bbvtkImagePlanes.cxx
packages/vtk/src/bbvtkImagePlanes.h
packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
packages/vtk/src/bbvtkIsoSurfaceExtractor.h
packages/vtk/src/bbvtkMIPCreator.cxx
packages/vtk/src/bbvtkMIPCreator.h
packages/vtk/src/bbvtkMarchingCubes.cxx
packages/vtk/src/bbvtkPiecewiseFunction.cxx
packages/vtk/src/bbvtkPiecewiseFunction.h
packages/vtk/src/bbvtkSegmentationConnectivity.cxx
packages/vtk/src/bbvtkSegmentationConnectivity.h
packages/vtk/src/bbvtkTransform.cxx
packages/vtk/src/bbvtkTransform.h
packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx
packages/vtk/src/bbvtkVecImageGaussianSmooth.h
packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h
packages/vtk/src/bbvtkVolumeRenderer.cxx
packages/vtk/src/bbvtkVolumeRenderer.h
packages/wx/src/bbwxCheckBox.cxx
packages/wx/src/bbwxCheckBox.h
packages/wx/src/bbwxColourSelector.cxx
packages/wx/src/bbwxColourSelector.h
packages/wx/src/bbwxColourSelectorButton.cxx
packages/wx/src/bbwxColourSelectorButton.h
packages/wx/src/bbwxCommandButton.cxx
packages/wx/src/bbwxCommandButton.h
packages/wx/src/bbwxDirectorySelector.cxx
packages/wx/src/bbwxFileSelector.cxx
packages/wx/src/bbwxFileSelector.h
packages/wx/src/bbwxInputText.cxx
packages/wx/src/bbwxInputText.h
packages/wx/src/bbwxLayoutLine.cxx
packages/wx/src/bbwxLayoutLine.h
packages/wx/src/bbwxLayoutSplit.cxx
packages/wx/src/bbwxLayoutSplit.h
packages/wx/src/bbwxLayoutTab.cxx
packages/wx/src/bbwxLayoutTab.h
packages/wx/src/bbwxRadioButton.cxx
packages/wx/src/bbwxRadioButton.h
packages/wx/src/bbwxSlider.cxx
packages/wx/src/bbwxSlider.h
packages/wxvtk/src/bbwxvtkViewer2D.cxx
packages/wxvtk/src/bbwxvtkViewer2D.h
packages/wxvtk/src/bbwxvtkViewer3D.cxx
packages/wxvtk/src/bbwxvtkViewer3D.h

index 37d355d207166f32bb8fa94b2580d9aa6b7e40fc..5b01ea221b33800082e821fe48fba1f9fec331e8 100644 (file)
@@ -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)
index ddcb7b9762202ae329461c6d81c371176fe39f2a..4a52d99523d73eac450507fda60041216d7ea95f 100644 (file)
@@ -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 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
                     <<"]"<<std::endl);                                 \
     itkParent::Update();                                               \
     bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()   \
-                    <<"]"<<std::endl);                                 \
-  }
+                    <<"]"<<std::endl);                 \
+  }                                                            
+
 //============================================================================
 
 //===========================================================================
index d976eb682411e39c1124aea29e7d818d664b96a9..b6fc7eaaec19a8ba5038ecf6c8f9843340a02f74 100644 (file)
@@ -124,7 +124,7 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS
 SET(${BBTK_PACKAGE_NAME}_LIBS 
   # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST
   # EXCEPT : the same libs than for INCLUDE_DIRS
-/usr/local/lib/gdcm/libvtkgdcm.so  
+   vtkgdcm
   )
 #===========================================================================
 
index 6b9668f9e1673c4362ca21c5a65fc3dd6bfdd9df..5a093d79a8527bb7de695a5c04543c4982bf2fb9 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkBinaryThresholdImageFilter.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,6 +42,8 @@ namespace bbitk
                                     bbtk::AtomicBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,
                                BinaryThresholdImageFilterGeneric);
+       
+       
 }
 
 // EO namespace bbtk
index c66255c351b7a9ff735a32351eb28965b7072e79..e6fdd1060b9602b0d1762d2077c0c234e72cb7bb 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkBinaryThresholdImageFilter.h,v $
   Language:  C++
-  Date:      $Date: 2009/03/23 12:55:49 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/05/15 14:57:58 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -57,9 +57,6 @@ namespace bbitk
     BBTK_ITK_PROCESS();
     BBTK_ITK_DELETE();
 
-    void bbUserConstructor() { Init(); }
-    void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); }
-    void Init();
 
   };
   
@@ -101,9 +98,6 @@ namespace bbitk
   private :
     inline void ProcessSwitch();
     template <class T> 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 <class T>
-  void BinaryThresholdImageFilter<T>::Init()
-  {
-    bbSetInputLowerThreshold(0);
-    bbSetInputUpperThreshold(100);
-    bbSetInputInsideValue(255);
-    bbSetInputOutsideValue(0);
-  }
 
-  void BinaryThresholdImageFilterGeneric::Init()
+       
+////-- 
+//  template <class T>
+//  void BinaryThresholdImageFilter<T>::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 <class T>
+       void BinaryThresholdImageFilter<T>::bbUserInitializeProcessing()
+       {
+       }
+       
+       void BinaryThresholdImageFilterGeneric::bbUserInitializeProcessing()
+       {
+       }
+       
+//--
+       
+       //--
+       
+       template <class T>
+       void BinaryThresholdImageFilter<T>::bbUserFinalizeProcessing()
+       {
+       }
+       
+       void BinaryThresholdImageFilterGeneric::bbUserFinalizeProcessing()
+       {
+       }
+       
+       
+       
 }
 // EO namespace bbtk
 
index 7a020701a5b6dbeaa9bc1c595b57460ff1c3c52f..0bc3eb414fb604d233abdf5627ac669cc6fe0cc8 100644 (file)
@@ -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
 
index fefb554c028d608bfe739ca0357ec11fe4905b29..7b7e9d10ca81135e419a5749010e32698391622c 100644 (file)
@@ -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()
index 4e9021fbafd3aea51e9281e8fe526cc51b86a378..58fd442e49e6bcdeb3fe63cade5b71c4b4615bb5 100644 (file)
@@ -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();
index 11026e57e8d724f96b34e273d3beee4715541b80..e2890b4177ae3bd806e85ef60230769826b4bdb0 100644 (file)
@@ -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 <unsigned int Dimension>
+       void ImageRegionCreator::bbUserSetDefaultValues()               {       }
+       
+       template <unsigned int Dimension>
+       void ImageRegionCreator::bbUserInitializeProcessing()   {       }
+       
+       template <unsigned int Dimension>
+       void ImageRegionCreator::bbUserFinalizeProcessing()             {       }       
+       */
+       
   void ImageRegionCreator::DoIt()
   {
     const std::vector<long>& index = bbGetInputIndex();
index 68de42d33d37370de47b2343945d0ee1138afc8a..d182265656bb632c164995e5fcadd40d1ae11f34 100644 (file)
@@ -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<std::string>& filenames = bbGetInputFileNames();
index 2c78ba550e4a84e3b7a84c736d1ee5933978727f..5e6c44e14fd5ced9b757d9ce491ec48bb83343a0 100644 (file)
@@ -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<std::string>);
     BBTK_DECLARE_INPUT(XSpacing,float);
     BBTK_DECLARE_INPUT(YSpacing,float);    
index 71f3eb2390e2c056e68b86a572f47a33ce5d789c..28dbc82412a75a014c2345f7a35b9f4f900870f0 100644 (file)
@@ -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()
   {
index 0dae92d7b8a9a0ca6e3d4e190f7a849b9eb945d3..f8d5a1e53915d6727fb491d812bfe936ccf29a10 100644 (file)
@@ -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 <class T> 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<double> res;
-    res.push_back(1);
-    res.push_back(1);
-    res.push_back(1);
-    bbSetInputSpacing(res);
-    mOutput = 0;
-  }
+       //-----------------------------------------------------------------     
+       void ResampleImageFilter::bbUserSetDefaultValues()
+       {
+               std::vector<double> 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
index f716663b9cb34c1076cdbfc707ad8171043410d2..cd5ba230af6e795378b67065ccd8c90b29aab53f 100644 (file)
@@ -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_
index 333f7b7856e00867cba4c70ec6af9c3c9364274b..4728f232f521eb5bade606b5654408d11b6e0a67 100644 (file)
@@ -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;
index 5884c8a6a1b23af9fa0e382c3732601d7601d264..d48505ad01848a39520ee72853a933186a755923 100644 (file)
@@ -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<double> 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<double> 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()
index 554ca8cc5cc1a7011596353d4637a4224f4bca1f..0b67d59e1489e1b9b1fea7c93206ec411103b785 100644 (file)
@@ -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);
index a398952569dd1540f40619886e4926da3c9fc138..0e737bd9b168464c798c046abe9ade27fd5ac494 100644 (file)
@@ -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();
index 16ffc10585ad46cca6645107423d631d3a57ad32..55ec756be6dba40a4e6882f8a27b668b920a8da3 100644 (file)
@@ -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:
-    vtkImageShiftScalemCast;
-    vtkVolumeRayCastMIPFunctionmMIP;
-    vtkVolumeRayCastMappermMapper;
-    vtkVolumemVolume;
+    vtkImageShiftScale                         *mCast;
+    vtkVolumeRayCastMIPFunction                *mMIP;
+    vtkVolumeRayCastMapper                     *mMapper;
+    vtkVolume                                          *mVolume;
   };
    
   //=================================================================
index ee36d1723829e01310a51f9039741dd6c4e3a868..53d88746723b296eecc0a196f9aaf908da536b8e 100644 (file)
@@ -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
 
 
index 67e2198b27915814e5d5d4e1a27387468e913bfb..c62709b18c867c45d706d4ae99bac63c9e6447ce 100644 (file)
@@ -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<float> 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);
+          }
    }
 //---------------------------------------------------------------------
 
index 1fb9eba383d0c82a22b282fd054ac0b9464cf5de..ebb23f66222f6f19e1f524ceb5d36ae97633867d 100644 (file)
@@ -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();
   };
    
   //=================================================================
index 550110a21d785b69f9feaa51009b63d87195f0e0..5c33b54c367cfa1aaee0174ac790dd2bc3835348 100644 (file)
@@ -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<int> position;
-    position.push_back(0);
-    position.push_back(0);
-    position.push_back(0);
-    bbSetInputPositionXYZ(position);
-    std::vector<int> 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<int> position;
+         position.push_back(0);
+         position.push_back(0);
+         position.push_back(0);
+         bbSetInputPositionXYZ(position);
+         std::vector<int> 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();
index e3618a91c020fa4443350db7cbf3ec04090b7fec..d11136415bfbe0dc7f844ecff449e6af82d8570d 100644 (file)
@@ -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;
index 0d53007254586192b8226b1043b27caaab6194d6..be42242d05e6207074a1e626dc608120db55fd95 100644 (file)
@@ -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
 
index 85b979b187841ba1fa83a8834974dfb1111061b8..760cce4cb5d8fac6c9105e66cfbabce38a4c223b 100644 (file)
@@ -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<double>);
     BBTK_DECLARE_INPUT(RotateWXYZ,std::vector<double>);
@@ -31,10 +23,10 @@ namespace bbvtk
     BBTK_PROCESS(Process);
     void Process();
     
-    std::vector<double>        vecScale;
-    std::vector<double>        vecRotateWXYZ;
-    std::vector<double>        vecTranslate;
-    std::vector<double>        vecSpacing;
+    std::vector<double>                vecScale;
+    std::vector<double>                vecRotateWXYZ;
+    std::vector<double>                vecTranslate;
+    std::vector<double>                vecSpacing;
     vtkTransform                       *result; 
 };
   
index dabc8681fafa6160741b552416d75bde2b695d21..844b9242e25037609046f2808c19c4d8453d1667 100644 (file)
@@ -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 ;  i<size ; i++)
-       {               
-               VecVtkimagegaussiansmooth[i]->Delete();
+       
+       
+       //---------------------------------------------------------------------
+       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 ;  i<size ; i++)
-       {       
-               vtkimagegaussiansmooth = vtkImageGaussianSmooth::New();
-               vtkimagegaussiansmooth->SetInput( 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 ;  i<size ; i++)
+               {               
+                       VecVtkimagegaussiansmooth[i]->Delete();
+               }
+               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 ;  i<size ; i++)
+               {       
+                       vtkimagegaussiansmooth = vtkImageGaussianSmooth::New();
+                       vtkimagegaussiansmooth->SetInput( 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
index d5fc22608175cca18e14cb26f22f981a7291c546..c6fc5a4c4528dfcac563a0a15be4d85e2e290bbe 100644 (file)
@@ -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<vtkImageData*>);
   BBTK_DECLARE_INPUT(StdDevX,double);
   BBTK_DECLARE_INPUT(StdDevY,double);
index d175944fe51920685d507355e3363950b149389f..ebe70c1095edfe07f0e213e301cd298a570c5696 100644 (file)
@@ -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<size ; i++)
+       
+       //-----------------------------------------------------------   
+       void VecIsoSurfaceExtractor::bbUserSetDefaultValues()
        {
-               if (bbGetInputRenderer()!=NULL )
+               std::vector<double> 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;i<size;i++)
                {
-                       bbGetInputRenderer()->RemoveActor( 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 ; i<size ; i++){
-               marchingcubes           = vtkMarchingCubes::New();
-               polydatamapper          = vtkPolyDataMapper::New();
-               vtkactor                        = vtkActor::New();
-
-               polydatamapper->SetInput(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 ; i<size ; i++){
-               // Visualisation - result volume
-               marchingcubes=VecMarchingcubes[i];
-               vtkactor=(vtkActor*)VecVtkactor[i];
-
-               marchingcubes->SetInput( 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 ; i<size ; i++)
                {
-                       bbGetInputRenderer()->AddActor( 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<double> 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;i<size;i++)
-       {
-               VecMarchingcubes[i]->Delete();
-               VecPolydatamapper[i]->Delete();
-               VecVtkactor[i]->Delete();
+               VecMarchingcubes.clear();
+               VecPolydatamapper.clear();
+               VecVtkactor.clear();
+
+
+                size = bbGetInputIn().size();
+               for( i=0 ; i<size ; i++){
+                       marchingcubes           = vtkMarchingCubes::New();
+                       polydatamapper          = vtkPolyDataMapper::New();
+                       vtkactor                        = vtkActor::New();
+
+                       polydatamapper->SetInput(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 ; i<size ; i++){
+                       // Visualisation - result volume
+                       marchingcubes=VecMarchingcubes[i];
+                       vtkactor=(vtkActor*)VecVtkactor[i];
+
+                       marchingcubes->SetInput( 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);
-       
-}
 
 
 }
index 060eb1493bce22ddd631f182bbcc09689c3c2908..c26a6c2c55b91fb11947b6c67362fed14b482ef0 100644 (file)
@@ -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<vtkImageData*>);
+  BBTK_DECLARE_INPUT(In,std::vector<vtkImageData*>);
     //    BBTK_DECLARE_INPUT(InVtkObject,vtkObject *);
     BBTK_DECLARE_INPUT(Isovalue,double);
     BBTK_DECLARE_INPUT(Opacity,double);
index d9de17f8d76848998e04f32e49188e15960639e0..0273d3c66215bde502cdc8e34c451fdaa62f6e11 100644 (file)
@@ -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
index cc2998ec8946544441b3a69f694ba3534a09d49e..fc46e6559c8dd3659bdeb4c35732e7dda2bb109f 100644 (file)
@@ -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;
index 33f6a61f012921f9148320b68006f601d7ebed19..501a8bdefb822b151eeb44ceddc1b88ad0ccc89c 100644 (file)
@@ -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() 
   {
index 778016a45f3eb9e00722aa1d721b09a0214ec1f5..b2b902a47594a99f9b682fc9d86b71153e065349 100644 (file)
@@ -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();
+
   };
   //=================================================================
  
index e5c1a7891c1158774a2c97ad529dc92253b7a41a..adef9252657c25b4e6b494b9751e0e334e80bdce 100644 (file)
@@ -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() ["
index 4c19eae369ee08d4b0b5108b765e088efb30c292..77e4c6a47e11313e35a26476f11da6ede9672191 100644 (file)
@@ -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();
+         
   };
   
   //=================================================================
index f61de883dbe95be403088ca616044c4ae026deda..042b494e5ba26aff2b61eefc6af321e638250c3e 100644 (file)
@@ -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() 
   { 
index 3e6a81e449b4fd789a4595ae2565825d72f041c8..029daa168ccbc1e441ef7bb55152bdc83fb2b144 100644 (file)
@@ -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();
+
   };
   //=================================================================
 
index e216d9904ad0efc8ab52ac0ed2c306e1a82901ff..5ad78e5b8110918aa62c4093daf11e9b7f730cf2 100644 (file)
@@ -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<double> 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<double> 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();
index ccbb0e0757c213cb7751d26271faa1686bb385eb..2490e8b8ef75f48a587cc3369faccff1e2565ec5 100644 (file)
@@ -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: 
index 848bb759ded78e7912b8402497052327dc586fcc..aeba9e6971b7718edc2b153ec4bb47c8e93aceaf 100644 (file)
@@ -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 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
 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() ["
-                       <<bbGetFullName()<<"]"<<std::endl);
-
-    wxDirDialog* FD = 
-      new wxDirDialog( 0, 
-                       bbtk::std2wx(bbGetInputMessage()),
-                       bbtk::std2wx(bbGetInputDefaultDir()));
-    
-       if (FD->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() ["
+                               <<bbGetFullName()<<"]"<<std::endl);
+
+               wxDirDialog* FD = 
+                 new wxDirDialog( 0, 
+                               bbtk::std2wx(bbGetInputMessage()),
+                               bbtk::std2wx(bbGetInputDefaultDir()));
+               
+               if (FD->ShowModal()==wxID_OK)
+                 {
+               bbSetOutputOut( bbtk::wx2std (FD->GetPath()) );
+               bbSetInputDefaultDir( bbtk::wx2std (FD->GetPath()) );
+               }
+               else
+                 {  
+               bbSetOutputOut("");
+               bbSetInputDefaultDir("");
+                 }
+               
+               bbtkDebugDecTab("Core",9); 
+         }
   
 
 
index d14b27409b759a2b3f52ac77c0f25f9f019b442b..8f1e78a5adaba03e45a507e2cfbdf3621e2870b9 100644 (file)
@@ -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");
-  }
        
 
 
index 32faca1c67098524b1e607d7a1e930ef2d872411..5566faeaa7c2b2c693c35472b66c856faef72226 100644 (file)
@@ -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();
 
   };
   //=================================================================
index cc7c72497c22e811b53bdbb7e99471aa0c182bac..48ba722ab09b015aeb4660c26ece0e2ef422f082 100644 (file)
@@ -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();
index e6d5b4307f8400d1b8d684802855e1b38a546648..af235652fc88aa30c2e0ff6a54dcef33345ac20e 100644 (file)
@@ -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();
+
   };
   //=================================================================
   
index 22739baa835a0d0792f9d61a5484b8c9fd29bf1a..d9043f958a5fc96c9f8460eeaf2b415fd609f84b 100644 (file)
@@ -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()
   {
   }
index 39ff23646a1bdef25890f28f702bafbda79a6624..010fe2018943fc00cbb9623c2607155ea126b873 100644 (file)
@@ -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);
 
   };
index 642708530e1a2ac8e9fe9f810447d11f1f294fda..ff32fc4a81840d2c62fa82bbd9b79c71689fff0c 100644 (file)
@@ -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()
   {
   }
index 01827547ab0bdb547fa84fc5ec8f63e1aed06730..7e5effaa2b99e09292beb54fb21579209eca55f6 100644 (file)
@@ -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();
 
   };
   //=================================================================
index ddd037ffb1bf4196319f69c59ffbda4edb1faac3..fd9419178e861f7287cf781722ed6090613d5445 100644 (file)
@@ -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);
index f0e2c480ddc03e471a06c4916875f038bb8b828d..04db62d7f8966758330aee64a8d4f9eead9e1455 100644 (file)
@@ -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);
 
   };
index 203fd9e879e7172fe9b02c7ccec197bb8e3dc3a7..904d9828d5675fb1c55285fda76c04b6278d2c21 100644 (file)
@@ -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()"<<std::endl);
index adeed849eca75dcf5a0d31f85e0f8443c347dfaf..048f080d70f84694a171ecee4b3159835d7d0e83 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxRadioButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/12/12 08:55:24 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -87,7 +87,7 @@ namespace bbwx
     void CreateWidget(wxWindow*);
 
   protected:
-    virtual void bbUserConstructor();
+
   };
  
   //=================================================================
index 1a5bd25cc019625dba7643f86ccaa455c5c0aee1..1b3db8559cacb13b196b3d3d6af08675039c19bf 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/16 16:08:23 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.24 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -399,18 +399,28 @@ namespace bbwx
   BBTK_BLACK_BOX_IMPLEMENTATION(Slider,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,Slider);
   
-  //--------------------------------------------------------------------------
-  void Slider::bbUserConstructor() 
-  { 
-    bbSetInputIn(0);
-    bbSetInputMin(0);
-    bbSetInputMax(500);
-    bbSetOutputOut(0);
-    bbSetInputOrientation("HORIZONTAL");
-    bbSetInputChangeResolution(false);
-    bbSetInputLabel(true);
-    bbSetInputReactiveOnTrack(false);    
-  }
+       //-----------------------------------------------------------------     
+       void Slider::bbUserSetDefaultValues()
+       {
+               bbSetInputIn(0);
+               bbSetInputMin(0);
+               bbSetInputMax(500);
+               bbSetOutputOut(0);
+               bbSetInputOrientation("HORIZONTAL");
+               bbSetInputChangeResolution(false);
+               bbSetInputLabel(true);
+               bbSetInputReactiveOnTrack(false);    
+       }
+       
+       //-----------------------------------------------------------------     
+       void Slider::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void Slider::bbUserFinalizeProcessing()
+       {
+       }       
   
   //--------------------------------------------------------------------------
   void Slider::Process() 
index f899a418650ec11108caca75a1c8752446fd5b02..93e615cba1e3e4319124b0f6b2b38933019a7c4a 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/16 16:08:23 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.18 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -84,7 +84,7 @@ namespace bbwx
     void CreateWidget(wxWindow*);
 
   protected:
-    virtual void bbUserConstructor();
+
   };
   //=================================================================
  
index c5299614e1e74a22812b48214e8c3470ab327262..1a1d93f91c60667dc995c8bde1fa03f8fe718c17 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/17 09:04:13 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2009/05/15 14:58:07 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -300,6 +300,28 @@ namespace bbwxvtk
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
+       
+       //-----------------------------------------------------------------     
+       void Viewer2D::bbUserSetDefaultValues()
+       {
+               bbSetInputIn(NULL);
+               bbSetInputSlice(0);
+               bbSetOutputWidget(0);
+               bbSetOutputRenderer(0);
+               bbSetInputOrientation(2);
+       }
+       
+       //-----------------------------------------------------------------     
+       void Viewer2D::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void Viewer2D::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //--------------------------------------------------------------------------
   void Viewer2D::Process() 
   { 
     //    std::cout << "Viewer2D::Process" << std::endl;
@@ -314,16 +336,9 @@ namespace bbwxvtk
   }
   
 
-  void Viewer2D::bbUserConstructor()
-  {
-    bbSetInputIn(NULL);
-    bbSetInputSlice(0);
-    bbSetOutputWidget(0);
-    bbSetOutputRenderer(0);
-    bbSetInputOrientation(2);
-  }
 
 
+       //--------------------------------------------------------------------------
   void Viewer2D::CreateWidget(wxWindow* parent)
   {
     Viewer2DWidget* w = new Viewer2DWidget(this,parent);
index 183527d210ebb73a57595a12f89877e88ba868bf..bc8cac597ee42253a2ffab3e0dd8e0c45831db5b 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.h,v $
   Language:  C++
-  Date:      $Date: 2009/04/17 09:04:13 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2009/05/15 14:58:08 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -65,7 +65,7 @@ namespace bbwxvtk
     void Process();
     void CreateWidget(wxWindow*);
     //    void OnShowWidget();
-    void bbUserConstructor();
+
   };
    
   //=================================================================
index 056e4961e87ae3ddf85861c1a80cf0a9d10bcaff..f155e9ab1a15adeb4498cc8951233fcf8cc3b943 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/15 15:45:57 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/05/15 14:58:08 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -132,26 +132,38 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
 
-  void Viewer3D::bbUserConstructor() 
-  { 
-         firsttime=true;
-    bbSetInputIn1(NULL);
-    bbSetInputIn2(NULL);
-    bbSetInputIn3(NULL);
-    bbSetInputIn4(NULL);
-    bbSetInputIn5(NULL);
-    bbSetInputObs1(NULL);
-    bbSetInputObs2(NULL);
-    bbSetInputObs3(NULL);
-    bbSetInputObs4(NULL);
-    bbSetInputObs5(NULL);
-    bbSetInputStereo(false);
-    bbSetOutputRenderer( NULL );
-    bbSetOutputInteractor( NULL );
-    bbSetOutputWidget(NULL);
-  }
-
-
+       
+       //-----------------------------------------------------------------     
+       void Viewer3D::bbUserSetDefaultValues()
+       { 
+               firsttime=true;
+               bbSetInputIn1(NULL);
+               bbSetInputIn2(NULL);
+               bbSetInputIn3(NULL);
+               bbSetInputIn4(NULL);
+               bbSetInputIn5(NULL);
+               bbSetInputObs1(NULL);
+               bbSetInputObs2(NULL);
+               bbSetInputObs3(NULL);
+               bbSetInputObs4(NULL);
+               bbSetInputObs5(NULL);
+               bbSetInputStereo(false);
+               bbSetOutputRenderer( NULL );
+               bbSetOutputInteractor( NULL );
+               bbSetOutputWidget(NULL);
+       }
+       
+       //-----------------------------------------------------------------     
+       void Viewer3D::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void Viewer3D::bbUserFinalizeProcessing()
+       {
+       }       
+       
+       //--------------------------------------------------------------------------
   void Viewer3D::Process() 
   { 
          
index 4971915cd3cfab082943a4a1e6f01f880ab53443..1ef1ecd5ba83a21933417c97ee2a141764792b1e 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.h,v $
   Language:  C++
-  Date:      $Date: 2009/03/23 12:55:54 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/15 14:58:08 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -99,7 +99,6 @@ namespace bbwxvtk
     void OnShowWidget();
 
   protected:
-    virtual void bbUserConstructor();
          bool firsttime;
   };