X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdExecBbiCommand.cxx;h=ea7894fceed30e2a88753e68c8bc1d8c453b7b27;hb=73922461adf24cf7d6539db9f752fc4e44db462d;hp=fb85734a9b71a4be1151ac0fe492ad28aeacb1f5;hpb=05e7ead34117d7cd9946e02dfc6a4f1079630f4f;p=bbtk.git

diff --git a/packages/std/src/bbstdExecBbiCommand.cxx b/packages/std/src/bbstdExecBbiCommand.cxx
index fb85734..ea7894f 100755
--- a/packages/std/src/bbstdExecBbiCommand.cxx
+++ b/packages/std/src/bbstdExecBbiCommand.cxx
@@ -1,3 +1,34 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbstdExecBbiCommand.cxx,v $
+  Language:  C++
+  Date:      $Date: 2009/05/14 14:43:38 $
+  Version:   $Revision: 1.11 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #include "bbstdExecBbiCommand.h"
 #include "bbstdPackage.h"
 #include "bbtkInterpreter.h"
@@ -7,68 +38,75 @@ namespace bbstd
 {
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(std,ExecBbiCommand);
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(ExecBbiCommand,bbtk::AtomicBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(ExecBbiCommand,bbtk::AtomicBlackBox);
 
-  void ExecBbiCommand::bbUserConstructor() 
+  void ExecBbiCommand::bbUserSetDefaultValues() 
   { 
     bbSetInputIn("help");
   }
+  void ExecBbiCommand::bbUserInitializeProcessing() 
+  { 
+  }
+  void ExecBbiCommand::bbUserFinalizeProcessing() 
+  {
+  }
   
-
   void ExecBbiCommand::DoProcess()
     {
+
       // Look for the interpreter
-      bbtk::Interpreter* I = 0;
-	  bool delete_inter = false; 
-	  if (bbGetParent() != 0) 
-	{
-	  bbtk::Factory* f = ((bbtk::ComplexBlackBoxDescriptor*)bbGetParent()
-			->bbGetDescriptor())->GetFactory();
+      bbtk::Interpreter::Pointer I;
+	  bool delete_inter = false;
+	  if (bbGetParent() != 0)
+	  {
+	  bbtk::Factory::Pointer f
+	  	= ((bbtk::ComplexBlackBoxDescriptor*)bbGetParent()
+		  ->bbGetDescriptor().get())->GetFactory();
 	  if ((f != 0)&&
 	      (f->GetExecuter()))
 	    {
 	      I = f->GetExecuter()->GetInterpreter();
 	    }
-	}
-      if (I==0) 
-	{
+	  }
+      if (I==0)
+	  {
 	  //	  bbtkError("ExecBbiCommand::DoProcess() : could not find interpreter");
-	  I = new bbtk::Interpreter();
-	  delete_inter = true; 
-	}
+	  I = bbtk::Interpreter::New();
+	  delete_inter = true;
+	  }
+
+      unsigned int i;
 
-      int i;
-      
       bool ok=true;
       int pos1=0,pos2;
       pos2 = bbGetInputIn().find(";",pos1);
       std::string ccommand;
       while (ok==true)
-	{
-	  if (pos2==-1) 
 	    {
-	      ok=false;
-	      ccommand=bbGetInputIn().substr(pos1,bbGetInputIn().length()-pos1 );
-	    } else {
+	  if (pos2==-1) 
+	   {
+	    ok=false;
+	    ccommand=bbGetInputIn().substr(pos1,bbGetInputIn().length()-pos1 );
+	   } else {
 	    ccommand=bbGetInputIn().substr(pos1,pos2-pos1);
 	  }
 	  for ( i=0 ; i < ccommand.length() ; i++)
+	  {
+	    if (ccommand[i]==39)
 	    {
-	      if (ccommand[i]==39)
-		{
 		  ccommand[i]=34;
-		}
-	    }		
-	
+        }
+     }
+
 	  I->InterpretLine( ccommand );
 	  pos1=pos2+1;
 	  pos2 = bbGetInputIn().find(";",pos2+1);
-	  
+
 	}
       
-      if (delete_inter) delete I;
-      
-      /*  Grrr  not works in windows
+//      if (delete_inter) delete I;
+
+   /*  Grrr  not works in windows
 	char * pch;
   	pch = strtok (bbGetInputIn(),";");
 	while (pch != NULL)
@@ -81,16 +119,14 @@ namespace bbstd
 			{
 				ccommand[i]=34;
 			}
-		}		
+		}
 
 		printf("EED  ExecBbiCommand::DoProcess 2  %s\n",ccommand.c_str());
 		bbtk::Interpreter::mGlobalInterpreter->InterpretLine( ccommand );
     	pch = strtok (NULL, ";");
   	}
-*/
-}
-
-
+  */
+  }
 } // EO namespace bbstd