From 998354bb81a4f450cae3a2263838d7d3b6024bac Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Tue, 5 Feb 2008 12:16:54 +0000 Subject: [PATCH] keyword -> category --- kernel/appli/bbi/bbs-mode.el | 2 +- kernel/doc/bbtkWebSite/menu.html | 2 + kernel/src/bbtkBlackBoxDescriptor.cxx | 28 ++--- kernel/src/bbtkBlackBoxDescriptor.h | 24 ++-- kernel/src/bbtkComplexBlackBoxDescriptor.cxx | 18 +-- kernel/src/bbtkExecuter.cxx | 8 +- kernel/src/bbtkExecuter.h | 8 +- kernel/src/bbtkFactory.cxx | 27 ++-- kernel/src/bbtkInterpreter.cxx | 123 ++++++++++--------- kernel/src/bbtkInterpreter.h | 8 +- kernel/src/bbtkMessageManager.h | 4 +- kernel/src/bbtkPackage.cxx | 6 +- kernel/src/bbtkPackage.h | 12 +- kernel/src/bbtkTranscriptor.h | 8 +- kernel/src/bbtkUserBlackBoxMacros.h | 8 +- kernel/src/bbtkVirtualExec.h | 8 +- packages/wx/bbs/appli/testSlider.bbs | 2 +- packages/wx/bbs/boxes/bbDoubleSlider.bbs | 2 +- packages/wx/src/bbwxSlider.h | 6 +- packages/wx/src/bbwxSplit.h | 6 +- 20 files changed, 162 insertions(+), 148 deletions(-) diff --git a/kernel/appli/bbi/bbs-mode.el b/kernel/appli/bbi/bbs-mode.el index e6d0df0..bc61891 100644 --- a/kernel/appli/bbi/bbs-mode.el +++ b/kernel/appli/bbi/bbs-mode.el @@ -42,7 +42,7 @@ "set" "unload" "index" - "keyword" + "category" ) t ) "Highlighting expressions for bbs mode.") ) diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html index e51744f..5a06bcb 100644 --- a/kernel/doc/bbtkWebSite/menu.html +++ b/kernel/doc/bbtkWebSite/menu.html @@ -48,8 +48,10 @@ Reference (pdf)
href="../bbdoc/index-alpha.html">Alphabetical list
List by package
+ List by category
+
diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index cde4b51..be29eb4 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/05 11:07:42 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/05 12:16:55 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,7 +34,7 @@ namespace bbtk : mTypeName("Unknown"), mDescription(""), mAuthor(""), - mKeyword(""), + mCategory(""), mKind(STANDARD), mPackage(NULL) { @@ -84,14 +84,14 @@ namespace bbtk //========================================================================= //========================================================================= - /// Adds the string to the BlackBox keyword list - void BlackBoxDescriptor::AddToKeyword( const std::string& s, bool clear) + /// Adds the string to the BlackBox category list + void BlackBoxDescriptor::AddToCategory( const std::string& s, bool clear) { - bbtkDebugMessage("Core",9,"BlackBoxDescriptor::AddToKeyword(\""<"<\n"; (s) << "
Description : " diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h index 0604f9c..1c15241 100644 --- a/kernel/src/bbtkBlackBoxDescriptor.h +++ b/kernel/src/bbtkBlackBoxDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxDescriptor.h,v $ Language: C++ - Date: $Date: 2008/02/05 11:07:42 $ - Version: $Revision: 1.3 $ + 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 @@ -77,8 +77,8 @@ namespace bbtk /// Returns the author(s) of the BlackBox const std::string& GetAuthor() const { return mAuthor; } - /// Returns the keyword(s) of the BlackBox - const std::string& GetKeyword() const { return mKeyword; } + /// Returns the category(s) of the BlackBox + const std::string& GetCategory() const { return mCategory; } /// Returns the Package to which the box belongs Package* GetPackage() { return mPackage; } @@ -101,10 +101,10 @@ namespace bbtk { return mOutput; } /// Returns a const pointer on the descriptor of the input of name - const InputDescriptor* GetInputDescriptor(const std::string & name) const; + const InputDescriptor* GetInputDescriptor(const std::string &name) const; /// Returns a const pointer on the descriptor of the output of name - const OutputDescriptor* GetOutputDescriptor(const std::string & name) const; + const OutputDescriptor* GetOutputDescriptor(const std::string &name) const; /// Sets the name of the **TYPE** of BlackBox void SetTypeName( const std::string& name ) { mTypeName=name; } @@ -115,8 +115,8 @@ namespace bbtk /// Adds the string to the BlackBox author list void AddToAuthor( const std::string&, bool clear = false ); - /// Adds the string to the BlackBox keyword list - void AddToKeyword( const std::string&, bool clear = false ); + /// Adds the string to the BlackBox category list + void AddToCategory( const std::string&, bool clear = false ); /// Sets the Package to which the box belongs void SetPackage(Package *package) { mPackage = package; } @@ -140,10 +140,10 @@ namespace bbtk protected: /// Adds an input descriptor - void AddInputDescriptor( BlackBoxInputDescriptor* d ) + void AddInputDescriptor( BlackBoxInputDescriptor *d ) { mInput[d->GetName()] = d; } /// Adds an output descriptor - void AddOutputDescriptor( BlackBoxOutputDescriptor* d ) + void AddOutputDescriptor( BlackBoxOutputDescriptor *d ) { mOutput[d->GetName()] = d; } // private: @@ -153,8 +153,8 @@ namespace bbtk std::string mDescription; /// The author of the black box std::string mAuthor; - /// The keyword of the black box - std::string mKeyword; + /// The category of the black box + std::string mCategory; /// The kind of box Kind mKind; /// The Package to which the box belongs diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index 2631a33..ea85e12 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/30 12:14:43 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/05 12:16:55 $ + 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 @@ -282,8 +282,8 @@ namespace bbtk std::string author = GetAuthor(); Utilities::html_format(author); - std::string keyword = GetKeyword(); - Utilities::html_format(keyword); + std::string category = GetCategory(); + Utilities::html_format(category); (s) << "

\n"; (s) << "\n"; - (s) << "\n"; + (s) << "\n"; std::string inc = GetScriptFileName(); if (inc.size()>0) @@ -423,9 +423,9 @@ namespace bbtk if (full) bbtkMessage("Help",1,"Complex Black Box <"<< GetPackage()->GetName()<<"::" <"<AddToAuthor(authorName,Current()==mRoot); } - void Executer::Keyword(const std::string &keyword) + void Executer::Category(const std::string &category) { - Current()->AddToKeyword(keyword,Current()==mRoot); + Current()->AddToCategory(category,Current()==mRoot); } void Executer::Description(const std::string &d) diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h index a7455d9..3415e5b 100644 --- a/kernel/src/bbtkExecuter.h +++ b/kernel/src/bbtkExecuter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkExecuter.h,v $ $ Language: C++ - Date: $Date: 2008/02/05 11:07:42 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/05 12:16:55 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -122,8 +122,8 @@ namespace bbtk ///Adds the authorName to the Box author list void Author(const std::string &authorName); - ///Adds the Keywords to the Box keyword list - void Keyword(const std::string &keyword); + ///Adds the Categories to the Box category list + void Category(const std::string &category); /// The description string which explains what does the ComplexBox void Description(const std::string & d); diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index e994b38..3e6f772 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -4,8 +4,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ -Date: $Date: 2008/02/05 11:39:32 $ -Version: $Revision: 1.12 $ +Date: $Date: 2008/02/05 12:16:55 $ +Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de @@ -238,8 +238,8 @@ namespace bbtk <GetVersion() <<" (bbtk " <GetBBTKVersion()<<") " - <GetAuthor() << " Keyword(s) :" - <GetKeyword() + <GetAuthor() << " Category(s) :" + <GetCategory() <GetDescription()<second.mPackage->GetAuthor().length()>0) bbtkMessageCont("Help",1,"- "<second.mPackage->GetAuthor()); - if (i->second.mPackage->GetKeyword().length()>0) - bbtkMessageCont("Help",1,"- "<second.mPackage->GetKeyword()); + if (i->second.mPackage->GetCategory().length()>0) + bbtkMessageCont("Help",1,"- "<second.mPackage->GetCategory()); bbtkMessageCont("Help",1,std::endl); bbtkIncTab("Help",1); @@ -931,10 +931,21 @@ namespace bbtk } else if (type==Categories) { - // Split the keyword string + + // Split the category string + //std::vector categories; + std::string delimiters = ";,"; - Utilities::SplitString(j->second->GetKeyword(), + Utilities::SplitString(j->second->GetCategory(), delimiters,keys); + + //std::vector::iterator si; + //for (si=categories.begin();si!=categories.end;++si) + // { + // keys.push_back(*si); + // } + title = "Index by category"; + if (keys.size()==0) keys.push_back(" NONE"); title = "List by category"; diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 09954ef..c5a69ca 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/02/05 11:39:32 $ - Version: $Revision: 1.23 $ + Date: $Date: 2008/02/05 12:16:55 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -59,214 +59,215 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; // Builds the commands dict CommandInfoType info; - info.keyword = "new"; + info.category = "new"; info.argmin = 2; info.argmax = 2; info.code = cNew; info.syntax = "new "; info.help = "Creates a new black box of type with name "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "delete"; + info.category = "delete"; info.argmin = 1; info.argmax = 1; info.code = cDelete; info.syntax = "delete "; info.help = "Deletes the black box of name "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "connect"; + info.category = "connect"; info.argmin = 2; info.argmax = 2; info.code = cConnect; info.syntax = "connect "; info.help = "Connects the ouput of black box to the input of black box "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "print"; + info.category = "print"; info.argmin = 1; info.argmax = 1; info.code = cPrint; info.syntax = "print "; info.help = "Prints the string. Substitutes any token of the form '$box.output$' by the string adaptation of the output of the box (requires the right adaptor). No carriage return is issued at the end, use '\\n' to add carriage returns. The level of 'Echo' messages must be greater than 1 (see the command 'message')."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "exec"; + info.category = "exec"; info.argmin = 1; info.argmax = 2; info.code = cExec; info.syntax = "exec "; - info.help = "Executes the black box of name (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; - mCommandDict[info.keyword] = info; + info.help = "Executes the black box of name (and connected boxes if needed). If the special category 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; + mCommandDict[info.category] = info; - info.keyword = "package"; + info.category = "package"; info.argmin = 1; info.argmax = 1; info.code = cPackage; info.syntax = "package "; info.help = "Begins the definition of a package."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "endpackage"; + info.category = "endpackage"; info.argmin = 0; info.argmax = 0; info.code = cEndPackage; info.syntax = "endpackage"; info.help = "Ends the definition of a package."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "define"; + info.category = "define"; info.argmin = 1; info.argmax = 2; info.code = cDefine; info.syntax = "define []"; info.help = "Begins the definition of a new type of complex black box called . If if provided will create it in the given package."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "endefine"; + info.category = "endefine"; info.argmin = 0; info.argmax = 0; info.code = cEndDefine; info.syntax = "endefine"; info.help = "Ends the definition of a new type of complex black box"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "input"; + info.category = "input"; info.argmin = 3; info.argmax = 3; info.code = cInput; info.syntax = "input "; info.help = "Defines the input of the current working black box as being an alias for the input of the black box . defines the help string for the newly created input"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "output"; + info.category = "output"; info.argmin = 3; info.argmax = 3; info.code = cOutput; info.syntax = "output "; info.help = "Defines the output of the current working black box as being an alias for the output of the black box . defines the help string for the newly created output"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "set"; + info.category = "set"; info.argmin = 2; info.argmax = 2; info.code = cSet; info.syntax = "set "; info.help = "Sets the value of the input of the black box to . There must exist a string to the value type adaptor"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "config"; // JPR + info.category = "config"; // JPR info.argmin = 0; info.argmax = 0; info.code = cConfig; info.syntax = "config"; info.help = "Prints the value of all configuration parameters"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "index"; // LG + info.category = "index"; // LG info.argmin = 0; info.argmax = 2; info.code = cIndex; + info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories']]"; info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories"; mCommandDict[info.keyword] = info; - info.keyword = "reset"; //EED + info.category = "reset"; //EED info.argmin = 0; info.argmax = 0; info.code = cReset; info.syntax = "reset"; info.help = "Deletes all boxes and unloads all packages (bbi is reset to its start state)"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "author"; + info.category = "author"; info.argmin = 1; info.argmax = 1; info.code = cAuthor; info.syntax = "author "; info.help = "Adds the string to the author information of the black box being defined"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "keyword"; //JP + info.category = "category"; //JP info.argmin = 1; info.argmax = 1; - info.code = cKeyword; - info.syntax = "keyword "; - info.help = "Adds the string to the keyword information of the black box being defined"; - mCommandDict[info.keyword] = info; + info.code = cCategory; + info.syntax = "category "; + info.help = "Adds the string to the category information of the black box being defined"; + mCommandDict[info.category] = info; - info.keyword = "description"; + info.category = "description"; info.argmin = 1; info.argmax = 1; info.code = cDescription; info.syntax = "description "; info.help = "Adds the string to the descriptive information of the black box being defined"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "help"; + info.category = "help"; info.argmin = 0; info.argmax = 2; info.code = cHelp; info.syntax = "help"; info.syntax = "\n (1) help \n (2) help \n (3) help packages [all]\n (4) help [all]\n (5) help \n (6) help "; info.help = "Effect :\n (1) Lists all available commands;\n (2) Prints help on a particular command; \n (3) Lists the packages loaded and their black boxes.\n Add 'all' to list adaptors; \n (4) Prints short help on the black boxes of a package.\n Add 'all' to include adaptors; \n (5) Prints full help on a black box type; \n (6) Prints information on the inputs, outputs and connections of a black box instance."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "message"; + info.category = "message"; info.argmin = 0; info.argmax = 2; info.code = cMessage; info.syntax = "message "; - info.help = "Sets the level of the kind of messages to .\n If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level."; mCommandDict[info.keyword] = info; + info.help = "Sets the level of the kind of messages to .\n If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level."; mCommandDict[info.category] = info; - info.keyword = "include"; + info.category = "include"; info.argmin = 1; info.argmax = 1; info.code = cInclude; info.syntax = "include "; info.help = "Includes the file "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "quit"; + info.category = "quit"; info.argmin = 0; info.argmax = 0; info.code = cQuit; info.syntax = "quit"; info.help = "Quits the program (during script execution it stops the complete execution)"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "load"; + info.category = "load"; info.argmin = 1; info.argmax = 1; info.code = cLoad; info.syntax = "load "; info.help = "Loads the black box package "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "unload"; + info.category = "unload"; info.argmin = 1; info.argmax = 1; info.code = cUnload; info.syntax = "unload "; info.help = "Unloads the black box package "; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; - info.keyword = "graph"; + info.category = "graph"; info.argmin = 0; info.argmax = 6; info.code = cGraph; info.syntax = "graph [ BlackBoxName [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]] \n graph [ BlackBoxNameType [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]]"; info.help = "Shows a graphical view of a bbtk pipeline.\n- BlackBoxName : name of the box to view. Default '.' : current box.\n- BlackBoxNameType : name of the type of box to view, ex : 'workspace')"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; /* - info.keyword = "workspace"; + info.category = "workspace"; info.argmin = 1; info.argmax = 2; info.code = cWorkspace; info.syntax = "workspace < ( freeze | unfreeze ) | ( rename ) >"; info.help = "Configures the workspace.\n 'freeze' allow to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n 'rename' allow to set a new name to the workspace."; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; */ bbtkDebugDecTab("Interpreter",9); @@ -429,7 +430,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) InterpretCommand(words,command); bbtkDebugMessage("Interpreter",9, - "Command='"<\n"; s << "\n"; + << GetCategory() << "\n"; s << "\n"; s << "
Description : " @@ -292,8 +292,8 @@ namespace bbtk (s) << "
Author(s) : " << author << "
Keyword(s) : " - << keyword << "
Category(s) : " + << category << "
Author(s) : " << GetAuthor() << "
Author(s) : " - << GetKeyword() << "
Version : " << GetVersion() << "
bbtk Version : " diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h index 24edc8f..fb7b32c 100644 --- a/kernel/src/bbtkPackage.h +++ b/kernel/src/bbtkPackage.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkPackage.h,v $ Language: C++ - Date: $Date: 2008/02/04 13:02:58 $ - Version: $Revision: 1.3 $ + 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 @@ -47,8 +47,8 @@ namespace bbtk /// Returns the author of the package const std::string& GetAuthor() const { return mAuthor; } - /// Returns the keyword of the package - const std::string& GetKeyword() const { return mKeyword; } + /// Returns the category of the package + const std::string& GetCategory() const { return mCategory; } /// Returns the description of the package const std::string& GetDescription() const { return mDescription; } @@ -110,8 +110,8 @@ namespace bbtk std::string mName; /// The author of the package std::string mAuthor; - /// The keywords of the package - std::string mKeyword; + /// The categories of the package + std::string mCategory; /// The description of the package std::string mDescription; /// The version of the package diff --git a/kernel/src/bbtkTranscriptor.h b/kernel/src/bbtkTranscriptor.h index 82c95da..c0a2c4f 100644 --- a/kernel/src/bbtkTranscriptor.h +++ b/kernel/src/bbtkTranscriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkTranscriptor.h,v $ $ Language: C++ - Date: $Date: 2008/02/05 11:07:42 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/05 12:16:55 $ + 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 @@ -131,8 +131,8 @@ namespace bbtk ///Adds the authorName to the Box author list void Author(const std::string &authorName); - ///Adds the Keywords to the Box keyword list - void Keyword(const std::string &keyword); + ///Adds the Categories to the Box category list + void Category(const std::string &category); /// The description string which explains what does the ComplexBox void Description(const std::string & d); diff --git a/kernel/src/bbtkUserBlackBoxMacros.h b/kernel/src/bbtkUserBlackBoxMacros.h index a69372a..07839e3 100644 --- a/kernel/src/bbtkUserBlackBoxMacros.h +++ b/kernel/src/bbtkUserBlackBoxMacros.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2008/02/05 11:07:43 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/05 12:16:55 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -243,8 +243,8 @@ //============================================================================ //============================================================================ -/// Declares the keywords of a UserBlackBox (to be put inside the UBB description block) -#define BBTK_KEYWORD(KEYWORD) AddToKeyword(KEYWORD) +/// Declares the categories of a UserBlackBox (to be put inside the UBB description block) +#define BBTK_CATEGORY(CATEGORY) AddToCategory(CATEGORY) //============================================================================ //============================================================================ diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h index 6a74401..f7c2295 100644 --- a/kernel/src/bbtkVirtualExec.h +++ b/kernel/src/bbtkVirtualExec.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkVirtualExec.h,v $ $ Language: C++ - Date: $Date: 2008/02/05 11:07:43 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/05 12:16:56 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -119,8 +119,8 @@ namespace bbtk ///Adds the authorName to the Box author list virtual void Author(const std::string &authorName) = 0; - ///Adds the keywords to the Box keywords list - virtual void Keyword(const std::string &keywords) = 0; + ///Adds the categories to the Box categoris list + virtual void Category(const std::string &categories) = 0; /// The description string which explains what does the ComplexBox virtual void Description(const std::string &d) = 0; diff --git a/packages/wx/bbs/appli/testSlider.bbs b/packages/wx/bbs/appli/testSlider.bbs index 0c07327..8078c51 100644 --- a/packages/wx/bbs/appli/testSlider.bbs +++ b/packages/wx/bbs/appli/testSlider.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::Slider widget" author "laurent.guigues@creatis.insa-lyon.fr" -keyword "test;wx" +category "test;wx" load wx new Slider slider diff --git a/packages/wx/bbs/boxes/bbDoubleSlider.bbs b/packages/wx/bbs/boxes/bbDoubleSlider.bbs index 65ad3c9..ed6226b 100644 --- a/packages/wx/bbs/boxes/bbDoubleSlider.bbs +++ b/packages/wx/bbs/boxes/bbDoubleSlider.bbs @@ -1,6 +1,6 @@ define DoubleSlider description "test object" - keyword "box;wx;slider" + category "box;wx;slider" author "laurent.guigues at creatis.insa-lyon.fr" new Slider slider1 new Slider slider2 diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h index 2b550ed..3a17e3d 100644 --- a/packages/wx/src/bbwxSlider.h +++ b/packages/wx/src/bbwxSlider.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSlider.h,v $ Language: C++ - Date: $Date: 2008/02/04 13:02:58 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/05 12:16:56 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -147,7 +147,7 @@ namespace bbwx BBTK_BEGIN_DESCRIBE_BLACK_BOX(Slider,bbtk::WxBlackBox); BBTK_NAME("Slider"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); - BBTK_KEYWORD("wx;widget"); + BBTK_CATEGORY("widget"); BBTK_DESCRIPTION("Slider widget (wxSlider)"); BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int); BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int); diff --git a/packages/wx/src/bbwxSplit.h b/packages/wx/src/bbwxSplit.h index 569dfa5..d402182 100644 --- a/packages/wx/src/bbwxSplit.h +++ b/packages/wx/src/bbwxSplit.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSplit.h,v $ Language: C++ - Date: $Date: 2008/02/04 13:02:58 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/05 12:16:56 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -99,7 +99,7 @@ namespace bbwx BBTK_NAME("Split"); BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Widget which splits a window in two fixed size parts (wxSplitterWindow)"); - BBTK_KEYWORD("wx;widget"); + BBTK_CATEGORY("widget"); BBTK_INPUT(Split,Widget1,"Upper or left widget",wxWindow*); BBTK_INPUT(Split,Widget2,"Lower or right widget",wxWindow*); BBTK_INPUT(Split,Orientation,"Orientation (default 0), 0=Horizontal , 1=Vertical",int); -- 2.45.1