X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=966c1f70486f924d6c5f3eb88e6b00215d0f4322;hb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;hp=a50ce204187397b1f380ab0a0e723b1954e287ea;hpb=3ccde402d1eb179b3e940ec7ca3d1d2e9c96386c;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index a50ce20..966c1f7 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/21 08:37:04 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2008/12/15 09:04:47 $
+  Version:   $Revision: 1.32 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -95,7 +95,8 @@ namespace bbtk
     mInterpreter->SetUser(this);
     mInterpreter->SetCommandLine(true);
     mInterpreter->SetThrow(true);
-    
+    //    mInterpreter->AddBreakObserver
+    //boost::bind( &WxGUIScriptingInterface::InterpreterUserOnBreak, this ));
     //==============
     // Menu
     wxInitAllImageHandlers();
@@ -260,7 +261,8 @@ namespace bbtk
     m_mgr.Update();
     //   LoadPerspective();
 
-
+    mBreaked = false;	
+    
     wxTipWindow* tip = new wxTipWindow(this,
 				       _T("\n                  Welcome to bbStudio !\n\n   To run a demo or example:\n     1. click on the 'Demos' or 'Examples' link\n     2. select a demo or example\n     3. click on the '[source]' link : the source file is loaded in bbStudio\n     4. click on the 'Run' button (the arrow at the bottom right of the source file)   \n"),1000);
     tip->CenterOnParent();
@@ -282,24 +284,54 @@ namespace bbtk
     mWxGUITextEditor->Open(filename);
   }
   //================================================================
-  
-#define CATCH_MACRO							\
-  catch (QuitException e)						\
+  /*
+  catch (BreakException e)						\
     {									\
-      std::cout << "* quit exception caught"<<std::endl;		\
+      std::cout << "* BREAK"<<std::endl;				\
+      if (e.IsInScriptFile())						\
+	std::cout << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
+      std::cout << "* LINE   : "<<e.GetScriptLine()<<std::endl;		\
     }									\
-  catch (InterpreterError e)						\
+  catch (QuitException e)						\
     {									\
-      std::cerr << "* IERROR : "<<e.GetErrorMessage()<<std::endl;		\
+      std::cout << "* QUIT"<<std::endl;					\
       if (e.IsInScriptFile())						\
-	std::cerr << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
-      std::cerr << "* LINE   : "<<e.GetScriptLine()<<std::endl;		\
-      int lev = bbtk::MessageManager::GetMessageLevel("Error");		\
-      if (lev > 0) {							\
-	std::cerr << "* Exception thrown : "<<std::endl;		\
-	std::cerr << "*  OBJECT : " <<e.GetObject()<<std::endl;		\
-	std::cerr << "*  FILE   : " <<e.GetSourceFile()<<std::endl;	\
-      }									\
+	std::cout << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
+      std::cout << "* LINE   : "<<e.GetScriptLine()<<std::endl;		\
+    }									\
+*/
+  
+#define CATCH_MACRO							\
+  catch (InterpreterException e)					\
+    {									\
+      if (e.GetErrorMessage()=="quit")					\
+	{								\
+	  std::cerr << "* QUIT ENCOUNTERED"<<std::endl;			\
+	  if (e.IsInScriptFile())					\
+	    std::cerr << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
+	  std::cerr << "* LINE   : "<<e.GetScriptLine()<<std::endl;	\
+	}								\
+      else if (e.GetErrorMessage()=="break")				\
+	{								\
+	  mBreaked = true;						\
+	  std::cerr << "* BREAK"<<std::endl;				\
+	  if (e.IsInScriptFile())					\
+	    std::cerr << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
+	  std::cerr << "* LINE   : "<<e.GetScriptLine()<<std::endl;	\
+	}								\
+      else								\
+	{								\
+	  std::cerr << "* ERROR : "<<e.GetErrorMessage()<<std::endl;	\
+	  if (e.IsInScriptFile())					\
+	    std::cerr << "* FILE   : '"<<e.GetScriptFile()<<"'"<<std::endl; \
+	  std::cerr << "* LINE   : "<<e.GetScriptLine()<<std::endl;	\
+	  int lev = bbtk::MessageManager::GetMessageLevel("Error");	\
+	  if (lev > 0) {						\
+	    std::cerr << "* Exception thrown : "<<std::endl;		\
+	    std::cerr << "*  OBJECT : " <<e.GetObject()<<std::endl;	\
+	    std::cerr << "*  FILE   : " <<e.GetSourceFile()<<std::endl;	\
+	  }								\
+	}								\
     }
   
   //================================================================
@@ -338,9 +370,16 @@ namespace bbtk
     (*buf) << mWxGUITextEditor->GetCurrentPage()->GetText();
     try 
       {
-	//	std::cout << "RUN"<<std::endl;
-	if (mwxMenuItemReset->IsChecked()) WxGUICommandEnter("reset");
-	mInterpreter->InterpretBuffer(buf);
+	if (!mBreaked)
+	  {
+	    if (mwxMenuItemReset->IsChecked()) WxGUICommandEnter("reset");
+	    mInterpreter->InterpretBuffer(buf);
+	  }
+	else 
+	  {
+	    mBreaked = false;
+	    mInterpreter->InterpretCurrentStreams();
+	  }
 	//	std::cout << "EO RUN"<<std::endl;
       }
     CATCH_MACRO;
@@ -414,12 +453,18 @@ namespace bbtk
   //================================================================
   void WxGUIScriptingInterface::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event))
   {
-
+/*
     std::string command("toolsbbtk/appli/GUICreatePackage");
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
-    
-    Interpreter::Pointer I = Interpreter::New();    
+  
+	Interpreter::Pointer I = Interpreter::New();    
     I->InterpretFile(command);
+*/
+    std::string command("reset");
+	mWxGUICommand->SendCommand(command);
+    command = "include toolsbbtk/appli/GUICreatePackage";
+    bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
+	mWxGUICommand->SendCommand(command);
 
   }
   //================================================================
@@ -428,11 +473,18 @@ namespace bbtk
   //================================================================
   void WxGUIScriptingInterface::OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event))
   {
+	  /*
     std::string command("toolsbbtk/appli/GUICreateBlackBox");
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
     
     Interpreter::Pointer I = Interpreter::New();    
     I->InterpretFile(command);
+*/
+    std::string command("reset");
+	mWxGUICommand->SendCommand(command);
+    command = "include toolsbbtk/appli/GUICreateBlackBox";
+    bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
+	mWxGUICommand->SendCommand(command);
   }
   //================================================================
   
@@ -596,6 +648,16 @@ namespace bbtk
   } 
   //================================================================  
   
+  /*
+  //================================================================
+  void WxGUIScriptingInterface::InterpreterUserOnBreak()
+  {
+    //    std::cout << "Break" << std::endl;
+    
+  }
+  //================================================================
+  */
+
   //================================================================  
   bool WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked(const std::string& target)
   {