*** empty log message ***

diff --git a/INSTALL.txt b/INSTALL.txt
index e95045acd411a98ec6a1cc1805a97309b57e52ae..12d00ae131f9b578549e601060fc59392d76cc4d 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -49,6 +49,7 @@ Install from
        -basic-miktex-2.6.2742.exe
          (You have to make update) 
        -tth_exe.zip     (c:\Creatis\tth_exe)
+        -nsis-2.34-setup.exe
   http://www.creatis.insa-lyon.fr/~davila/bbtk/Software/new/
        -graphviz-2.2.1.exe
        -doxygen-1.5.3-setup.exe

diff --git a/kernel/appli/bbCreatePackage/void-Package/doc/doxygen/Doxyfile.txt.in b/kernel/appli/bbCreatePackage/void-Package/doc/doxygen/Doxyfile.txt.in
index 0dc43062a4acd5b585eb7d0ba470f270fb3f1ee4..6b4211a26982d5130620d9e5e6d32e3114852749 100644 (file)
--- a/kernel/appli/bbCreatePackage/void-Package/doc/doxygen/Doxyfile.txt.in
+++ b/kernel/appli/bbCreatePackage/void-Package/doc/doxygen/Doxyfile.txt.in
@@ -342,7 +342,7 @@ INLINE_SOURCES         = YES
 # If the REFERENCED_BY_RELATION tag is set to YES (the default) 
 # then for each documented function all documented 
 # functions referencing it will be listed.
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 

diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
index fb51a9d7de4a051c78b17c12363977bf5c2cf7c3..fef9c53fc6d24960db3ce62030895e93a3b13ca8 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
@@ -11,3 +11,5 @@ INSTALL(
 
 INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
 BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
+
+BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME})
\ No newline at end of file

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index d447c987e86afe8eca2ba8d702b650c3a2df1626..c7ba3dc6b399906d0d916051d3284fdb73a5caef 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -78,33 +78,40 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
   SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx)
   
   IF (WIN32)
-    SET(command00  Path=%WXWIN%/lib/vc_dll/__RR__%VTK_DIR%__RR__%ITK_DIR%/../../bin/__RR__%PATH% )
-    STRING(REPLACE "__RR__" "\;" command0 ${command00} )
-    SET(SETPATH "set ${command0} &&")
+    SET(command00 Path=%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 ${SETPATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    DEPENDS ${xmlfile}
+    ${BBTK_BBFY_DEPENDENCY} 
+    )
   ELSE(WIN32)
-    SET(SETPATH "")
-  ENDIF(WIN32)
-  
-  ADD_CUSTOM_COMMAND(
+ ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    ${SETPATH} ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    ${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)
   
   
- #  IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}")
+ IF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}.cxx")
  # message ("EED Alert BBTKConfigurePackage_src  "  "IF NOT MATCHES" )
   SET(${BBTK_PACKAGE_NAME}_CXX_SOURCES
       ${${BBTK_PACKAGE_NAME}_CXX_SOURCES}
-      ${filename}
+      ${filename}.cxx
       )
-#  ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}") 
+ ENDIF(NOT ${BBTK_PACKAGE_NAME}_CXX_SOURCES MATCHES "${filename}.cxx") 
   
   INSTALL(
     FILES       ${CMAKE_CURRENT_BINARY_DIR}/${filename}.h 

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index a4e3dcb09c466634c5ed260090be7dd71a8896e4..f86e7f8292b0636f330314fc3a6bf52a18f1ac1d 100644 (file)
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -1,3 +1,5 @@
+
+
 #-----------------------------------------------------------------------------
 #OPTION(USE_VTK "Build VTK-based black boxes" OFF)
 IF(USE_VTK)
@@ -166,7 +168,6 @@ IF(USE_TTH)
 ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 
-
 #-----------------------------------------------------------------------------
 IF(USE_BOOST)
   IF(BBTK_USE_SHIPPED_BOOST)

diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index b5396fee7a5fe9813b4f06b3da562a5e1998c78b..7812755e77609d7eedc3c3401538d80e9df6cc58 100644 (file)
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -47,7 +47,7 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
     ${JPG_IMAGES}
     ${TIF_IMAGES}
     )
- #   MESSAGE(ERROR ${IMAGES})
+#    MESSAGE(ERROR ${IMAGES} )
   FOREACH(image ${IMAGES})  
     GET_FILENAME_COMPONENT(filename "${image}" NAME)
     CONFIGURE_FILE(
@@ -55,6 +55,7 @@ MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
        ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}/${filename}
       COPYONLY
       ) 
