X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=53cbb2fdc4d40f0a7d0c7b88971600c71aae6309;hb=a32025c531a0e20e967dc2ba3e0817f6932061b1;hp=a4d4299144b6067fbe87626fe27f4bcb86bfc276;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index a4d4299..53cbb2f 100644
--- a/kernel/src/bbtkWxGUIConsole.cxx
+++ b/kernel/src/bbtkWxGUIConsole.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/05/06 13:45:12 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,6 +52,7 @@ namespace bbtk
       ID_Menu_CreatePackage,
       ID_Menu_CreateBlackBox,
       ID_Menu_ShowImageGraph,
+      ID_Menu_ShowHTMLDoc,
       ID_Menu_CreateIndex,
       ID_Button_Run
     };
@@ -67,6 +68,7 @@ namespace bbtk
 	mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetUser(this);
     mInterpreter->SetCommandLine(true);
+    mInterpreter->SetThrow(false);
     //==============
     // Menu
     wxInitAllImageHandlers();
@@ -82,6 +84,7 @@ namespace bbtk
     menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") );
     menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &blackbox") );
     menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") );
+    menuTools->Append( ID_Menu_ShowHTMLDoc, _T("Show &HTML documentation") );
     menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") );
     
     
@@ -150,11 +153,11 @@ namespace bbtk
     cmdsizer->Add (mWxGUICommand, 0, wxALL | wxGROW, 5);
 
         
-    // Creates and sets the parent window of all bbtk windows
-    wxWindow* top = new wxPanel(this,-1);//,_T("top"));
-    top->Hide();
-    Wx::SetTopWindow(top);
-    
+    // Creates the parent window of all bbtk windows as a child of this
+    Wx::CreateTopWindow(this,true);
+    // Add the method OnWxSignal as a Wx::Signal observer 
+    bbtkAddWxSignalObserver(WxGUIConsole::OnWxSignal);
+
 
     // Layout
 //EED    SetSizer(sizer);
@@ -178,6 +181,16 @@ namespace bbtk
   }
   //================================================================
 
+  //================================================================
+  void WxGUIConsole::OnWxSignal()
+  {
+    if ((!Wx::TopWindowExists())&&(!IsShown())) 
+      {
+	bbtkDebugMessage("wx",2,"  --> bbtk top window destroyed and WxGUIConsole not shown => destructing"<<std::endl);
+	Close();
+      }
+  }
+  //================================================================
 
   //================================================================
   void WxGUIConsole::WxGUICommandEnter(const std::string& command)
@@ -303,7 +316,28 @@ namespace bbtk
 #else
     std::string strappli="gnome-open ";
 #endif
-    std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png";
+    std::string strcommand0 = "cd \"" + default_temp_dir+"/temp_dir/" +"\"";
+    std::string strcommand1 = strappli + "workspace_workspacePrototype.png";
+    std::string strcommand = strcommand0 + " && " + strcommand1;
+	std::cout << "system: " << strcommand << std::endl;
+    system ( strcommand.c_str() );
+
+  }
+  //================================================================
+
+  //================================================================
+  void WxGUIConsole::OnMenuShowHTMLDoc(wxCommandEvent& WXUNUSED(event))
+  {
+	std::string doc_path		= ConfigurationFile::GetInstance().Get_doc_path();
+
+#if defined(WIN32)
+    std::string strappli="start ";
+#else
+    std::string strappli="gnome-open ";
+#endif
+    std::string strcommand0 = "cd \"" + doc_path+"\"";
+    std::string strcommand1 = strappli + "index.html";
+    std::string strcommand = strcommand0 + " && " + strcommand1;
 	std::cout << "system: " << strcommand << std::endl;
     system ( strcommand.c_str() );
 
@@ -311,6 +345,7 @@ namespace bbtk
   //================================================================
 
 
+
   //================================================================
   void WxGUIConsole::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event))
   {
@@ -373,17 +408,26 @@ namespace bbtk
   } 
   //================================================================  
   
-    
+  //================================================================  
+  // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction
+  bool WxGUIConsole::Show(bool show)
+  {
+    Wx::AutoDestroyTopWindow(!show);
+    return wxFrame::Show(show);
+  }
+  //================================================================  
+   
   //================================================================  
   BEGIN_EVENT_TABLE(WxGUIConsole, wxFrame)
-    EVT_MENU(ID_Menu_Quit, WxGUIConsole::OnMenuQuit)
-    EVT_MENU(ID_Menu_About, WxGUIConsole::OnMenuAbout)
-    EVT_MENU(ID_Menu_EditConfig, WxGUIConsole::OnMenuEditConfig)
-    EVT_MENU(ID_Menu_CreatePackage, WxGUIConsole::OnMenuCreatePackage)
-    EVT_MENU(ID_Menu_CreateBlackBox, WxGUIConsole::OnMenuCreateBlackBox)
-    EVT_MENU(ID_Menu_ShowImageGraph, WxGUIConsole::OnMenuShowImageGraph)
-    EVT_MENU(ID_Menu_CreateIndex, WxGUIConsole::OnMenuCreateIndex)
-    EVT_BUTTON(ID_Button_Run, WxGUIConsole::OnButtonRun )
+    EVT_MENU(ID_Menu_Quit			, WxGUIConsole::OnMenuQuit)
+    EVT_MENU(ID_Menu_About			, WxGUIConsole::OnMenuAbout)
+    EVT_MENU(ID_Menu_EditConfig		, WxGUIConsole::OnMenuEditConfig)
+    EVT_MENU(ID_Menu_CreatePackage	, WxGUIConsole::OnMenuCreatePackage)
+    EVT_MENU(ID_Menu_CreateBlackBox	, WxGUIConsole::OnMenuCreateBlackBox)
+    EVT_MENU(ID_Menu_ShowImageGraph	, WxGUIConsole::OnMenuShowImageGraph)
+    EVT_MENU(ID_Menu_ShowHTMLDoc	, WxGUIConsole::OnMenuShowHTMLDoc)
+    EVT_MENU(ID_Menu_CreateIndex	, WxGUIConsole::OnMenuCreateIndex)
+    EVT_BUTTON(ID_Button_Run		, WxGUIConsole::OnButtonRun )
     END_EVENT_TABLE()
   //================================================================