From 6ad84645e7e5971e3a7b166bd3099c06c343010f Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 8 Feb 2008 07:39:49 +0000 Subject: [PATCH] *** empty log message *** --- .../BBTKConfigurePackage_PackageConfig.cmake | 1 + .../BBTKConfigurePackage_UsePackage.cmake | 1 + kernel/src/bbtkBlackBoxDescriptor.cxx | 24 +++++++++---- kernel/src/bbtkComplexBlackBoxDescriptor.cxx | 25 +++++++++----- kernel/src/bbtkFactory.cxx | 34 +++++++++---------- kernel/src/bbtkPackage.cxx | 5 +-- packages/itk/PackageConfig.cmake.in | 4 +++ packages/itk/UsePackage.cmake.in | 4 +++ packages/std/PackageConfig.cmake.in | 4 +++ packages/std/UsePackage.cmake.in | 4 +++ packages/wx/PackageConfig.cmake.in | 4 +++ packages/wx/UsePackage.cmake.in | 4 +++ 12 files changed, 80 insertions(+), 34 deletions(-) create mode 100644 kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake create mode 100644 kernel/cmake/BBTKConfigurePackage_UsePackage.cmake diff --git a/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake b/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake @@ -0,0 +1 @@ + diff --git a/kernel/cmake/BBTKConfigurePackage_UsePackage.cmake b/kernel/cmake/BBTKConfigurePackage_UsePackage.cmake new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/kernel/cmake/BBTKConfigurePackage_UsePackage.cmake @@ -0,0 +1 @@ + diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index cd15961..04ede1c 100644 --- 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/02/07 11:06:37 $ - Version: $Revision: 1.11 $ + Date: $Date: 2008/02/08 07:39:49 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -233,20 +233,30 @@ namespace bbtk std::string descr = GetDescription(); Utilities::html_format(descr); - std::cout << "HTML *** "< categories; + // Split the category string + std::string delimiters = ";,"; + Utilities::SplitString(GetCategory(), + delimiters,categories); + (s) << "

\n"; (s) << "\n"; (s) << "\n"; - (s) << "\n"; + (s) << "\n"; + (s) << "\n"; (s) << "
Description : " << descr << "
Author(s) : " << author << "
Category(s) : " - << category << "
Category(s) : "; + std::vector::iterator ci; + for (ci=categories.begin(); ci!=categories.end(); ++ci) + { + s << "" << *ci + << " \n"; + } + s << "
To use it : include " << GetPackage()->GetName() << "
\n"; diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index 8485061..1afb3f6 100644 --- 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/02/07 11:06:37 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/02/08 07:39:49 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -286,8 +286,12 @@ namespace bbtk std::string author = GetAuthor(); Utilities::html_format(author); - std::string category = GetCategory(); - Utilities::html_format(category); + std::vector categories; + // Split the category string + std::string delimiters = ";,"; + Utilities::SplitString(GetCategory(), + delimiters,categories); + (s) << "

\n"; (s) << "\n"; - (s) << "\n"; - + (s) << "\n"; std::string inc = GetScriptFileName(); if (inc.size()>0) { @@ -311,7 +320,7 @@ namespace bbtk if (B.size()) { - (s) << "
Description : " @@ -296,9 +300,14 @@ namespace bbtk (s) << "
Author(s) : " << author << "
Category(s) : " - << category << "
Category(s) : "; + std::vector::iterator ci; + for (ci=categories.begin(); ci!=categories.end(); ++ci) + { + s << "" << *ci + << " \n"; + } + s << "
Dependencies : "; + (s) << "
Uses : "; std::set pdeps; ComplexBlackBox::BlackBoxMapType::const_iterator b; diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 3652d95..48963f2 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/06 10:51:28 $ -Version: $Revision: 1.16 $ +Date: $Date: 2008/02/08 07:39:49 $ +Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de @@ -920,7 +920,7 @@ namespace bbtk std::string k(""); k += pack->GetName(); keys.push_back(k); - title = "List by package"; + title = "Boxes by package"; } else if (type==Initials) { @@ -931,24 +931,13 @@ namespace bbtk } else if (type==Categories) { - // Split the category string - //std::vector categories; - std::string delimiters = ";,"; Utilities::SplitString(j->second->GetCategory(), delimiters,keys); - - //std::vector::iterator si; - //for (si=categories.begin();si!=categories.end;++si) - // { - // keys.push_back(*si); - // } - title = "Index by category"; - if (keys.size()==0) keys.push_back(" NONE"); - title = "List by category"; + title = "Boxes by category"; } std::vector::const_iterator k; @@ -1021,8 +1010,17 @@ namespace bbtk { s << "

\n"; s << "

Top"; - s << "first<<"\">\n"; - s << "

"<first<<"\n"; + if (type==Packages) + { + s << "first<<"\">\n"; + s << "

first<<"/index.html\">" + << ii->first<<"\n"; + } + else + { + s << "first<<"\">\n"; + s << "

"<first<<"\n"; + } s << "

    \n"; s << "

    \n"; @@ -1032,7 +1030,9 @@ namespace bbtk { std::string pack = (*di)->GetPackage()->GetName(); std::string name = (*di)->GetTypeName(); + Utilities::html_format(name); std::string descr = (*di)->GetDescription(); + Utilities::html_format(descr); s << ""; s << ""; s << "
    "; s << "   second->GetTypeName(); Utilities::html_format(name); std::string descr = i->second->GetDescription(); + Utilities::html_format(descr); s << "
    "; diff --git a/packages/itk/PackageConfig.cmake.in b/packages/itk/PackageConfig.cmake.in index e69de29..bec06eb 100644 --- a/packages/itk/PackageConfig.cmake.in +++ b/packages/itk/PackageConfig.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_PackageConfig.cmake) + +# INSERT YOUR CUSTOM CONFIG HERE diff --git a/packages/itk/UsePackage.cmake.in b/packages/itk/UsePackage.cmake.in index e69de29..2ecb206 100644 --- a/packages/itk/UsePackage.cmake.in +++ b/packages/itk/UsePackage.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_UsePackage.cmake) + +# INSERT YOUR CUSTOM USE HERE diff --git a/packages/std/PackageConfig.cmake.in b/packages/std/PackageConfig.cmake.in index e69de29..bec06eb 100644 --- a/packages/std/PackageConfig.cmake.in +++ b/packages/std/PackageConfig.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_PackageConfig.cmake) + +# INSERT YOUR CUSTOM CONFIG HERE diff --git a/packages/std/UsePackage.cmake.in b/packages/std/UsePackage.cmake.in index e69de29..2ecb206 100644 --- a/packages/std/UsePackage.cmake.in +++ b/packages/std/UsePackage.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_UsePackage.cmake) + +# INSERT YOUR CUSTOM USE HERE diff --git a/packages/wx/PackageConfig.cmake.in b/packages/wx/PackageConfig.cmake.in index e69de29..bec06eb 100644 --- a/packages/wx/PackageConfig.cmake.in +++ b/packages/wx/PackageConfig.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_PackageConfig.cmake) + +# INSERT YOUR CUSTOM CONFIG HERE diff --git a/packages/wx/UsePackage.cmake.in b/packages/wx/UsePackage.cmake.in index e69de29..2ecb206 100644 --- a/packages/wx/UsePackage.cmake.in +++ b/packages/wx/UsePackage.cmake.in @@ -0,0 +1,4 @@ +# DO NOT REMOVE : +INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_UsePackage.cmake) + +# INSERT YOUR CUSTOM USE HERE -- 2.45.1