*** empty log message ***

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index 04ae605b9f11a2c0e223ea6fff1ac3ec8a59be83..a0157af2738d0393335d312a739c2c7e64aced56 100755 (executable)
--- 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 578995d10834aaa609dd44b459d3c1b50b42110a..8357831b6f6fcae47a432790f5c413e21c4fc3ac 100644 (file)
--- 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 (file)
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 7bcd9607a9968bf77b6c7eec3b94f281360c13f0..f69753ba0a2cd35d939c381de96bf1d6a71b1261 100644 (file)
--- a/kernel/doc/bbtkWebSite/menu.html
+++ b/kernel/doc/bbtkWebSite/menu.html
@@ -38,40 +38,19 @@ Guide</a> (<font size="2"><small><small><a
  target="information">pdf</a></small></small></font>)<br>
 Reference (pdf)<br>
 </small></font></small><small><font size="3"><small> <a
- href="../bbtkDoxygen/html/index.html" target="information">Doxygen doc</a></small></font></small>
+ href="../doxygen/bbtk/index.html" target="information">Doxygen doc</a></small></font></small>
 <ul>
 </ul>
-<hr style="width: 100%; height: 2px;">Packages<small><br>
+<hr style="width: 100%; height: 2px;">Boxes<small><br>
 </small>
 <blockquote><small> </small></blockquote>
-<small><b>itk :<big> </big></b></small><font size="2"><a
- href="../packages/bbdoc/itk/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/doxygen/itk/index.html"
- target="information">doxygen</a></font> <br>
-<small><b> itkvtk : </b></small><font size="2"><a
- href="../packages/bbdoc/itkvtk/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/docygen/itkvtk/index.html"
- target="information">doxygen</a></font><br>
-<small><b> std : </b></small><span style="text-decoration: underline;"></span><font
- size="2"><a href="../packages/bbdoc/std/index.html"
- target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/doxygen/std/index.html"
- target="information">doxygen</a></font><br>
-<small><b> vtk : </b></small><font size="2"><a
- href="../packages/bbdoc/vtk/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/doxygen/vtk/index.html"
- target="information">doxygen</a></font><br>
-<small><b> wx : </b></small><font size="2"><a
- href="../bbdoc/wx/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../doxygen/wx/index.html"
- target="information">doxygen</a></font><br>
-<small><b> wxvtk : </b></small><font size="2"><a
- href="../packages/bbdoc/wxvtk/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/doxygen/wxvtk/index.html"
- target="information">doxygen</a><br>
-<br>
-<span style="font-weight: bold;">browse packages </span></font><font
- size="2"><a href="../packages/" target="information">folder</a></font>
+<small><b></b></small><font size="2"><a target="information"
+ href="../bbdoc/index-alpha.html">Alphabetical
+index</a><br>
+<a target="information" href="../bbdoc/index-package.html">Index by
+package</a><br>
+<a target="information" href="../bbdoc/index-keyword.html">Index by
+keyword</a></font><br>
 <ul>
 </ul>
 <hr style="width: 100%; height: 2px;"><small>

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 1847452410ac472ab7addd8f4d7da9b6b9c96a3b..0339fa70fe29982d4d54039f8b362e88c9e47050 100644 (file)
--- 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 5f6b3e65b9853a38c5f2e6316faf8e3a003a227c..7a57fe976f7e48bf687c8ce5e03700f388e76d80 100644 (file)
--- 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<std::string>&
 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
 //std::cout <<"fullpath [" <<   fullDirectoryName << "]" <<std::endl;
+//     std::cout << "== "<<fullDirectoryName<<" =="<<std::endl;
+       
+
       // Check if library exists           
         if ( ! Utilities::IsDirectory(fullDirectoryName) )
         {
@@ -824,6 +827,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
+         //    std::cout << "=== "<<*i<<" =="<<std::endl;
            if ((*i).substr((*i).size()-4, 4) != ".bbs")
               continue;      // ignore non .bbs files
            LoadScript(*i);
@@ -833,7 +837,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
            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<std::string>&
 
   void Interpreter::LoadScript( std::string fullPathScriptName)
   {
+    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
+       !=mFileName.end()) 
+      {
+       bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName<<"' already open : do not open it once more to prevent recursive inclusion"<<std::endl);
+       return;
+      }
+
     bbtkMessage("Interpreter",1,fullPathScriptName<<" found"<<std::endl);
 
     std::ifstream* s;      
@@ -950,7 +962,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         return;     
     }
     
-    if (verbose)
+    //if (verbose)
        std::cout << "   -->[" << fullPathScriptName << "] found" << std::endl;
 
     mFile.push_back(s);