From ddbf713a6bf02c1d7fc75a370ec11f2b87cfe20d Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 4 Feb 2008 13:51:29 +0000 Subject: [PATCH 1/1] *** empty log message *** --- kernel/doc/CMakeLists.txt | 3 ++ kernel/doc/bbtkWebSite/CMakeLists.txt | 23 ++++++++++++++ kernel/doc/bbtkWebSite/make-index.bbs.in | 4 +++ kernel/doc/bbtkWebSite/menu.html | 39 ++++++------------------ kernel/src/bbtkFactory.cxx | 5 +-- kernel/src/bbtkInterpreter.cxx | 20 +++++++++--- 6 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 kernel/doc/bbtkWebSite/make-index.bbs.in diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt index 04ae605..a0157af 100755 --- a/kernel/doc/CMakeLists.txt +++ b/kernel/doc/CMakeLists.txt @@ -101,6 +101,9 @@ IF(BUILD_bbtk_DOC) # Recurse it bbtkWebSite dir SUBDIRS(bbtkWebSite) + + + # INSTALL( # DIRECTORY ${BBTK_BINARY_DIR}/kernel/doc # DESTINATION ${CMAKE_INSTALL_PREFIX} diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 578995d..8357831 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -28,3 +28,26 @@ FOREACH(page ${HTML_PAGES}) ENDFOREACH(page) +# Index +SET(BBTK_INDEX_ALPHA_FILE ${BBTK_BBDOC_BUILD_PATH}/index-alpha.html) +SET(BBTK_INDEX_PACKAGES_FILE ${BBTK_BBDOC_BUILD_PATH}/index-package.html) +SET(BBTK_INDEX_KEYWORDS_FILE ${BBTK_BBDOC_BUILD_PATH}/index-keyword.html) +SET(INDEX_OUTPUT + ${BBTK_INDEX_ALPHA_FILE} ${BBTK_INDEX_PACKAGES_FILE} + ${BBTK_INDEX_KEYWORDS_FILE} + ) + +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in + ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs + @ONLY + ) +ADD_CUSTOM_COMMAND( + OUTPUT ${INDEX_OUTPUT} + COMMAND + cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs + # DEPENDS ${PACKAGE_NAME} + ) +ADD_CUSTOM_TARGET(bbdoc_index ALL + DEPENDS ${INDEX_OUTPUT} + ) diff --git a/kernel/doc/bbtkWebSite/make-index.bbs.in b/kernel/doc/bbtkWebSite/make-index.bbs.in new file mode 100644 index 0000000..5679463 --- /dev/null +++ b/kernel/doc/bbtkWebSite/make-index.bbs.in @@ -0,0 +1,4 @@ +include * +index @BBTK_INDEX_ALPHA_FILE@ Initials +index @BBTK_INDEX_PACKAGES_FILE@ Packages +index @BBTK_INDEX_KEYWORDS_FILE@ Keywords diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html index 7bcd960..f69753b 100644 --- a/kernel/doc/bbtkWebSite/menu.html +++ b/kernel/doc/bbtkWebSite/menu.html @@ -38,40 +38,19 @@ Guide (pdf)
Reference (pdf)
Doxygen doc + href="../doxygen/bbtk/index.html" target="information">Doxygen doc -
Packages
+
Boxes
-itk : bbdoc -- doxygen
- itkvtk : bbdoc -- doxygen
- std : bbdoc -- doxygen
- vtk : bbdoc -- doxygen
- wx : bbdoc -- doxygen
- wxvtk : bbdoc -- doxygen
-
-browse packages folder +Alphabetical +index
+Index by +package
+Index by +keyword
diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 1847452..0339fa7 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -4,8 +4,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ -Date: $Date: 2008/02/04 13:02:58 $ -Version: $Revision: 1.9 $ +Date: $Date: 2008/02/04 13:51:30 $ +Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de @@ -907,6 +907,7 @@ namespace bbtk for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i ) { Package* pack = i->second.mPackage; + if (pack->GetName()=="user") continue; Package::BlackBoxMapType::const_iterator j; for (j = pack->GetBlackBoxMap().begin(); j!= pack->GetBlackBoxMap().end(); diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 5f6b3e6..7a57fe9 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/02/04 13:02:58 $ - Version: $Revision: 1.18 $ + Date: $Date: 2008/02/04 13:51:30 $ + 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 @@ -806,6 +806,9 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); //std::cout <<"fullpath [" << fullDirectoryName << "]" <& nbBssFiles = 0; for (std::vector::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) { + // std::cout << "=== "<<*i<<" =="<& if (verbose) std::cout << "WARNING : No '.bbs' file found in [" << fullDirectoryName << "]" << std::endl; - break; // a directory was found; we stop iterating + //break; // a directory was found; we stop iterating + // LG : No! We want all files included ! } return; } @@ -939,6 +944,13 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& void Interpreter::LoadScript( std::string fullPathScriptName) { + if (find(mFileName.begin(),mFileName.end(),fullPathScriptName) + !=mFileName.end()) + { + bbtkMessage("Interpreter",1,"file '"<& return; } - if (verbose) + //if (verbose) std::cout << " -->[" << fullPathScriptName << "] found" << std::endl; mFile.push_back(s); -- 2.45.1