From db2adec4da5413691b7430ee1fa2354b9e53d312 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 29 Jul 2008 07:31:13 +0000 Subject: [PATCH] *** empty log message *** --- kernel/cmake/BBTKConfigurePackage_src.cmake | 20 ++++---- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 2 +- kernel/doc/bbtkWebSite/CMakeLists.txt | 2 +- kernel/src/bbtkAtomicBlackBoxMacros.h | 32 ++++++++++++- kernel/src/bbtkVtkBlackBoxMacros.h | 53 ++++++++++++++++++--- samples/CMakeLists.txt | 1 + 6 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 samples/CMakeLists.txt diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index ecc26f9..371b645 100644 --- 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 ebcee68..f2d9713 100644 --- 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 66daead..7a66fe7 100644 --- 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 cdbf459..ef5042a 100644 --- 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 4a16b6e..6453a70 100644 --- 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 +//#include +//#include +#include //=========================================================================== @@ -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(\""< "<<#CLASS \ + <<"::bbClone(\""<