From: guigues Date: Fri, 27 Jun 2008 08:12:46 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~4 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bdbe8432a23b398ce457f38d647e9298a7cf560a;p=bbtk.git *** empty log message *** --- diff --git a/kernel/cmake/AdditionalBBTKConfig.cmake.in b/kernel/cmake/AdditionalBBTKConfig.cmake.in index 2e3084a..c8ae91b 100644 --- a/kernel/cmake/AdditionalBBTKConfig.cmake.in +++ b/kernel/cmake/AdditionalBBTKConfig.cmake.in @@ -6,6 +6,7 @@ SET(BBTK_COMPILE_DEBUG_MESSAGES @BBTK_COMPILE_DEBUG_MESSAGES@) SET(BBTK_COMPILE_WARNING_MESSAGES @BBTK_COMPILE_WARNING_MESSAGES@) SET(BBTK_COMPILE_ERROR_MESSAGES @BBTK_COMPILE_ERROR_MESSAGES@) #----------------------------------------------------------------------------- +SET(BBTK_BIN_REL_PATH @BBTK_BIN_REL_PATH@) SET(BBTK_SHARE_REL_PATH @BBTK_SHARE_REL_PATH@) SET(BBTK_DOC_REL_PATH @BBTK_DOC_REL_PATH@) SET(BBTK_BBS_REL_PATH @BBTK_BBS_REL_PATH@) @@ -20,6 +21,7 @@ IF(FIND_PACKAGE_VERBOSE) MESSAGE(STATUS "* BBTK_COMPILE_WARNING_MESSAGES = ${BBTK_COMPILE_WARNING_MESSAGES}") MESSAGE(STATUS "* BBTK_COMPILE_ERROR_MESSAGES = ${BBTK_COMPILE_ERROR_MESSAGES}") MESSAGE(STATUS "* BBTK_COMPILE_DEBUG_MESSAGES = ${BBTK_COMPILE_DEBUG_MESSAGES}") + MESSAGE(STATUS "* BBTK_BIN_REL_PATH = ${BBTK_BIN_REL_PATH}") MESSAGE(STATUS "* BBTK_SHARE_REL_PATH = ${BBTK_SHARE_REL_PATH}") MESSAGE(STATUS "* BBTK_DOC_REL_PATH = ${BBTK_DOC_REL_PATH}") MESSAGE(STATUS "* BBTK_BBS_REL_PATH = ${BBTK_BBS_REL_PATH}") diff --git a/kernel/cmake/BBTKConfigurePackagePaths.cmake b/kernel/cmake/BBTKConfigurePackagePaths.cmake index bf6cfcf..6a5c2a3 100644 --- a/kernel/cmake/BBTKConfigurePackagePaths.cmake +++ b/kernel/cmake/BBTKConfigurePackagePaths.cmake @@ -2,16 +2,23 @@ IF(WIN32) FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/$(OutDir) BBTK_BIN_PATH) + # TO DO : use computed path for build/install tree + SET(BBTK_BBI "${BBTK_DIR}/bin/bbi") + SET(BBTK_BBS2CPP "${BBTK_DIR}/bin/bbs2cpp") + SET(BBTK_BBC "${BBTK_DIR}/bin/bbc") + SET(BBTK_BBFY "${BBTK_DIR}/bin/bbfy") + SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc") + ELSE(WIN32) - FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/bin BBTK_BIN_PATH) + FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH} BBTK_BIN_PATH) + # TO DO : use computed path for build/install tree + SET(BBTK_BBI "${BBTK_DIR}/../../bin/bbi") + SET(BBTK_BBS2CPP "${BBTK_DIR}/../../bin/bbs2cpp") + SET(BBTK_BBC "${BBTK_DIR}/../../bin/bbc") + SET(BBTK_BBFY "${BBTK_DIR}/../../bin/bbfy") + SET(BBTK_BBDOC "${BBTK_DIR}/../../bin/bbdoc") ENDIF(WIN32) -# TO DO : use computed path for build/install tree -SET(BBTK_BBI "${BBTK_DIR}/bin/bbi") -SET(BBTK_BBS2CPP "${BBTK_DIR}/bin/bbs2cpp") -SET(BBTK_BBC "${BBTK_DIR}/bin/bbc") -SET(BBTK_BBFY "${BBTK_DIR}/bin/bbfy") -SET(BBTK_BBDOC "${BBTK_DIR}/bin/bbdoc") INCLUDE(${BBTK_CMAKE_DIR}/BBTKSetDeducedPaths.cmake) diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index 36cd4c9..c971745 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -27,6 +27,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) DESTINATION ${BBTK_BBS_INSTALL_PATH}/${BBTK_PACKAGE_NAME}/appli ) + # IF(WIN32) @@ -52,7 +53,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) ADD_CUSTOM_COMMAND( OUTPUT ${DOC_OUTPUT} COMMAND - cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} + cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} ${BBTK_MAKE_INDEX} DEPENDS bb${PACKAGE_NAME} ) ENDIF(WIN32) @@ -65,6 +66,11 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) DESTINATION ${BBTK_BBDOC_INSTALL_PATH} ) + # runs bbtk-make-index as a post install step + IF(NOT BBTK_CORE_PACKAGE) + INSTALL(CODE "EXECUTE_PROCESS(COMMAND bbtk-make-index)") + ENDIF(NOT BBTK_CORE_PACKAGE) + ENDMACRO(BBTK_CREATE_PACKAGE_BBDOC NAME) diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx index 1dba6df..b826efc 100644 --- a/kernel/src/bbtkAtomicBlackBox.cxx +++ b/kernel/src/bbtkAtomicBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/04/24 10:11:27 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/06/27 08:12:46 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -90,7 +90,10 @@ namespace bbtk if ( ( bbGetStatus() == MODIFIED ) || ( bbBoxProcessModeIsAlways() ) ) { - bool wasExecuting = bbGlobalGetSomeBoxExecuting(); + + bbSetStatus(UPDATING); + + bool wasExecuting = bbGlobalGetSomeBoxExecuting(); bbGlobalSetSomeBoxExecuting(true); // Updates its inputs @@ -100,16 +103,18 @@ namespace bbtk // If all inputs are in UPTODATE post-update status // and mProcessMode is not "Always" // then the box is now UPTODATE + IOStatus new_status; if ( ( s == UPTODATE ) && ( ! bbBoxProcessModeIsAlways() ) ) { - bbSetStatus(UPTODATE); + new_status = UPTODATE; } else { // else it remains MODIFIED - bbSetStatus(MODIFIED); + new_status = MODIFIED; } + bbSetStatus(new_status); // User process bbProcess(); diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index e436c1c..401ac41 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/06/26 18:45:58 $ - Version: $Revision: 1.22 $ + Date: $Date: 2008/06/27 08:12:46 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -482,7 +482,8 @@ namespace bbtk if ((caller==0) || ((caller!=0) && (caller->GetBlackBoxTo() != to))&& - (!bbGetUpdateTransferedToParent())) + (!bbGetUpdateTransferedToParent())&& + (to->bbGetStatus()!=UPDATING)) { bbtkDebugMessage("process",3, " ... Transfering update order to parent" diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx index e695801..5f44b38 100644 --- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer2D.cxx,v $ Language: C++ - Date: $Date: 2008/06/26 18:45:58 $ - Version: $Revision: 1.13 $ + Date: $Date: 2008/06/27 08:12:46 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -275,6 +275,10 @@ namespace bbwxvtk ((Viewer2DWidget*)bbGetOutputWidget())->Update(); ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView(); #endif + /* + ((Viewer2DWidget*)bbGetOutputWidget())->Update(); + ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView(); + */ }