*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index ecc26f9818ac88976962b3536fd33d2fefeae96d..371b645860aaeac552be709668c8ee49bf67cf48 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -85,17 +85,17 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
     )
   ELSE(WIN32)
 
- ADD_CUSTOM_COMMAND(
-    OUTPUT ${BBFY_CXX_OUT}
-    COMMAND
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
-    DEPENDS ${xmlfile}
-    ${BBTK_BBFY_DEPENDENCY} 
-    )
-
-       ENDIF(WIN32)
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${BBFY_CXX_OUT}
+      COMMAND
+      export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+      DEPENDS ${xmlfile}
+      ${BBTK_BBFY_DEPENDENCY} 
+      )
+    
+  ENDIF(WIN32)
+  
   
-   
   SET_SOURCE_FILES_PROPERTIES(
     ${BBFY_CXX_OUT}
     PROPERTIES GENERATED ON)

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index ebcee6803f48b0c810c89b43a3439d72b69fc46d..f2d971368c89cca6c31383583d1469ab845251ed 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -53,7 +53,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
-      cd ${EXECUTABLE_OUTPUT_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
+      cd ${EXECUTABLE_OUTPUT_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX}
       DEPENDS bb${PACKAGE_NAME} 
       )
   ENDIF(WIN32)

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 66daead6803412e30ae8bd4da7a34a0e260da805..7a66fe7d62395a90f6bc3fd0c75bf11e78d04b1b 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -46,7 +46,7 @@ ELSE (WIN32)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${INDEX_OUTPUT}
     COMMAND 
-    cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
     DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ENDIF (WIN32)

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index cdbf459ecae949a39f2e75d8a66ed1b1fc9e4b3f..ef5042aae19e35de69223c1d438d14119975f312 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/05/07 06:31:37 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/07/29 07:31:13 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,6 +24,28 @@
 #ifndef __bbtkAtomicBlackBoxMacros_h__
 #define __bbtkAtomicBlackBoxMacros_h__
 
+//============================================================================
+/// Declares the standard interface of a AtomicBlackBox 
+/// (ctor, New, descriptor related methods)
+#define BBTK_BLACK_BOX_INTERFACE_INTERNAL_WITHOUT_NEW(CLASS,PARENT)    \
+  BBTK_OBJECT_MINIMAL_INTERFACE;                               \
+  private:                                                             \
+  protected:                                                           \
+  CLASS(const std::string& name, bool allocate_connectors = true);     \
+  CLASS(Self& from, const std::string& name,                           \
+       bool allocate_connectors = true);                               \
+  ~CLASS();                                                            \
+  public:                                                              \
+  std::string GetObjectName() const                                    \
+  { return std::string(#CLASS)+std::string(" '")                       \
+      +bbGetNameWithParent()+std::string("'"); }                       \
+  virtual void bbLockDescriptor();                                     \
+  private:                                                             \
+  CLASS() : PARENT("") {}                                              \
+  CLASS(const CLASS&) : PARENT("") {}                                  
+
+//============================================================================
+
 //============================================================================
 /// Declares the standard interface of a AtomicBlackBox 
 /// (ctor, New, descriptor related methods)
@@ -70,6 +92,12 @@
   BBTK_BLACK_BOX_INTERFACE_INTERNAL(CLASS,PARENT);
 //============================================================================
 
+//============================================================================
+#define BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENT)     \
+  public : typedef CLASS Self;                         \
+  BBTK_BLACK_BOX_INTERFACE_INTERNAL_WITHOUT_NEW(CLASS,PARENT);
+//============================================================================
+
 //============================================================================
 /// Defines the bbUserProcess method
 #define BBTK_PROCESS(CALLBACK)                                         \

diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h
index 4a16b6ea697dfb8bd4ab1eb89a845c3bdd8f3bf4..6453a7070f63f4b6fa45eaada4f0c437f8614aee 100644 (file)
--- a/kernel/src/bbtkVtkBlackBoxMacros.h
+++ b/kernel/src/bbtkVtkBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVtkBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/07/23 12:02:15 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/07/29 07:31:13 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,9 @@
  */
 #ifndef __bbtkVtkBlackBoxMacros_h__
 #define __bbtkVtkBlackBoxMacros_h__
-#include <vtkGarbageCollector.h>
+//#include <vtkGarbageCollector.h>
+//#include <vtkObjectFactory.h>
+#include <vtkDebugLeaks.h>
 
 
 //===========================================================================
@@ -41,12 +43,47 @@
   }
 
 //    bbmDescriptorPointer.reset();            
