From: guigues Date: Thu, 14 May 2009 14:43:27 +0000 (+0000) Subject: *** MAJOR CHANGE *** NOT WORKING YET !!! X-Git-Tag: EED.02Oct2009~50 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b8fe96fbebd153e92de1f1bfcad48ad009365df5;p=bbtk.git *** MAJOR CHANGE *** NOT WORKING YET !!! We have removed the bbUserConstructor/CopyConstructor/Destructor methods And created the bbUserSetDefaultValues / InitializeProcessing / FinalizeProcessing which are better ! Related changes have been made in: *the kernel *bbfy *the std-template.xml of bbCreateBlackBox *package std All other packages have to be patched !!!! --- diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml index bb8050b..e40b521 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml @@ -30,55 +30,54 @@ - -
+// THE MAIN PROCESSING METHOD BODY
+//   Here we simply set the input 'In' value to the output 'Out'
+//   And print out the output value
+// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
+//    void bbSet{Input|Output}NAME(const TYPE&)
+//    const TYPE& bbGet{Input|Output}NAME() const 
+//    Where :
+//    * NAME is the name of the input/output
+//      (the one provided in the attribute 'name' of the tag 'input')
+//    * TYPE is the C++ type of the input/output
+//      (the one provided in the attribute 'type' of the tag 'input')
     bbSetOutputOut( bbGetInputIn() );
     std::cout << "Output value = " <
   
   
 
-  
-  
+   
   
-    bbSetInputIn(0);
+//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
+//    Here we initialize the input 'In' to 0
+   bbSetInputIn(0);
   
-
+ + - - + +
+//  THE INITIALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should allocate the internal/output pointers 
+//    if any 
+
   
-
+ - - +
+//  THE FINALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should desallocate the internal/output pointers 
+//    if any
   
-
- + + diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp index 347babc..d528eb9 100644 --- a/kernel/appli/bbfy/bbfy.cpp +++ b/kernel/appli/bbfy/bbfy.cpp @@ -79,9 +79,9 @@ private: std::vector mInclude; std::vector mTypedef; - std::string mUserConstructor; - std::string mUserCopyConstructor; - std::string mUserDestructor; + std::string mUserSetDefaultValues; + std::string mUserInitializeProcessing; + std::string mUserFinalizeProcessing; typedef struct { @@ -276,25 +276,30 @@ void bbfy::ParseXML() bbtk::GetTextOrClear(BB.getChildNode("namespace"),mNamespace); } - // UserConstructor body - if (BB.nChildNode("constructor")) + // UserSetDefaultValues body + if (BB.nChildNode("defaultValues")) { - bbtk::GetTextOrClear(BB.getChildNode("constructor"),mUserConstructor); + bbtk::GetTextOrClear(BB.getChildNode("defaultValues"), + mUserSetDefaultValues); } - // UserCopyConstructor body - if (BB.nChildNode("copyconstructor")) + // UserInitializeProcessing body + if (BB.nChildNode("initializeProcessing")) { - bbtk::GetTextOrClear(BB.getChildNode("copyconstructor"),mUserCopyConstructor); + bbtk::GetTextOrClear(BB.getChildNode("initializeProcessing"), + mUserInitializeProcessing); } - // UserDestructor body - if (BB.nChildNode("destructor")) + // UserFinalizeProcessing body + if (BB.nChildNode("finalizeProcessing")) { - bbtk::GetTextOrClear(BB.getChildNode("destructor"),mUserDestructor); + bbtk::GetTextOrClear(BB.getChildNode("finalizeProcessing"), + mUserFinalizeProcessing); } - - // Template parameters + + + + // Template parameters // mNbTemplateParam = BB.nChildNode("template"); if ( BB.nChildNode("template") > 0) @@ -430,6 +435,30 @@ void bbfy::ParseXML() { bbtk::GetTextOrClear(BB.getChildNode("createwidget"),mCreateWidget); } + + + + + + + + // OBSOLETE/UNSUPPORTED TAGS + // WARN IF OBSOLETE TAGS PROVIDED + if (BB.nChildNode("constructor")) + { + std::cout << "WARNING !!! The tag is obsolete !!"< is obsolete !!"< is obsolete !!"<::iterator ioi; @@ -1045,24 +1075,20 @@ void bbfy::CreateCode() } // User constr / copy constr / destr implementation - mFile <<"void "< "<<#CLASS <<"::~"<< #CLASS \ - <<"() ["<bbGetFullName()<<"]"<bbGetFullName()<<"]"<());*/ \ - BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ + CLASS::bbUserSetDefaultValues(); \ + BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ } \ CLASS::~CLASS() \ { \ BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS); \ - /*CLASS::bbUserDestructor();*/ \ + CLASS::bbUserFinalizeProcessing(); \ BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS); \ } \ void CLASS::bbLockDescriptor() \ @@ -536,7 +552,7 @@ : PARENT(name,false) \ { \ BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc); \ - /*CLASS::bbUserConstructor();*/ \ + CLASS::bbUserSetDefaultValues(); \ BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS); \ } \ template \ @@ -545,14 +561,14 @@ : PARENT(from,name,false) \ { \ BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ - /*CLASS::bbUserCopyConstructor(from.GetThisPointer());*/ \ - BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ + CLASS::bbUserSetDefaultValues(); \ + BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ } \ template \ CLASS::~CLASS() \ { \ BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS); \ - /*CLASS::bbUserDestructor();*/ \ + CLASS::bbFinalizeProcessing(); \ BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS); \ } \ template \ @@ -711,7 +727,7 @@ : PARENT(name,false) \ { \ BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,alloc); \ - /*CLASS::bbUserConstructor();*/ \ + CLASS::bbUserSetDefaultValues(); \ BBTK_END_BLACK_BOX_CONSTRUCTOR(CLASS); \ } \ template \ @@ -720,14 +736,14 @@ : PARENT(from,name,false) \ { \ BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ - /*CLASS::bbUserCopyConstructor(from.GetThisPointer());*/ \ - BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ + CLASS::bbUserSetDefaultValues(); \ + BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ } \ template \ CLASS::~CLASS() \ { \ BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS); \ - /*CLASS::bbUserDestructor();*/ \ + CLASS::bbFinalizeProcessing(); \ BBTK_END_BLACK_BOX_DESTRUCTOR(CLASS); \ } \ template \ diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index 4aa8d01..76fce53 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/04/30 14:31:31 $ - Version: $Revision: 1.43 $ + Date: $Date: 2009/05/14 14:43:33 $ + Version: $Revision: 1.44 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -107,7 +107,7 @@ namespace bbtk BlackBox::BlackBox(const std::string &name) : // bbmStatus(MODIFIED), - bbmConstructed(false), + bbmInitialized(false), bbmExecuting(false), bbmName(name), bbmBoxProcessMode("Pipeline"), @@ -129,7 +129,7 @@ namespace bbtk BlackBox::BlackBox(BlackBox& from, const std::string &name) : // bbmStatus(from.bbmStatus), - bbmConstructed(false), + bbmInitialized(false), bbmExecuting(false), bbmName(name), bbmBoxProcessMode(from.bbmBoxProcessMode), @@ -753,7 +753,31 @@ namespace bbtk } //========================================================================= + //========================================================================= + void BlackBox::bbInitializeProcessing() + { + if (!bbmInitialized) + { + std::cout << "INIT "<bbRecursiveInitializeProcessing(); + bbmInitialized = true; + } + } + //========================================================================= + //========================================================================= + void BlackBox::bbFinalizeProcessing() + { + if (bbmInitialized) + { + std::cout << "FINI "<bbRecursiveFinalizeProcessing(); + bbmInitialized = false; + } + } + //========================================================================= + + //========================================================================= /// Main recursive processing method of the box. void BlackBox::bbRecursiveExecute( Connection::Pointer caller ) @@ -771,13 +795,8 @@ namespace bbtk return; } - // If not constructed do it - if (!bbmConstructed) - { - this->bbConstructor(); - bbmConstructed = true; - } - + // If not initialized do it + bbInitializeProcessing(); bbSetExecuting(true); bool wasExecuting = bbGlobalGetSomeBoxExecuting(); diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h index d25fc88..ce1117f 100644 --- a/kernel/src/bbtkBlackBox.h +++ b/kernel/src/bbtkBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.h,v $ Language: C++ - Date: $Date: 2009/04/30 14:31:31 $ - Version: $Revision: 1.24 $ + Date: $Date: 2009/05/14 14:43:33 $ + Version: $Revision: 1.25 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -118,14 +118,6 @@ namespace bbtk - //================================================================== - /// System callback which calls bbUserConstructor for all its ancestors - /// and the box itself - virtual void bbConstructor() {} - /// System callback which calls bbUserDestructor for all its ancestors - /// and the box itself - virtual void bbDestructor() {} - //================================================================== @@ -247,6 +239,62 @@ namespace bbtk + //================================================================== + /// User can redefine this method to set + /// the default values of the box inputs and outputs + /// (it is called in the box constructor) + virtual void bbUserSetDefaultValues() {} + + /// User can redefine this method to initialize what must be + /// initialized for the box to work, for example allocate dynamic data. + /// It is called once and only once before any call to bbUserCreateWidget + /// or bbUserProcess. + /// What has been allocated here must be desalocated in + /// bbFinalizeProcessing + virtual void bbUserInitializeProcessing() {} + + /// User must redefine this method to uninitialize what has been + /// initialized in bbUserInitializeProcessing, + /// typically desallocate memory that has been allocated dynamically. + /// It is called in the box destructor if and only if (iff) + /// bbUserInitializeProcessing has been called previously. + virtual void bbUserFinalizeProcessing() {} + + + /// Initializes processing IF NEEDED. + /// Calls bbRecursiveInitializeProcessing if the box is in + /// "uninitialized" state and put it in "initialized" state. + /// On construction, boxes are "uninitialized". + /// See also bbFinalizeProcessing + void bbInitializeProcessing(); + + /// Finalizes processing IF NEEDED. + /// Calls bbRecursiveFinalizeProcessing if the box is in + /// "initialized" state and put it in "uninitialized" state. + /// On construction, boxes are "uninitialized". + /// See also bbInitializeProcessing + void bbFinalizeProcessing(); + + /// Abstract prototype of the method which + /// Recursively calls itself for the parent black box and then + /// calls bbUserInitializeProcessing for its own class. + /// It is redefined in each black box descendant. + /// Allows to call bbUserInitializeProcessing for all inherited classes + /// (like a constructor does) + virtual void bbRecursiveInitializeProcessing() {} + + + /// Abstract prototype of the method which + /// calls bbUserFinalizeProcessing for its own class and then + /// recursively calls itself for the parent black box. + /// It is redefined in each black box descendant. + /// Allows to call bbUserFinalizeProcessing for all inherited classes + /// (like a destructor does) + virtual void bbRecursiveFinalizeProcessing() {} + + //================================================================== + + //================================================================== // Common inputs / outputs to all boxes /// Returns the value of the input "BoxProcessMode" @@ -502,8 +550,8 @@ namespace bbtk //================================================================== // ATTRIBUTES - /// Is the box "constructed" ? (initialized) - bool bbmConstructed; + /// Is the box initialized ? + bool bbmInitialized; /// Is the box executing ? bool bbmExecuting; /// The name of the black-box diff --git a/kernel/src/bbtkQtBlackBox.cxx b/kernel/src/bbtkQtBlackBox.cxx index 7534fd6..8ac7de0 100644 --- a/kernel/src/bbtkQtBlackBox.cxx +++ b/kernel/src/bbtkQtBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkQtBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/04/08 07:56:11 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/14 14:43:33 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -82,7 +82,23 @@ namespace bbtk } //================================================================== + //================================================================== + void QtBlackBox::bbUserSetDefaultValues() + { + } + //================================================================== + + //================================================================== + void QtBlackBox::bbUserInitializeProcessing() + { + } + //================================================================== + //================================================================== + void QtBlackBox::bbUserFinalizeProcessing() + { + } + //================================================================== //================================================================== // void QtBlackBox::InitWindowManagerIfNeeded() { Qt:: diff --git a/kernel/src/bbtkVtkBlackBoxMacros.h b/kernel/src/bbtkVtkBlackBoxMacros.h index 21816d3..8b1c8ab 100644 --- a/kernel/src/bbtkVtkBlackBoxMacros.h +++ b/kernel/src/bbtkVtkBlackBoxMacros.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkVtkBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2009/04/30 14:31:31 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/14 14:43:34 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -191,9 +191,27 @@ { return vtkParent::Get##NAME(); } \ void bbSetInput##NAME (TYPE d) \ { vtkParent::Set##NAME(d); \ - /*bbSetModifiedStatus();*/ } + } //=========================================================================== +//=========================================================================== +/// Declares an AtomicBlackBox input corresponding to an +/// inherited vtk parameter +/// which was declared by vtkSetMacro/vtkGetMacro +/// The NAME **MUST** be the same than the vtk parameter name +/* +#define BBTK_DECLARE_VTK_2_PARAM(NAME,TYPE) \ + public: \ + TYPE bbGetInput##NAME () \ + { + TO DO : HOW TO RECOMPOSE A VECTOR ? + { return vtkParent::Get##NAME(); } \ + void bbSetInput##NAME (TYPE d) \ + { + vtkParent::Set##NAME(d[0],d[1]); \ +} +*/ +//=========================================================================== //============================================================================ diff --git a/kernel/src/bbtkWidgetBlackBox.h b/kernel/src/bbtkWidgetBlackBox.h index 66f2bf1..03601b1 100644 --- a/kernel/src/bbtkWidgetBlackBox.h +++ b/kernel/src/bbtkWidgetBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBox.h,v $ Language: C++ - Date: $Date: 2009/04/21 14:36:51 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/05/14 14:43:34 $ + Version: $Revision: 1.3 $ ========================================================================*/ @@ -138,17 +138,6 @@ namespace bbtk protected: - //================================================================== - /// User callback called in the box contructor - virtual void bbUserConstructor(); - /// User callback called in the box copy constructor - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - /// User callback called in the box destructor - virtual void bbUserDestructor(); - //================================================================== - - - //================================================================== /// Convenient method for layout widgets which creates and returns @@ -213,7 +202,6 @@ namespace bbtk Window* bbmWindow; - void bbInitAttributes(); }; //================================================================= diff --git a/kernel/src/bbtkWidgetBlackBox.txx b/kernel/src/bbtkWidgetBlackBox.txx index 39738cf..1abdaad 100644 --- a/kernel/src/bbtkWidgetBlackBox.txx +++ b/kernel/src/bbtkWidgetBlackBox.txx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWidgetBlackBox.txx,v $ Language: C++ - Date: $Date: 2009/04/21 14:36:51 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/05/14 14:43:34 $ + Version: $Revision: 1.3 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -54,56 +54,42 @@ namespace bbtk //========================================================================= template - void WidgetBlackBox::bbUserConstructor() + void WidgetBlackBox::bbUserSetDefaultValues() { - bbtkDebugMessage("widget",9,"WidgetBlackBox::bbUserConstructor()"< - void WidgetBlackBox::bbUserCopyConstructor(bbtk::BlackBox::Pointer) + void WidgetBlackBox::bbUserInitializeProcessing() { - bbtkDebugMessage("widget",9,"WidgetBlackBox::bbUserCopyConstructor()" - < - void WidgetBlackBox::bbUserDestructor() + void WidgetBlackBox::bbUserFinalizeProcessing() { - bbtkDebugMessage("widget",9,"==> WidgetBlackBox::bbUserDestructor() ["< WidgetBlackBox::bbUserFinalizeProcessing() ["<bbClose(); bbSetWindow(0); } - bbtkDebugMessage("widget",9,"<== WidgetBlackBox::bbUserDestructor() ["< - void WidgetBlackBox::bbInitAttributes() - { - bbmWindow = 0; - bbSetInputWinTitle(bbGetName()); - bbSetInputWinWidth(800); - bbSetInputWinHeight(800); - bbSetInputWinDialog(false); - bbSetOutputWidget(0); - } - //========================================================================= - + //========================================================================= template @@ -181,7 +167,10 @@ namespace bbtk // Cast it into a WidgetBlackBox typename WidgetBlackBox::Pointer wfrom = boost::dynamic_pointer_cast >(from); - // Call bbCreateWidget + // If the black box from construction is not done yet : do it + // If not constructed do it + wfrom->bbInitializeProcessing(); + // Call bbUserCreateWidget wfrom->bbUserCreateWidget(parent); // Get the widget created w = wfrom->bbGetOutputWidget(); diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index b99ca45..245a074 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2009/04/08 07:56:11 $ - Version: $Revision: 1.38 $ + Date: $Date: 2009/05/14 14:43:34 $ + Version: $Revision: 1.39 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -292,31 +292,24 @@ namespace bbtk //========================================================================= //========================================================================= - void WxBlackBox::bbUserConstructor() + void WxBlackBox::bbUserSetDefaultValues() { - bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserConstructor()"< -
+  
     bbSetInputIn1(0);
     bbSetInputIn2(0);
     bbSetOutputOut(0);    
-  
+
diff --git a/packages/std/src/bbstdCast.h b/packages/std/src/bbstdCast.h index 73731a9..2f40c18 100644 --- a/packages/std/src/bbstdCast.h +++ b/packages/std/src/bbstdCast.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdCast.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:20 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -76,6 +76,10 @@ namespace bbstd BBTK_END_DESCRIBE_TEMPLATE2_BLACK_BOX(Cast); //================================================================= + template void Cast::bbUserSetDefaultValues() {} + template void Cast::bbUserInitializeProcessing() {} + template void Cast::bbUserFinalizeProcessing() {} + } // namespace bbstd diff --git a/packages/std/src/bbstdConcatStrings.cxx b/packages/std/src/bbstdConcatStrings.cxx index b332eb0..8c81ef0 100644 --- a/packages/std/src/bbstdConcatStrings.cxx +++ b/packages/std/src/bbstdConcatStrings.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdConcatStrings.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -37,7 +37,7 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,ConcatStrings); BBTK_BLACK_BOX_IMPLEMENTATION(ConcatStrings,bbtk::AtomicBlackBox); - void ConcatStrings::bbUserConstructor() + void ConcatStrings::bbUserSetDefaultValues() { bbSetInputIn1(""); bbSetInputIn2(""); @@ -51,6 +51,12 @@ namespace bbstd bbSetInputIn10(""); } + void ConcatStrings::bbUserInitializeProcessing() + { + } + void ConcatStrings::bbUserFinalizeProcessing() + { + } void ConcatStrings::DoProcess() { diff --git a/packages/std/src/bbstdConcatStrings.h b/packages/std/src/bbstdConcatStrings.h index 715154c..c00d581 100644 --- a/packages/std/src/bbstdConcatStrings.h +++ b/packages/std/src/bbstdConcatStrings.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdConcatStrings.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -55,9 +55,6 @@ namespace bbstd BBTK_DECLARE_OUTPUT(Out,std::string); BBTK_PROCESS(DoProcess); void DoProcess(); - - protected: - virtual void bbUserConstructor(); }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ConcatStrings,bbtk::AtomicBlackBox); diff --git a/packages/std/src/bbstdConfiguration.cxx b/packages/std/src/bbstdConfiguration.cxx index 08a1e89..7aced9a 100644 --- a/packages/std/src/bbstdConfiguration.cxx +++ b/packages/std/src/bbstdConfiguration.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdConfiguration.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -38,11 +38,17 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,Configuration); BBTK_BLACK_BOX_IMPLEMENTATION(Configuration,bbtk::AtomicBlackBox); - void Configuration::bbUserConstructor() + void Configuration::bbUserSetDefaultValues() { } - + void Configuration::bbUserInitializeProcessing() + { + } + void Configuration::bbUserFinalizeProcessing() + { + } + void Configuration::DoProcess() { bbSetOutputBinPath( bbtk::ConfigurationFile::GetInstance().Get_bin_path() ); diff --git a/packages/std/src/bbstdConfiguration.h b/packages/std/src/bbstdConfiguration.h index 0c76ab3..09a6b27 100644 --- a/packages/std/src/bbstdConfiguration.h +++ b/packages/std/src/bbstdConfiguration.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdConfiguration.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -50,9 +50,6 @@ namespace bbstd BBTK_PROCESS(DoProcess); void DoProcess(); - protected: - virtual void bbUserConstructor(); - }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(Configuration,bbtk::AtomicBlackBox); diff --git a/packages/std/src/bbstdDiv.xml b/packages/std/src/bbstdDiv.xml index 5a09058..09686eb 100644 --- a/packages/std/src/bbstdDiv.xml +++ b/packages/std/src/bbstdDiv.xml @@ -14,11 +14,11 @@ bbSetOutputOut( bbGetInputIn1() / bbGetInputIn2() );
-
+  
     bbSetInputIn1(0);
     bbSetInputIn2(1);
     bbSetOutputOut(0);
-  
+
diff --git a/packages/std/src/bbstdExecBbiCommand.cxx b/packages/std/src/bbstdExecBbiCommand.cxx index c496ca1..ea7894f 100755 --- a/packages/std/src/bbstdExecBbiCommand.cxx +++ b/packages/std/src/bbstdExecBbiCommand.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdExecBbiCommand.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.10 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -40,11 +40,17 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,ExecBbiCommand); BBTK_BLACK_BOX_IMPLEMENTATION(ExecBbiCommand,bbtk::AtomicBlackBox); - void ExecBbiCommand::bbUserConstructor() + void ExecBbiCommand::bbUserSetDefaultValues() { bbSetInputIn("help"); } - + void ExecBbiCommand::bbUserInitializeProcessing() + { + } + void ExecBbiCommand::bbUserFinalizeProcessing() + { + } + void ExecBbiCommand::DoProcess() { diff --git a/packages/std/src/bbstdExecBbiCommand.h b/packages/std/src/bbstdExecBbiCommand.h index 7a85a7d..fff3bc6 100755 --- a/packages/std/src/bbstdExecBbiCommand.h +++ b/packages/std/src/bbstdExecBbiCommand.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdExecBbiCommand.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -47,9 +47,6 @@ namespace bbstd BBTK_DECLARE_INPUT(In,std::string); BBTK_PROCESS(DoProcess); void DoProcess(); - - protected: - virtual void bbUserConstructor(); }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ExecBbiCommand,bbtk::AtomicBlackBox); diff --git a/packages/std/src/bbstdExecSystemCommand.cxx b/packages/std/src/bbstdExecSystemCommand.cxx index f30234f..3c32175 100755 --- a/packages/std/src/bbstdExecSystemCommand.cxx +++ b/packages/std/src/bbstdExecSystemCommand.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdExecSystemCommand.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -39,11 +39,17 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,ExecSystemCommand); BBTK_BLACK_BOX_IMPLEMENTATION(ExecSystemCommand,bbtk::AtomicBlackBox); - void ExecSystemCommand::bbUserConstructor() + void ExecSystemCommand::bbUserSetDefaultValues() { bbSetInputIn("help"); } - + void ExecSystemCommand::bbUserInitializeProcessing() + { + } + void ExecSystemCommand::bbUserFinalizeProcessing() + { + } + void ExecSystemCommand::DoProcess() { bool ok=true; diff --git a/packages/std/src/bbstdExecSystemCommand.h b/packages/std/src/bbstdExecSystemCommand.h index 6633faf..d10c26c 100755 --- a/packages/std/src/bbstdExecSystemCommand.h +++ b/packages/std/src/bbstdExecSystemCommand.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdExecSystemCommand.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -47,9 +47,6 @@ namespace bbstd BBTK_DECLARE_INPUT(In,std::string) BBTK_PROCESS(DoProcess); void DoProcess(); - - protected: - virtual void bbUserConstructor(); }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ExecSystemCommand,bbtk::AtomicBlackBox); diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx index e91ef23..698cca5 100644 --- a/packages/std/src/bbstdFilesFromDirectory.cxx +++ b/packages/std/src/bbstdFilesFromDirectory.cxx @@ -27,24 +27,20 @@ void FilesFromDirectory::Process() } -void FilesFromDirectory::bbUserConstructor() +void FilesFromDirectory::bbUserSetDefaultValues() { bbSetInputIn("."); bbSetInputRecursive(false); } -void FilesFromDirectory::bbUserCopyConstructor(bbtk::BlackBox::Pointer) -{ - - -} -void FilesFromDirectory::bbUserDestructor() -{ - + void FilesFromDirectory::bbUserInitializeProcessing() + { + } + void FilesFromDirectory::bbUserFinalizeProcessing() + { + } -} - /** * \brief Add a SEPARATOR to the end of the name if necessary * @param pathname file/directory name to normalize diff --git a/packages/std/src/bbstdFilesFromDirectory.h b/packages/std/src/bbstdFilesFromDirectory.h index 125909b..6223255 100644 --- a/packages/std/src/bbstdFilesFromDirectory.h +++ b/packages/std/src/bbstdFilesFromDirectory.h @@ -12,14 +12,6 @@ namespace bbstd public bbtk::AtomicBlackBox { BBTK_BLACK_BOX_INTERFACE(FilesFromDirectory,bbtk::AtomicBlackBox); - //================================================================== - /// User callback called in the box contructor - virtual void bbUserConstructor(); - /// User callback called in the box copy constructor - virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); - /// User callback called in the box destructor - virtual void bbUserDestructor(); - //================================================================== BBTK_DECLARE_INPUT(In,std::string); BBTK_DECLARE_INPUT(Recursive,bool); BBTK_DECLARE_OUTPUT(Out,std::vector); diff --git a/packages/std/src/bbstdGetVectorElement.h b/packages/std/src/bbstdGetVectorElement.h index d49110e..438caea 100644 --- a/packages/std/src/bbstdGetVectorElement.h +++ b/packages/std/src/bbstdGetVectorElement.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdGetVectorElement.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -48,7 +48,6 @@ namespace bbstd BBTK_DECLARE_OUTPUT(Out,T); BBTK_PROCESS(DoIt); void DoIt(); - virtual void bbUserConstructor(); }; //================================================================= @@ -81,7 +80,21 @@ namespace bbstd //================================================================= template - void GetVectorElement::bbUserConstructor() + void GetVectorElement::bbUserSetDefaultValues() + { + + } + //================================================================= + //================================================================= + template + void GetVectorElement::bbUserInitializeProcessing() + { + + } + //================================================================= + //================================================================= + template + void GetVectorElement::bbUserFinalizeProcessing() { } diff --git a/packages/std/src/bbstdMagicBox.cxx b/packages/std/src/bbstdMagicBox.cxx index fe601be..16d7c97 100644 --- a/packages/std/src/bbstdMagicBox.cxx +++ b/packages/std/src/bbstdMagicBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdMagicBox.cxx,v $ Language: C++ - Date: $Date: 2009/03/30 14:42:23 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -57,6 +57,16 @@ namespace bbstd BlackBox::bbSetStatusAndPropagate(c,s); } + void MagicBox::bbUserSetDefaultValues() + { + mCanSet = true; + } + void MagicBox::bbUserInitializeProcessing() + { + } + void MagicBox::bbUserFinalizeProcessing() + { + } void MagicBox::DoProcess() { mCanSet = true; diff --git a/packages/std/src/bbstdMagicBox.h b/packages/std/src/bbstdMagicBox.h index de0e443..ec5a169 100644 --- a/packages/std/src/bbstdMagicBox.h +++ b/packages/std/src/bbstdMagicBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdMagicBox.h,v $ Language: C++ - Date: $Date: 2009/03/30 14:42:23 $ - Version: $Revision: 1.11 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.12 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -71,8 +71,6 @@ public: \ virtual void bbSetStatusAndPropagate(bbtk::BlackBoxInputConnector* c, bbtk::IOStatus s); bool mCanSet; - virtual void bbUserConstructor() { mCanSet = true; } - }; //================================================================== diff --git a/packages/std/src/bbstdMakeFileName.cxx b/packages/std/src/bbstdMakeFileName.cxx index ef056a3..f888ded 100644 --- a/packages/std/src/bbstdMakeFileName.cxx +++ b/packages/std/src/bbstdMakeFileName.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdMakeFileName.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:27 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -39,13 +39,19 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,MakeFileName); BBTK_BLACK_BOX_IMPLEMENTATION(MakeFileName,bbtk::AtomicBlackBox); - void MakeFileName::bbUserConstructor() + void MakeFileName::bbUserSetDefaultValues() { bbSetInputDirectory(""); bbSetInputFile(""); bbSetInputExtent(""); } - + void MakeFileName::bbUserInitializeProcessing() + { + } + void MakeFileName::bbUserFinalizeProcessing() + { + } + void MakeFileName::DoProcess() { std::string fileSep = bbtk::ConfigurationFile::GetInstance().Get_file_separator(); diff --git a/packages/std/src/bbstdMakeFileName.h b/packages/std/src/bbstdMakeFileName.h index d259137..00c3051 100644 --- a/packages/std/src/bbstdMakeFileName.h +++ b/packages/std/src/bbstdMakeFileName.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdMakeFileName.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -48,10 +48,6 @@ namespace bbstd BBTK_DECLARE_OUTPUT(Out, std::string); BBTK_PROCESS(DoProcess); void DoProcess(); - - protected: - virtual void bbUserConstructor(); - }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(MakeFileName,bbtk::AtomicBlackBox); diff --git a/packages/std/src/bbstdMul.xml b/packages/std/src/bbstdMul.xml index 7397061..1c0dfd9 100644 --- a/packages/std/src/bbstdMul.xml +++ b/packages/std/src/bbstdMul.xml @@ -14,11 +14,11 @@ bbSetOutputOut( bbGetInputIn1() * bbGetInputIn2() ); -
+  
     bbSetInputIn1(0);
     bbSetInputIn2(0);
     bbSetOutputOut(0);
-  
+
diff --git a/packages/std/src/bbstdRelay.h b/packages/std/src/bbstdRelay.h index fe80f66..4d9d7ff 100644 --- a/packages/std/src/bbstdRelay.h +++ b/packages/std/src/bbstdRelay.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdRelay.h,v $ Language: C++ - Date: $Date: 2009/01/08 10:18:34 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -63,6 +63,10 @@ namespace bbstd BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(Relay); //======================================================================= + template void Relay::bbUserSetDefaultValues() {} + template void Relay::bbUserInitializeProcessing() {} + template void Relay::bbUserFinalizeProcessing() {} + } // namespace bbstd diff --git a/packages/std/src/bbstdStringSelect.cxx b/packages/std/src/bbstdStringSelect.cxx index 47054d2..825683a 100644 --- a/packages/std/src/bbstdStringSelect.cxx +++ b/packages/std/src/bbstdStringSelect.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdStringSelect.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:27 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -38,7 +38,7 @@ namespace bbstd BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,StringSelect) BBTK_BLACK_BOX_IMPLEMENTATION(StringSelect,bbtk::AtomicBlackBox); - void StringSelect::bbUserConstructor() + void StringSelect::bbUserSetDefaultValues() { bbSetInputIn(0); bbSetInputIn0(""); @@ -52,9 +52,16 @@ namespace bbstd bbSetInputIn8(""); bbSetInputIn9(""); } + + void StringSelect::bbUserInitializeProcessing() + { + } - - + void StringSelect::bbUserFinalizeProcessing() + { + } + + void StringSelect::DoProcess() { if (bbGetInputIn()==0) bbSetOutputOut( bbGetInputIn0() ); diff --git a/packages/std/src/bbstdStringSelect.h b/packages/std/src/bbstdStringSelect.h index 2e3ab73..d4bb635 100644 --- a/packages/std/src/bbstdStringSelect.h +++ b/packages/std/src/bbstdStringSelect.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdStringSelect.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -57,10 +57,6 @@ namespace bbstd BBTK_DECLARE_OUTPUT(Out,std::string); BBTK_PROCESS(DoProcess); void DoProcess(); - - protected: - virtual void bbUserConstructor(); - }; //======================================================================= diff --git a/packages/std/src/bbstdStringTo.h b/packages/std/src/bbstdStringTo.h index 1e68938..77e6a8e 100644 --- a/packages/std/src/bbstdStringTo.h +++ b/packages/std/src/bbstdStringTo.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdStringTo.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -63,7 +63,12 @@ namespace bbstd BBTK_TEMPLATE_OUTPUT(StringTo, Out,"Output",T); BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(StringTo); //================================================================= - + + template void StringTo::bbUserSetDefaultValues() {} + template void StringTo::bbUserInitializeProcessing() {} + template void StringTo::bbUserFinalizeProcessing() {} + + } // namespace bbstd #endif // __bbstdStringTo_h_INCLUDED__ diff --git a/packages/std/src/bbstdStringToVector.h b/packages/std/src/bbstdStringToVector.h index 7b515d1..95572f1 100644 --- a/packages/std/src/bbstdStringToVector.h +++ b/packages/std/src/bbstdStringToVector.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdStringToVector.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.9 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -66,6 +66,10 @@ namespace bbstd BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector); //================================================================= + + template void StringToVector::bbUserSetDefaultValues() {} + template void StringToVector::bbUserInitializeProcessing() {} + template void StringToVector::bbUserFinalizeProcessing() {} //================================================================= template void StringToVector::DoIt() diff --git a/packages/std/src/bbstdToString.h b/packages/std/src/bbstdToString.h index ab8c6a2..5ec4195 100644 --- a/packages/std/src/bbstdToString.h +++ b/packages/std/src/bbstdToString.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdToString.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.7 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -62,6 +62,10 @@ namespace bbstd BBTK_TEMPLATE_OUTPUT(ToString, Out,"Output",std::string); BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(ToString); //================================================================= + + template void ToString::bbUserSetDefaultValues() {} + template void ToString::bbUserInitializeProcessing() {} + template void ToString::bbUserFinalizeProcessing() {} } // namespace bbstd diff --git a/packages/std/src/bbstdVectorToString.h b/packages/std/src/bbstdVectorToString.h index b75907d..a493ce6 100644 --- a/packages/std/src/bbstdVectorToString.h +++ b/packages/std/src/bbstdVectorToString.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdVectorToString.h,v $ Language: C++ - Date: $Date: 2008/12/12 08:55:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2009/05/14 14:43:38 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -49,7 +49,6 @@ namespace bbstd BBTK_DECLARE_OUTPUT(Out,std::string); BBTK_PROCESS(DoIt); void DoIt(); - virtual void bbUserConstructor(); }; //================================================================= @@ -67,7 +66,7 @@ namespace bbstd BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString); //================================================================= - //================================================================= + //================================================================= template void VectorToString::DoIt() { @@ -87,12 +86,21 @@ namespace bbstd //================================================================= template - void VectorToString::bbUserConstructor() + void VectorToString::bbUserSetDefaultValues() { bbSetInputSeparator(" "); } //================================================================= - + template + void VectorToString::bbUserInitializeProcessing() + { + } + //================================================================= + template + void VectorToString::bbUserFinalizeProcessing() + { + } + //================================================================= } // namespace bbstd #endif //__bbstdVectorToString_INCLUDED_h__ diff --git a/packages/std/src/bbstdWait.xml b/packages/std/src/bbstdWait.xml index 8d6c093..b554cee 100644 --- a/packages/std/src/bbstdWait.xml +++ b/packages/std/src/bbstdWait.xml @@ -34,31 +34,13 @@ - - + +
     bbSetInputIn(1000);
   
-
- - - -
-  
-
+ - - -
-  
-
diff --git a/packages/vtk/src/bbvtkSphereSource.xml b/packages/vtk/src/bbvtkSphereSource.xml index 113aa8d..bad1264 100644 --- a/packages/vtk/src/bbvtkSphereSource.xml +++ b/packages/vtk/src/bbvtkSphereSource.xml @@ -22,9 +22,6 @@ SetCenter(bbGetInputCenterX(), bbGetInputCenterY(), bbGetInputCenterZ()); -SetPhiResolution(bbGetInputPhiResolution()); -SetRadius((double)bbGetInputRadius()); -SetThetaResolution(bbGetInputThetaResolution()); Update();