X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxDescriptor.cxx;h=04ede1c4a7717f3efe2bb9fecca3b88816cbe9e0;hb=0d9c3f691b5889816aea4d7e813f58e1950f81ed;hp=050231eccab747e7a3b638cf2666e732d50bd51c;hpb=2d76cd309d74d5f83d701d6bb0a4140d5d122b36;p=bbtk.git diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index 050231e..04ede1c 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/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 @@ -24,6 +24,8 @@ #include "bbtkMessageManager.h" #include "bbtkPackage.h" #include "bbtkUtilities.h" +#include "bbtkAtomicBlackBoxDescriptor.h" +#include "bbtkWxBlackBox.h" namespace bbtk { @@ -34,11 +36,11 @@ namespace bbtk : mTypeName("Unknown"), mDescription(""), mAuthor(""), - mKeyword(""), - mCategory(STANDARD), + mCategory(""), + mKind(STANDARD), mPackage(NULL) { - bbtkDebugMessage("Core",9, + bbtkDebugMessage("Kernel",9, "BlackBoxDescriptor::BlackBoxDescriptor()"<second; - bbtkDebugDecTab("Core",9); + bbtkDebugDecTab("Kernel",9); } //========================================================================= @@ -65,7 +67,7 @@ namespace bbtk /// Adds the string to the BlackBox description void BlackBoxDescriptor::AddToDescription( const std::string& s, bool clear) { - bbtkDebugMessage("Core",9,"BlackBoxDescriptor::AddToDescription(\""<second; } //========================================================================= @@ -116,7 +119,7 @@ namespace bbtk const BlackBoxDescriptor::OutputDescriptor* BlackBoxDescriptor::GetOutputDescriptor(const std::string & name) const { - bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::GetOutputDescriptor('" + bbtkDebugMessageInc("Kernel",9,"BlackBoxDescriptor::GetOutputDescriptor('" <second; } //========================================================================= @@ -133,7 +136,7 @@ namespace bbtk //========================================================================= void BlackBoxDescriptor::GetHelp(bool full) const { - bbtkDebugMessageInc("Core",9,"BlackBoxDescriptor::GetHelp() ["<"<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()< categories; + // Split the category string + std::string delimiters = ";,"; + Utilities::SplitString(GetCategory(), + delimiters,categories); + (s) << "

\n"; (s) << "\n"; (s) << "\n"; + (s) << "\n"; + + (s) << "\n"; (s) << "
Description : " << descr << "
Author(s) : " << author << "
Category(s) : "; + std::vector::iterator ci; + for (ci=categories.begin(); ci!=categories.end(); ++ci) + { + s << "" << *ci + << " \n"; + } + s << "
To use it : include " + << GetPackage()->GetName() << "
\n"; - + //------------- // Graph //i->second->InsertHTMLGraph( &s , detail,level,dir); //------------- // Inputs - std::string col("#CCCCFF"); - + std::string titlecol("#BBBBFF"); + std::string usercol("#FFFFFF"); + std::string ubbcol("#DDFFFF"); + std::string wxbbcol("#EEFFFF"); + + // (s) << "

Inputs

\n"; (s) << "

\n"; - (s) << "\n"; + + std::vector user_defined; + std::vector ubb_defined; + std::vector wxbb_defined; + const BlackBoxDescriptor::InputDescriptorMapType& imap = GetInputDescriptorMap(); - 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 descr(in->second->GetDescription()); - //Utilities::html_format(descr); + { + // Skips system-defined inputs + std::string col(usercol); + int iotype = 0; + if (in->second->GetCreatorTypeInfo() == + typeid(AtomicBlackBoxDescriptor)) + { + col = ubbcol; + iotype = 1; + } + else if (in->second->GetCreatorTypeInfo() == + typeid(WxBlackBoxDescriptor)) + { + col = wxbbcol; + iotype = 2; + } + + std::string name(in->second->GetName()); + Utilities::html_format(name); + + std::string type("<"); + type += in->second->GetTypeName(); + type += ">"; + Utilities::html_format(type); + + std::string descr(in->second->GetDescription()); + Utilities::html_format(descr); + + std::string out = + "" + + "" + + "\n"; + + if (iotype==0) user_defined.push_back(out); + else if (iotype==1) ubb_defined.push_back(out); + else if (iotype==2) wxbb_defined.push_back(out); + + } + + std::vector::iterator hi; + for (hi=user_defined.begin();hi!=user_defined.end();++hi) s << *hi; + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) s << *hi; + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) s << *hi; + + user_defined.clear(); + ubb_defined.clear(); + wxbb_defined.clear(); - (s) << "" - << "" - << "\n"; - - } - // (s) << "
Inputs
 "+name+" 
 "+type+"
"+descr+"
 "<
 "<
"<
\n"; - - //------------- // Outputs // (s) << "

Outputs

\n"; // (s) << "\n"; - (s) << "\n"; const BlackBoxDescriptor::OutputDescriptorMapType& omap = @@ -291,6 +351,21 @@ namespace bbtk for ( o = omap.begin(); o != omap.end(); ++o ) { + std::string col(usercol); + int iotype = 0; + if (o->second->GetCreatorTypeInfo() == + typeid(AtomicBlackBoxDescriptor)) + { + col = ubbcol; + iotype = 1; + } + else if (o->second->GetCreatorTypeInfo() == + typeid(WxBlackBoxDescriptor)) + { + col = wxbbcol; + iotype = 2; + } + std::string name(o->second->GetName()); Utilities::html_format(name); @@ -300,20 +375,32 @@ namespace bbtk Utilities::html_format(type); std::string descr(o->second->GetDescription()); - //Utilities::html_format(descr); + Utilities::html_format(descr); + std::string out = + "" + + "" + + "\n"; - (s) << "" - << "" - << "\n"; + if (iotype==0) user_defined.push_back(out); + else if (iotype==1) ubb_defined.push_back(out); + else if (iotype==2) wxbb_defined.push_back(out); } - (s) << "
Outputs
 "+name+" 
 "+type+"
"+descr+"
 "<
 "<
"<
\n"; + + for (hi=user_defined.begin();hi!=user_defined.end();++hi) s << *hi; + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) s << *hi; + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) s << *hi; + (s) << "\n"; + //------------ // End - bbtkDebugDecTab("Core",9); + bbtkDebugDecTab("Kernel",9); } //=========================================================================