From: guigues Date: Tue, 5 Feb 2008 11:39:32 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~279 X-Git-Url: http://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b0f29a1286e2f997c5e4bc93b047c35a8b4e14f4;p=bbtk.git *** empty log message *** --- diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 62e1307e..e25309ab 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -20,10 +20,10 @@ ENDFOREACH(page) # Index generation 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(BBTK_INDEX_CATEGORIES_FILE ${BBTK_BBDOC_BUILD_PATH}/index-category.html) SET(INDEX_OUTPUT ${BBTK_INDEX_ALPHA_FILE} ${BBTK_INDEX_PACKAGES_FILE} - ${BBTK_INDEX_KEYWORDS_FILE} + ${BBTK_INDEX_CATEGORIES_FILE} ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in diff --git a/kernel/doc/bbtkWebSite/make-index.bbs.in b/kernel/doc/bbtkWebSite/make-index.bbs.in index 56794635..aa15bc79 100644 --- a/kernel/doc/bbtkWebSite/make-index.bbs.in +++ b/kernel/doc/bbtkWebSite/make-index.bbs.in @@ -1,4 +1,4 @@ include * index @BBTK_INDEX_ALPHA_FILE@ Initials index @BBTK_INDEX_PACKAGES_FILE@ Packages -index @BBTK_INDEX_KEYWORDS_FILE@ Keywords +index @BBTK_INDEX_CATEGORIES_FILE@ Categories diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html index f69753ba..e51744f5 100644 --- a/kernel/doc/bbtkWebSite/menu.html +++ b/kernel/doc/bbtkWebSite/menu.html @@ -45,12 +45,11 @@ Reference (pdf)
Alphabetical -index
-Index by + href="../bbdoc/index-alpha.html">Alphabetical list
+List by package
-Index by -keyword
+List by +category
diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 5429d74b..e994b382 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 14:12:47 $ -Version: $Revision: 1.11 $ +Date: $Date: 2008/02/05 11:39:32 $ +Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de @@ -920,28 +920,24 @@ namespace bbtk std::string k(""); k += pack->GetName(); keys.push_back(k); - title = "Index by package"; + title = "List by package"; } else if (type==Initials) { std::string init(" "); init[0] = std::toupper(j->second->GetTypeName()[0]); keys.push_back(init); - title = "Alphabetical index"; + title = "Alphabetical list"; } - else if (type==Keywords) + else if (type==Categories) { // Split the keyword string - //std::vector keywords; std::string delimiters = ";,"; Utilities::SplitString(j->second->GetKeyword(), delimiters,keys); - //std::vector::iterator si; - //for (si=keywords.begin();si!=keywords.end;++si) - // { - // keys.push_back(*si); - // } - title = "Index by keyword"; + if (keys.size()==0) + keys.push_back(" NONE"); + title = "List by category"; } std::vector::const_iterator k; diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h index 7eaefeb8..9b2aab19 100644 --- a/kernel/src/bbtkFactory.h +++ b/kernel/src/bbtkFactory.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.h,v $ Language: C++ - Date: $Date: 2008/02/04 13:02:58 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/02/05 11:39:32 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -76,7 +76,7 @@ namespace bbtk typedef enum { Packages, - Keywords, + Categories, Initials } IndexEntryType; diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index d5f08d28..09954ef4 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/05 11:07:42 $ - Version: $Revision: 1.22 $ + Date: $Date: 2008/02/05 11:39:32 $ + 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 @@ -167,8 +167,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.argmin = 0; info.argmax = 2; info.code = cIndex; - info.syntax = "index [ ['Initials'(default)|'Packages'|'Keywords']]"; - info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Keywords' is provided then the entries are either the package names or the keywords"; + info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories']]"; + info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories"; mCommandDict[info.keyword] = info; info.keyword = "reset"; //EED @@ -1554,7 +1554,7 @@ void Interpreter::Index(const std::string& filename, { Factory::IndexEntryType t; if (type=="Initials") t = Factory::Initials; - else if (type=="Keywords") t = Factory::Keywords; + else if (type=="Categories") t = Factory::Categories; else if (type=="Packages") t = Factory::Packages; GetGlobalFactory()->CreateHtmlIndex(t,filename);