X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUITextEditor.cxx;h=5f3aea8afe8f077f0ed4ef5a62fda940c58615dd;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=e2f7fe46eada0f9f3346205ff88feac0f3089e44;hpb=fc399c5aab38ad24ea5d57552701411b4d805181;p=bbtk.git diff --git a/kernel/src/bbtkWxGUITextEditor.cxx b/kernel/src/bbtkWxGUITextEditor.cxx index e2f7fe4..5f3aea8 100644 --- a/kernel/src/bbtkWxGUITextEditor.cxx +++ b/kernel/src/bbtkWxGUITextEditor.cxx @@ -1,20 +1,42 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # 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. + # ------------------------------------------------------------------------ */ + + /*========================================================================= - Program: bbtk Module: $RCSfile: bbtkWxGUITextEditor.cxx,v $ Language: C++ - Date: $Date: 2008/03/21 14:59:39 $ - Version: $Revision: 1.2 $ - - 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: 2012/11/16 08:49:01 $ + Version: $Revision: 1.22 $ +=========================================================================*/ + + + + +/** * \brief Short description in one line * * Long description which @@ -36,13 +58,28 @@ #include "bbtkWxGUITextEditor.h" #include "bbtkWxBlackBox.h" #include "bbtkConfigurationFile.h" - -#include "icons/cc_new.xpm" -#include "icons/cc_open.xpm" -#include "icons/cc_save.xpm" -#include "icons/cc_run.xpm" -#include "icons/cc_exit.xpm" - +#include "bbtkUtilities.h" + +//#include "icons/cc_new.xpm" +//#include "icons/cc_open.xpm" +//#include "icons/cc_stop.xpm" +//#include "icons/cc_save.xpm" +//#include "icons/cc_save_as.xpm" +//#include "icons/cc_run.xpm" +//#include "icons/cc_exit.xpm" + +#include "../data/icons/wxart_new.xpm" +#include "../data/icons/wxart_fileopen.xpm" +#include "../data/icons/wxart_filesave.xpm" +#include "../data/icons/wxart_filesaveas.xpm" +//#include "../data/icons/wxart_exefile.xpm" +//#include "../data/icons/wxart_delete.xpm" +//#include "../data/icons/wxart_down.xpm" +#include "../data/icons/wxart_run.xpm" +#include "../data/icons/wxart_runbbi.xpm" +#include "../data/icons/wxart_graphsimple.xpm" +#include "../data/icons/wxart_graphdetail.xpm" +#include "../data/icons/wxart_eldel.xpm" namespace bbtk { @@ -96,7 +133,6 @@ namespace bbtk //================================================================ - //================================================================ /* BEGIN_EVENT_TABLE(WxGUITextEditorPage, wxPanel) EVT_CLOSE(WxGUITextEditorPage::OnClose) @@ -111,9 +147,13 @@ namespace bbtk mName(""), mAskFilename(true) { + + // std::cout << "WxGUITextEditorPage::WxGUITextEditorPage("<SetWxGUITextEditor(mEditor); - - wxFont* FixedFont = new wxFont(10, + /* + new wxTextCtrl(this,-1,_T(""), + wxDefaultPosition, + wxDefaultSize, + wxTE_MULTILINE + // |wxTE_PROCESS_ENTER + // | wxTE_PROCESS_TAB + // | wxWANTS_CHARS + // | wxTAB_TRAVERSAL + ); + */ + mFixedFont = new wxFont(10, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false); mwxInputTextAttr = new wxTextAttr; - mwxInputTextAttr->SetFont(*FixedFont); + mwxInputTextAttr->SetFont(*mFixedFont); sizer->Add(mwxInputText,1,wxGROW); SetSizer(sizer); @@ -146,6 +196,8 @@ namespace bbtk //================================================================ WxGUITextEditorPage::~WxGUITextEditorPage() { + delete mwxInputTextAttr; + delete mFixedFont; } //================================================================ @@ -160,8 +212,8 @@ namespace bbtk //================================================================ void WxGUITextEditorPage::Load(const std::string& filename) { - std::cout << "-------------- LOAD ---------------"<ShowModal(); + int result_fd = fd->ShowModal(); + // This line is need it by windows // EED + fd->SetReturnCode( result_fd ); + if (fd->GetReturnCode()==wxID_OK) { mName = wx2std(fd->GetPath()); @@ -187,17 +242,42 @@ namespace bbtk } else { - std::cout << "-------------- CANCELLED ---------------" - <SaveFile(mName); + // std::cout << "file [" << mName << "]" <SaveFile(std2wx(mName)); + SaveFile(mName); mwxInputText->SetModified(false); } //================================================================ + + //================================================================ + void WxGUITextEditorPage::SaveFile(const std::string& filename) + { + mwxInputText->SaveFile( std2wx(filename) ); + } + //================================================================ + + + + + + + + + + + + + //================================================================ + // WxGUITextEditor + //================================================================ + + //================================================================ WxGUITextEditor::WxGUITextEditor( wxWindow *parent, WxGUITextEditorUser* user ) @@ -205,21 +285,25 @@ namespace bbtk mUser(user), mFileNameFilter("*.*") { - std::cout << "WxGUITextEditor::WxGUITextEditor"<SetWxGUITextEditor(this); - // mInterpreter->SetCommandLine(true); - m_mgr.SetManagedWindow(this); - - //============== - // Menu - wxInitAllImageHandlers(); - - - // wxFlexGridSizer *sizer= new wxFlexGridSizer(2); - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - - mwxNotebook = new wxAuiNotebook(this, + // m_mgr.SetManagedWindow(this); + // wxInitAllImageHandlers(); + + // std::cout << "WxGUITextEditor::WxGUITextEditor"<Add(mwxNotebook,1,wxGROW); + + + /* + mwxNotebook = new wxAuiNotebook(this, -1, wxPoint(0, 0), wxSize(500,500), @@ -233,52 +317,110 @@ namespace bbtk //| wxAUI_NB_CLOSE_ON_ALL_TABS | wxNO_BORDER); - sizer->Add(mwxNotebook,1,wxGROW); - - // BUTTONS - wxPanel *btnsCtrlPanel = new wxPanel(this,-1); - wxBoxSizer *btnsSizer = new wxBoxSizer(wxHORIZONTAL); - + m_mgr.AddPane(mwxNotebook, + wxAuiPaneInfo().Name(wxT("notebook")) + .Caption(wxT("")) + .CaptionVisible(false) + .MinimizeButton(false) + .MaximizeButton(false) + .CloseButton(false) + // .Dockable(false).Float() + .Center() + .MinSize(wxSize(100,50)) + ); +*/ + + /* wxBitmap bmp_new(cc_new_xpm); - mwxButtonNew = new wxBitmapButton( btnsCtrlPanel,ID_ButtonNew,bmp_new);//_T("New") ); - btnsSizer->Add( mwxButtonNew ); wxBitmap bmp_open(cc_open_xpm); - mwxButtonOpen = new wxBitmapButton( btnsCtrlPanel,ID_ButtonOpen,bmp_open);//,_T("Open") ); - btnsSizer->Add( mwxButtonOpen ); + wxBitmap bmp_close(cc_stop_xpm); wxBitmap bmp_save(cc_save_xpm); - mwxButtonSave = new wxBitmapButton( btnsCtrlPanel,ID_ButtonSave,bmp_save);//_T("Save") ); - btnsSizer->Add( mwxButtonSave ); - + wxBitmap bmp_saveas(cc_save_as_xpm); wxBitmap bmp_run(cc_run_xpm); - mwxButtonRun = new wxBitmapButton( btnsCtrlPanel,ID_ButtonRun,bmp_run);//_T("Run") ); - btnsSizer->Add( mwxButtonRun ); - /* - wxBitmap bmp_quit(cc_exit_xpm); - mwxButtonQuit = new wxBitmapButton( btnsCtrlPanel,ID_ButtonQuit,bmp_quit);//_T("Quit") ); - btnsSizer->Add( mwxButtonQuit ); - */ - - mwxPosition = new wxStaticText ( btnsCtrlPanel, -1, _T("")); - btnsSizer->Add( mwxPosition ); + */ + wxBitmap bmp_new(new_xpm); + wxBitmap bmp_open(fileopen_xpm); + wxBitmap bmp_close(eldel_xpm); + wxBitmap bmp_save(filesave_xpm); + wxBitmap bmp_saveas(filesaveas_xpm); + wxBitmap bmp_run(wxart_run_xpm); + wxBitmap bmp_runbbi(wxart_runbbi_xpm); + wxBitmap bmp_graphsimple(wxart_graphsimple_xpm); + wxBitmap bmp_graphdetail(wxart_graphdetail_xpm); + + mwxToolBar = new wxToolBar(this, wxID_ANY, + wxDefaultPosition, wxDefaultSize, + wxTB_FLAT | wxTB_NODIVIDER); + + mwxToolBar->AddTool(ID_ButtonNew, _T("New"), + bmp_new, wxNullBitmap, wxITEM_NORMAL, + _T("New file"), _T("Create a new file")); + mwxToolBar->AddTool(ID_ButtonOpen, _T("Open"), + bmp_open, wxNullBitmap, wxITEM_NORMAL, + _T("Open file"), _T("This is help for new file tool")); + mwxToolBar->AddTool(ID_ButtonClose, _T("Close"), + bmp_close, wxNullBitmap, wxITEM_NORMAL, + _T("Close file"), _T("Close current file")); + mwxToolBar->AddTool(ID_ButtonSave, _T("New"), + bmp_save, wxNullBitmap, wxITEM_NORMAL, + _T("Save file"), _T("Save current file")); + mwxToolBar->AddTool(ID_ButtonSaveAs, _T("New"), + bmp_saveas, wxNullBitmap, wxITEM_NORMAL, + _T("Save file as"), _T("Save current file as")); + mwxToolBar->AddTool(ID_ButtonRun, _T("Run"), + bmp_run, wxNullBitmap, wxITEM_NORMAL, + _T("Run file"), _T("Run current file")); + + + mwxToolBar->AddTool(ID_ButtonGraphSimple, _T("Graph (simple)"), + bmp_graphsimple, wxNullBitmap, wxITEM_NORMAL, + _T("Graph simple"), _T("Simple graph of actual script")); + + mwxToolBar->AddTool(ID_ButtonGraphDetail, _T("Graph (detail)"), + bmp_graphdetail, wxNullBitmap, wxITEM_NORMAL, + _T("Graph (detail)"), _T("Detail graph of actual script")); + + mwxToolBar->AddTool(ID_ButtonRunBBI, _T("Run external bbi "), + bmp_runbbi, wxNullBitmap, wxITEM_NORMAL, + _T("Run external bbi"), _T("Run external bbi")); + + + + mwxToolBar->AddSeparator(); + mwxPosition = new wxStaticText ( mwxToolBar, -1, _T("")); + mwxToolBar->AddControl(mwxPosition); + mwxToolBar->Realize(); + + sizer->Add(mwxToolBar,0,wxGROW); + + /* + m_mgr.AddPane(mwxToolBar, + wxAuiPaneInfo().Name(wxT("toolBar")) + .Caption(wxT("")) + .ToolbarPane() + .Bottom() + .MinSize(wxSize(100,50)) + .LeftDockable(false).RightDockable(false) + ); +*/ + SetSizer(sizer); + - btnsCtrlPanel->SetSizer(btnsSizer); - sizer->Add ( btnsCtrlPanel, 0, wxLEFT | wxRIGHT | wxBOTTOM //| wxGROW - , 10 ); - +// m_mgr.Update(); + SetAutoLayout(true); + Layout(); NewPage(""); UpdateInfo(); - - SetSizer(sizer); - SetAutoLayout(true); - Layout(); + } //================================================================ //================================================================ WxGUITextEditor::~WxGUITextEditor() { - m_mgr.UnInit(); + // m_mgr.UnInit(); + // delete mInterpreter; } //================================================================ @@ -295,7 +437,8 @@ namespace bbtk page->Load(name); } page->SetPageName(name); - mwxNotebook->AddPage(page,name,true); + std::string fname = Utilities::get_file_name(name); + mwxNotebook->AddPage(page,std2wx(fname),true); FocusOnCurrentPage(); } //================================================================ @@ -317,20 +460,84 @@ namespace bbtk //================================================================ //================================================================ - void WxGUITextEditor::OnButtonOpen(wxCommandEvent& event) - { - Open(); - FocusOnCurrentPage(); - } + void WxGUITextEditor::OnToolLeftClick(wxCommandEvent& event) + { + switch (event.GetId()) + { + case ID_ButtonNew : + New(); + FocusOnCurrentPage(); + break; + case ID_ButtonOpen : + Open(); + FocusOnCurrentPage(); + break; + case ID_ButtonClose : + CloseCurrentPage(); + break; + case ID_ButtonSave : + SaveCurrentPage(); + break; + case ID_ButtonSaveAs : + if (mwxNotebook->GetPageCount()==0) break; + GetCurrentPage()->SetAskFilename(true); + SaveCurrentPage(); + break; + case ID_ButtonRun : + if ((mUser!=0) && (mwxNotebook->GetPageCount()>0)) + mUser->WxGUITextEditorRun(); + FocusOnCurrentPage(); + break; + + case ID_ButtonGraphSimple : + if ((mUser!=0) && (mwxNotebook->GetPageCount()>0)) + mUser->WxGUITextEditorGraphSimple(); + FocusOnCurrentPage(); + break; + + case ID_ButtonGraphDetail : + if ((mUser!=0) && (mwxNotebook->GetPageCount()>0)) + mUser->WxGUITextEditorGraphDetail(); + FocusOnCurrentPage(); + break; + + case ID_ButtonRunBBI : + if ((mUser!=0) && (mwxNotebook->GetPageCount()>0)) + mUser->WxGUITextEditorRunBBI(); + FocusOnCurrentPage(); + break; + + } + } + //================================================================ + + //================================================================ + void WxGUITextEditor::OnToolRightClick(wxCommandEvent& event) + { + } + //================================================================ + + //================================================================ + void WxGUITextEditor::New() + { + NewPage(""); + UpdateInfo(); + } + //================================================================ + + //================================================================ void WxGUITextEditor::Open() { - std::cout << "-------------- OPEN ---------------"<ShowModal(); - + int result_fd = fd->ShowModal(); + + // This line is need it by windows //EED + fd->SetReturnCode( result_fd ); + if (fd->GetReturnCode()==wxID_OK) { std::string filename = wx2std(fd->GetPath()); @@ -339,7 +546,7 @@ namespace bbtk } else { - std::cout << "-------------- CANCELLED ---------------"<GetPageCount()==0) return; - GetCurrentPage()->Save(mFileNameFilter); - mwxNotebook->SetPageText(mwxNotebook->GetSelection(), - GetCurrentPage()->GetPageName()); - } - //================================================================ //================================================================ - void WxGUITextEditor::OnPageClose(wxAuiNotebookEvent& evt) + bool WxGUITextEditor::CloseCurrentPage() { - std::cout << "-------------- CLOSE ---------------"<GetPageCount()==0) return; + if (mwxNotebook->GetPageCount()==0) return true; + if (GetCurrentPage()->IsModified()) { + wxString mess = std2wx(GetCurrentPage()->GetPageName()); + mess += _T(" modified. Save it ?"); wxMessageDialog* d = new wxMessageDialog(this, - _T("Buffer modified. Save it ?"), + mess, _T("Save buffer"), wxYES_NO | wxCANCEL | wxICON_QUESTION); switch (d->ShowModal()) { case wxID_CANCEL : - evt.Veto(); + return false; break; case wxID_YES : GetCurrentPage()->Save(mFileNameFilter); break; case wxID_NO : ; } + } + mwxNotebook->DeletePage(mwxNotebook->GetSelection()); + FocusOnCurrentPage(); + return true; + } + //================================================================ + + //================================================================ + bool WxGUITextEditor::CloseAllPages() + { + bool ok = true; + while (mwxNotebook->GetPageCount()!=0) + { + if (!CloseCurrentPage()) + { + ok = false; + break; + } } - + return ok; + } + //================================================================ + + //================================================================ + void WxGUITextEditor::SaveCurrentPage() + { + if (mwxNotebook->GetPageCount()==0) return; + GetCurrentPage()->Save(mFileNameFilter); + mwxNotebook->SetPageText(mwxNotebook->GetSelection(), + std2wx(GetCurrentPage()->GetPageName())); + } + //================================================================ + + + //================================================================ + void WxGUITextEditor::OnPageClose(wxAuiNotebookEvent& evt) + { + if (!CloseCurrentPage()) evt.Veto(); } //================================================================ + /* //================================================================ void WxGUITextEditor::OnButtonQuit(wxCommandEvent& event) @@ -411,11 +643,6 @@ namespace bbtk */ //================================================================ - void WxGUITextEditor::OnButtonRun(wxCommandEvent& event) - { - if (mUser!=0) mUser->WxGUITextEditorRun(); - FocusOnCurrentPage(); - } /* void WxGUITextEditor::Run() @@ -447,19 +674,6 @@ namespace bbtk //================================================================ - //================================================================ - void WxGUITextEditor::OnButtonNew(wxCommandEvent& event) - { - New(); - FocusOnCurrentPage(); - } - void WxGUITextEditor::New() - { - std::cout << "-------------- NEW ---------------" << std::endl; - NewPage(""); - UpdateInfo(); - } - //================================================================ //================================================================ void WxGUITextEditor::UpdateInfo() @@ -483,21 +697,22 @@ namespace bbtk // pos+1, // (long)mwxInputText->GetValue().length())+1; - mwxPosition->SetLabel(wxString(mess)); + // mwxPosition->SetLabel(wxString(mess)); + mwxPosition->SetLabel(std2wx(mess)); mwxPosition->Show(); if (text->IsModified()) { std::string title("*"); title += GetCurrentPage()->GetPageName(); - mwxNotebook->SetPageText(mwxNotebook->GetSelection(),title); + mwxNotebook->SetPageText(mwxNotebook->GetSelection(),std2wx(title)); } } //================================================================ //================================================================ void WxGUITextEditor::OnKeyUp(wxKeyEvent& event) { - // std::cout << "U" << std::endl; + // std::cout << "U" << std::endl; UpdateInfo(); } //================================================================ @@ -505,14 +720,14 @@ namespace bbtk //================================================================ void WxGUITextEditor::OnKeyDown(wxKeyEvent& event) { - // std::cout << "D" << std::endl; + // std::cout << "D" << std::endl; // std::cout << "Key="<Hide(); + // parent window of all bbtk windows will be a child of this + // Wx::SetTopWindowParent(this); + Wx::SetTopWindow(this); + // Add the method OnWxSignal as a Wx::Signal observer + //bbtkAddWxSignalObserver(WxGUITextEditorWindow::OnWxSignal); - Wx::SetTopWindow(top); SetAutoLayout(true); Layout();