X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=d176ba3d31a2b1eb8adf37ddffdc7169c903362a;hb=d4eee42d2a2b5cc416a30deb49bf07aa76b7b3b1;hp=669d9ac2cb0eb4bdff773e38de94ec95deb72e56;hpb=c777b23c18131be9bf4d2e4fc9b25daead080a38;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 669d9ac..d176ba3 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/06/26 06:50:05 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2008/09/10 09:25:19 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,9 +37,10 @@
 #include "bbtkWxBlackBox.h"
 #include "bbtkConfigurationFile.h"
 #include "bbtkWxStreamRedirector.h"
- 
+#include "bbtkUtilities.h"
+
 
-#include "icons/cc_run.xpm"
+//#include "icons/cc_run.xpm"
 
 namespace bbtk
 {
@@ -64,30 +65,32 @@ namespace bbtk
     
   
   //================================================================
-  WxGUIScriptingInterface::WxGUIScriptingInterface( wxWindow *parent, wxString title, wxSize size)
-    : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size)
+  WxGUIScriptingInterface::WxGUIScriptingInterface( wxWindow *parent )
+    : wxFrame((wxFrame *)parent, -1, _T("bbStudio"), 
+	      wxDefaultPosition, wxSize(1200,800) )
   {	
-//    m_mgr = new wxAuiManager(this);
-	m_mgr.SetManagedWindow(this);
-   
-	mInterpreter = bbtk::Interpreter::New();
+    //    m_mgr = new wxAuiManager(this);
+    m_mgr.SetManagedWindow(this);
+    
+    mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetUser(this);
     mInterpreter->SetCommandLine(true);
     mInterpreter->SetThrow(true);
+    
     //==============
     // Menu
     wxInitAllImageHandlers();
     
     wxMenu *menuFile = new wxMenu;
+    menuFile->Append( ID_Menu_EditConfig, _T("Open bbtk &Config file") );
     menuFile->Append( ID_Menu_Quit, _T("&Quit") );
     
     wxMenu *menuAbout = new wxMenu;
     menuAbout->Append( ID_Menu_About, _T("&About...") );
 
     wxMenu *menuTools = new wxMenu;
-    menuTools->Append( ID_Menu_EditConfig, _T("&Edit bbtk config") );
     menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") );
-    menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &blackbox") );
+    menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") );
     menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") );
     menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") );
 
@@ -101,10 +104,10 @@ namespace bbtk
     menuWindows->AppendCheckItem(ID_Menu_Windows_Command,
 				 _T("Show 'command' panel") )->Check();
     menuWindows->AppendSeparator();
-    menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Show Package &Browser") );
+    menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Launch Package &Browser") );
     
-    menuWindows->AppendSeparator();
-    menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration"));
+    //    menuWindows->AppendSeparator();
+    //    menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration"));
 
     wxMenu *menuOptions = new wxMenu;
     mwxMenuItemReset = menuOptions->AppendCheckItem(-1,
@@ -120,21 +123,18 @@ namespace bbtk
     
     SetMenuBar( menuBar );
     
+    //=== 
+    // Status bar
     CreateStatusBar();
-    SetStatusText( _T("Welcome to bbi !") );
+    SetStatusText( _T("Welcome to bbStudio !") );
     
-    //
+    //===
+    // Panes (Files, Messages, Help, Command)
     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")  );
-    */
-  
     mWxGUIOutputMessages = new WxGUIOutputMessages(this);
 
     mWxGUICommand = new WxGUICommand(this,this);
@@ -142,6 +142,7 @@ namespace bbtk
     mWxGUICommand->SetFocus();
 
  
+#if NOTEBOOK
 
     mwxNotebook = new wxAuiNotebook(this,  
 				    -1,
@@ -174,8 +175,8 @@ namespace bbtk
 		  .Center()
 		  //		  .MinSize(wxSize(100,100))
 		  );   
+#else 
 
-  /*
     //
     m_mgr.AddPane(mWxGUITextEditor,
 		  wxAuiPaneInfo().Name(wxT("editor_content"))
@@ -192,7 +193,8 @@ namespace bbtk
 		  .MinimizeButton(true)
 		  .MaximizeButton(true)
 		  .Right()
-		  .MinSize(wxSize(200,100))
+		  .Layer(2)
+		  .MinSize(wxSize(400,100))
 		  );
 
     m_mgr.AddPane(mWxGUIOutputMessages,
@@ -209,33 +211,38 @@ namespace bbtk
 		  .MinimizeButton(true)
 		  .MaximizeButton(true)
 		  .Bottom()
-		  .Position(1)
+		  .Layer(1)
 		  .MinSize(wxSize(100,100))
 		  );     
-    */
-    //    m_mgr.AddPane(mwxButtonRun,
-    //		  wxAuiPaneInfo().Name(wxT("button_run_content")));     
+#endif
 
-    // Creates the parent window of all bbtk windows as a child of this
-    Wx::CreateTopWindow(this);
+    // parent window of all bbtk windows will be a child of this
+    Wx::SetTopWindowParent(this);
     // Add the method OnWxSignal as a Wx::Signal observer 
     //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal);
 
-//.PaneBorder(false)); 
-    m_mgr.Update();
+    //.PaneBorder(false)); 
+    // Load the interface appearance saved on last closing
+    LoadPerspective();
+
+    // Done in LoadPerspective
+    //    m_mgr.Update();
 	
     SetAutoLayout(true);
     Layout();
-    mwxNotebook->SetSelection(1);
+    //    mwxNotebook->SetSelection(1);
     mWxGUIHtmlBrowser->GoHome();
 //    Refresh();
 //    m_mgr.Update();
+    //   LoadPerspective();
+
   }
   //================================================================
 
  //================================================================
   WxGUIScriptingInterface::~WxGUIScriptingInterface()
   {
+    SavePerspective();
     m_mgr.UnInit();
   }
   //================================================================
@@ -302,13 +309,13 @@ namespace bbtk
     (*buf) << mWxGUITextEditor->GetCurrentPage()->GetText();
     try 
       {
-	std::cout << "RUN"<<std::endl;
+	//	std::cout << "RUN"<<std::endl;
 	if (mwxMenuItemReset->IsChecked()) WxGUICommandEnter("reset");
 	mInterpreter->InterpretBuffer(buf);
-	std::cout << "EO RUN"<<std::endl;
+	//	std::cout << "EO RUN"<<std::endl;
       }
     CATCH_MACRO;
-    std::cout << "EO RUN 3"<<std::endl;
+    //    std::cout << "EO RUN 3"<<std::endl;
   }
   //================================================================  
 
