*** empty log message ***

diff --git a/kernel/cmake/AdditionalBBTKConfig.cmake.in b/kernel/cmake/AdditionalBBTKConfig.cmake.in
index 2e3084ae8f7c708037d40fd499f1d22a006b7bfe..c8ae91b9168c4e098b611815d7d2f34dac9ef687 100644 (file)
--- 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 bf6cfcf8ef358aec801bc087fa7a1b82d5702f3c..6a5c2a3c02725a53af0febbb7883cd759dd431b6 100644 (file)
--- 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 36cd4c9f796426336701146c777718f9d0aa4283..c971745209a36e5522e3138173bb81e75be6a44d 100644 (file)
--- 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 1dba6df361e943a0857a2fdaa979883317692e59..b826efcc7e31676d93e57184a35c8f6e3e64aebf 100644 (file)
--- 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 e436c1ca9988c46cc762cc557a8d46076bfd24ca..401ac4130637bbde28941572f8f28ab7a03b47bc 100644 (file)
--- 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 e69580129d4281b954b367c773472069ee23553e..5f44b38ed7664e0be8a4f3fb55f0edb75a3e7ade 100644 (file)
--- 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();
+    */
   }