*** empty log message ***

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

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index 5c34cd5d140154c7f819001c750832345d833744..7a9352ee60ba3fe452f0aa636b293857d7d6a171 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/03/07 11:37:48 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/07/25 07:44:12 $
+  Version:   $Revision: 1.10 $
                                                                                 
   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"
 
 
 
@@ -50,7 +51,7 @@ namespace bbwx
             &CommandButtonWidget::OnCommandButton ); 
     
     wxFlexGridSizer *sizer     = new wxFlexGridSizer(1);
-    sizer -> Add( mwxCommandButton,1,wxGROW ); 
+    sizer -> Add( mwxCommandButton,1,wxGROW | wxALL,10 ); 
     sizer      -> AddGrowableCol(0);
     
     panel      -> SetSizer(sizer);
@@ -66,29 +67,38 @@ namespace bbwx
   
   void CommandButtonWidget::OnCommandButton( wxEvent& )
   {
-    // Look for the interpreter
-      bbtk::Interpreter* I = 0;
+    // Look for the interpreter or the executer if no interpreter
+    bbtk::Interpreter::Pointer I;
+    bbtk::VirtualExec::Pointer E;
       if (mBox->bbGetParent() != 0) 
        {
-         bbtk::Factory* f = 
-           ((bbtk::ComplexBlackBoxDescriptor*)mBox->bbGetParent()
-            ->bbGetDescriptor())->GetFactory();
+         bbtk::Factory::Pointer f = boost::dynamic_pointer_cast<bbtk::ComplexBlackBoxDescriptor>(mBox->bbGetParent()->bbGetDescriptor())->GetFactory();
          if ((f != 0)&&
              (f->GetExecuter()))
            {
-             I = f->GetExecuter()->GetInterpreter();
+             E = f->GetExecuter();
+             I = E->GetInterpreter();
            }
        }
       if (I==0) 
        {
-         //      bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter");
-         I = new bbtk::Interpreter();
+         //      bbtkError("CommandButton::DoProcess() : could not find interpreter");
+         if (E==0) 
+           {
+             // If no executer : create a totally independant interpreter
+             I = bbtk::Interpreter::New();
+           }
+         else 
+           {
+             // If executer : create an interpreter using E
+             I = bbtk::Interpreter::New(E);
+           }
        }
       
       std::string commandstr(mBox->bbGetInputIn());
     
     // bbtk::Interpreter::mGlobalInterpreter->InterpretLine( commandstr );
-    int i;
+    unsigned int i;
     bool ok=true;
     int pos1=0,pos2;
     pos2 = commandstr.find(";",pos1);
@@ -106,13 +116,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
-       I->InterpretLine( ccommand, insideComment );
+       I->InterpretLine( ccommand );
        pos1=pos2+1;
        pos2 = commandstr.find(";",pos2+1);
        
@@ -145,16 +154,16 @@ namespace bbwx
   //-------------------------------------------------------------------------- 
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(CommandButton,bbtk::WxBlackBox);
 
   void CommandButton::bbUserConstructor() 
   { 
     bbSetInputIn("");
     bbSetInputLabel("");
     std::vector<double> lstColour;
-    lstColour.push_back(-1);
-    lstColour.push_back(-1);
-    lstColour.push_back(-1);
+    lstColour.push_back(0.75);
+    lstColour.push_back(0.75);
+    lstColour.push_back(0.75);
     bbSetInputColour(lstColour);
   }