@@ -326,7 +333,7 @@ namespace bbtk
   {
     m_mgr.Update();
 	Refresh();
-    wxMessageBox(_T("  bbi\nThe Black Box Toolkit interpreter\n(c) CREATIS-LRMN 2008"),
+    wxMessageBox(_T("  bbStudio\nThe Black Box Toolkit Development Studio\n(c) CREATIS-LRMN 2008"),
                  _T("About ..."), wxOK | wxICON_INFORMATION,
                  this);
   }
@@ -336,26 +343,40 @@ namespace bbtk
   //================================================================
   void WxGUIScriptingInterface::OnMenuEditConfig(wxCommandEvent& WXUNUSED(event))
   {
-	std::string commandStr;
-    std::string configFile = ConfigurationFile::GetInstance().Get_config_xml_full_path();
-#ifdef WIN32
-	commandStr = "notepad.exe ";
-#else
-	commandStr = "gedit ";
-#endif 
-	commandStr = commandStr + configFile;
-	//	std::cout << "system: " << commandStr << std::endl;
-	system ( commandStr.c_str() );
+    std::string configFile = 
+      ConfigurationFile::GetInstance().Get_config_xml_full_path();
+    Open(configFile);
   }
   //================================================================
 
   //================================================================
   void WxGUIScriptingInterface::OnMenuWindowsPackageBrowser(wxCommandEvent& WXUNUSED(event))
   {
-	 wxBusyCursor wait;
-     WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this);
-     browser->IncludeAll();
-	 mwxNotebook->AddPage(browser,_T("Package Browser"),true);
+    wxBusyCursor wait;
+    WxGUIPackageBrowser2Window *helpbrowser = new
+      WxGUIPackageBrowser2Window(this,_T("Package Browser"), wxSize(600,600) );
+    helpbrowser->Show();
+    
+    /*
+    wxBusyCursor wait;
+    WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this);
+    browser->IncludeAll();
+    */
+#if NOTEBOOK
+    //     mwxNotebook->AddPage(browser,_T("Package Browser"),true);
+#else
+     /*
+     m_mgr.AddPane(browser,
+		   wxAuiPaneInfo().Name(wxT("package_brower"))
+		   .Caption(wxT("Package browser"))
+		   .MinimizeButton(true)
+		   .MaximizeButton(true)
+		   .Bottom()
+		   .Position(1)
+		   .MinSize(wxSize(100,100))
+		   );     
+     */
+#endif
   }
   //================================================================
 
