MagicBox : support of data synchronization + various related fixes

[bbtk.git] / kernel / src / bbtkExecuter.cxx

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 86757deaa63483f1c66c03152b9cbf8f99cdb786..41ca9b6f13dd52dc0731551d68d832b179b078ea 100644 (file)
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-         
+/*=========================================================================                                                                               
   Program:   bbtk
-  Module:    $RCSfile: bbtkExecuter.cxx,v $ $
+  Module:    $RCSfile: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/08 10:56:27 $
-  Version:   $Revision: 1.22 $
-
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
+  Date:      $Date: 2009/03/30 14:42:16 $
+  Version:   $Revision: 1.28 $
+=========================================================================*/
 
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
 
-=========================================================================*/
 /**
  *  \file 
  *  \brief class Executer: level 0 of script execution (code)
@@ -26,7 +39,7 @@
 #include "bbtkUtilities.h"
 #include <fstream>
 
-#ifdef _USE_WXWIDGETS_
+#ifdef USE_WXWIDGETS
 #include <wx/textdlg.h>
 #endif
 
@@ -51,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();
@@ -107,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
@@ -136,6 +147,7 @@ namespace bbtk
   }
   //=======================================================================
 
+
   //=======================================================================
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
@@ -156,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);
@@ -202,6 +210,15 @@ namespace bbtk
   }
   //=======================================================================
 
+  //=======================================================================
+  void Executer::Clear()
+  {
+    bbtkDebugMessageInc("Kernel",9,"Executer::Clear()" <<std::endl);
+    GetCurrentDescriptor()->GetPrototype()->Clear();
+
+  }
+  //=======================================================================
+
   //=======================================================================
   void Executer::EndDefine ()
   {
@@ -219,11 +236,7 @@ namespace bbtk
          }
        catch (Exception e)
          {
-           p = Package::New(pname,
-                            "",
-                            "",
-                            "",
-                            BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));
+           p = Package::New(pname,"","","");
            GetFactory()->InsertPackage(p);
          }
       }
@@ -343,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) 
@@ -384,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),