X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxDescriptor.cxx;h=e9436f562a69b642141c6646217807413b8b4431;hb=8a15ae69662abfba701a970f9efee218e0b126d3;hp=c81206d1c75946e72848571b71f6b419ce4c9ecb;hpb=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index c81206d..e9436f5 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/06 14:14:22 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/02/19 18:40:09 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,7 @@
 #include "bbtkMessageManager.h"
 #include "bbtkPackage.h"
 #include "bbtkUtilities.h"
-#include "bbtkUserBlackBoxDescriptor.h"
+#include "bbtkAtomicBlackBoxDescriptor.h"
 #include "bbtkWxBlackBox.h"
 
 namespace bbtk
@@ -232,20 +232,31 @@ namespace bbtk
 
 
     std::string descr = GetDescription();
-    //Utilities::html_format(descr);
+    Utilities::html_format(descr);
     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";
@@ -280,7 +291,7 @@ namespace bbtk
       std::string col(usercol);
       int iotype = 0;
       if (in->second->GetCreatorTypeInfo() == 
-	  typeid(UserBlackBoxDescriptor))
+	  typeid(AtomicBlackBoxDescriptor))
 	{
 	  col = ubbcol; 
 	  iotype = 1;
@@ -301,7 +312,7 @@ namespace bbtk
       Utilities::html_format(type);
       
       std::string descr(in->second->GetDescription());
-      //Utilities::html_format(descr);
+      Utilities::html_format(descr);
       
       std::string out = 
 	"<TR><TD style='vertical-align: top;' bgcolor=\"" + col
@@ -343,7 +354,7 @@ namespace bbtk
 	std::string col(usercol);
 	int iotype = 0;
 	if (o->second->GetCreatorTypeInfo() == 
-	    typeid(UserBlackBoxDescriptor))
+	    typeid(AtomicBlackBoxDescriptor))
 	  {
 	    col = ubbcol; 
 	    iotype = 1;
@@ -364,7 +375,7 @@ namespace bbtk
 	Utilities::html_format(type);
 	
 	std::string descr(o->second->GetDescription());
-	//Utilities::html_format(descr);
+	Utilities::html_format(descr);
 	
 	std::string out = 
 	  "<TR><TD style='vertical-align: top;' bgcolor=\"" + col