X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=c15e5996551ca429597292ddfa59b8073663f217;hb=63d56e2f28b834d9e13f3757aaa23ab63b2b3dd6;hp=49bc3460c4b27219bd8b51e26ae56fb3ecea7d24;hpb=8822f9075c66dcf742b9edae47271bb46af6a9b7;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 49bc346..c15e599 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: 2009/01/27 14:22:57 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2009/05/28 08:12:07 $
+  Version:   $Revision: 1.38 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -93,7 +93,7 @@ namespace bbtk
     
     mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetUser(this);
-    mInterpreter->SetCommandLine(true);
+	mInterpreter->SetCommandLine(true);
     mInterpreter->SetThrow(true);
     //    mInterpreter->AddBreakObserver
     //boost::bind( &WxGUIScriptingInterface::InterpreterUserOnBreak, this ));
@@ -230,6 +230,7 @@ namespace bbtk
 		  .Bottom()
 		  .MinSize(wxSize(100,100))
 		  );
+	  
     m_mgr.AddPane(mWxGUICommand,
 		  wxAuiPaneInfo().Name(wxT("command_content"))
 		  .Caption(wxT("Command"))
@@ -242,8 +243,10 @@ namespace bbtk
 #endif
 
     // parent window of all bbtk windows will be a child of this
-    Wx::SetTopWindowParent(this);
-    // Add the method OnWxSignal as a Wx::Signal observer 
+    //    Wx::SetTopWindowParent(this);
+    Wx::SetTopWindow(this);
+    // Wx::SetAutoDestroyTopWindow(false);
+  // Add the method OnWxSignal as a Wx::Signal observer 
     //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal);
 
     //.PaneBorder(false)); 
@@ -300,11 +303,29 @@ namespace bbtk
  //================================================================
   WxGUIScriptingInterface::~WxGUIScriptingInterface()
   {
+  bbtkDebugMessage("widget",9,"bbStudio::~bbStudio()"<<std::endl);
     SavePerspective();
     m_mgr.UnInit();
   }
   //================================================================
 
+  //================================================================
+  void WxGUIScriptingInterface::OnClose(wxCloseEvent& event)
+  {
+    bbtkDebugMessage("widget",9,"bbStudio::OnClose()"<<std::endl);
+    //Wx::SetWindowsHaveBeenDestroyedByParent();
+    //mInterpreter.reset();
+    wxWindowList& list = GetChildren();
+    wxWindowList::iterator iter;
+    for (iter = list.begin(); iter != list.end(); ++iter)
+      {
+	(*iter)->Close();
+      }
+    this->Destroy();
+  }
+  //================================================================
+
+
   //================================================================
   void WxGUIScriptingInterface::Open(const std::string& filename)
   {
@@ -389,6 +410,52 @@ namespace bbtk
   }
   //================================================================
  
+	
+  //================================================================
+	void WxGUIScriptingInterface::WxGUITextEditorGraphSimple()
+	{
+		WxGUICommandEnter("exec freeze_no_error");
+		WxGUITextEditorRun();
+		WxGUICommandEnter("exec unfreeze");
+		WxGUICommandEnter("graph");
+	}
+  //================================================================
+	
+	//================================================================
+	void WxGUIScriptingInterface::WxGUITextEditorGraphDetail()
+	{
+		WxGUICommandEnter("exec freeze_no_error");
+		WxGUITextEditorRun();
+		WxGUICommandEnter("exec unfreeze");
+		WxGUICommandEnter("graph . 1");
+	}
+	//================================================================
+
+	
+	//================================================================
+	void WxGUIScriptingInterface::WxGUITextEditorRunBBI()
+	{
+	  std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
+	  std::string dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
+	  std::string filename = dir + separator + "tmp_bbtk.bbs";
+	  mWxGUITextEditor->GetCurrentPage()->SaveFile(filename);
+	
+		std::string command = "\"";
+ 	  command += ConfigurationFile::GetInstance().Get_bin_path();
+#ifdef MACOSX
+	  command += separator + "bbi.app/Contents/MacOS/bbi\" ";
+#else 
+	  command += separator + "bbi\" ";
+#endif
+	  command += "\""+filename + "\"";
+	  command += " & ";
+	  
+  	  printf ("EED WxGUIScriptingInterface::WxGUITextEditorRunBBI %s \n" , command.c_str() );
+   	  system( command.c_str() );
+	}
+	//================================================================
+	
+	
   //================================================================
   void WxGUIScriptingInterface::WxGUITextEditorRun()
   {
@@ -518,14 +585,27 @@ namespace bbtk
   //================================================================
   void WxGUIScriptingInterface::OnMenuShowImageGraph(wxCommandEvent& WXUNUSED(event))
   {
-    std::string default_temp_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
 
+      std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path();
+      doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
+      doc_path += "bbdoc";
+      doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
+	  
+	  std::string pack_name("User");
+	  std::string pack_path = doc_path + pack_name;
+	  
+	  
 #if defined(WIN32)
     std::string strappli="start ";
 #else
-    std::string strappli="gnome-open ";
+  #if defined(MACOSX)
+      std::string strappli="open ";
+  #else
+      std::string strappli="gnome-open ";	  
+  #endif
 #endif
-    std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png";
+	  
+	  std::string strcommand = strappli +pack_path+"/workspace_workspacePrototype.png";
     //	std::cout << "system: " << strcommand << std::endl;
     system ( strcommand.c_str() );
 
@@ -557,7 +637,7 @@ namespace bbtk
 #endif
 	command += " " + pack + " -q";
     bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
-    
+
 
     if ( ! system ( command.c_str() ) )
       {
@@ -856,6 +936,7 @@ namespace bbtk
   
   //================================================================  
   BEGIN_EVENT_TABLE(WxGUIScriptingInterface, wxFrame)
+    EVT_CLOSE(  WxGUIScriptingInterface::OnClose)
     EVT_MENU(ID_Menu_Quit, WxGUIScriptingInterface::OnMenuQuit)
     EVT_MENU(ID_Menu_About, WxGUIScriptingInterface::OnMenuAbout)
     EVT_MENU(ID_Menu_EditConfig, WxGUIScriptingInterface::OnMenuEditConfig)