*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake b/kernel/cmake/BBTKConfigurePackage_PackageConfig.cmake
new file mode 100644 (file)
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 (file)
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 cd1596155b18612759b57561fdfeb063930c47e0..04ede1c4a7717f3efe2bb9fecca3b88816cbe9e0 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/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 *** "<<descr<<std::endl;
     std::string author = GetAuthor();
     Utilities::html_format(author);
 
-    std::string category = GetCategory();
-    Utilities::html_format(category);    
+    std::vector<std::string> categories;
+    // Split the category string 
+    std::string delimiters = ";,";
+    Utilities::SplitString(GetCategory(),
+                          delimiters,categories);
+
     
     (s) << "<p><TABLE cellspacing=0  cellpadding=3>\n";
     (s) << "<TR><TD style='vertical-align: top;'><b> Description </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 
       << descr << "</TD></TR>\n";
     (s) << "<TR><TD style='vertical-align: top;'><b> Author(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
       << author << "</TD></TR>\n";
-    (s) << "<TR><TD style='vertical-align: top;'><b> Category(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
-      << category << "</TD></TR>\n";
+    (s) << "<TR><TD style='vertical-align: top;'><b> Category(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
+    std::vector<std::string>::iterator ci;
+    for (ci=categories.begin(); ci!=categories.end(); ++ci)
+      {
+        s << "<a href=\"../index-category.html#"<< *ci <<"\">" << *ci 
+         << "</a>&nbsp;\n";
+      }
+    s << "</TD></TR>\n";      
+
     (s) << "<TR><TD style='vertical-align: top;'><b> To use it </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  include " 
        << GetPackage()->GetName() << "</TD></TR>\n";
     (s) << "</TABLE>\n";

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index 8485061fde7bdf29ca43926ac542e9eab36905cc..1afb3f60e9dbc21ecc29a08d3a45651b8da8877a 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/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<std::string> categories;
+    // Split the category string 
+    std::string delimiters = ";,";
+    Utilities::SplitString(GetCategory(),
+                          delimiters,categories);
+
         
     (s) << "<p><TABLE cellspacing=0  cellpadding=3>\n";
     (s) << "<TR><TD style='vertical-align: top;'><b> Description </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 
@@ -296,9 +300,14 @@ namespace bbtk
     (s) << "<TR><TD style='vertical-align: top;'><b> Author(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
         << author << "</TD></TR>\n";
 
-    (s) << "<TR><TD style='vertical-align: top;'><b> Category(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
-        << category << "</TD></TR>\n";      
-
+    (s) << "<TR><TD style='vertical-align: top;'><b> Category(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
+    std::vector<std::string>::iterator ci;
+    for (ci=categories.begin(); ci!=categories.end(); ++ci)
+      {
+        s << "<a href=\"../index-category.html#"<< *ci <<"\">" << *ci 
+         << "</a>&nbsp;\n";
+      }
+    s << "</TD></TR>\n";      
     std::string inc = GetScriptFileName();
     if (inc.size()>0) 
       {
@@ -311,7 +320,7 @@ namespace bbtk
        
     if (B.size()) 
     {
-          (s) << "<TR><TD style='vertical-align: top;'><b> Dependencies </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
+          (s) << "<TR><TD style='vertical-align: top;'><b> Uses </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
 
           std::set<BlackBoxDescriptor*> pdeps;
           ComplexBlackBox::BlackBoxMapType::const_iterator b;

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 3652d95a8f364681ee8fdf2f2cffa2a653b8813a..48963f21558658cca8ec5c79aa42a29342a5e3dc 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/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<std::string> categories;
-
                std::string delimiters = ";,";
                Utilities::SplitString(j->second->GetCategory(),
                                       delimiters,keys);
-
-               //std::vector<std::string>::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<std::string>::const_iterator k;
@@ -1021,8 +1010,17 @@ namespace bbtk
       {
        s << "<p><hr>\n";
        s << "<p><a href=\"#Top\">Top</a>";
-       s << "<a name=\""<<ii->first<<"\"></a>\n"; 
-       s << "<p><b>"<<ii->first<<"</b>\n";
+       if (type==Packages)
+         {
+           s << "<a name=\""<<ii->first<<"\"></a>\n"; 
+           s << "<p><a href=\""<<ii->first<<"/index.html\">"
+             << ii->first<<"</a>\n"; 
+         }
+       else 
+         {
+           s << "<a name=\""<<ii->first<<"\"></a>\n"; 
+           s << "<p><b>"<<ii->first<<"</b>\n";
+         }
        s << "<ul>\n";
 
        s << "<p><TABLE cellspacing=0  cellpadding=3>\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 << "<TR>";
            s << "<TD style='vertical-align: top;'>";
            s << "&nbsp;&nbsp;&nbsp;<a href=\""<<pack

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 3518a01cbebe48238dd81919c244777d549e5ca4..5fd8cce424c9b726b72dd34bac9c7ae90cab2e10 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/02/06 10:51:28 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/02/08 07:39:49 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -533,6 +533,7 @@ namespace bbtk
        std::string name = i->second->GetTypeName();
        Utilities::html_format(name);
        std::string descr = i->second->GetDescription();
+       Utilities::html_format(descr);
 
         s << "<TR>";
        s << "<TD style='vertical-align: top;'>";

diff --git a/packages/itk/PackageConfig.cmake.in b/packages/itk/PackageConfig.cmake.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bec06eb52eea7c072b48f2acc3a7b9818670807a 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2ecb2066eb20bdbd01be6505e7f93e60766bb056 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bec06eb52eea7c072b48f2acc3a7b9818670807a 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2ecb2066eb20bdbd01be6505e7f93e60766bb056 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bec06eb52eea7c072b48f2acc3a7b9818670807a 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2ecb2066eb20bdbd01be6505e7f93e60766bb056 100644 (file)
--- 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