X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2Fmathplot.cxx;h=738cae1a18c679ffc58824cb6c176891870dfde2;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=bf519013eec252d10a83c4f04e186272c9b6659c;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;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 bf51901..738cae1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
@@ -368,12 +368,10 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w, int orgy)
 	if (tmp>=1)
 	{
 		fmt = wxT("%.f");
-	}
-	else
-	{
+	} else {
 		tmp=8-tmp;
 		fmt.Printf(wxT("%%.%df"), tmp >= -1 ? 2 : -tmp);
-	}
+	} // if temp
 
 	double n = floor( (w.GetPosY() - (double)extend / w.GetScaleY()) / step ) * step ;
 
@@ -389,8 +387,8 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w, int orgy)
 		{
 			dc.DrawText( s, orgx+4, GetYTranslated(sizedc,p-ty/2));
 			tmp=p-ty/2;
-		}
-	}
+		} // if
+	} // for
 
 	dc.GetTextExtent(m_name, &tx, &ty);
 	dc.DrawText( m_name, orgx-tx-4, GetYTranslated(sizedc,-extend + ty + 4));
@@ -400,7 +398,13 @@ void mpScaleY::Plot(wxDC & dc, mpWindow & w, int orgy)
 // mpWindow
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxScrolledWindow)
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	IMPLEMENT_DYNAMIC_CLASS(mpWindow, wxScrolledWindow)
+#else
+	wxIMPLEMENT_DYNAMIC_CLASS(mpWindow, wxScrolledWindow);
+#endif
+
 
 BEGIN_EVENT_TABLE(mpWindow, wxScrolledWindow)
 EVT_PAINT    ( mpWindow::OnPaint)
@@ -421,24 +425,24 @@ END_EVENT_TABLE()
 mpWindow::mpWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag )
 : wxScrolledWindow( parent, id, wxDefaultPosition, wxDefaultSize, flag, wxT("wxPlotter") )
 {
-	m_scaleX = m_scaleY = 1.0;
-	m_posX   = m_posY   = 0;
-	m_scrX   = m_scrY   = 64;
-	m_minX   = m_minY   = 0;
-	m_maxX   = m_maxY   = 0;
-	maxScrX = maxScrY   = 200;
-	minScrX = minScrY   = 0;
-	m_clickedX =  0;
-	m_clickedY = 5000;
-	m_lockaspect = FALSE;
-	offsetX = offsetY = 0;
-	offsetPixelX = offsetPixelY= 0;
-	_bitmap_functions=NULL;
-
-	real_guideLine_X = -1;
-	real_guideLine_Y = -1;
-	drawGuides = true;
-	type=1;
+	m_scaleX 			= m_scaleY 		= 1.0;
+	m_posX   			= m_posY   		= 0;
+	m_scrX   			= m_scrY   		= 64;
+	m_minX   			= m_minY   		= 0;
+	m_maxX   			= m_maxY   		= 0;
+	maxScrX 			= maxScrY   	= 200;
+	minScrX 			= minScrY   	= 0;
+	m_clickedX 			= 0;
+	m_clickedY 			= 5000;
+	m_lockaspect		= FALSE;
+	offsetX 			= offsetY 		= 0;
+	offsetPixelX		= offsetPixelY	= 0;
+	_bitmap_functions	= NULL;
+
+	real_guideLine_X 	= -1;
+	real_guideLine_Y 	= -1;
+	drawGuides 			= true;
+	type				= 1;
 
 	m_popmenu.Append( mpID_CENTER,     _("Center"),      _("Center plot view to this position"));
 	m_popmenu.Append( mpID_FIT,        _("Fit"),         _("Set plot view to show all items"));
@@ -511,16 +515,13 @@ void mpWindow::ZoomOut()
 void mpWindow::LockAspect(bool enable)
 {
 	m_lockaspect = enable;
-
 	m_popmenu.Check(mpID_LOCKASPECT, enable);
-
 	if (m_lockaspect)
 	{
 		double s = (m_scaleX + m_scaleY)/2;
 		m_scaleX = s;
 		m_scaleY = s;
 	}
-
 	UpdateAll();
 }
 
@@ -729,14 +730,12 @@ void mpWindow::UpdateAll()
 	{
 		int cx, cy;
 		GetClientSize( &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);
 	}
-
 	FitInside();
 	Refresh( false );
 }