X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIHtmlBrowser.cxx;h=1b687a7156b5ed3a10f528cdacf7b72f55cd388e;hb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;hp=c44820ff8fe04972e1c86405a455dcbef7355f3a;hpb=b60f4996d8155665b79e20f85999f287bf1d73d3;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index c44820f..1b687a7 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/06/10 19:19:42 $
-  Version:   $Revision: 1.6 $
-                                                                                
-  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/11/25 13:18:30 $
+  Version:   $Revision: 1.12 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
@@ -51,28 +66,20 @@ namespace bbtk
       reload_id,
       include_id,
       url_id  ,
-      html_id
+      html_id = 10100
     };
 
 
-/*EED
+/*
   //========================================================================
   void WxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& e)
   {
         std::cout  << "WxHtmlWindow::OnLink"<<std::endl;
     //    std::cout  << e.GetHref()<<std::endl;
-    LoadPage(e.GetHref());
-    if ( ! GetOpenedAnchor().IsEmpty() )
-      { 
-	//	std::cout << "#" << GetOpenedAnchor() << std::endl;
-	LoadPage(_T("#"+GetOpenedAnchor()));
-      }
-    mBrowser->UpdateURL();
+    mBrowser->OnLinkClicked2(e);
   }
-  //========================================================================
 */
 
-
 //EED2  BEGIN_EVENT_TABLE(WxHtmlWindow, wxPanel)
 //EED2    EVT_SIZE(WxHtmlWindow::OnSize)
 //EED2  END_EVENT_TABLE()
@@ -93,7 +100,7 @@ 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()
@@ -146,8 +153,13 @@ namespace bbtk
     bsizer->Add(mwxURL, 1, wxEXPAND);
 
 
-//    mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size);
-    mwxHtmlWindow = new WxHtmlWindow(this,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"));
 
     /*
 
@@ -165,21 +177,12 @@ namespace bbtk
 					     wxDefaultPosition, 
 					     size ),
 			    wxVERTICAL );
-//EED    hw->Add ( mwxHtmlWindow, 1, wxGROW  );
-    hw->Add ( mwxHtmlWindow, 1, wxEXPAND  );
 
-
-
-
-
-    //sizer->Add ( mwxHtmlWindow, 1, wxGROW  );
-//EED    sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+	  hw->Add ( mwxHtmlWindow, 1, wxEXPAND  );
 
     sizer->Add ( bsizer , 0, wxEXPAND );
     sizer->Add ( hw, 1, wxGROW ); // | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
 
-
-
     panel	-> SetSizer(sizer);
     panel	-> SetAutoLayout(true);
     panel	-> Layout();
@@ -219,23 +222,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);
   }
   //========================================================================
 
@@ -299,24 +287,48 @@ namespace bbtk
   }
   //========================================================================
   
-
+	//========================================================================
+	void WxGUIHtmlBrowser::OnLinkClicked2(const wxHtmlLinkInfo& info)
+	{
+	  //		std::cout << "OLK2"<<std::endl;
+		bool go = true;
+		if (mUser) 
+		{
+			wxString file = info.GetHref();
+			go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
+		}
+		if (go) 
+		{
+			mwxHtmlWindow->LoadPage( info.GetHref() );
+			UpdateURL();
+		}
+		
+		
+	}
+		
   //========================================================================
   void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
   { 
-  
+    //	  std::cout << "OLK"<<std::endl;
     bool go = true;
     if (mUser) 
       {
+		  /*
 	wxString file = wxPathOnly(mwxURL->GetValue());
 	file += std2wx(ConfigurationFile::GetInstance().Get_file_separator());
 	file += e.GetLinkInfo().GetHref();
-	go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
+	*/
+		wxString file = e.GetLinkInfo().GetHref();
+		go = mUser->WxGUIHtmlBrowserUserOnLinkClicked( wx2std( file ) );
       }
     if (go) 
       {
 	mwxHtmlWindow->LoadPage( e.GetLinkInfo().GetHref() );
 	UpdateURL();
-      }
+	//	OnURLEnter(e);
+	//	mwxHtmlWindow->LoadPage(mwxURL->GetValue());
+     }
+
     //    mwxHtmlWindow->LoadPage( mwxURL->GetValue() );
    }
   //========================================================================