#2482 creaMaracasVisu Bug New High - ColorLayer refresh missing. The MPR is not...

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
index ccd89464f5db75132ea5cf83740881ae425e23c9..b92232faecc1a806ae48ab8e4fba8551abbfc1f9 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.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.
+# ------------------------------------------------------------------------ */
+
 //----------------------------------------------------------------------------
 #include "mBarRange.h"
 
@@ -46,10 +71,10 @@ mBarRange::mBarRange(wxWindow *parent, int w, int h)
 :wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL)
 {
        acceptedClick           = true;
-       _bitmap_bar                     =       NULL;
+       _bitmap_bar                     = NULL;
        SetWidth (w);
        SetHeight(h);
-       _initialPoint           =       0;
+       _initialPoint           = 0;
        trianglesHalfWidth      = 5;
        
        wxColour start_Colour;
@@ -254,14 +279,15 @@ void mBarRange::SetHeight(int h)
 int mBarRange::filtreValue(int value)
 {
        if(value<_min)
+       {
                value = _min;
-       else if (value>_max)
+       } else if (value>_max) {
                value = _max;
-       
+       }
        return value;
 }
 
-
+//----------------------------------------------------------------------------
 int mBarRange::GetStart()
 {
        return _start;
@@ -272,11 +298,17 @@ int mBarRange::GetStart()
 void mBarRange::SetStart(int newstart)
 {
        _start = filtreValue(newstart);
-       if (_start>_end) { _start=_end; }
+
+       if (_start>_end) 
+       { 
+               _start=_end; 
+       }
+
        if (_in_rangeProperty==true)
        {
                if (_start>_actual)   { _start=_actual; }
        }
+
        RefreshForce(); 
 }
 //----------------------------------------------------------------------------
@@ -296,7 +328,10 @@ void mBarRange::SetEnd(int newend)
        if (_end<_start) { _end=_start; }
        if (_in_rangeProperty==true)
        {
-               if (_end<_actual)   { _end=_actual; }
+               if (_end<_actual)   
+               {
+                _end=_actual; 
+               } // _end
        }
        RefreshForce(); 
 }
@@ -326,6 +361,7 @@ int mBarRange::GetTrianglesHalfWidth()
 {
        return trianglesHalfWidth;
 }
+
 //----------------------------------------------------------------------------
 void mBarRange::SetTrianglesHalfWidth(int nwTriHalfWidth)
 {
@@ -338,9 +374,7 @@ void mBarRange::OnSize( wxSizeEvent &WXUNUSED(event) )
        if(_orientation)
        {               
                SetWidth( rectTotal.GetWidth() - deviceEndMargin );                     
-       } 
-       else 
-       {
+       }       else    {
                SetWidth( rectTotal.GetHeight() - deviceEndMargin);                             
        }
        _selectionMoveId = -1;
@@ -351,19 +385,7 @@ void mBarRange::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 void mBarRange::Refresh(bool eraseBackground, const wxRect* rect)
 {
-// EED Borrame
-//FILE *ff;
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "mBarRange :: Refresh 01\n" );
-//fclose(ff);
-
        wxScrolledWindow::Refresh(false);
-
-
-// EED Borrame
-//ff=fopen ("c:/temp/xx.txt", "a+");
-//fprintf( ff , "mBarRange :: Refresh 02\n" );
-//fclose(ff);
 }
 
 
@@ -372,14 +394,8 @@ void mBarRange::Refresh(bool eraseBackground, const wxRect* rect)
 //----------------------------------------------------------------------------
 void mBarRange::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
-
-// EED Borrame
-//FILE *ff;
-//ff=fopen ("c:/temp/xx.txt", "a+");
-//fprintf( ff , "pColorBar :: OnPaint 01\n" );
-//fclose(ff);
-
-       if (_bitmap_bar!=NULL){
+       if (_bitmap_bar!=NULL)
+       {
                //repaint rectangle
                if(_orientation)
                {
@@ -411,29 +427,16 @@ void mBarRange::OnPaint( wxPaintEvent &WXUNUSED(event) )
 //                             dc.Blit(0,_w, _h+deviceStart_y+200, _w+deviceStart_x+200-deviceEndMargin, &temp_dc, deviceStart_y,_w+deviceStart_x);
 //                     }
 
-
                } 
-       } 
-
-// EED Borrame
-//ff=fopen ("c:/temp/xx.txt", "a+");
-//fprintf( ff , "pColorBar :: OnPaint 02\n" );
-//fclose(ff);
+       } // _bitmap_bar
+}
 
 
-}
 //----------------------------------------------------------------------------
 //Repaint the bar if it is horizontal
 //----------------------------------------------------------------------------
 void mBarRange::RefreshHorizontalView()
 {
-
-// EED Borrame
-//FILE *ff;
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "mBarRange :: RefreshHorizontalView 01\n" );
-//fclose(ff);
-
        wxPoint points[3];
 
        //int largestNumberWidthInPixels = 15; // JPRx
@@ -632,10 +635,6 @@ void mBarRange::RefreshHorizontalView()
                }                       
        }
 
-// EED Borrame
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "mBarRange :: RefreshHorizontalView 02\n" );
-//fclose(ff);
 }
 
 //----------------------------------------------------------------------------
@@ -644,12 +643,6 @@ void mBarRange::RefreshHorizontalView()
 
 void mBarRange::RefreshVerticalView()
 {
-
-// EED Borrame
-//FILE *ff;
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "mBarRange :: RefreshVerticalView 01\n" );
-//fclose(ff);
        wxPoint points[3];
 
        int px1=GetPixelStart();
@@ -843,15 +836,6 @@ void mBarRange::RefreshForce()
 //----------------------------------------------------------------------------
 void mBarRange::OnMouseMove(wxMouseEvent& event )
 {
-// EED Borrame
-//FILE *ff;
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "mBarRange :: OnMouseMove 01\n" );
-//fclose(ff);
-
-       //int px1=GetPixelStart(); // JPRx
-       //int px2=GetPixelEnd(); // JPRx
-       //int px3=GetPixelActual(); // JPRx
        if (activeState)
        {
                wxPoint point = event.GetPosition();
@@ -1065,13 +1049,9 @@ void mBarRange::OnMouseMove(wxMouseEvent& event )
                        }
                }                               
        }       
+}
 
-// EED Borrame
-//ff=fopen ("c:/temp/xxx.txt", "a+");
-//fprintf( ff , "  mBarRange :: OnMouseMove 02\n" );
-//fclose(ff);
 
-}
 /*
 * Sets the represented minimum and maximunm values
 * param minRealValue The minimum represented value (real value)
@@ -1416,7 +1396,6 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB )
                return guideLineColor;
        }
 
-
        void  mBarRange ::onLeftClicDown(wxMouseEvent& event )
        {
                acceptedClick = true;           
@@ -1479,11 +1458,6 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB )
                                } // Start>_min  &&  End<_max
                        }// _selectionMoveId == 4
                } // step
-               
-               
-               
-               
-               printf("EED  mBarRange::onKey code:%d\n", event.GetKeyCode());
        }