X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=2631a337def4b8099797a2ae926c023f9efb22b1;hb=d73a7833a28e6111e1e805efae5df3ab18a240e2;hp=4d6b6e88533c1b74a84e978766b12cf5d6c40fe4;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git
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) << " Description | : | "
- << descr << " |
\n";
+ << descr << "\n";
+
(s) << " Author(s) | : | "
- << author << " |
\n";
-
+ << author << "\n";
+
+ (s) << " Keyword(s) | : | "
+ << keyword << " |
\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) << " 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";
- }
+ }
- (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()<<">"<