@@ -412,8 +433,11 @@ namespace bbtk
 
     Interpreter::Pointer I = Interpreter::New();    
 
+    I->InterpretLine( "config");
+    I->InterpretLine( "message echo 2");
     I->InterpretLine( "exec freeze");
     I->InterpretLine( "include *");
+    I->InterpretLine( "help packages");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-alpha.html Initials");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-package.html Packages");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-category.html Categories");
@@ -450,7 +474,9 @@ namespace bbtk
 	&& (target[s-4]=='.'))
       {
 	mWxGUITextEditor->Open(target);
+#if NOTEBOOK
 	mwxNotebook->SetSelection(0);
+#endif
 	mWxGUITextEditor->SetFocus();
 	return false;
       }
@@ -503,17 +529,67 @@ namespace bbtk
   //================================================================  
   void WxGUIScriptingInterface::OnMenuWindowsSave( wxCommandEvent& WXUNUSED(event))
   {
-    // TO DO : Save it into ConfigurationFile
-    //    m_mgr.SavePerspective();
+    SavePerspective();
+  }
+  //================================================================  
+
+  //================================================================  
+  void WxGUIScriptingInterface::SavePerspective()
+  {
+    //    std::cout  << "Saving configuration..."<<std::endl;
+    std::string conf = wx2std(m_mgr.SavePerspective());
+    std::string fname = Utilities::MakeUserSettingsFullFileName("bbStudio.aui");
+    std::ofstream f;
+    f.open(fname.c_str(), std::ios::out );
+    f << conf << std::endl;
+
+    int w,h;
+    GetSize(&w,&h);
+
+    f << w << " " << h << std::endl;
+
+    f.close();
   }
   //================================================================  
 
+  //================================================================  
+  void WxGUIScriptingInterface::LoadPerspective()
+  {
+    std::string fname = 
+      Utilities::MakeUserSettingsFullFileName("bbStudio.aui");
+    if ( Utilities::FileExists( fname ))
+      {
+	//	std::cout  << "Loading configuration..."<<std::endl;
+
+	std::ifstream f;
+	f.open(fname.c_str());
+	std::string conf;
+	f >> conf;
+
+	int w,h;
+
+	f >> w >> h ;
+
+	f.close();
+	
+	//	std::cout << conf << std::endl;
+
+	SetSize(w,h);
+	m_mgr.LoadPerspective(std2wx(conf));
+      }
+    else 
+      {
+	m_mgr.Update();
+      }
+  }
+  //================================================================  
 
   //================================================================  
   void WxGUIScriptingInterface::OnPaneClose(wxAuiManagerEvent& evt)
   {
     std::cout  << "Closing panel '"<<evt.pane->name<<"'"<<std::endl;
-    
+    // TO DO : Uncheck 
+    //    OnMenuWindowsCheck( wxCommandEvent& event, wxWindow* w);
   }
   //================================================================  
 
@@ -531,6 +607,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_Save, WxGUIScriptingInterface::OnMenuWindowsSave)
     EVT_MENU(ID_Menu_Windows_PackageBrowser, WxGUIScriptingInterface::OnMenuWindowsPackageBrowser)
     EVT_AUI_PANE_CLOSE(WxGUIScriptingInterface::OnPaneClose)
   //    EVT_BUTTON(ID_Button_Run, WxGUIScriptingInterface::OnButtonRun )