+      
     #  IF (WIN32)
 #      CONFIGURE_FILE(
 #          ${image}

diff --git a/kernel/doc/bbtkDoxygen/Doxyfile.txt.in b/kernel/doc/bbtkDoxygen/Doxyfile.txt.in
index 2f63cfd493d130d06891ec0c77a9723119be46a4..44afa2a64dbd55d37d403da1f0f7c181553194fb 100644 (file)
--- a/kernel/doc/bbtkDoxygen/Doxyfile.txt.in
+++ b/kernel/doc/bbtkDoxygen/Doxyfile.txt.in
@@ -645,7 +645,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
@@ -1293,7 +1293,7 @@ DOT_IMAGE_FORMAT       = png
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = @DOXYGEN_DOT_PATH@
+DOT_PATH               = "@DOXYGEN_DOT_PATH@"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index cb2833445ab0969ccb12f8ab9ac4f6fe344a8a1f..7e9a8f5e235abd29c112d8bda8eccdf4b9e848cd 100644 (file)
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -36,17 +36,21 @@ 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(SETPATH "set ${command0} &&")
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    set ${command0} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
+  )
 ELSE (WIN32)
-  SET(SETPATH "")
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
+    DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
+  )
 ENDIF (WIN32)
 
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${INDEX_OUTPUT}
-  COMMAND 
-  ${SETPATH} cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs
-  DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
-  )
 ADD_CUSTOM_TARGET(bbdoc_index ALL
   DEPENDS ${INDEX_OUTPUT}
   )

diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt
index 435ddb83d4fab9921aca0a597e50c03a7074e13c..857f212ec342debd94ab1f8e4f20b81ac615b79f 100644 (file)
--- a/kernel/install/CMakeLists.txt
+++ b/kernel/install/CMakeLists.txt
@@ -21,47 +21,47 @@ IF(WIN32)
       ENDFOREACH(iLST)
     ENDIF(${VTK_DIR})
 
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkCommon.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkDICOMParser.dll                 DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkexoIIc.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkexpat.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkFiltering.dll                           DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkfreetype.dll                    DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkftgl.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkGenericFiltering.dll            DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkGraphics.dll                    DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkHybrid.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkImaging.dll                     DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkIO.dll                                  DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkjpeg.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkNetCDF.dll                      DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkpng.dll                                 DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkRendering.dll                   DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtksys.dll                                 DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtktiff.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkVolumeRendering.dll     DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkWidgets.dll                     DESTINATION bin/ )
-    INSTALL(   FILES ${VTK_DIR}/bin/Release/vtkzlib.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkCommon.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkDICOMParser.dll                           DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkexoIIc.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkexpat.dll                                 DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkFiltering.dll                     DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkfreetype.dll                      DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkftgl.dll                                  DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkGenericFiltering.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkGraphics.dll                      DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkHybrid.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkImaging.dll                               DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkIO.dll                                    DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkjpeg.dll                                  DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkNetCDF.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkpng.dll                                           DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkRendering.dll                     DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtksys.dll                                           DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtktiff.dll                                  DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkVolumeRendering.dll               DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkWidgets.dll                               DESTINATION bin/ )
+    INSTALL(   FILES ${VTK_DIR}/../../bin/vtkzlib.dll                                  DESTINATION bin/ )
   ENDIF(USE_VTK)
   
   IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/Release/ITKCommon.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${ITK_DIR}/../../bin/ITKCommon.dll        DESTINATION bin/ )
   ENDIF(USE_ITK)
 
   IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll               DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                        DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll     DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                        DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll               DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll               DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                  DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
     INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
   ENDIF(USE_WXWIDGETS)
 
 ENDIF(WIN32)

diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index e4318a7a3dd3d7259bef6bb5486509d2cc76a89e..f1fb6a003a7981f7e8c99d37e6586f31b485c53f 100644 (file)
--- a/kernel/src/bbtkBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/06 13:45:12 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2008/05/14 10:26:29 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -313,7 +313,7 @@ namespace bbtk
 
 
     std::string descr = GetDescription();
-    Utilities::html_format(descr);
+    //Utilities::html_format(descr);
     std::string author = GetAuthor();
     Utilities::html_format(author);
 
@@ -393,7 +393,7 @@ namespace bbtk
       Utilities::html_format(type);
       
       std::string descr(in->second->GetDescription());
-      Utilities::html_format(descr);
+      //Utilities::html_format(descr);
       
       std::string out = 
        "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
@@ -456,7 +456,7 @@ namespace bbtk
        Utilities::html_format(type);
        
        std::string descr(o->second->GetDescription());
-       Utilities::html_format(descr);
+       //Utilities::html_format(descr);
        
        std::string out = 
          "<TR><TD style='vertical-align: top;' bgcolor=\"" + col

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index efe06f170e8444cc9ee7105576d1b5a4d5a66887..0e1114d52383c1480eb50ca410ba084ff1aa0746 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2008/05/14 10:26:29 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -335,7 +335,7 @@ namespace bbtk
 
 
     std::string descr = GetDescription();
-    Utilities::html_format(descr);
+    //Utilities::html_format(descr);
     
     std::string author = GetAuthor();
     Utilities::html_format(author);
@@ -435,7 +435,7 @@ namespace bbtk
        Utilities::html_format(type);
        
        std::string descr(in->second->GetDescription());
