#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / mathplot.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
index e8b67dc375c238f2fbf67a485e8cfd50ee2eea0b..743bc54d5cca32ab867b1995d1ce8dce58493a1f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
@@ -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.
+# ------------------------------------------------------------------------ */
+
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mathplot.h
 // Purpose:     Framework for mathematical graph plotting in wxWindows
@@ -194,6 +219,14 @@ public:
        */
        void SetPen(wxPen& pen)     { m_pen  = pen;  }
 
+       /**
+       ** Get the translation of the Y coordinate acoording to the new orientation of the axis du to the problem
+       ** identified in MACOS with the funtion 'SetAxisOrientation'
+       **/
+       int GetYTranslated(double sizey, double y){
+               return -y+sizey;
+       }
+
 protected:
        wxFont   m_font;    //!< Layer's font
        wxPen    m_pen;     //!< Layer's pen
@@ -385,7 +418,7 @@ public:
        /** Layer plot handler.
        This implementation will plot the ruler adjusted to the visible area.
        */
-       virtual void Plot(wxDC & dc, mpWindow & w);
+       virtual void Plot(wxDC & dc, mpWindow & w, int orgy);
 
        /** Check whether this layer has a bounding box.
        This implementation returns \a FALSE thus making the ruler invisible
@@ -432,6 +465,7 @@ public:
                int flags = 0);
        ~mpWindow();
 
+
        /** Get reference to context menu of the plot canvas.
        @return Pointer to menu. The menu can be modified.
        */
@@ -784,6 +818,13 @@ public:
        /** Refresh display */
        void UpdateAll();
 
+       /**
+       ** Get the translation of the Y coordinate
+       **/
+       int GetYTranslated(wxSize size, double y){
+               return size.GetHeight()-y;
+       }
+
 protected:
 
        void Refresh(bool eraseBackground = true, const wxRect* rect = NULL);
@@ -877,13 +918,22 @@ protected:
        */
         int type;
 
+
  private:
        //bitmap of functions
        wxBitmap        *_bitmap_functions;
 
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        DECLARE_CLASS(mpWindow)
+#else
+       wxDECLARE_DYNAMIC_CLASS(mpWindow);
+#endif
+
        DECLARE_EVENT_TABLE()
+
+
 };
 
 #endif // _MP_MATHPLOT_H_