X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkPackage.cxx;h=21dfbe3c63aa0980105fd82183b900b04c339b33;hb=998354bb81a4f450cae3a2263838d7d3b6024bac;hp=7b50aefd251f3e9ef3503a424fc8c3de3623a6d4;hpb=d74933e88492b90684ad0648d9ca7eb9d6ecb720;p=bbtk.git

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 7b50aef..21dfbe3 100644
--- 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/01/30 12:14:43 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/02/05 12:16:55 $
+  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
@@ -157,7 +157,7 @@ namespace bbtk
     d->SetPackage(this);
     
     // If it is a default adaptor, also register it in the adaptors map
-    if ( d->GetCategory() == BlackBoxDescriptor::DEFAULT_ADAPTOR) 
+    if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR) 
       {
 	TypeInfo typein = d->GetInputDescriptor("In")->GetTypeInfo();
 	TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo();
@@ -257,7 +257,7 @@ namespace bbtk
   {
     unsigned int lmax = 0;
     std::vector<std::string> names;
-    std::vector<std::string> categs;
+    std::vector<std::string> kinds;
     std::vector<std::string> descrs;
 
     BlackBoxMapType::const_iterator i;
@@ -266,25 +266,25 @@ namespace bbtk
 	 ++i) 
       {
 	if ( adaptors || 
-	     ( i->second->GetCategory() == BlackBoxDescriptor::STANDARD) ) 
+	     ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) ) 
 	  {
 	    std::string name("  ");
 	    name += i->second->GetTypeName();
 	    names.push_back(name);
 
-	    std::string categ;
-	    if ( i->second->GetCategory() == BlackBoxDescriptor::ADAPTOR )
+	    std::string kind;
+	    if ( i->second->GetKind() == BlackBoxDescriptor::ADAPTOR )
 	      {
-		categ = std::string("[A]");
+		kind = std::string("[A]");
 	      }
-	    else if ( i->second->GetCategory() == 
+	    else if ( i->second->GetKind() == 
 		      BlackBoxDescriptor::DEFAULT_ADAPTOR )
 	      {
-		categ = std::string("[DA]");
+		kind = std::string("[DA]");
 	      }
-	    categs.push_back(categ);
+	    kinds.push_back(kind);
 
-	    unsigned int l = name.size()+categ.size();
+	    unsigned int l = name.size()+kind.size();
 	    if (l>lmax) lmax = l;
 
 	    std::string descr;
@@ -301,7 +301,7 @@ namespace bbtk
     std::string offs;
     offs.append(lmax+3,' ');
     std::vector<std::string>::iterator ni,ci,di;
-    for (ni = names.begin(), ci = categs.begin(), di = descrs.begin();
+    for (ni = names.begin(), ci = kinds.begin(), di = descrs.begin();
 	 ni != names.end(); ++ni, ++ci, ++di)
       {
 	std::string space;
@@ -331,11 +331,11 @@ namespace bbtk
 	 i!=mBlackBoxMap.end();
 	 ++i) 
       {
-	if ( i->second->GetCategory() != BlackBoxDescriptor::STANDARD ) 
+	if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD ) 
 	  {
 	    bbtkMessage("Help",1,
 			"  "<<i->second->GetTypeName());
-	    if ( i->second->GetCategory() == 
+	    if ( i->second->GetKind() == 
 		 BlackBoxDescriptor::DEFAULT_ADAPTOR )
 	      {
 		bbtkMessage("Help",1,
@@ -507,7 +507,7 @@ 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;'>  " 
 	  << GetAuthor() << "</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;'>  " 
-	  << GetKeyword() << "</TD></TR>\n";
+	  << GetCategory() << "</TD></TR>\n";
   	s << "<TR><TD style='vertical-align: top;'><b> Version </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 
 	  << GetVersion() << "</TD></TR>\n";
 	s << "<TR><TD style='vertical-align: top;'><b> bbtk Version </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 
@@ -527,7 +527,7 @@ namespace bbtk
     BlackBoxMapType::const_iterator i;
     for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end(); ++i) 
       {
-	if ( i->second->GetCategory() != BlackBoxDescriptor::STANDARD) 
+	if ( i->second->GetKind() != BlackBoxDescriptor::STANDARD) 
 	  continue;
 	
 	std::string name = i->second->GetTypeName();
@@ -561,7 +561,7 @@ namespace bbtk
 	s << "<p><TABLE cellspacing=0  cellpadding=3>\n";
 	for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end();++i) 
 	  {
-	    if ( i->second->GetCategory() == BlackBoxDescriptor::STANDARD) 
+	    if ( i->second->GetKind() == BlackBoxDescriptor::STANDARD) 
 	      continue;
     
 	    std::string name = i->second->GetTypeName();