#3472 TDx

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx
index 1f95b6bb930621ed71dcced809d89da61c9f451f..6db34e632d2d34a10f6c95e020cf3ed398268594 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.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.
+# ------------------------------------------------------------------------ */
+
 //----------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------
@@ -21,8 +46,8 @@ IMPLEMENT_CLASS(pPlotterScaleX, pPlotterLayer)
 //----------------------------------------------------------------------------
 // Methods
 //----------------------------------------------------------------------------
-pPlotterScaleX::pPlotterScaleX(wxString aName,int flags) {
-
+pPlotterScaleX::pPlotterScaleX(wxString aName,int flags) 
+{
        SetName(aName);/*
        SetFont(*wxSMALL_FONT);
        SetPen(*wxGREY_PEN);*/
@@ -40,6 +65,8 @@ void pPlotterScaleX::Plot(wxDC& dc, mpWindow& w)
 
        dc.SetPen( m_pen);
        dc.SetFont( m_font);
+
+       
        
        //data
        float min=(float)w.getMinScrX();
@@ -50,14 +77,23 @@ void pPlotterScaleX::Plot(wxDC& dc, mpWindow& w)
        int offsetX=w.getOffsetX();
 
        //setting origins
-       const int orgy   = w.GetScrY()-40;
-       const int extend = w.GetScrX()-100;
+       
+       //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);       
+       //dc.SetAxisOrientation(true,false);  
+       double sizedc = dc.GetSize().GetY()-orgy;
+               
+       //const int extend = w.GetScrX()-100; //JPRx
 
-       dc.SetDeviceOrigin(70,orgy);
-       dc.SetAxisOrientation(true,true);
        
        //draw the axe
-       dc.DrawLine(0,0,(max-min)*scaleX,0);
+       dc.DrawLine(0,GetYTranslated(sizedc, 0),(max-min)*scaleX,GetYTranslated(sizedc, 0));
 
        //maximum value in x
        int d=max-min;
@@ -77,9 +113,9 @@ void pPlotterScaleX::Plot(wxDC& dc, mpWindow& w)
        
        
        //drawing the first line
-       dc.DrawLine(0,0,0,-10);
+       dc.DrawLine(0,GetYTranslated(sizedc, 0),0,GetYTranslated(sizedc, -10));
        s.Printf(_T("%d"),(int)(min));
-       dc.DrawText(s,(wxCoord)0,(wxCoord)-20);
+       dc.DrawText(s,(wxCoord)0,GetYTranslated(sizedc, (wxCoord)-20));
        
        for(float i=0;i<=(max);i+=step)
        {
@@ -89,14 +125,14 @@ void pPlotterScaleX::Plot(wxDC& dc, mpWindow& w)
                {       
                        dc.DrawLine(p,0,p,-10);
                        s.Printf(_T("%d"),(int)(i));
-                       dc.DrawText(s,(wxCoord)p,(wxCoord)-20);         
+                       dc.DrawText(s,(wxCoord)p,GetYTranslated(sizedc, (wxCoord)-20));         
                }
        }
        //drawing the last line
        int p=(max-min-offsetX)*scaleX+offsetpx;
-       dc.DrawLine(p,0,p,-10);
+       dc.DrawLine(p,GetYTranslated(sizedc, 0),p,GetYTranslated(sizedc, -10));
        s.Printf(_T("%d"),(int)(max));
-       dc.DrawText(s,(wxCoord)p,(wxCoord)-20);
+       dc.DrawText(s,(wxCoord)p,GetYTranslated(sizedc, (wxCoord)-20));
 
 }