X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkExecuter.cxx;h=d20ed655310e3b8dece8b01ec28ca197c055d5c1;hb=cd39bfaca5c64598de7046df6989f244fc6e32cd;hp=519a264eec6eb7bb3017a38ae007d33df0cf4c89;hpb=98e18224b83c6955a804d79d4e7083626ea8afcd;p=bbtk.git

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 519a264..d20ed65 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/03/30 15:22:51 $
-  Version:   $Revision: 1.29 $
+  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 
@@ -37,6 +44,7 @@
 #include "bbtkMessageManager.h"
 #include "bbtkFactory.h"
 #include "bbtkUtilities.h"
+//#include "bbtkWx.h"
 #include <fstream>
 
 #ifdef USE_WXWIDGETS
@@ -52,7 +60,7 @@ namespace bbtk
   //=======================================================================
   Executer::Pointer Executer::New()
   {
-    bbtkDebugMessage("Kernel",9,"Executer::New()"<<std::endl);
+    bbtkDebugMessage("object",9,"Executer::New()"<<std::endl);
     return MakePointer(new Executer());
   }
   //=======================================================================
@@ -67,7 +75,7 @@ namespace bbtk
     mDialogMode(NoDialog),
     mNoErrorMode(false)
   {
-    bbtkDebugMessageInc("Kernel",9,"Executer::Executer()" <<std::endl);
+    bbtkDebugMessage("object",2,"==> Executer()" <<std::endl);
     mFactory = Factory::New();
     // The smart pointer on this is not made yet (is made by New) 
     // -> create it to pass it to the factory
@@ -76,19 +84,19 @@ namespace bbtk
     // -> this would auto-destroy !!
     mFactory->SetExecuter(MakePointer(this,true));
     Reset();
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("object",2,"<== Executer()" <<std::endl);
   }
   //=======================================================================
 
   //=======================================================================
   Executer::~Executer()
   {
-     bbtkDebugMessageInc("Kernel",9,"==> Executer::~Executer()" <<std::endl);
+     bbtkDebugMessage("object",2,"==> ~Executer()" <<std::endl);
      mOpenDefinition.clear();
      mOpenPackage.clear();
      mFactory->Reset();
      mFactory.reset();
-     bbtkDebugDecTab("Kernel",9);
+     bbtkDebugMessage("object",2,"<== ~Executer()" <<std::endl);
   }
   //=======================================================================
 
@@ -111,14 +119,20 @@ namespace bbtk
   //=======================================================================
   void Executer::Reset()
   {
-    bbtkDebugMessageInc("Kernel",9,"Executer::Reset()" <<std::endl);
+    bbtkDebugMessage("kernel",9,"==> Executer::Reset()" <<std::endl);
 
-    GetFactory()->CheckPackages();
+    //    GetFactory()->Check();
  
     mOpenDefinition.clear();
     mOpenPackage.clear();
-    GetFactory()->Reset();
 
+    //  Wx::DestroyTopWindow();
+
+    GetFactory()->Reset();
+#if(USE_WXWIDGETS)
+    Wx::ProcessPendingEvents();
+#endif
+ 
     // Create user package
     Package::Pointer p =
       Package::New("user","internal","User defined black boxes","");
@@ -137,13 +151,12 @@ 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();
     //  GetFactory()->CheckPackages();
-
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("kernel",9,"<== Executer::Reset()" <<std::endl);
   }
   //=======================================================================
 
@@ -152,14 +165,14 @@ namespace bbtk
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
   {
-    GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n );
+    GetUserPackage()->ChangeDescriptorName( GetWorkspace()->GetTypeName(), n );
   }
   //=======================================================================
 
   //=======================================================================
   void Executer::BeginPackage (const std::string &name)
   {
-     bbtkDebugMessageInc("Kernel",9,"Executer::BeginPackage(\""<<name<<"\")"
+     bbtkDebugMessage("kernel",9,"==> Executer::BeginPackage(\""<<name<<"\")"
                         <<std::endl);
      Package::Pointer p;
      try 
@@ -172,6 +185,9 @@ namespace bbtk
 	GetFactory()->InsertPackage(p);
       }
      mOpenPackage.push_back(p);
+
+     bbtkDebugMessage("kernel",9,"<== Executer::BeginPackage(\""<<name<<"\")"
+		      <<std::endl);
   }
   //=======================================================================
 
