-/*=========================================================================
-
+/*=========================================================================
Program: bbtk
Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
Language: C++
- 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
- http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*//**
+ Date: $Date: 2008/10/21 08:37:04 $
+ Version: $Revision: 1.30 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+* This software is governed by the CeCILL-B license under French law and
+* abiding by the rules of distribution of free software. You can use,
+* modify and/ or redistribute the software under the terms of the CeCILL-B
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+* or in the file LICENSE.txt.
+*
+* As a counterpart to the access to the source code and rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty and the software's author, the holder of the
+* economic rights, and the successive licensors have only limited
+* liability.
+*
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */
+
+
+/**
* \brief Short description in one line
*
* Long description which
#include "bbtkWxBlackBox.h"
#include "bbtkConfigurationFile.h"
#include "bbtkWxStreamRedirector.h"
-
+#include "bbtkUtilities.h"
-#include "icons/cc_run.xpm"
+#include <wx/tipwin.h>
+
+//#include "icons/cc_run.xpm"
namespace bbtk
{
ID_Menu_CreatePackage,
ID_Menu_CreateBlackBox,
ID_Menu_ShowImageGraph,
- ID_Menu_CreateIndex,
+ ID_Menu_RegeneratePackageDoc,
+ ID_Menu_RegenerateBoxesLists,
+ ID_Menu_RegenerateAll,
+ ID_Menu_PlugPackage,
ID_Menu_Windows_Files,
ID_Menu_Windows_Help,
ID_Menu_Windows_Messages,
ID_Menu_Windows_Command,
ID_Menu_Windows_Save,
- ID_Menu_Windows_HelpBrowser
+ 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 = 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_ShowImageGraph, _T("&Show last image graph") );
- menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") );
+ menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") );
+ menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") );
+ menuTools->AppendSeparator();
+ menuTools->Append( ID_Menu_RegeneratePackageDoc,_T("Regenerate package &doc") );
+ menuTools->Append( ID_Menu_RegenerateBoxesLists,_T("Regenerate boxes &lists") );
+ menuTools->Append( ID_Menu_RegenerateAll,_T("Regenerate &all") );
+ menuTools->AppendSeparator();
+ menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last graph") );
wxMenu *menuWindows = new wxMenu;
menuWindows->AppendCheckItem(ID_Menu_Windows_Files,
menuWindows->AppendCheckItem(ID_Menu_Windows_Command,
_T("Show 'command' panel") )->Check();
menuWindows->AppendSeparator();
- menuWindows->Append( ID_Menu_Windows_HelpBrowser, _T("Show help &Browser") );
+ menuWindows->Append( ID_Menu_Windows_PackageBrowser, _T("Start 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,
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);
mWxGUICommand->SetFocus();
+#if NOTEBOOK
mwxNotebook = new wxAuiNotebook(this,
-1,
.Center()
// .MinSize(wxSize(100,100))
);
+#else
- /*
//
m_mgr.AddPane(mWxGUITextEditor,
wxAuiPaneInfo().Name(wxT("editor_content"))
.MinimizeButton(true)
.MaximizeButton(true)
.Right()
- .MinSize(wxSize(200,100))
+ .Layer(2)
+ .MinSize(wxSize(400,100))
);
m_mgr.AddPane(mWxGUIOutputMessages,
.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();
+ 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();
}
//================================================================
} \
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;
+ // 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;
}
//================================================================
{
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 ";
-#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::OnMenuWindowsHelpBrowser(wxCommandEvent& WXUNUSED(event))
+ void WxGUIScriptingInterface::OnMenuWindowsPackageBrowser(wxCommandEvent& WXUNUSED(event))
{
- wxBusyCursor wait;
- WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this);
- browser->IncludeAll();
- mwxNotebook->AddPage(browser,_T("Help 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
}
//================================================================
}
//================================================================
+ void WxGUIScriptingInterface::DoRegeneratePackageDoc( const std::string& pack )
+ {
+ std::string command;
+#if defined(WIN32)
+ command = "\"";
+#endif
+ command += ConfigurationFile::GetInstance().Get_bin_path();
+ command += ConfigurationFile::GetInstance().Get_file_separator();
+ command += "bbRegeneratePackageDoc";
+#if defined(WIN32)
+ command += "\"";
+#endif
+ command += " " + pack + " -q";
+ bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
+
+
+ if ( ! system ( command.c_str() ) )
+ {
+ wxMessageBox(_T("Done !"),_T("Regenerate package '")+std2wx(pack)+_T("' doc"),
+ wxOK | wxICON_INFORMATION);
+ }
+ else
+ {
+ wxString err(_T("An error occured while running '"));
+ err += bbtk::std2wx(command) + _T("'");
+ wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR);
+ }
+ }
+
//================================================================
- void WxGUIScriptingInterface::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event))
+ void WxGUIScriptingInterface::OnMenuRegeneratePackageDoc(wxCommandEvent& WXUNUSED(event))
{
- std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path();
- std::string filepath = doc_path+"/bbdoc/make-index.bbs";
+ wxString name = wxGetTextFromUser(_T("Enter package name (-a for all)"),
+ _T("Regenerate package doc"),
+ _T(""));
+ if (name.IsEmpty()) return;
+ std::string pack = bbtk::wx2std(name);
+
+ DoRegeneratePackageDoc(pack);
+ }
+ //================================================================
- Interpreter::Pointer I = Interpreter::New();
- I->InterpretLine( "exec freeze");
- I->InterpretLine( "include *");
- 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");
-
+ void WxGUIScriptingInterface::DoRegenerateBoxesLists()
+ {
+ std::string command;
+#if defined(WIN32)
+ command = "\"";
+#endif
+ command += ConfigurationFile::GetInstance().Get_bin_path();
+ command += ConfigurationFile::GetInstance().Get_file_separator();
+ command += "bbRegenerateBoxesLists";
+#if defined(WIN32)
+ command += "\"";
+#endif
+ command += " -q";
+ bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
+
+ if ( ! system ( command.c_str() ) )
+ {
+ wxMessageBox(_T("Done !"),_T("Regenerate boxes lists"),
+ wxOK | wxICON_INFORMATION);
+ }
+ else
+ {
+ wxString err(_T("An error occured while running '"));
+ err += bbtk::std2wx(command) + _T("'");
+ wxMessageBox(err,_T("Regenerate boxes lists"),wxOK | wxICON_ERROR);
+ }
+ }
+
+ //================================================================
+ void WxGUIScriptingInterface::OnMenuRegenerateBoxesLists(wxCommandEvent& WXUNUSED(event))
+ {
+ DoRegenerateBoxesLists();
}
//================================================================
+ //================================================================
+ void WxGUIScriptingInterface::OnMenuRegenerateAll(wxCommandEvent& WXUNUSED(event))
+ {
+
+ DoRegeneratePackageDoc("-a");
+ DoRegenerateBoxesLists();
+ }
+ //================================================================
+
+
+ //================================================================
+ void WxGUIScriptingInterface::OnMenuPlugPackage(wxCommandEvent& WXUNUSED(event))
+ {
+ long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
+ wxDirDialog* FD =
+ new wxDirDialog( 0,
+ _T("Select package directory"),
+ _T(""),
+ style);
+
+ if (FD->ShowModal()==wxID_OK)
+ {
+ std::string path = wx2std (FD->GetPath()) ;
+ std::string fname = path + "/bbtkPackage";
+ if ( ! Utilities::FileExists( fname ) )
+ {
+ wxString err(_T("The directory does not contain a 'bbtkPackage' file"));
+ wxMessageBox(err,_T("Plug package"),wxOK | wxICON_ERROR);
+ return;
+ }
+
+ std::ifstream f;
+ f.open(fname.c_str());
+ std::string pname;
+ f >> pname;
+ f.close();
+
+
+ bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path );
+
+ DoRegeneratePackageDoc(pname);
+ DoRegenerateBoxesLists();
+
+ }
+ }
+ //================================================================
//================================================================
void WxGUIScriptingInterface::InterpreterUserViewHtmlPage(const std::string& page)
&& (target[s-4]=='.'))
{
mWxGUITextEditor->Open(target);
+#if NOTEBOOK
mwxNotebook->SetSelection(0);
+#endif
mWxGUITextEditor->SetFocus();
return false;
}
//================================================================
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_CreatePackage, WxGUIScriptingInterface::OnMenuCreatePackage)
EVT_MENU(ID_Menu_CreateBlackBox, WxGUIScriptingInterface::OnMenuCreateBlackBox)
EVT_MENU(ID_Menu_ShowImageGraph, WxGUIScriptingInterface::OnMenuShowImageGraph)
- EVT_MENU(ID_Menu_CreateIndex, WxGUIScriptingInterface::OnMenuCreateIndex)
+ EVT_MENU(ID_Menu_RegeneratePackageDoc, WxGUIScriptingInterface::OnMenuRegeneratePackageDoc)
+ EVT_MENU(ID_Menu_RegenerateBoxesLists, WxGUIScriptingInterface::OnMenuRegenerateBoxesLists)
+ EVT_MENU(ID_Menu_RegenerateAll, WxGUIScriptingInterface::OnMenuRegenerateAll)
+ EVT_MENU(ID_Menu_PlugPackage, WxGUIScriptingInterface::OnMenuPlugPackage)
EVT_MENU(ID_Menu_Windows_Files, WxGUIScriptingInterface::OnMenuWindowsFiles)
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_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