X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=db654b8e64c963d8dfb40da5c546e12e868889b7;hb=b60f4996d8155665b79e20f85999f287bf1d73d3;hp=4d0a5104bea454f12178890157a5502987b4503e;hpb=caba246bb51787dac9357d9244052dba34c77840;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 4d0a510..db654b8 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/25 07:33:17 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/06/10 19:19:42 $
+  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
@@ -57,7 +57,8 @@ namespace bbtk
       ID_Menu_Windows_Help,
       ID_Menu_Windows_Messages,
       ID_Menu_Windows_Command,
-      ID_Menu_Windows_Save
+      ID_Menu_Windows_Save,
+	  ID_Menu_Windows_HelpBrowser
       //      ID_Button_Run
     };
     
@@ -89,7 +90,7 @@ namespace bbtk
     menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &blackbox") );
     menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") );
     menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") );
-    
+
     wxMenu *menuWindows = new wxMenu;
     menuWindows->AppendCheckItem(ID_Menu_Windows_Files,
 				 _T("Show 'files' panel") )->Check();
@@ -99,6 +100,8 @@ namespace bbtk
 				 _T("Show 'messages' panel") )->Check();
     menuWindows->AppendCheckItem(ID_Menu_Windows_Command,
 				 _T("Show 'command' panel") )->Check();
+    menuWindows->AppendSeparator();
+    menuWindows->Append( ID_Menu_Windows_HelpBrowser, _T("Show help &Browser") );
     
     menuWindows->AppendSeparator();
     menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration"));
@@ -123,10 +126,11 @@ namespace bbtk
     //
     mWxGUITextEditor = new WxGUITextEditor(this,this);
     mWxGUITextEditor->SetFileNameFilter("*.bbs");
+	
+    mWxGUIHtmlBrowser		= new WxGUIHtmlBrowser(this,wxSize(200,0),this);
 
-    mWxGUIHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0),this);
 
-    /*    
+	/*    
 	  wxBitmap bmp_run(cc_run_xpm);
 	  mwxButtonRun = new wxBitmapButton( this, ID_Button_Run,bmp_run);//_T("Run")  );
     */
@@ -137,8 +141,8 @@ namespace bbtk
    
     mWxGUICommand->SetFocus();
 
-    /*
-    
+ 
+
     mwxNotebook = new wxAuiNotebook(this,  
 				    -1,
 				    wxPoint(0, 0),
@@ -152,7 +156,26 @@ namespace bbtk
 				    //| wxAUI_NB_CLOSE_ON_ACTIVE_TAB
 				    //| wxAUI_NB_CLOSE_ON_ALL_TABS
 				    | wxNO_BORDER);
-    */
+  
+
+    mwxNotebook->AddPage(mWxGUITextEditor,_T("Files"),true);
+    mwxNotebook->AddPage(mWxGUIHtmlBrowser,_T("Help"),true);
+
+    mwxNotebook->AddPage(mWxGUIOutputMessages,_T("Messages"),true);
+
+    mwxNotebook->AddPage(mWxGUICommand,_T("Command"),true);
+
+
+    m_mgr.AddPane(mwxNotebook,
+		  wxAuiPaneInfo().Name(wxT("nb"))
+		  .CaptionVisible(false)
+		  .MinimizeButton(false)
+		  .MaximizeButton(false)
+		  .Center()
+		  //		  .MinSize(wxSize(100,100))
+		  );   
+
+  /*
     //
     m_mgr.AddPane(mWxGUITextEditor,
 		  wxAuiPaneInfo().Name(wxT("editor_content"))
@@ -189,6 +212,7 @@ namespace bbtk
 		  .Position(1)
 		  .MinSize(wxSize(100,100))
 		  );     
+    */
     //    m_mgr.AddPane(mwxButtonRun,
     //		  wxAuiPaneInfo().Name(wxT("button_run_content")));     
 
@@ -202,6 +226,8 @@ namespace bbtk
 	
     SetAutoLayout(true);
     Layout();
+    mwxNotebook->SetSelection(1);
+    mWxGUIHtmlBrowser->GoHome();
 //    Refresh();
 //    m_mgr.Update();
   }
@@ -323,12 +349,23 @@ namespace bbtk
   }
   //================================================================
 
+  //================================================================
+  void WxGUIScriptingInterface::OnMenuWindowsHelpBrowser(wxCommandEvent& WXUNUSED(event))
+  {
+	 wxBusyCursor wait;
+     WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this);
+     browser->IncludeAll();
+	 mwxNotebook->AddPage(browser,_T("Help Browser"),true);
+  }
+  //================================================================
+
+
 
   //================================================================
   void WxGUIScriptingInterface::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();    
@@ -341,7 +378,7 @@ namespace bbtk
   //================================================================
   void WxGUIScriptingInterface::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();    
@@ -413,6 +450,8 @@ namespace bbtk
 	&& (target[s-4]=='.'))
       {
 	mWxGUITextEditor->Open(target);
+	mwxNotebook->SetSelection(0);
+	mWxGUITextEditor->SetFocus();
 	return false;
       }
     return true;
@@ -492,6 +531,7 @@ namespace bbtk
     EVT_MENU(ID_Menu_Windows_Help, WxGUIScriptingInterface::OnMenuWindowsHelp)
     EVT_MENU(ID_Menu_Windows_Messages, WxGUIScriptingInterface::OnMenuWindowsMessages)
     EVT_MENU(ID_Menu_Windows_Command, WxGUIScriptingInterface::OnMenuWindowsCommand)
+    EVT_MENU(ID_Menu_Windows_HelpBrowser, WxGUIScriptingInterface::OnMenuWindowsHelpBrowser)
     EVT_AUI_PANE_CLOSE(WxGUIScriptingInterface::OnPaneClose)
   //    EVT_BUTTON(ID_Button_Run, WxGUIScriptingInterface::OnButtonRun )
     END_EVENT_TABLE()