*** empty log message ***

diff --git a/packages/std/bbs/boxes/bbPrependPackageDataPath.bbs b/packages/std/bbs/boxes/bbPrependPackageDataPath.bbs
index f55b8e724b0d25e9ce83cc8623667e0263dc31d1..cc262572d651f8e37c55070675a35ab9adf08970 100755 (executable)
--- a/packages/std/bbs/boxes/bbPrependPackageDataPath.bbs
+++ b/packages/std/bbs/boxes/bbPrependPackageDataPath.bbs
@@ -1,6 +1,6 @@
 load std
 
-define PrependPackageDataPath util
+define PrependPackageDataPath std
   author "laurent.guigues at creatis.insa-lyon.fr"
   description "Prepends the input file name 'In' with the path to the data directory of the package 'Package'"
   category "misc"

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
index 1ac72578591d49e62a6302117ae275f616f3894a..e4bbc81577a1ffd08ae0fc13dc60c882e3ff7aef 100644 (file)
--- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
+++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
@@ -4,8 +4,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkIsoSurfaceExtractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 14:01:49 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/03 14:10:03 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,15 +26,15 @@
 
 #include "vtkProperty.h"
 
-#include "bbvtkIsoSurfaceInserter.h"
+#include "bbvtkIsoSurfaceExtractor.h"
 #include "bbvtkPackage.h"
 
 namespace bbvtk
 {
-   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,IsoSurfaceInserter)
-   BBTK_USER_BLACK_BOX_IMPLEMENTATION(IsoSurfaceInserter,bbtk::AtomicBlackBox);
+   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,IsoSurfaceExtractor)
+   BBTK_USER_BLACK_BOX_IMPLEMENTATION(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
 
-   void IsoSurfaceInserter::bbUserConstructor() 
+   void IsoSurfaceExtractor::bbUserConstructor() 
    { 
      Init();
      std::vector<double> colour;
@@ -44,12 +44,12 @@ namespace bbvtk
      bbSetInputColour(colour);
 
    }
-   void IsoSurfaceInserter::bbUserCopyConstructor() 
+   void IsoSurfaceExtractor::bbUserCopyConstructor() 
    { 
      Init();
    }
 
-   void IsoSurfaceInserter::Init() 
+   void IsoSurfaceExtractor::Init() 
    { 
      firsttime=true;
 
@@ -74,7 +74,7 @@ namespace bbvtk
 
 //---------------------------------------------------------------------
 
-   void IsoSurfaceInserter::DoProcess()
+   void IsoSurfaceExtractor::DoProcess()
    {
      //   bbGetInputIn()->Print(std::cout);
      // Visualisation - result volume

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
index 3b0665dc78f4d8100a84a2ebe1c86358a9db1b39..d3b51a9f8959b69e6290e6248b8f93c48cbfdc6d 100644 (file)
--- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
+++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkIsoSurfaceExtractor.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 14:01:49 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/03 14:10:03 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,8 +33,8 @@
 #ifdef _USE_VTK_
 
 
-#ifndef __vtkIsoSurfaceInserter_h__
-#define __vtkIsoSurfaceInserter_h__
+#ifndef __vtkIsoSurfaceExtractor_h__
+#define __vtkIsoSurfaceExtractor_h__
 
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
@@ -49,7 +49,7 @@
 namespace bbvtk
 {
   
-  class /*BBTK_EXPORT*/ IsoSurfaceInserter
+  class /*BBTK_EXPORT*/ IsoSurfaceExtractor
     : 
     public bbtk::AtomicBlackBox
   {
@@ -59,7 +59,7 @@ namespace bbvtk
     vtkActor          *vtkactor; 
     
     
-    BBTK_USER_BLACK_BOX_INTERFACE(IsoSurfaceInserter,bbtk::AtomicBlackBox);
+    BBTK_USER_BLACK_BOX_INTERFACE(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
     
     BBTK_DECLARE_INPUT(In,vtkImageData *);
     BBTK_DECLARE_INPUT(InVtkObject,vtkObject *);
@@ -78,25 +78,25 @@ namespace bbvtk
     void Init();
   };
   
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceInserter,bbtk::AtomicBlackBox);
-  BBTK_NAME("IsoSurfaceInserter");
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
+  BBTK_NAME("IsoSurfaceExtractor");
   BBTK_AUTHOR("eduardo.davila / laurent.guigues at creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Extracts an iso-surface of a 3D image and insert it into a 3D scene (vtkRenderer)");
+  BBTK_DESCRIPTION("Extracts an iso-surface of a 3D image and creates a vtkProp3D object to insert into a 3D scene (e.g. a Viewer3D)");
   typedef std::vector<double> vectorcolour;
-  BBTK_INPUT(IsoSurfaceInserter,In,"Input image",vtkImageData*);
-  BBTK_INPUT(IsoSurfaceInserter,InVtkObject,"Image vtkObject",vtkObject*);
-  BBTK_INPUT(IsoSurfaceInserter,Isovalue,"Isovalue",double);
-  BBTK_INPUT(IsoSurfaceInserter,Opacity,"Opacity",double);
-  BBTK_INPUT(IsoSurfaceInserter,Colour,"r g b",vectorcolour);
-  BBTK_INPUT(IsoSurfaceInserter,Renderer,"3D scene in which to insert the surface",vtkRenderer*);
-  BBTK_OUTPUT(IsoSurfaceInserter,Out,"Image",vtkProp3D *);
+  BBTK_INPUT(IsoSurfaceExtractor,In,"Input image",vtkImageData*);
+  BBTK_INPUT(IsoSurfaceExtractor,InVtkObject,"Image vtkObject",vtkObject*);
+  BBTK_INPUT(IsoSurfaceExtractor,Isovalue,"Isovalue",double);
+  BBTK_INPUT(IsoSurfaceExtractor,Opacity,"Opacity",double);
+  BBTK_INPUT(IsoSurfaceExtractor,Colour,"r g b",vectorcolour);
+  BBTK_INPUT(IsoSurfaceExtractor,Renderer,"3D scene in which to insert the surface",vtkRenderer*);
+  BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *);
   
-  BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceInserter);
+  BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor);
   
 }// EO namespace bbtk
 
 
-#endif  //__IsoSurfaceInserter_h__
+#endif  //__IsoSurfaceExtractor_h__
 
 #endif //_USE_VTK_
 

diff --git a/packages/wxvtk/src/CMakeLists.txt b/packages/wxvtk/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e2d2a11
--- /dev/null
+++ b/packages/wxvtk/src/CMakeLists.txt
@@ -0,0 +1,5 @@
+#---------------------------------------------------------------------------
+# Include src configuration cmake script
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_src.cmake)
+#---------------------------------------------------------------------------
+