X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreterVirtual.cxx;h=58552fc160db1b8ee27dd2a1a0ebd7577d1fbcc3;hb=3dcc408acd2264664ca6431a501378ea64233dd6;hp=35a87464b311639d28bd23b655cc26870cc58d2c;hpb=0cac86ce714cf094a2f74f5a48c314688d12347c;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index 35a8746..58552fc 100644
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -1,4 +1,31 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
@@ -6,27 +33,7 @@
   Version:   $Revision: 1.88 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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 
@@ -339,7 +346,6 @@ namespace bbtk
     */
 
 
-
   } 
   //=======================================================================
   
@@ -797,8 +803,7 @@ namespace bbtk
 	
   //=======================================================================  
   void InterpreterVirtual::DoInterpretLine( const std::string& line )
-  {
-	  
+  {  
     bbtkDebugMessage("interpreter",6,"==> InterpreterVirtual::DoInterpretLine(\""
 		     <<line<<"\")"<<std::endl);
     std::vector<std::string> words;
@@ -1123,7 +1128,7 @@ namespace bbtk
 
     bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\""
 		     <<line<<"\")"<<std::endl);
-    	  
+
   }
   //=======================================================================  
 
@@ -1365,7 +1370,7 @@ printf("EED InterpreterVirtual::SwitchToFile 1. >>%s\n", full_path.c_str() );
 	for (i=script_paths.begin();i!=script_paths.end();i++)
 	  {
 
-printf("EED InterpreterVirtual::SwitchToFile jaja >>  %s\n", (*i).c_str() );
+printf("EED InterpreterVirtual::SwitchToFile (1) >>  %s\n", (*i).c_str() );
 		  
 	    bbtkMessage("interpreter",1,
 			"--> Looking in '" << *i << "'" << std::endl);
@@ -1399,7 +1404,7 @@ printf("EED InterpreterVirtual::SwitchToFile jaja >>  %s\n", (*i).c_str() );
 		 j!= Filenames.end(); ++j)
 	      {
 			  
-printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() );
+printf("EED InterpreterVirtual::SwitchToFile (2)     >>  %s\n", (*j).c_str() );
 			  
 		int lgr = (*j).size();
 		if (lgr < 5) continue;  
@@ -1559,7 +1564,12 @@ printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() )
 //EED printf("EED D. SwitchToFile %s\n", fullPathScriptName.c_str() );	  
 		LoadScript(fullPathScriptName,name);
 //EED Borrame	  if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
-		if (source) SetCurrentFileName(fullPathScriptName);
+		  if (source) 
+		  {
+			  // Over writing the fullpath of the bbp file.
+			  SetCurrentFileName( fullPathScriptName );
+			  SetTypeOfScript_Application();
+		  }
 	}    
 	  	  
     return;
@@ -1572,6 +1582,14 @@ printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() )
 	}	
 	//=======================================================================
 	
+	
+	//=======================================================================
+	void InterpreterVirtual::SetTypeOfScript_Application( )
+	{
+	}
+	//=======================================================================
+
+	
   //=======================================================================
 void InterpreterVirtual::SwitchToStream( std::stringstream* stream )
 {