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

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 91054a3..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/05/28 08:12:05 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2010/06/18 14:43:19 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -114,7 +114,7 @@ namespace bbtk
   {
     bbtkDebugMessage("kernel",9,"==> Executer::Reset()" <<std::endl);
 
-    GetFactory()->CheckPackages();
+    //    GetFactory()->Check();
  
     mOpenDefinition.clear();
     mOpenPackage.clear();
@@ -122,7 +122,9 @@ namespace bbtk
     //  Wx::DestroyTopWindow();
 
     GetFactory()->Reset();
+#if(USE_WXWIDGETS)
     Wx::ProcessPendingEvents();
+#endif
  
     // Create user package
     Package::Pointer p =
@@ -142,7 +144,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 +158,7 @@ namespace bbtk
   /// changes the workspace name
   void Executer::SetWorkspaceName( const std::string& n )
   {
-    GetUserPackage()->ChangeBlackBoxName( GetWorkspace()->GetTypeName(), n );
+    GetUserPackage()->ChangeDescriptorName( GetWorkspace()->GetTypeName(), n );
   }
   //=======================================================================
 
@@ -253,7 +255,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 +504,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 +649,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 +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");
       }
   }
   //=======================================================================