-       Utilities::html_format(descr);
+       //Utilities::html_format(descr);
 
        (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
          << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
@@ -468,7 +468,7 @@ namespace bbtk
        Utilities::html_format(type);
        
        std::string descr(o->second->GetDescription());
-       Utilities::html_format(descr);
+       //Utilities::html_format(descr);
        
        (s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
          << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 236953e51c7a65482bbf9f26adc1a9cec54355dc..078e2f8dc52c8fc95d03b5c6b4ba37b2d4d34775 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/09 10:39:46 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/05/14 10:26:29 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -1192,7 +1192,7 @@ namespace bbtk
        std::string name = i->second->GetTypeName();
        Utilities::html_format(name);
        std::string descr = i->second->GetDescription();
-       Utilities::html_format(descr);
+       //Utilities::html_format(descr);
 
         s << "<TR>";
        s << "<TD style='vertical-align: top;'>";

diff --git a/packages/itk/doc/doxygen/Doxyfile.txt.in b/packages/itk/doc/doxygen/Doxyfile.txt.in
index 5f1898d080a59952411fac3e3ee5359326eafa85..09312d5c3cc337466079d001db299d69e94f9ef5 100644 (file)
--- a/packages/itk/doc/doxygen/Doxyfile.txt.in
+++ b/packages/itk/doc/doxygen/Doxyfile.txt.in
@@ -592,7 +592,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
@@ -1206,7 +1206,7 @@ DOT_IMAGE_FORMAT       = png
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = @DOXYGEN_DOT_PATH@
+DOT_PATH               = "@DOXYGEN_DOT_PATH@"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

diff --git a/packages/itkvtk/doc/doxygen/Doxyfile.txt.in b/packages/itkvtk/doc/doxygen/Doxyfile.txt.in
index bc622af42a32b4dffd61430569b5fd0653d0d182..54ef3aee721836e7b43d13f0d3b3f864f58ef137 100644 (file)
--- a/packages/itkvtk/doc/doxygen/Doxyfile.txt.in
+++ b/packages/itkvtk/doc/doxygen/Doxyfile.txt.in
@@ -645,7 +645,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 

diff --git a/packages/std/doc/doxygen/Doxyfile.txt.in b/packages/std/doc/doxygen/Doxyfile.txt.in
index 5f1898d080a59952411fac3e3ee5359326eafa85..09312d5c3cc337466079d001db299d69e94f9ef5 100644 (file)
--- a/packages/std/doc/doxygen/Doxyfile.txt.in
+++ b/packages/std/doc/doxygen/Doxyfile.txt.in
@@ -592,7 +592,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
@@ -1206,7 +1206,7 @@ DOT_IMAGE_FORMAT       = png
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = @DOXYGEN_DOT_PATH@
+DOT_PATH               = "@DOXYGEN_DOT_PATH@"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

diff --git a/packages/toolsbbtk/doc/doxygen/Doxyfile.txt.in b/packages/toolsbbtk/doc/doxygen/Doxyfile.txt.in
index bc622af42a32b4dffd61430569b5fd0653d0d182..54ef3aee721836e7b43d13f0d3b3f864f58ef137 100644 (file)
--- a/packages/toolsbbtk/doc/doxygen/Doxyfile.txt.in
+++ b/packages/toolsbbtk/doc/doxygen/Doxyfile.txt.in
@@ -645,7 +645,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 

diff --git a/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs b/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs
index eed2e61f74976863ae53b19fc0428e6cb80488c8..8fb2da9a747e3f97d8c8506f1cd989e17599a3dd 100644 (file)
--- a/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs
+++ b/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs
@@ -1,3 +1,8 @@
+print "=== GaussianSmooth box example ==="
+description "GaussianSmooth box example"
+author "eduardo.davila at creatis.insa-lyon.fr"
+category "example"
+
 include std
 include vtk
 include wx
@@ -5,11 +10,6 @@ include itk
 include itkvtk
 include wxvtk
 
-description "Example ..."
-author "eduardo.davila@creatis.insa-lyon.fr"
-category "example"
-
-
 new MetaImageReader reader 
 include  std/boxes/bbPrependPackageDataPath.bbs 
 new PrependPackageDataPath prependDatapath 
@@ -19,27 +19,30 @@ new PrependPackageDataPath prependDatapath
 #---------------------------------------------------------------------
 
 new Slider slider
-
+  set slider.Title "Slice"
+  set slider.Max       190
+  set slider.In        10
+  
 #---------------------------------------------------------------------
 
 new Viewer2D viewer2DImageOriginal
   connect reader.Out                   viewer2DImageOriginal.In
   connect slider.Out                   viewer2DImageOriginal.Slice
-  connect slider.BoxChange     viewer2DImageOriginal.BoxExecute
+  connect slider.BoxChange             viewer2DImageOriginal.BoxExecute
     
 #---------------------------------------------------------------------
 
 new BinaryThresholdImageFilter threshold
-  set threshold.LowerThreshold 2000
+  set threshold.LowerThreshold 1000
   set threshold.UpperThreshold 5000
   set threshold.InsideValue 255
   set threshold.OutsideValue 0
   connect reader.Out threshold.In
 
 new Viewer2D viewer2DImageSegmented
-  connect threshold.Out                viewer2DImageSegmented.In
+  connect threshold.Out                        viewer2DImageSegmented.In
   connect slider.Out                   viewer2DImageSegmented.Slice
-  connect slider.BoxChange     viewer2DImageSegmented.BoxExecute
+  connect slider.BoxChange             viewer2DImageSegmented.BoxExecute
 
 #---------------------------------------------------------------------
 
@@ -50,15 +53,15 @@ new ImageGaussianSmooth smooth
   set smooth.StdDevZ  1
 
 new Viewer2D viewer2DImageSmooth
-  connect smooth.Out           viewer2DImageSmooth.In
+  connect smooth.Out                   viewer2DImageSmooth.In
   connect slider.Out                   viewer2DImageSmooth.Slice
-  connect slider.BoxChange     viewer2DImageSmooth.BoxExecute
+  connect slider.BoxChange             viewer2DImageSmooth.BoxExecute
 
 #---------------------------------------------------------------------
 
 new LayoutLine upLayout
   set upLayout.Orientation H
-  connect viewer2DImageOriginal.Widget                 upLayout.Widget1
+  connect viewer2DImageOriginal.Widget         upLayout.Widget1
   connect viewer2DImageSegmented.Widget                upLayout.Widget2
   connect viewer2DImageSmooth.Widget           upLayout.Widget3
 

diff --git a/packages/vtk/doc/doxygen/Doxyfile.txt.in b/packages/vtk/doc/doxygen/Doxyfile.txt.in
index bc622af42a32b4dffd61430569b5fd0653d0d182..54ef3aee721836e7b43d13f0d3b3f864f58ef137 100644 (file)
--- a/packages/vtk/doc/doxygen/Doxyfile.txt.in
+++ b/packages/vtk/doc/doxygen/Doxyfile.txt.in
@@ -645,7 +645,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 

diff --git a/packages/wx/doc/doxygen/Doxyfile.txt.in b/packages/wx/doc/doxygen/Doxyfile.txt.in
index 5f1898d080a59952411fac3e3ee5359326eafa85..09312d5c3cc337466079d001db299d69e94f9ef5 100644 (file)
--- a/packages/wx/doc/doxygen/Doxyfile.txt.in
+++ b/packages/wx/doc/doxygen/Doxyfile.txt.in
@@ -592,7 +592,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
@@ -1206,7 +1206,7 @@ DOT_IMAGE_FORMAT       = png
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = @DOXYGEN_DOT_PATH@
+DOT_PATH               = "@DOXYGEN_DOT_PATH@"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that 
 # contain dot files that are included in the documentation (see the 

diff --git a/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs b/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs
index 71e6373a5bd1be64ef1275e0657579dc5f24fbba..1839a2cf70dddc2f00a2ac6da57bccd912eef020 100644 (file)
--- a/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs
+++ b/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs
@@ -1,4 +1,4 @@
-description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWithControls."
+description "Example of complex 3D view of an image using vtk::ImagePlanes and wxvtk::IsoSurfaceWithControls. Screenshot : <img src=ExampleView3DImage1.jpg></img>"
 author "laurent.guigues at creatis.insa-lyon.fr"
 category "example"
 

diff --git a/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg b/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg
new file mode 100644 (file)
index 0000000..534dd32
Binary files /dev/null and b/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg differ

diff --git a/packages/wxvtk/doc/doxygen/Doxyfile.txt.in b/packages/wxvtk/doc/doxygen/Doxyfile.txt.in
index bc622af42a32b4dffd61430569b5fd0653d0d182..54ef3aee721836e7b43d13f0d3b3f864f58ef137 100644 (file)
--- a/packages/wxvtk/doc/doxygen/Doxyfile.txt.in
+++ b/packages/wxvtk/doc/doxygen/Doxyfile.txt.in
@@ -645,7 +645,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 2750a33f8aa90f93960343707e478379c8d97543..63f833e3be47d5e8ff886155e49bcb3ad5a369a3 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/09 10:39:47 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/05/14 10:26:32 $
+  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
@@ -149,18 +149,7 @@ namespace bbwxvtk
     Viewer3DWidget* w = new Viewer3DWidget(this,bbGetWxParent());
     w->Update();
     
-    vtkRenderer *renderer = w->GetRenderer();
-    if (renderer!=NULL)
-      {
-       if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
-       if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
-       if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
-       if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
-       if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); }
-       renderer->ResetCamera();
-       bbSetOutputRenderer( renderer );
 
-      }
     vtkRenderWindowInteractor *interactor = w->GetInteractor();
     if (interactor!=NULL)
       {
@@ -192,6 +181,19 @@ namespace bbwxvtk
        bbSetOutputInteractor(  w->GetInteractor() );
       }
         
+
+    vtkRenderer *renderer = w->GetRenderer();
+    if (renderer!=NULL)
+      {
+       if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
+       if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
+       if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
+       if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
+       if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); }
+       renderer->ResetCamera();
+       bbSetOutputRenderer( renderer );
+         }
+
     bbSetOutputWidget(w);
     
     bbtkDebugDecTab("Core",9);