X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=e19fb0e8f97e1f55e28c0f3ffeab28f75e9f29b9;hb=6bbabb32cba07ce95376c2cdcb804ee97050d453;hp=3659fa97f2711159291a614f0d97e57cc443733c;hpb=5934ccb7ca0fabdbe6c1907b2aea3696e19a0251;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index 3659fa9..e19fb0e 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/22 14:30:25 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/06/19 09:46:41 $
+  Version:   $Revision: 1.13 $
                                                                                 
   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
     };
@@ -83,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") );
     
     
@@ -151,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);
@@ -179,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)
@@ -275,7 +287,7 @@ namespace bbtk
   //================================================================
   void WxGUIConsole::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event))
   {
-    std::string command("toolsbbtk/appli/CreatePackage");
+    std::string command("toolsbbtk/appli/GUICreatePackage");
 
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
     Interpreter::Pointer I = Interpreter::New();    
@@ -287,7 +299,7 @@ namespace bbtk
   //================================================================
   void WxGUIConsole::OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event))
   {
-    std::string command("toolsbbtk/appli/CreateBlackBox");
+    std::string command("toolsbbtk/appli/GUICreateBlackBox");
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
     Interpreter::Pointer I = Interpreter::New();    
     I->InterpretFile(command);
@@ -304,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() );
 
@@ -312,6 +345,7 @@ namespace bbtk
   //================================================================
 
 
+
   //================================================================
   void WxGUIConsole::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event))
   {
@@ -337,7 +371,7 @@ namespace bbtk
 	std::string strcommand0		= "cd "+bbdoc_path+" && mkdir tmp && cd tmp";
 
 	std::string strcommand1		= "cd "+bbdoc_path+"/tmp";
-    std::string strcommand2		= "\""+bin_path+"/bbi\" -n "+make_index_path;
+    std::string strcommand2		= "\""+bin_path+"/bbi\" -N "+make_index_path;
 #ifdef WIN32 
     std::string strcommand3		= "move index*.html ../.";
 #else
@@ -374,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()
   //================================================================