X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2Fmathplot.cxx;h=af3e86591c91280d11a42fa6a1869c3fdfb7df18;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=5a34b170b12e57d2a12b07b2a0f6a22c85771e47;hpb=1f7a3dc82e27e218ecf69e19be2f36c02456ea2d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
index 5a34b17..af3e865 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mathplot.cpp
 // Purpose:     Framework for mathematical graph plotting in wxWindows
@@ -408,6 +433,7 @@ mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
 	m_lockaspect = FALSE;
 	offsetX = offsetY = 0;
 	offsetPixelX = offsetPixelY= 0;
+	_bitmap_functions=NULL;
 
 	real_guideLine_X = -1;
 	real_guideLine_Y = -1;
@@ -564,7 +590,6 @@ void mpWindow::OnPaint( wxPaintEvent &event )
 {
 	wxPaintDC dc(this);
 	dc.GetSize(&m_scrX, &m_scrY);
-printf("EED mpWindow::OnPaint %d %d\n",m_scrX,m_scrY);
 
 	//m_scrX=200;
 	//m_scrY=200;
@@ -704,15 +729,12 @@ void mpWindow::UpdateAll()
 	{
 		int cx, cy;
 		GetClientSize( &cx, &cy);
-printf("EED mpWindow::UpdateAll %d %d\n",cx,cy);
-
-		//const int sx = (int)((m_maxX - m_minX) * GetScaleX()); // JPRx
-		//const int sy = (int)((m_maxY - m_minY) * GetScaleY()); // JPRx
-		//const int px = (int)((GetPosX() - m_minX) * GetScaleX() - (cx>>1)); // JPRx
-		//const int py = (int)((GetPosY() - m_minY) * GetScaleY() - (cy>>1)); // JPRx
-		//SetScrollbars( 1, 1, sx, sy, px, py);
+		const int sx = (int)((m_maxX - m_minX) * GetScaleX()); // JPRx
+		const int sy = (int)((m_maxY - m_minY) * GetScaleY()); // JPRx
+		const int px = (int)((GetPosX() - m_minX) * GetScaleX() - (cx>>1)); // JPRx
+		const int py = (int)((GetPosY() - m_minY) * GetScaleY() - (cy>>1)); // JPRx
+		SetScrollbars( 1, 1, sx, sy, px, py);
 	}
-
 	FitInside();
 	Refresh( false );
 }