X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=41ca9b6f13dd52dc0731551d68d832b179b078ea;hb=a35973b128a2f7130b619a2a11a35cfd418b21b6;hp=9290e1d83d37b906bcc43bc680a2be6fd2c21d48;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 9290e1d..41ca9b6 100644
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2009/03/30 14:42:16 $
+  Version:   $Revision: 1.28 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -39,7 +39,7 @@
 #include "bbtkUtilities.h"
 #include <fstream>
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 #include <wx/textdlg.h>
 #endif
 
@@ -64,7 +64,8 @@ namespace bbtk
     mRootPackage(),
     mRootCBB(),
     mNoExecMode(false),
-    mDialogMode(NoDialog)
+    mDialogMode(NoDialog),
+    mNoErrorMode(false)
   {
     bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
     mFactory = Factory::New();
@@ -120,10 +121,7 @@ namespace bbtk
 
     // Create user package
     Package::Pointer p =
-      Package::New("user","internal",
-		   "User defined black boxes",
-		   "",
-		   BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+      Package::New("user","internal","User defined black boxes","");
     // Insert the user package in the factory
     GetFactory()->InsertPackage(p);
     // And in the list of open packages
@@ -149,6 +147,7 @@ namespace bbtk
   }
   //=======================================================================
 
+
   //=======================================================================
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
@@ -169,11 +168,7 @@ namespace bbtk
       }
     catch (Exception e)
       {
-	p = Package::New(name,
-                         "",
-                         "",
-                         "",
-                         BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+	p = Package::New(name,"","","");
 	GetFactory()->InsertPackage(p);
       }
      mOpenPackage.push_back(p);
@@ -215,6 +210,15 @@ namespace bbtk
   }
   //=======================================================================
 
+  //=======================================================================
+  void Executer::Clear()
+  {
+    bbtkDebugMessageInc("Kernel",9,"Executer::Clear()" <<std::endl);
+    GetCurrentDescriptor()->GetPrototype()->Clear();
+
+  }
+  //=======================================================================
+
   //=======================================================================
   void Executer::EndDefine ()
   {
@@ -232,11 +236,7 @@ namespace bbtk
 	  }
 	catch (Exception e)
 	  {
-	    p = Package::New(pname,
-			     "",
-			     "",
-			     "",
-			     BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+	    p = Package::New(pname,"","","");
 	    GetFactory()->InsertPackage(p);
 	  }
       }
@@ -356,7 +356,7 @@ namespace bbtk
            std::cin >> ans;
            Set(box,input,ans);
         }
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
        // If the dialog mode is set to GraphicalDialog
        // A dialog box is pop up
        else if (mDialogMode == GraphicalDialog) 
@@ -397,7 +397,8 @@ namespace bbtk
     BlackBox::Pointer b = GetCurrentDescriptor()->GetPrototype()->bbGetBlackBox(box);
     // Looks for the adaptor
 
-    if ( b->bbGetInputType(input) !=  typeid(std::string) ) 
+    if ( ( b->bbGetInputType(input) != typeid(bbtk::any<bbtk::thing>) )&&
+	 ( b->bbGetInputType(input) != typeid(std::string) ) )
       {
 	BlackBox::Pointer a =
 	   GetFactory()->NewAdaptor(typeid(std::string),