Changements dans la class CutModuleMainPanel et CutModuleManager pour ajouter la...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / pPlotterScaleY.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx
index 96cf2cfb509beb794b8d9e23d86a4f47794cdf59..2f3ba1d668fdd612683f8741dee22c2b372bbd56 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx
@@ -51,13 +51,22 @@ void pPlotterScaleY::Plot(wxDC& dc, mpWindow& w)
 
 
        //setting origins
-       const int orgy   = w.GetScrY()-40;
-       const int extend = w.GetScrY()-50;
-       dc.SetDeviceOrigin(70,orgy);
-       dc.SetAxisOrientation(true,true);
+       
+//EED 14Mai2009
+//     const int orgy   = w.GetScrY()-40;
+//     dc.SetDeviceOrigin(70,orgy);
+//     dc.SetAxisOrientation(true,true);  //EED  MacOx ??? 
+       
+       const int orgy   = 40;
+       //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;
@@ -76,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)
@@ -87,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));
 }