X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=e6db9eaa82687212724579983cb68a66e0ee2148;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=046144871ebb57227ec76f9ba5425ec52295592c;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx index 0461448..e6db9ea 100644 --- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx +++ b/kernel/src/bbtkWxGUIHtmlBrowser.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: bbtkWxGUIHtmlBrowser.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 09:51:29 $ - Version: $Revision: 1.1 $ - - 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.15 $ +=========================================================================*/ + + + + +/** * \brief Short description in one line * * Long description which @@ -51,27 +73,30 @@ namespace bbtk reload_id, include_id, url_id , - html_id + html_id = 10100 }; -/*EED +/* //======================================================================== void WxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& e) { std::cout << "WxHtmlWindow::OnLink"<UpdateURL(); + mBrowser->OnLinkClicked2(e); } - //======================================================================== */ +//EED2 BEGIN_EVENT_TABLE(WxHtmlWindow, wxPanel) +//EED2 EVT_SIZE(WxHtmlWindow::OnSize) +//EED2 END_EVENT_TABLE() + +//EED2 void WxHtmlWindow::OnSize( wxSizeEvent& ) +//EED2 { +//EED2 printf("EED WxHtmlWindow::OnSize \n" ); +//EED2 Scroll(10,500); +//EED2 } + //======================================================================== @@ -82,20 +107,23 @@ namespace bbtk EVT_BUTTON(reload_id, WxGUIHtmlBrowser::OnReloadButton ) // EVT_BUTTON(include_id, WxGUIHtmlBrowser::OnIncludeFileButton ) EVT_TEXT_ENTER(url_id, WxGUIHtmlBrowser::OnURLEnter ) - EVT_HTML_LINK_CLICKED(html_id, WxGUIHtmlBrowser::OnLinkClicked) + EVT_HTML_LINK_CLICKED(html_id, WxGUIHtmlBrowser::OnLinkClicked) + EVT_SIZE(WxGUIHtmlBrowser::OnSize) + END_EVENT_TABLE() //======================================================================== //======================================================================== - WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size ) + WxGUIHtmlBrowser::WxGUIHtmlBrowser ( wxWindow *parent, wxSize size, + WxGUIHtmlBrowserUser* user) : - wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) - // , mWxGUIConsole(0) + wxPanel ( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), + mUser(user) { wxPanel* panel = this; - + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); @@ -103,19 +131,19 @@ namespace bbtk mwxBackButton = new wxButton( panel, bwd_id,_T("<"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE ); mwxForwardButton = new wxButton( panel, fwd_id,_T(">"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10); + bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE ); mwxHomeButton = new wxButton( panel, home_id,_T("Home"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE ); mwxReloadButton = new wxButton( panel, reload_id,_T("Reload"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE ); /* mwxIncludeFileButton = new wxButton( panel, include_id, @@ -129,11 +157,16 @@ namespace bbtk wxDefaultSize, wxTE_PROCESS_ENTER); mwxURL->SetLabel(_T("URL")); - bsizer->Add(mwxURL, 1, wxEXPAND | wxALL, 10); + bsizer->Add(mwxURL, 1, wxEXPAND); + +// mwxHtmlWindow = new WxHtmlWindow(this,html_id,this,size); -// mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size); - mwxHtmlWindow = new WxHtmlWindow(this,html_id,this,size); + mwxHtmlWindow = new wxHtmlWindow(this,html_id, + wxDefaultPosition, + size, + wxHW_SCROLLBAR_AUTO, + _T("bbtk::WxGUIHtmlBrowser")); /* @@ -146,27 +179,21 @@ namespace bbtk mwxHtmlWindow->SetBorders(5); // mwxHtmlWindow->FitInside(); - wxStaticBoxSizer* hw = - new wxStaticBoxSizer( new wxStaticBox( this, -1, _T(""), - wxDefaultPosition, - size ), - wxVERTICAL ); -//EED hw->Add ( mwxHtmlWindow, 1, wxGROW ); - hw->Add ( mwxHtmlWindow, 1, wxEXPAND ); - - - - - - //sizer->Add ( mwxHtmlWindow, 1, wxGROW ); + sizer->Add ( bsizer , 0, wxEXPAND ); + +// EED: This have a problem in macOS +// wxStaticBoxSizer* hw = +// new wxStaticBoxSizer( +// new wxStaticBox( this, -1, _T(""), wxDefaultPosition, size ), +// wxVERTICAL +// ); +// hw->Add ( mwxHtmlWindow, 1, wxEXPAND ); //EED sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 ); - - sizer->Add ( bsizer , 0, wxEXPAND ); - sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 ); - - + + sizer->Add ( mwxHtmlWindow, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 ); panel -> SetSizer(sizer); + panel -> SetAutoLayout(true); panel -> Layout(); @@ -179,8 +206,6 @@ namespace bbtk //======================================================================== bool WxGUIHtmlBrowser::GoTo(std::string& file) { - // std::cout << "goto"<LoadPage(std2wx(file)); UpdateURL(); return r; @@ -190,7 +215,6 @@ namespace bbtk //======================================================================== void WxGUIHtmlBrowser::OnBackButton(wxCommandEvent& ) { - // std::cout << "back"<HistoryBack(); UpdateURL(); } @@ -199,7 +223,6 @@ namespace bbtk //======================================================================== void WxGUIHtmlBrowser::OnForwardButton(wxCommandEvent& ) { - // std::cout << "forward"<HistoryForward(); UpdateURL(); } @@ -209,23 +232,8 @@ namespace bbtk void WxGUIHtmlBrowser::GoHome() { std::string url = ConfigurationFile::GetInstance().Get_doc_path(); - url += "/bbtkWebSite/menu.html"; - GoTo(url); - - mwxURL->Clear(); - mwxURL->AppendText(std2wx(url)); - - -/*EED - if (Utilities::FileExists(url)) - { - GoTo(url); - } - else - { - // what ? - } -*/ + url += "/help_contents.html"; + GoTo(url); } //======================================================================== @@ -289,17 +297,69 @@ namespace bbtk } //======================================================================== - + //======================================================================== + void WxGUIHtmlBrowser::OnLinkClicked2(const wxHtmlLinkInfo& info) + { + // std::cout << "OLK2"<WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) ); + } + if (go) + { + mwxHtmlWindow->LoadPage( info.GetHref() ); + UpdateURL(); + } + + + } + //======================================================================== void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e) - { - mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() ); + { + // std::cout << "OLK"<GetValue()); + file += std2wx(ConfigurationFile::GetInstance().Get_file_separator()); + file += e.GetLinkInfo().GetHref(); + */ + wxString file = e.GetLinkInfo().GetHref(); + go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) ); + } + if (go) + { + mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() ); UpdateURL(); - mwxHtmlWindow->LoadPage( mwxURL->GetValue() ); - } + // OnURLEnter(e); + // mwxHtmlWindow->LoadPage(mwxURL->GetValue()); + } + + // mwxHtmlWindow->LoadPage( mwxURL->GetValue() ); + } //======================================================================== + //======================================================================== + void WxGUIHtmlBrowser::OnSize(wxSizeEvent& e) + { + mwxHtmlWindow->EnableScrolling(true,true); + if ( mwxURL->GetValue()!=wxString(_T("")) ) + { +// ?????????? No funciona ....????? +//EED2 mwxHtmlWindow->LoadPage(mwxURL->GetValue()); +// printf("EED WxGUIHtmlBrowser::OnSize %s \n", mwxURL->GetValue().c_str() ); +//EED2 mwxHtmlWindow->Scroll( 10, 500); + } else { +// GoHome(); + } + e.Skip(true); + } + /* void WxGUIHtmlBrowser::OnCell(wxHtmlCellEvent& ) { @@ -310,7 +370,6 @@ namespace bbtk //======================================================================== void WxGUIHtmlBrowser::UpdateURL() { - wxString s = mwxHtmlWindow->GetOpenedPage(); if (!mwxHtmlWindow->GetOpenedAnchor().IsEmpty()) {