X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FmBarRange.cxx;h=b92232faecc1a806ae48ab8e4fba8551abbfc1f9;hb=63a0a21e6736a800c58442edd531c91d75e71694;hp=ffdbcdef096d4cbbfc80f1f226ba665e3a62d3a5;hpb=ed6f960acce2ed63b0d6b964aee7ee243d8c6446;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx index ffdbcde..b92232f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx @@ -279,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; @@ -297,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(); } //---------------------------------------------------------------------------- @@ -321,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(); } @@ -351,6 +361,7 @@ int mBarRange::GetTrianglesHalfWidth() { return trianglesHalfWidth; } + //---------------------------------------------------------------------------- void mBarRange::SetTrianglesHalfWidth(int nwTriHalfWidth) { @@ -363,9 +374,7 @@ void mBarRange::OnSize( wxSizeEvent &WXUNUSED(event) ) if(_orientation) { SetWidth( rectTotal.GetWidth() - deviceEndMargin ); - } - else - { + } else { SetWidth( rectTotal.GetHeight() - deviceEndMargin); } _selectionMoveId = -1; @@ -385,7 +394,8 @@ void mBarRange::Refresh(bool eraseBackground, const wxRect* rect) //---------------------------------------------------------------------------- void mBarRange::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - if (_bitmap_bar!=NULL){ + if (_bitmap_bar!=NULL) + { //repaint rectangle if(_orientation) { @@ -417,9 +427,8 @@ 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); // } - } - } + } // _bitmap_bar }