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

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 519a264..72ad0de 100644
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 15:22:51 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2010/06/18 14:43:19 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -37,6 +37,7 @@
 #include "bbtkMessageManager.h"
 #include "bbtkFactory.h"
 #include "bbtkUtilities.h"
+//#include "bbtkWx.h"
 #include <fstream>
 
 #ifdef USE_WXWIDGETS
@@ -52,7 +53,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 +68,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 +77,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 +112,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 +144,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 +158,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 +178,9 @@ namespace bbtk
 	GetFactory()->InsertPackage(p);
       }
      mOpenPackage.push_back(p);
+
+     bbtkDebugMessage("kernel",9,"<== Executer::BeginPackage(\""<<name<<"\")"
+		      <<std::endl);
   }
   //=======================================================================
 
@@ -187,9 +196,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 +206,9 @@ namespace bbtk
     b->SetScriptFileName(scriptfilename);
     mOpenDefinition.push_back( CBBDefinition( b, pack ) );
     
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("kernel",9,"<== Executer::Define(\""<<name<<
+		     ","<<pack<<"\")"
+		     <<std::endl);
   }
   //=======================================================================
 
@@ -213,18 +224,18 @@ namespace bbtk
   //=======================================================================
   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 +255,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 +504,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 +641,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 +670,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 +704,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 +762,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);
   }
   //==========================================================================