X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpPlotterScaleY.cxx;h=2f3ba1d668fdd612683f8741dee22c2b372bbd56;hb=ae196719490130990cdde501c982c3370b46b21c;hp=18d585ecbd1a990676b7b23595e8794bc56e012b;hpb=8b75d0d7ee7c2aed68f1663282127c8e9932e705;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx index 18d585e..2f3ba1d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx @@ -58,13 +58,15 @@ void pPlotterScaleY::Plot(wxDC& dc, mpWindow& w) // dc.SetAxisOrientation(true,true); //EED MacOx ??? const int orgy = 40; - dc.SetDeviceOrigin(70,orgy); - dc.SetAxisOrientation(true,false); + //dc.SetDeviceOrigin(70,orgy); + dc.SetDeviceOrigin(70,0); + double sizedc = dc.GetSize().GetY()-orgy; + //dc.SetAxisOrientation(true,false); // const int extend = w.GetScrY()-50; //EED //draw the axe - dc.DrawLine( 0,0, 0, (max-min)*scaleY); + dc.DrawLine( 0,GetYTranslated(sizedc, 0), 0, GetYTranslated(sizedc, (max-min)*scaleY)); //maximum value in Y int d=max-min; @@ -83,9 +85,9 @@ void pPlotterScaleY::Plot(wxDC& dc, mpWindow& w) //drawing the axe with the numbers wxString s; //drawing the first line - dc.DrawLine(0,0,-10,0); + dc.DrawLine(0,GetYTranslated(sizedc, 0),-10,GetYTranslated(sizedc, 0)); s.Printf(_T("%d"),(int)(min)); - dc.DrawText(s,(wxCoord)-20,(wxCoord)0); + dc.DrawText(s,(wxCoord)-20,GetYTranslated(sizedc, (wxCoord)0)); for(float i=0;i<=(max);i+=step) @@ -94,16 +96,16 @@ void pPlotterScaleY::Plot(wxDC& dc, mpWindow& w) int p=(i-min-offsetY)*scaleY+offsetpy; if(p>=0) { - dc.DrawLine(0,p,-10,p); + dc.DrawLine(0,GetYTranslated(sizedc, p),-10,GetYTranslated(sizedc, p)); s.Printf(_T("%d"),(int)(i)); - dc.DrawText(s,(wxCoord)-20,(wxCoord)p); + dc.DrawText(s,(wxCoord)-20,GetYTranslated(sizedc, (wxCoord)p)); } } //drawing the last line int p=(max-min-offsetY)*scaleY+offsetpy; - dc.DrawLine(0,p,-10,p); + dc.DrawLine(0,GetYTranslated(sizedc, p),-10,GetYTranslated(sizedc, p)); s.Printf(_T("%d"),(int)(max)); - dc.DrawText(s,(wxCoord)-20,(wxCoord)p); + dc.DrawText(s,(wxCoord)-20,GetYTranslated(sizedc, (wxCoord)p)); }