#2971 creaMaracasVisu Feature New Normal ColorLayerImage - ColorBar position

[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 18d585ecbd1a990676b7b23595e8794bc56e012b..a5887180a4033b7e5a319fe6709252a9adfa7e63 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.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
 //----------------------------------------------------------------------------
@@ -58,13 +83,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 +110,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 +121,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));
 }