Program: bbtk
Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
Language: C++
- Date: $Date: 2008/03/25 15:47:54 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2008/10/02 13:21:11 $
+ Version: $Revision: 1.20 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "bbtkWxBlackBox.h"
#include "bbtkConfigurationFile.h"
#include "bbtkWxStreamRedirector.h"
-
+#include "bbtkUtilities.h"
+
+#include <wx/tipwin.h>
-#include "icons/cc_run.xpm"
+//#include "icons/cc_run.xpm"
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_PackageBrowser
// ID_Button_Run
};
//================================================================
- 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 = new bbtk::Interpreter();
+ // 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") );
-
+
wxMenu *menuWindows = new wxMenu;
menuWindows->AppendCheckItem(ID_Menu_Windows_Files,
_T("Show 'files' panel") )->Check();
_T("Show 'messages' panel") )->Check();
menuWindows->AppendCheckItem(ID_Menu_Windows_Command,
_T("Show 'command' panel") )->Check();
-
menuWindows->AppendSeparator();
- menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration"));
+ menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Launch Package &Browser") );
+
+ // menuWindows->AppendSeparator();
+ // menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration"));
wxMenu *menuOptions = new wxMenu;
mwxMenuItemReset = menuOptions->AppendCheckItem(-1,
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);
- /*
- 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);
mWxGUICommand->SetFocus();
- // Creates and sets the parent window of all bbtk windows
- wxWindow* top = new wxPanel(this,-1);//,_T("top"));
- top->Hide();
- Wx::SetTopWindow(top);
-
+
+#if NOTEBOOK
+
+ mwxNotebook = new wxAuiNotebook(this,
+ -1,
+ wxPoint(0, 0),
+ wxSize(500,500),
+ wxAUI_NB_TAB_SPLIT
+ | wxAUI_NB_TAB_MOVE
+ | wxAUI_NB_TAB_EXTERNAL_MOVE
+ //| wxAUI_NB_WINDOWLIST_BUTTON
+ //|wxAUI_NB_SCROLL_BUTTONS
+ // | wxAUI_NB_CLOSE_BUTTON
+ //| 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))
+ );
+#else
//
m_mgr.AddPane(mWxGUITextEditor,
.MaximizeButton(true)
.Center()
.MinSize(wxSize(100,100))
- );
+ );
+
m_mgr.AddPane(mWxGUIHtmlBrowser,
wxAuiPaneInfo().Name(wxT("browser_content"))
.Caption(wxT("Help"))
.MinimizeButton(true)
.MaximizeButton(true)
.Right()
- .MinSize(wxSize(100,100))
+ .Layer(2)
+ .MinSize(wxSize(400,100))
);
+
m_mgr.AddPane(mWxGUIOutputMessages,
wxAuiPaneInfo().Name(wxT("messages_content"))
.Caption(wxT("Messages"))
.MinimizeButton(true)
.MaximizeButton(true)
.Bottom()
- .Position(1)
+ .Layer(1)
.MinSize(wxSize(100,100))
);
- // m_mgr.AddPane(mwxButtonRun,
- // wxAuiPaneInfo().Name(wxT("button_run_content")));
+#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
+ //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);
+ mWxGUIHtmlBrowser->GoHome();
// Refresh();
-// m_mgr.Update();
+ m_mgr.Update();
+ // LoadPerspective();
+
+
+ wxTipWindow* tip = new wxTipWindow(this,
+ _T("\n Welcome to bbStudio !\n\n To run a demo or example:\n 1. click on the 'Demos' or 'Examples' link\n 2. select a demo or example\n 3. click on the '[source]' link : the source file is loaded in bbStudio\n 4. click on the 'Run' button (the arrow at the bottom right of the source file) \n"),1000);
+ tip->CenterOnParent();
+ tip->Show();
}
//================================================================
//================================================================
WxGUIScriptingInterface::~WxGUIScriptingInterface()
{
+ SavePerspective();
m_mgr.UnInit();
}
//================================================================
//================================================================
#define CATCH_MACRO \
+ catch (QuitException e) \
+ { \
+ std::cout << "* quit exception caught"<<std::endl; \
+ } \
catch (InterpreterError e) \
{ \
- std::cerr << "* IERROR : "<<e.GetMessage()<<std::endl; \
+ std::cerr << "* IERROR : "<<e.GetErrorMessage()<<std::endl; \
if (e.IsInScriptFile()) \
std::cerr << "* FILE : '"<<e.GetScriptFile()<<"'"<<std::endl; \
std::cerr << "* LINE : "<<e.GetScriptLine()<<std::endl; \
(*buf) << mWxGUITextEditor->GetCurrentPage()->GetText();
try
{
+ // std::cout << "RUN"<<std::endl;
if (mwxMenuItemReset->IsChecked()) WxGUICommandEnter("reset");
mInterpreter->InterpretBuffer(buf);
+ // std::cout << "EO RUN"<<std::endl;
}
- CATCH_MACRO
+ CATCH_MACRO;
+ // std::cout << "EO RUN 3"<<std::endl;
}
//================================================================
{
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);
}
//================================================================
void WxGUIScriptingInterface::OnMenuEditConfig(wxCommandEvent& WXUNUSED(event))
{
- std::string commandStr;
- std::string configFile = ConfigurationFile::GetInstance().Get_config_xml_full_path();
-#ifdef WIN32
- commandStr = "notepad.exe ";
+ std::string configFile =
+ ConfigurationFile::GetInstance().Get_config_xml_full_path();
+ Open(configFile);
+ }
+ //================================================================
+
+ //================================================================
+ void WxGUIScriptingInterface::OnMenuWindowsPackageBrowser(wxCommandEvent& WXUNUSED(event))
+ {
+ 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
- commandStr = "gedit ";
-#endif
- commandStr = commandStr + configFile;
- std::cout << "system: " << commandStr << std::endl;
- system ( commandStr.c_str() );
+ /*
+ 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
}
//================================================================
+
//================================================================
void WxGUIScriptingInterface::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event))
{
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 01 \n");
- std::string command("toolsbbtk/appli/CreatePackage");
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 02 \n");
+ std::string command("toolsbbtk/appli/GUICreatePackage");
bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 03 \n");
- Interpreter* I = new Interpreter;
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 04 \n");
+
+ Interpreter::Pointer I = Interpreter::New();
I->InterpretFile(command);
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 05 \n");
- delete I;
-printf("EED WxGUIScriptingInterface::OnMenuCreatePackage 06 \n");
+
}
//================================================================
//================================================================
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* I = new Interpreter;
+
+ Interpreter::Pointer I = Interpreter::New();
I->InterpretFile(command);
- delete I;
}
//================================================================
std::string strappli="gnome-open ";
#endif
std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png";
- std::cout << "system: " << strcommand << std::endl;
+ // std::cout << "system: " << strcommand << std::endl;
system ( strcommand.c_str() );
}
{
std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path();
std::string filepath = doc_path+"/bbdoc/make-index.bbs";
- Interpreter* I = new Interpreter;
-//EED std::cout << "bbi: include "<<filepath<<std::endl;
-//EED I->InterpretFile( filepath );
+ 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");
I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors");
- delete I;
}
//================================================================
//================================================================
bool WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked(const std::string& target)
{
- std::cout << "OnLink"<<std::endl;
size_t s = target.length();
if ((s>3) && (target[s-1]=='s')
&& (target[s-2]=='b')
&& (target[s-4]=='.'))
{
mWxGUITextEditor->Open(target);
+#if NOTEBOOK
+ mwxNotebook->SetSelection(0);
+#endif
+ mWxGUITextEditor->SetFocus();
return false;
}
return true;
//================================================================
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 x,y;
+ // GetPosition(&x,&y);
+ // f << x << " " << y << 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 x,y;
+ // f >> x >> y ;
+
+ int w,h;
+ f >> w >> h ;
+
+ f.close();
+
+ // std::cout << conf << std::endl;
+
+ // Move(x,y);
+ 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);
}
//================================================================
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 )
END_EVENT_TABLE()
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff