X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2Fmathplot.cxx;h=4b37ef916bcf6c4722029202a8758f120a407f1a;hb=096822cf3513065cfa25e378679339a5ae4684cf;hp=7661beec1da8001dac586234fb9a2cf3158fff7c;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;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 7661bee..4b37ef9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.cxx @@ -440,7 +440,7 @@ void mpWindow::Fit() { int cx, cy; GetClientSize( &cx, &cy); - + double d; d = m_maxX - m_minX; if (d!=0) @@ -562,6 +562,7 @@ 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; @@ -589,7 +590,14 @@ void mpWindow::OnPaint( wxPaintEvent &event ) //dc.SetDeviceOrigin(70,40); //dc.SetAxisOrientation(false,true); temp_dc.SetAxisOrientation(true,false); - dc.Blit(0,0, m_scrX, m_scrY, &temp_dc,-70,-m_scrY+40); + + //EED 14mai2009 + //dc.Blit(0,0, m_scrX, m_scrY, &temp_dc,-70,-m_scrY+40); + + temp_dc.SetDeviceOrigin(0,0); + dc.Blit(0,0, m_scrX, m_scrY, &temp_dc,0,0); + + delete _bitmap_functions; //_bitmap_functions //dc.SetAxisOrientation(false,true); @@ -688,12 +696,13 @@ bool mpWindow::UpdateBBox() return first == FALSE; } -void mpWindow :: UpdateAll() +void mpWindow::UpdateAll() { if (UpdateBBox()) { 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