=== MAJOR RELEASE ====

[bbtk.git] / packages / wx / src / bbwxCommandButton.cxx

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index b13d2426e5998f829cca4e09725336780dc62374..e48681db7cfc3525e08e6396d5d4d36fdc2fbfb8 100644 (file)
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -3,14 +3,14 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:17 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/18 12:59:52 $
+  Version:   $Revision: 1.7 $
                                                                                 
   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.
                                                                                 
-     This software is distributed WITHOUT ANY WARRANTY; without even
+     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.
                                                                                 
@@ -27,6 +27,7 @@
 #include "bbwxCommandButton.h"
 #include "bbwxPackage.h"
 #include "bbtkInterpreter.h"
+#include "bbtkExecuter.h"
 
 
 
@@ -66,7 +67,24 @@ namespace bbwx
   
   void CommandButtonWidget::OnCommandButton( wxEvent& )
   {
-    std::string commandstr(mBox->bbGetInputIn());
+    // Look for the interpreter
+    bbtk::Interpreter::Pointer I;
+      if (mBox->bbGetParent() != 0) 
+       {
+         bbtk::Factory::Pointer f = boost::dynamic_pointer_cast<bbtk::ComplexBlackBoxDescriptor>(mBox->bbGetParent()->bbGetDescriptor())->GetFactory();
+         if ((f != 0)&&
+             (f->GetExecuter()))
+           {
+             I = f->GetExecuter()->GetInterpreter();
+           }
+       }
+      if (I==0) 
+       {
+         //      bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter");
+         I = bbtk::Interpreter::New();
+       }
+      
+      std::string commandstr(mBox->bbGetInputIn());
     
     // bbtk::Interpreter::mGlobalInterpreter->InterpretLine( commandstr );
     int i;
@@ -87,13 +105,12 @@ namespace bbwx
          }
        for ( i=0 ; i < ccommand.length() ; i++)
          {
-           if (ccommand[i]==39)
+           if (ccommand[i]==39) // '
              {
-               ccommand[i]=34;
+               ccommand[i]=34;  // "
              }
          }             
-       bool insideComment = false; // for multiline comment
-       bbtk::Interpreter::mGlobalInterpreter->InterpretLine( ccommand, insideComment );
+       I->InterpretLine( ccommand );
        pos1=pos2+1;
        pos2 = commandstr.find(";",pos2+1);
        
@@ -126,7 +143,7 @@ namespace bbwx
   //-------------------------------------------------------------------------- 
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
 
   void CommandButton::bbUserConstructor() 
   {