+//===========================================================================
+
+//===========================================================================
+#define BBTK_VTK_NEW(CLASS,VTKPARENT)                                  \
+  inline static Pointer New(const std::string& name)                   \
+  {                                                                    \
+    vtkDebugLeaks::ConstructClass(#VTKPARENT);                         \
+    bbtkDebugMessage("object",1,"##> "<<#CLASS                         \
+                    <<"::New(\""<<name<<"\")"<<std::endl);             \
+    Pointer p = MakeBlackBoxPointer(new Self(name));                   \
+    bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
+                    <<"::New(\""<<name<<"\")"<<std::endl);             \
+    return p;                                                          \
+  }                                                                    \
+//===========================================================================
+
+//===========================================================================
+#define BBTK_VTK_CLONE(CLASS,VTKPARENT)                                        \
+  inline bbtk::BlackBox::Pointer bbClone(const std::string& name)      \
+  {                                                                    \
+    vtkDebugLeaks::ConstructClass(#VTKPARENT);                         \
+    bbtkDebugMessage("object",1,"##> "<<#CLASS                         \
+                    <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
+    Pointer p = MakeBlackBoxPointer(new Self(*this,name));             \
+    bbtkDebugMessage("object",1,"<## "<<#CLASS                         \
+                    <<"::bbClone(\""<<name<<"\")"<<std::endl);         \
+    return p;                                                          \
+  }                                                                    \
 
+
+//===========================================================================
 #define BBTK_VTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX,VTKPARENT)   \
-  BBTK_BLACK_BOX_INTERFACE(CLASS,PARENTBLACKBOX);                      \
+  BBTK_BLACK_BOX_INTERFACE_WITHOUT_NEW(CLASS,PARENTBLACKBOX);          \
   typedef VTKPARENT vtkParent;                                         \
-  BBTK_VTK_DELETE();
+  BBTK_VTK_DELETE();                                                   \
+  public :                                                             \
+  BBTK_VTK_NEW(CLASS,VTKPARENT);                                       \
+  BBTK_VTK_CLONE(CLASS,VTKPARENT);                                                     
+//===========================================================================
 
+//===========================================================================
 /// Declares a vtkImageAlgorithm-inherited AtomicBlackBox input 
 #define BBTK_DECLARE_VTK_IMAGE_ALGORITHM_INPUT(NAME,TYPE)              \
   public:                                                              \
@@ -54,10 +91,12 @@
   { return GetImageDataInput(0); /*vtkParent::GetInput();*/ }          \
   void bbSetInput##NAME (TYPE d)                                       \
   { vtkParent::SetInput( (vtkDataObject*) d);                          \
-    /*bbSetModifiedStatus();*/ }                                                      
+    /*bbSetModifiedStatus();*/ }                               
+//===========================================================================
+
 //===========================================================================
 /// Declares a vtkPolyDataAlgorithm-inherited AtomicBlackBox input 
-#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)  \
+#define BBTK_DECLARE_VTK_POLY_DATA_ALGORITHM_INPUT(NAME,TYPE)          \
   public:                                                              \
   TYPE bbGetInput##NAME ()                                             \
   { return GetPolyDataInput(0); /*vtkParent::GetInput();*/ }           \

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
new file mode 100644 (file)
index 0000000..785c0df
--- /dev/null
+++ b/samples/CMakeLists.txt
@@ -0,0 +1 @@
+SUBDIRS(cxx_sample1)