@@ -187,9 +203,9 @@ namespace bbtk
                          const std::string &pack,
                          const std::string &scriptfilename)
   {
-    bbtkDebugMessageInc("Kernel",9,"Executer::Define(\""<<name<<
-                        ","<<pack<<"\")"
-                        <<std::endl);
+    bbtkDebugMessage("kernel",9,"==> Executer::Define(\""<<name<<
+		     ","<<pack<<"\")"
+		     <<std::endl);
 
     ComplexBlackBoxDescriptor::Pointer b 
       = ComplexBlackBoxDescriptor::New(name);
@@ -197,7 +213,9 @@ namespace bbtk
     b->SetScriptFileName(scriptfilename);
     mOpenDefinition.push_back( CBBDefinition( b, pack ) );
     
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("kernel",9,"<== Executer::Define(\""<<name<<
+		     ","<<pack<<"\")"
+		     <<std::endl);
   }
   //=======================================================================
 
@@ -210,21 +228,28 @@ namespace bbtk
   }
   //=======================================================================
 
+	void Executer::SetTypeOfScript_Application ()
+	{
+		mOpenDefinition.back().box->SetTypeOfScript_Application();
+	}
+	
+	
+	
   //=======================================================================
   void Executer::Clear()
   {
-    bbtkDebugMessageInc("Kernel",9,"Executer::Clear()" <<std::endl);
+    bbtkDebugMessage("kernel",9,"==> Executer::Clear()" <<std::endl);
     GetCurrentDescriptor()->GetPrototype()->Clear();
-
+    bbtkDebugMessage("kernel",9,"<== Executer::Clear()" <<std::endl);
   }
   //=======================================================================
 
   //=======================================================================
   void Executer::EndDefine ()
   {
-    bbtkDebugMessageInc("Kernel",9,"Executer::EndDefine(\""
-                        <<GetCurrentDescriptor()->GetTypeName()<<"\")" 
-                        <<std::endl);
+    bbtkDebugMessage("kernel",9,"==> Executer::EndDefine(\""
+		     <<GetCurrentDescriptor()->GetTypeName()<<"\")" 
+		     <<std::endl);
     // Does current package exist ?
     Package::Pointer p;
     std::string pname(mOpenDefinition.back().package);
@@ -244,8 +269,12 @@ 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()<<"\")" 
+		     <<std::endl);
     mOpenDefinition.pop_back();
   }
   //======================================================================= 
@@ -489,14 +518,15 @@ namespace bbtk
   }
   //=======================================================================
 
+
+
   //=======================================================================
   /// prints the list of the boxes of the current descriptor
-  void Executer::PrintBoxes()
+  void Executer::PrintHelpListBoxes()
   {
-    bbtkMessageInc("Help",1,"The black box descriptor \""
-                   <<GetCurrentDescriptor()->GetTypeName()<<"\" contains : "<<std::endl);
+    bbtkMessage("help",1,"The black box descriptor \""
+		<<GetCurrentDescriptor()->GetTypeName()<<"\" contains : "<<std::endl);
     GetCurrentDescriptor()->PrintBlackBoxes();
-    bbtkDecTab("Help",1);
  }
   //=======================================================================
 
@@ -625,15 +655,15 @@ namespace bbtk
       } 
     else 
       {
-	bbtkMessageInc("Help",1,"No black box: \""
-		       <<nameblackbox<<"\" " <<std::endl);
+	bbtkMessage("help",1,"No black box: \""
+		    <<nameblackbox<<"\" " <<std::endl);
       }
     return page;
   }
   //=======================================================================
 
   //=======================================================================
-  void Executer::ShowRelations(const std::string &nameblackbox, 
+  void Executer::PrintHelpBlackBox(const std::string &nameblackbox, 
 			       const std::string &detailStr, 
 			       const std::string &levelStr)
   {
@@ -654,12 +684,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");
       }
   }
   //=======================================================================
@@ -688,7 +718,7 @@ namespace bbtk
     if (GetNoExecMode() &&  (GetCurrentDescriptor()==GetWorkspace()) ) return;
     if (GetCurrentDescriptor()!=GetWorkspace()) return;
 
-    bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<<str<<"\")"<<std::endl);
+    bbtkDebugMessage("kernel",9,"Executer::Print(\""<<str<<"\")"<<std::endl);
 
  // TO DO :
  // InterpretLine ("load std")
@@ -746,9 +776,9 @@ namespace bbtk
     for (i= chains.begin(); i!=chains.end(); ++i) 
       {
 	Utilities::SubsBackslashN(*i);
-	bbtkMessage("Output",1,*i);
+	bbtkMessage("output",1,*i);
       }
-    bbtkMessage("Output",1,std::endl);
+    bbtkMessage("output",1,std::endl);
   }
   //==========================================================================