From: jean-pierre roux Date: Wed, 30 Jan 2008 12:14:42 +0000 (+0000) Subject: Keywords X-Git-Tag: r0.6.1~302 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d74933e88492b90684ad0648d9ca7eb9d6ecb720;p=bbtk.git Keywords --- diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index 050231e..5aa953d 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/01/30 09:28:15 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/01/30 12:14:42 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -91,6 +91,7 @@ namespace bbtk <"<second->GetName().size()>namelmax) - namelmax = i->second->GetName().size(); - if (i->second->GetHumanTypeName().size()>typelmax) - typelmax = i->second->GetHumanTypeName().size(); - } + { + if (i->second->GetName().size()>namelmax) + namelmax = i->second->GetName().size(); + if (i->second->GetHumanTypeName().size()>typelmax) + typelmax = i->second->GetHumanTypeName().size(); + } OutputDescriptorMapType::const_iterator o; for ( o = mOutput.begin(); o != mOutput.end(); ++o ) - { - if (o->second->GetName().size()>namelmax) - namelmax = o->second->GetName().size(); - if (o->second->GetHumanTypeName().size()>typelmax) - typelmax = o->second->GetHumanTypeName().size(); - } + { + if (o->second->GetName().size()>namelmax) + namelmax = o->second->GetName().size(); + if (o->second->GetHumanTypeName().size()>typelmax) + typelmax = o->second->GetHumanTypeName().size(); + } // for ( i = mInput.begin(); i != mInput.end(); ++i ) - { - std::string name(i->second->GetName()); - name += "'"; - name.append(1+namelmax-name.size(),' '); - std::string type(i->second->GetHumanTypeName()); - type += ">"; - type.append(1+typelmax-type.size(),' '); - bbtkMessage("Help",1, + { + std::string name(i->second->GetName()); + name += "'"; + name.append(1+namelmax-name.size(),' '); + std::string type(i->second->GetHumanTypeName()); + type += ">"; + type.append(1+typelmax-type.size(),' '); + bbtkMessage("Help",1, " '"<second->GetDescription()<second->GetName()); - name += "'"; - name.append(1+namelmax-name.size(),' '); - std::string type(o->second->GetHumanTypeName()); - type += ">"; - type.append(1+typelmax-type.size(),' '); - bbtkMessage("Help",1, + { + std::string name(o->second->GetName()); + name += "'"; + name.append(1+namelmax-name.size(),' '); + std::string type(o->second->GetHumanTypeName()); + type += ">"; + type.append(1+typelmax-type.size(),' '); + bbtkMessage("Help",1, " '"<second->GetDescription()<\n"; (s) << "\n"; (s) << "
Description : " @@ -238,7 +243,7 @@ namespace bbtk (s) << "
Author(s) : " << author << "
\n"; - + //------------- // Graph //i->second->InsertHTMLGraph( &s , detail,level,dir); @@ -257,23 +262,23 @@ namespace bbtk InputDescriptorMapType::const_iterator in; for ( in = imap.begin(); in != imap.end(); ++in ) - { - std::string name(in->second->GetName()); - Utilities::html_format(name); - - std::string type("<"); - type += in->second->GetTypeName(); - type += ">"; - Utilities::html_format(type); + { + std::string name(in->second->GetName()); + Utilities::html_format(name); - std::string descr(in->second->GetDescription()); - //Utilities::html_format(descr); + std::string type("<"); + type += in->second->GetTypeName(); + type += ">"; + Utilities::html_format(type); - (s) << "
 "<"
-	  << "
 "<"
-	  << ""<\n";
+	   std::string descr(in->second->GetDescription());
+	   //Utilities::html_format(descr);
+
+	   (s) << "
 "<"
+	       << "
 "<"
+	       << ""<\n";
 	
-      }
+    }
     //	(s) << "\n";
     
     
@@ -290,24 +295,24 @@ namespace bbtk
     BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o;
     
     for ( o = omap.begin();  o != omap.end(); ++o ) 
-      {
-	std::string name(o->second->GetName());
-	Utilities::html_format(name);
-	
-	std::string type("<");
-	type += o->second->GetTypeName();    
-	type += ">";
-	Utilities::html_format(type);
+    {
+	   std::string name(o->second->GetName());
+	   Utilities::html_format(name);
+
+	   std::string type("<");
+	   type += o->second->GetTypeName();    
+	   type += ">";
+	   Utilities::html_format(type);
 	
-	std::string descr(o->second->GetDescription());
-	//Utilities::html_format(descr);
+	   std::string descr(o->second->GetDescription());
+	   //Utilities::html_format(descr);
 	
 	
-	(s) << "
 "<"
-	  << "
 "<"
-	  << ""<\n";
+	   (s) << "
 "<"
+	       << "
 "<"
+	       << ""<\n";
 	
-      }
+    }
     (s) << "\n";
 
     //------------
diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index 4d6b6e8..2631a33 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/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/01/30 12:14:43 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -278,15 +278,23 @@ namespace bbtk
 
     std::string descr = GetDescription();
     //Utilities::html_format(descr);
+    
     std::string author = GetAuthor();
     Utilities::html_format(author);
     
+    std::string keyword = GetKeyword();
+    Utilities::html_format(keyword);
+        
     (s) << "
\n";
     (s) << "\n";
+        << descr << "\n";
+
     (s) << "\n";
-     
+        << author << "\n";
+
+    (s) << "\n";      
+
     std::string inc = GetScriptFileName();
     if (inc.size()>0) 
       {
@@ -298,38 +306,37 @@ namespace bbtk
     const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
 	
     if (B.size()) 
-      {
-	(s) << "\n";
+	    (s) << "\n";
 
-      }
+     }
 
-    (s) << "
 Description  :  " 
-      << descr << "
 Author(s)  :   " 
-      << author << "
 Keyword(s)  :   " 
+        << keyword << "
 Dependencies  :   ";
- 
-
-
-	std::set pdeps;
-	ComplexBlackBox::BlackBoxMapType::const_iterator b;
-	for ( b = B.begin(); b != B.end(); ++b ) 
-	  {
-	    BlackBoxDescriptor* d = b->second->bbGetDescriptor();
-	    if (pdeps.find(d) != pdeps.end()) continue;
-	    pdeps.insert(d);
-
-	    Package* p = d->GetPackage();
+    {
+	   (s) << "
 Dependencies  :   ";
+
+	   std::set pdeps;
+	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
+	   for ( b = B.begin(); b != B.end(); ++b ) 
+	   {
+	      BlackBoxDescriptor* d = b->second->bbGetDescriptor();
+	      if (pdeps.find(d) != pdeps.end()) 
+            continue;
+	      pdeps.insert(d);
+
+	      Package* p = d->GetPackage();
 	    
-	    std::string name = b->second->bbGetTypeName();
+	      std::string name = b->second->bbGetTypeName();
 
-	    std::string url;
-	    if (relative_link) 
-	      url = p->GetDocRelativeURL();
-	    else 
-	      url = p->GetDocURL();
+	      std::string url;
+	      if (relative_link) 
+	         url = p->GetDocRelativeURL();
+	      else 
+	         url = p->GetDocURL();
 
-	    s << "" 
-	      << p->GetName()<<"::"<\n";
-	  }	
+	      s << "" 
+	        << p->GetName()<<"::"<\n";
+	    }	
 	
-	(s) << "
\n";
+     (s) << "\n";
 
  
    //-------------
@@ -395,7 +402,6 @@ namespace bbtk
 	std::string descr(o->second->GetDescription());
 	//Utilities::html_format(descr);
 	
-	
 	(s) << "
 "<"
 	  << "
 "<"
 	  << ""<\n";
@@ -417,8 +423,9 @@ namespace bbtk
     if (full) bbtkMessage("Help",1,"Complex Black Box <"<<
 			  GetPackage()->GetName()<<"::"
 			  <"<second->GetName().size()>namelmax) 
-	  namelmax = i->second->GetName().size();
-	if (i->second->GetTypeName().size()>typelmax) 
-	  typelmax = i->second->GetTypeName().size();
-      }
+    {
+	   if (i->second->GetName().size()>namelmax) 
+	     namelmax = i->second->GetName().size();
+	   if (i->second->GetTypeName().size()>typelmax) 
+	     typelmax = i->second->GetTypeName().size();
+    }
     OutputDescriptorMapType::const_iterator o;
     if (full) 
-      {
-	for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
-	  {
-	    if (o->second->GetName().size()>namelmax) 
-	      namelmax = o->second->GetName().size();
+    {
+	   for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
+	   {
+	     if (o->second->GetName().size()>namelmax) 
+	       namelmax = o->second->GetName().size();
 	    if (o->second->GetTypeName().size()>typelmax) 
-	      typelmax = o->second->GetTypeName().size();
-	  }
-      }
+	       typelmax = o->second->GetTypeName().size();
+	   }
+    }
     //
 
     for ( i = mInput.begin();  i != mInput.end(); ++i ) 
-      {
-	std::string name(i->second->GetName());
-	name += "'";
-	name.append(1+namelmax-name.size(),' ');
-	std::string type(i->second->GetTypeName());
-	type += ">";
-	type.append(1+typelmax-type.size(),' ');
-	bbtkMessage("Help",1,
+    {
+	   std::string name(i->second->GetName());
+	   name += "'";
+	   name.append(1+namelmax-name.size(),' ');
+	   std::string type(i->second->GetTypeName());
+	   type += ">";
+	   type.append(1+typelmax-type.size(),' ');
+	   bbtkMessage("Help",1,
 		    "    '"<second->GetDescription()<second->GetName());
-	    name += "'";
-	    name.append(1+namelmax-name.size(),' ');
-	    std::string type(o->second->GetTypeName());
-	    type += ">";
-	    type.append(1+typelmax-type.size(),' ');
-	    bbtkMessage("Help",1,
-			"    '"<second->GetDescription()<second->GetName());
+	     name += "'";
+	     name.append(1+namelmax-name.size(),' ');
+	     std::string type(o->second->GetTypeName());
+	     type += ">";
+	     type.append(1+typelmax-type.size(),' ');
+	     bbtkMessage("Help",1,
+			 "    '"<second->GetDescription()<bbGetBlackBoxMap();
+    {
+	   const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
 	
-	if (B.size()) 
-	  bbtkMessage("Help",1," * Boxes : "<second->bbGetName()<<
-			"' <"
-			<< b->second->bbGetDescriptor()->GetPackage()->GetName() 
-			<<"::"
-			<second->bbGetTypeName()<<">"<second->bbGetName()<<
+			 "' <"
+			 << b->second->bbGetDescriptor()->GetPackage()->GetName() 
+			 <<"::"
+			 <second->bbGetTypeName()<<">"<GetVersion()
            <<" (bbtk "
            <GetBBTKVersion()<<") "
-           <GetAuthor()
+           <GetAuthor() << " Keyword(s) :"
+           <GetKeyword()
            <GetDescription()<first<<" ");
+      
       if (i->second.mPackage->GetVersion().length()>0)
         bbtkMessageCont("Help",1,"v" <second.mPackage->GetVersion());
+        
       if (i->second.mPackage->GetAuthor().length()>0)
         bbtkMessageCont("Help",1,"- "<second.mPackage->GetAuthor());
+        
+      if (i->second.mPackage->GetKeyword().length()>0)
+        bbtkMessageCont("Help",1,"- "<second.mPackage->GetKeyword());        
+        
       bbtkMessageCont("Help",1,std::endl);
       bbtkIncTab("Help",1);
       bbtkMessage("Help",1,i->second.mPackage->GetDescription()<second;
-      } 
+         i!=mBlackBoxMap.end();
+       ++i) 
+     {
+        delete i->second;
+     } 
     // Adaptors are also stored in the black box map : hence already deleted
     /*
     AdaptorMapType::const_iterator j;
     for (j=mAdaptorMap.begin();
-	 j!=mAdaptorMap.end();
-	 ++j) 
+         j!=mAdaptorMap.end();
+       ++j) 
       {
-	delete j->second;
-	}
+         delete j->second;
+      }
     */ 
     bbtkDebugDecTab("Core",7);
   }
@@ -104,10 +104,10 @@ namespace bbtk
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(type);
     if (i == mBlackBoxMap.end())  
-      {
-	bbtkDebugDecTab("Core",8);
-	return 0;
-      }
+    {
+	   bbtkDebugDecTab("Core",8);
+	   return 0;
+    }
     BlackBox* bb =i->second->CreateInstance(name);
     bbtkDebugDecTab("Core",8);
     return bb;   
@@ -165,7 +165,7 @@ namespace bbtk
 	AdaptorMapType::const_iterator i = mAdaptorMap.find(key);
 	if (i == mAdaptorMap.end())  
 	  {
-	    bbtkDebugMessage("Core",8,"The box is an adaptor, inserting it in adaptors map ..."< as default adaptor but there is already a default adaptor registered (<"
 		      <second->GetTypeName()<<">)");
 	  }
-	
-
       }
     
     bbtkDebugDecTab("Core",8);
@@ -196,17 +194,17 @@ namespace bbtk
     // Looking into the bb map
     BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
-      {
-	bbtkDebugDecTab("Core",8);
-	bbtkError("UnRegister : The package <"< does not contains the black box <"<");
-      }
+    {
+       bbtkDebugDecTab("Core",8);
+       bbtkError("UnRegister : The package <"< does not contains the black box <"<");
+     }
     mBlackBoxMap.erase(i);
     // Is it also in the adaptors map ?
     /*
     AdaptorMapType::iterator j = mAdaptorMap.find(name);
     if (j != mAdaptorMap.end())  
       {
-	mAdaptorMap.erase(j);
+         mAdaptorMap.erase(j);
       }
     */    
     bbtkDebugDecTab("Core",8);    
@@ -222,8 +220,8 @@ namespace bbtk
     BlackBoxMapType::iterator i = mBlackBoxMap.find(oldname);
     if (i == mBlackBoxMap.end())  
       {
-	bbtkDebugDecTab("Core",8);
-	bbtkError("ChangeBlackBoxName : The package <"< does not contains the black box <"<");
+         bbtkDebugDecTab("Core",8);
+         bbtkError("ChangeBlackBoxName : The package <"< does not contains the black box <"<");
       }
 
     i->second->SetTypeName(newname);
@@ -318,7 +316,7 @@ namespace bbtk
 	else 
 	  bbtkMessage("Help",1,d << std::endl);
 	//    d = d.substr(dmax,d.size());
-	//  }	
+	//  }
       }
 
   }
@@ -347,7 +345,7 @@ namespace bbtk
 	      {
 		bbtkMessage("Help",1,
 			    " : "<second->GetDescription());
-		
+
 	      } 
 	    bbtkMessage("Help",1,std::endl);
 	  }
@@ -364,7 +362,7 @@ namespace bbtk
 	  {
 	    bbtkMessage("Help",1,
 			" : "<second->GetDescription());
-	  
+  
 	  } 
 	bbtkMessage("Help",1,std::endl);
       }
