X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=9d82ec22c82b473de142d1cc95b8bf481ff63485;hb=4234999264604da013c2574feef3816c75b3034e;hp=abc4835e484acf84178adc03529c096e4f753a27;hpb=2b7ac5ab18a67097a812e20a5ecba3dac63f29cc;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index abc4835..9d82ec2 100644
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 15:27:57 $
-  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: 2008/10/17 08:18:15 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -73,6 +88,17 @@ namespace bbtk
 */
 
 
+//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  }
+
+
   //========================================================================
   
   BEGIN_EVENT_TABLE(WxGUIHtmlBrowser, wxPanel)
@@ -83,15 +109,18 @@ namespace bbtk
   //    EVT_BUTTON(include_id, WxGUIHtmlBrowser::OnIncludeFileButton )
     EVT_TEXT_ENTER(url_id, WxGUIHtmlBrowser::OnURLEnter )
     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;
@@ -179,8 +208,6 @@ namespace bbtk
   //========================================================================
   bool WxGUIHtmlBrowser::GoTo(std::string& file)
   { 
-    //  std::cout << "goto"<<std::endl;
-
     bool r = mwxHtmlWindow->LoadPage(std2wx(file));
     UpdateURL();
     return r;
@@ -190,7 +217,6 @@ namespace bbtk
   //========================================================================
   void WxGUIHtmlBrowser::OnBackButton(wxCommandEvent& )
   {
-    //    std::cout << "back"<<std::endl;
     mwxHtmlWindow->HistoryBack();
     UpdateURL();
   }
@@ -199,7 +225,6 @@ namespace bbtk
   //========================================================================
   void WxGUIHtmlBrowser::OnForwardButton(wxCommandEvent& )
   {
-    //    std::cout << "forward"<<std::endl;
     mwxHtmlWindow->HistoryForward();
     UpdateURL();
   }
@@ -209,23 +234,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);
   }
   //========================================================================
 
@@ -292,14 +302,48 @@ namespace bbtk
 
   //========================================================================
   void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
-  {
-    mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
+  { 
+  
+    bool go = true;
+    if (mUser) 
+      {
+		  /*
+	wxString file = wxPathOnly(mwxURL->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& )
   {