X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=bf51fe564d3a1b644ee850f9bbc044d9b3abfa08;hb=87efce51877a540d943b1aa26307994b38bba55b;hp=91054a35c8c026b47be07c4315fa66c5d4c0750e;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 91054a3..bf51fe5 100644
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:05 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.34 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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 
@@ -114,7 +121,7 @@ namespace bbtk
   {
     bbtkDebugMessage("kernel",9,"==> Executer::Reset()" <<std::endl);
 
-    GetFactory()->CheckPackages();
+    //    GetFactory()->Check();
  
     mOpenDefinition.clear();
     mOpenPackage.clear();
@@ -122,7 +129,10 @@ namespace bbtk
     //  Wx::DestroyTopWindow();
 
     GetFactory()->Reset();
+#if(USE_WXWIDGETS)
     Wx::ProcessPendingEvents();
+#endif
+
  
     // Create user package
     Package::Pointer p =
@@ -142,7 +152,7 @@ namespace bbtk
     r->AddToDescription("User's workspace");
     mOpenDefinition.push_back(CBBDefinition(r,"user"));
     // Register it into the user package
-    p->RegisterBlackBox(r);
+    p->Register(r);
     mRootCBB = r;
 
     //    Object::PrintObjectListInfo();
@@ -156,7 +166,7 @@ namespace bbtk
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
   {
-    GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n );
+    GetUserPackage()->ChangeDescriptorName( GetWorkspace()->GetTypeName(), n );
   }
   //=======================================================================
 
@@ -219,6 +229,13 @@ namespace bbtk
   }
   //=======================================================================
 
+	void Executer::SetTypeOfScript_Application ()
+	{
+		mOpenDefinition.back().box->SetTypeOfScript_Application();
+	}
+	
+	
+	
   //=======================================================================
   void Executer::Clear()
   {
@@ -253,7 +270,8 @@ namespace bbtk
       {
 	p = mOpenPackage.back().lock();
       }
-    p->RegisterBlackBox(GetCurrentDescriptor());
+    // Register the descriptor in the current package
+    p->Register(GetCurrentDescriptor());
     
     bbtkDebugMessage("kernel",9,"<== Executer::EndDefine(\""
 		     <<GetCurrentDescriptor()->GetTypeName()<<"\")" 
@@ -501,9 +519,11 @@ namespace bbtk
   }
   //=======================================================================
 
+
+
   //=======================================================================
   /// prints the list of the boxes of the current descriptor
-  void Executer::PrintBoxes()
+  void Executer::PrintHelpListBoxes()
   {
     bbtkMessage("help",1,"The black box descriptor \""
 		<<GetCurrentDescriptor()->GetTypeName()<<"\" contains : "<<std::endl);
@@ -644,7 +664,7 @@ namespace bbtk
   //=======================================================================
 
   //=======================================================================
-  void Executer::ShowRelations(const std::string &nameblackbox, 
+  void Executer::PrintHelpBlackBox(const std::string &nameblackbox, 
 			       const std::string &detailStr, 
 			       const std::string &levelStr)
   {
@@ -665,12 +685,12 @@ namespace bbtk
     if (blackbox)
       {
 	found=true;
-	blackbox->bbShowRelations(blackbox,detail,level); //,mFactory);
+	blackbox->bbPrintHelp(blackbox,detail,level); //,mFactory);
       }
     
     if (!found) 
       {
-	bbtkError("Blackbox Name not found.. <"  <<nameblackbox<<">");
+	bbtkError("box with name '"  <<nameblackbox<<"' unknown");
       }
   }
   //=======================================================================