@@ -402,10 +400,10 @@ namespace bbtk
     
     BlackBoxMapType::const_iterator i = mBlackBoxMap.find(name);
     if (i == mBlackBoxMap.end())  
-      {
-	bbtkDebugDecTab("Core",8);
-	return false;
-      }
+    {
+      bbtkDebugDecTab("Core",8);
+      return false;
+    }
     bbtkDebugDecTab("Core",8);
     return true;
   }
@@ -416,7 +414,7 @@ namespace bbtk
   //==========================================================================
   void Package::CreateHtmlPage(const std::string& filename,
 			       const std::string& caller,
-			       const std::string& source,	
+			       const std::string& source,
 			       const std::string& custom_header,
 			       const std::string& custom_title,
 			       int detail, 
@@ -431,9 +429,9 @@ namespace bbtk
     std::ofstream s;
     s.open(filename.c_str());
     if (!s.good()) 
-      {
-	bbtkError("Package "<\n";
 	s << " Author(s)  :   " 
 	  << GetAuthor() << "\n";
-	s << " Version  :  " 
+	s << " Author(s)  :   " 
+	  << GetKeyword() << "\n";
+  	s << " Version  :  " 
 	  << GetVersion() << "\n";
 	s << " bbtk Version  :  " 
 	  << GetBBTKVersion() << "\n";
@@ -533,7 +533,7 @@ namespace bbtk
 	std::string name = i->second->GetTypeName();
 	Utilities::html_format(name);
 	std::string descr = i->second->GetDescription();
-	
+
         s << "";
 	s << "";
 	s << "
  • \n";
 	s << "
     Adaptors : \n";
 	s << "
      \n";
-	
+
 	//    BlackBoxMapType::const_iterator i;
 	s << "
      \n";
 	for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end();++i) 
 	  {
 	    if ( i->second->GetCategory() == BlackBoxDescriptor::STANDARD) 
 	      continue;
-	    
+    
 	    std::string name = i->second->GetTypeName();
 	    Utilities::html_format(name);
 	    std::string descr = i->second->GetDescription();
-	    
+    
 	    s << "";
 	    s << "
      ";
 	    s << "
    • \n";
 	  }    
 	s << "
      • \n";
-	
+
 	s << "
    \n";
 	s << "\n";
       }
@@ -605,7 +605,7 @@ namespace bbtk
       filename.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ());
     if (slash_position != std::string::npos) {
       if (slash_position == 0)
-	slash_position = 1;  
+         slash_position = 1;  
       dir = filename.substr(0,slash_position);
     }