*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 241faa34cf27ee9af41bbf253cf36299a49d7664..494d9ffb60cdd13721e96c930aeaeddcd5ba5ee2 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -74,13 +74,14 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   IF (WIN32)
+    MAKE_DLL_PATH()
  #   SET(command00 Path=c:/creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%)
  #   STRING(REPLACE "__RR__" "\;" SETPATH ${command00} )
  #   SET(SETPATH set ${command0} &&)
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    set ${CREA_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    set ${DLL_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )

diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index c00536ea8b7b255c44526b09a48e7b2c9d8f6a42..47f7aadd67dc083ebd9968099063c87d1ef2edfd 100644 (file)
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -31,10 +31,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
   #
   IF(WIN32)
     SET(USE_DOT TRUE)
-    # %DOT_DIR%
-    # set(command00  Path=C:/Creatis/dlls__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__${DOT_DIR}__RR__%PATH% )
-    # STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
- 
+    MAKE_DLL_PATH()
 #    FILE(TO_NATIVE_PATH ${EXECUTABLE_OUTPUT_PATH}/bb${BBTK_PACKAGE_NAME}.dll  pathCommand2 )  
     FILE(TO_NATIVE_PATH  ${BBTK_BIN_PATH}/bbtk_config.xml pathCommand2 )       
     FILE(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH} pathCommand1 )
@@ -48,7 +45,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
       #    cd ${BBTK_BIN_PATH}/../bbs/ && ${BBTK_BBI} -n ${OUTPUT_FILE}
-      set ${CREA_PATH} && ${command1} && ${command2} && ${command3} 
+      set ${DLL_PATH} && ${command1} && ${command2} && ${command3} 
       #&& ${command4}
       DEPENDS bb${PACKAGE_NAME} 
       )

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 8a9eec7b5af59318dbb7ba8c3761a9d964b94f13..21d8599efa703b2993b885ca72c00b90cb05da26 100644 (file)
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -170,16 +170,6 @@ IF(USE_DOXYGEN)
 ENDIF(USE_DOXYGEN)
 #-----------------------------------------------------------------------------
 
-#-----------------------------------------------------------------------------
-IF(USE_DOT)
-  IF(WIN32)
-    FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
-    IF(NOT DOT_DIR)
-      MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe")
-    ENDIF(NOT DOT_DIR)
-  ENDIF(WIN32)  
-ENDIF(USE_DOT) 
-#-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 IF(USE_LATEX) 

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 1600776e414971618d06e6b42292df1b4cef0223..27149d437857495088234016cbc534b56df2b1d8 100644 (file)
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -19,6 +19,7 @@ SET(BBTK_CORE_PACKAGE TRUE)
 IF(WIN32)
   SET (EXECUTABLE_OUTPUT_REL_PATH "") 
   SET (LIBRARY_OUTPUT_REL_PATH    "")
+  SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
 ELSE(WIN32)
   SET (EXECUTABLE_OUTPUT_REL_PATH bin) 
   SET (LIBRARY_OUTPUT_REL_PATH    bin)

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 7812755e77609d7eedc3c3401538d80e9df6cc58..3cfa5f4a13e7dcf98d12c13226175eff820e7de0 100644 (file)
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -81,3 +81,23 @@ MACRO(MKDIR DIR)
   ENDIF(NOT IS_DIRECTORY ${DIR})
 ENDMACRO(MKDIR)
 #========================================================================
+
+
+#========================================================================
+MACRO(MAKE_DLL_PATH)
+  IF(WIN32)
+   IF(NOT DLL_PATH)
+    IF(USE_DOT)
+      FIND_PATH(DOT_DIR dot.exe PATHS $ENV{PATH} )
+      IF(NOT DOT_DIR)
+        MESSAGE(FATAL_ERROR "Dot not found : set DOT_DIR to the folder containing dot.exe")
+      ELSE(NOT DOT_DIR)
+        MESSAGE(STATUS "Looking for dot... - found in ${DOT_DIR}")
+      ENDIF(NOT DOT_DIR)
+    ENDIF(USE_DOT)     
+    SET(DLL_PATH0 Path=${ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
+    STRING(REPLACE "__RR__" "\;" DLL_PATH ${DLL_PATH0} )
+   ENDIF(NOT DLL_PATH)
+  ENDIF(WIN32)  
+ENDMACRO(MAKE_DLL_PATH)
+#========================================================================

diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index 914e4dd1c69918fbdf34ad5edeb266797d80fd69..97b484d18b1ed5e65a7247c538d17d0b54f32ab6 100644 (file)
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -63,13 +63,5 @@ ENDIF(BBTK_CORE_PACKAGE)
 #-----------------------------------------------------------------------------
 
 
-#-----------------------------------------------------------------------------
-IF(WIN32)
-  SET(CREA_ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Addictional paths in which to look for dlls")
-  SET(CREA_PATH0 Path=${CREA_ADDITIONAL_DLL_PATH}__RR__%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH%__RR__${DOT_DIR})
-  STRING(REPLACE "__RR__" "\;" CREA_PATH ${CREA_PATH0} )
-ENDIF(WIN32)
-#-----------------------------------------------------------------------------
-
 
 

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 6b21b387e2765a2ed5c02be5aec2419cb1db8b8e..b39212801cf7fa76f00e848b8c1427a175a47eff 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -34,12 +34,12 @@ CONFIGURE_FILE(
   )
 
 IF (WIN32)
- # SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
- # STRING(REPLACE "__RR__" "\;" command0 ${command00} ) 
+  SET(USE_DOT TRUE)
+  MAKE_DLL_PATH()
   ADD_CUSTOM_COMMAND(
     OUTPUT ${INDEX_OUTPUT}
     COMMAND 
-    set ${CREA_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
     DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ELSE (WIN32)

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index a3b858d9fc587bd2de7616c33e5bc2a6d7f366c1..ed7cb860808fa014304a14a99da1d1e39b8b92a8 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/25 08:21:31 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/10/06 09:01:08 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -114,9 +114,9 @@ namespace bbvtk
 //---------------------------------------------------------------------
   void ImagePlanes::bbUserDestructor()
   {
-    planeWidgetX->Delete();
-    planeWidgetY->Delete();
-    planeWidgetZ->Delete();
+    if (bbGetOutputPlaneX()) bbGetOutputPlaneX()->Delete();
+    if (bbGetOutputPlaneY()) bbGetOutputPlaneY()->Delete();
+    if (bbGetOutputPlaneZ()) bbGetOutputPlaneZ()->Delete();
   }
   
 //---------------------------------------------------------------------