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=94a6229aed777e2270a361e3d1721a14daa50d25;hp=325eade90cb0b2dda61ec171c15314da92dd85ac;hpb=059d790d40c29a646fa02dfd30ee5b604aaba6ad;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 325eade..b92232f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx @@ -1,7 +1,34 @@ +/*# --------------------------------------------------------------------- +# +# 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" +//const wxEventType wxEVT_TSBAR = wxNewEventType(); + DEFINE_EVENT_TYPE(wxEVT_TSBAR) DEFINE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL) DEFINE_EVENT_TYPE(wxEVT_TSBAR_START) @@ -9,6 +36,8 @@ DEFINE_EVENT_TYPE(wxEVT_TSBAR_END) DEFINE_EVENT_TYPE(wxEVT_TSBAR_MOVED) DEFINE_EVENT_TYPE(wxEVT_SELECTION_END) + + //---------------------------------------------------------------------------- //EVENT TABLE //---------------------------------------------------------------------------- @@ -27,6 +56,8 @@ BEGIN_EVENT_TABLE(mBarRange, wxScrolledWindow) EVT_LEFT_DOWN( mBarRange :: onLeftClicDown) EVT_LEFT_UP( mBarRange :: onLeftClickUp) + EVT_CHAR( mBarRange :: onKey ) + //how to catch the new event (our event) //EVT_COMMAND (ID_MY_WINDOW, wxEVT_MY_EVENT, MyFrame::OnMyEvent) END_EVENT_TABLE() @@ -39,12 +70,12 @@ END_EVENT_TABLE() mBarRange::mBarRange(wxWindow *parent, int w, int h) :wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL) { - acceptedClick = true; - _bitmap_bar = NULL; + acceptedClick = true; + _bitmap_bar = NULL; SetWidth (w); SetHeight(h); - _initialPoint = 0; - trianglesHalfWidth = 5; + _initialPoint = 0; + trianglesHalfWidth = 5; wxColour start_Colour; @@ -245,19 +276,39 @@ void mBarRange::SetHeight(int h) // Logical Start of the rectangle //---------------------------------------------------------------------------- +int mBarRange::filtreValue(int value) +{ + if(value<_min) + { + value = _min; + } else if (value>_max) { + value = _max; + } + return value; +} + +//---------------------------------------------------------------------------- int mBarRange::GetStart() { return _start; - } //---------------------------------------------------------------------------- // param start: value real units //---------------------------------------------------------------------------- void mBarRange::SetStart(int newstart) { - if(newstart<_min) - newstart = _min; - _start = newstart; + _start = filtreValue(newstart); + + if (_start>_end) + { + _start=_end; + } + + if (_in_rangeProperty==true) + { + if (_start>_actual) { _start=_actual; } + } + RefreshForce(); } //---------------------------------------------------------------------------- @@ -271,11 +322,17 @@ int mBarRange::GetEnd() //---------------------------------------------------------------------------- // param end: value pixel units //---------------------------------------------------------------------------- -void mBarRange::SetEnd(int nwend) +void mBarRange::SetEnd(int newend) { - if(nwend>_max) - _end = _max; - _end=nwend; + _end = filtreValue(newend); + if (_end<_start) { _end=_start; } + if (_in_rangeProperty==true) + { + if (_end<_actual) + { + _end=_actual; + } // _end + } RefreshForce(); } //---------------------------------------------------------------------------- @@ -286,13 +343,14 @@ int mBarRange::GetActual() return _actual; } //---------------------------------------------------------------------------- -void mBarRange::SetActual(int actual) +void mBarRange::SetActual(int newactual) { - if(actual<_min) - _actual = _min; - else if (actual>_max) - _actual = _max; - _actual=actual; + _actual = filtreValue(newactual); + if (_in_rangeProperty==true) + { + if (_actual<_start) { _actual=_start; } + if (_actual>_end) { _actual=_end; } + } RefreshForce(); } @@ -303,6 +361,7 @@ int mBarRange::GetTrianglesHalfWidth() { return trianglesHalfWidth; } + //---------------------------------------------------------------------------- void mBarRange::SetTrianglesHalfWidth(int nwTriHalfWidth) { @@ -315,9 +374,7 @@ void mBarRange::OnSize( wxSizeEvent &WXUNUSED(event) ) if(_orientation) { SetWidth( rectTotal.GetWidth() - deviceEndMargin ); - } - else - { + } else { SetWidth( rectTotal.GetHeight() - deviceEndMargin); } _selectionMoveId = -1; @@ -328,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); } @@ -349,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) { @@ -388,48 +427,35 @@ 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 - int pxStart=GetPixelStart(); - int pxEnd=GetPixelEnd(); - int pxActual=GetPixelActual(); + int pxStart = GetPixelStart(); + int pxEnd = GetPixelEnd(); + int pxActual = GetPixelActual(); - int letterHeight = 9; - int barHeight = 2*letterHeight; - int tempHeight = _h-(6*letterHeight); + int letterHeight= 9; + int barHeight = 2*letterHeight; + int tempHeight = _h-(6*letterHeight); if (_visibleLables) { - barHeight = (tempHeight>0) ? tempHeight : (int) _h/2; + barHeight = (tempHeight>0) ? tempHeight : (int) _h/2; } else - barHeight = _h; + barHeight = _h; wxMemoryDC temp_dc; temp_dc.SelectObject( *_bitmap_bar ); @@ -609,10 +635,6 @@ void mBarRange::RefreshHorizontalView() } } -// EED Borrame -//ff=fopen ("c:/temp/xxx.txt", "a+"); -//fprintf( ff , "mBarRange :: RefreshHorizontalView 02\n" ); -//fclose(ff); } //---------------------------------------------------------------------------- @@ -621,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(); @@ -679,24 +695,24 @@ void mBarRange::RefreshVerticalView() // 2 Shadow Triangles: Start and End - points[0].x=_h; - points[0].y=0; - points[1].x=0; - points[1].y=-trianglesHalfWidth-1; - points[2].x=0; - points[2].y=trianglesHalfWidth+2; + points[0].x = _h; + points[0].y = 0; + points[1].x = 0; + points[1].y = -trianglesHalfWidth-1; + points[2].x = 0; + points[2].y = trianglesHalfWidth+2; temp_dc.SetBrush(wxBrush( wxColour(104,104,104),wxSOLID )); temp_dc.SetPen(wxPen( wxColour(104,104,104),1,wxSOLID )); temp_dc.DrawPolygon(3,points,0,px1); temp_dc.DrawPolygon(3,points,0,px2); // 2 Triangles: Start and End - points[0].x=_h; - points[0].y=0; - points[1].x=0; - points[1].y=-trianglesHalfWidth; - points[2].x=0; - points[2].y=trianglesHalfWidth; + points[0].x = _h; + points[0].y = 0; + points[1].x = 0; + points[1].y = -trianglesHalfWidth; + points[2].x = 0; + points[2].y = trianglesHalfWidth; //first triangle (start) if( _selectionMoveId==1 ) { @@ -820,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(); @@ -880,7 +887,7 @@ void mBarRange::OnMouseMove(wxMouseEvent& event ) //------------------------------------------- // Sending the event of start triangle moved //------------------------------------------- - createAndSendEvent( wxEVT_TSBAR_START ); + createAndSendEvent( wxEVT_TSBAR_START ); } //start has to be less than actual else if (validPos_StartTri && _in_rangeProperty) @@ -893,7 +900,7 @@ void mBarRange::OnMouseMove(wxMouseEvent& event ) //------------------------------------------- // Sending the event of start triangle moved //------------------------------------------- - createAndSendEvent( wxEVT_TSBAR_START ); + createAndSendEvent( wxEVT_TSBAR_START ); } } } // _selectionMoveId == 1 @@ -940,7 +947,7 @@ void mBarRange::OnMouseMove(wxMouseEvent& event ) //Sending the event of actual triangle moved //------------------------------------------- createAndSendEvent( wxEVT_TSBAR_ACTUAL ); -printf("EED mBarRange::OnMouseMove \n"); +// createAndSendEvent( 98765 ); } else if( validPos_ActualTri && _in_rangeProperty ) // the tringle in between start and end @@ -997,6 +1004,10 @@ printf("EED mBarRange::OnMouseMove \n"); // Sending the event that the bar ahs being moved //------------------------------------------- createAndSendEvent( wxEVT_TSBAR_MOVED ); + //EED + createAndSendEvent( wxEVT_TSBAR_ACTUAL ); + createAndSendEvent( wxEVT_TSBAR_END ); + createAndSendEvent( wxEVT_TSBAR_START ); } //if actual has to be between start and end else if(_in_rangeProperty && ((next_start<=GetActual()) && (next_end>=GetActual()) && (next_end<=_max)&& (next_start>=_min)) ) @@ -1018,6 +1029,10 @@ printf("EED mBarRange::OnMouseMove \n"); // Sending the event that the bar ahs being moved //------------------------------------------- createAndSendEvent( wxEVT_TSBAR_MOVED ); + //EED + createAndSendEvent( wxEVT_TSBAR_ACTUAL ); + createAndSendEvent( wxEVT_TSBAR_END ); + createAndSendEvent( wxEVT_TSBAR_START ); } } } @@ -1034,13 +1049,9 @@ printf("EED mBarRange::OnMouseMove \n"); } } } +} -// 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) @@ -1351,7 +1362,7 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB ) return withActualDrawed; } - void mBarRange :: createAndSendEvent(WXTYPE theEventType) + void mBarRange::createAndSendEvent(WXTYPE theEventType) { wxCommandEvent cevent( theEventType, GetId() ); cevent.SetEventObject( this ); @@ -1388,11 +1399,65 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB ) void mBarRange ::onLeftClicDown(wxMouseEvent& event ) { acceptedClick = true; + SetFocus(); } - void mBarRange ::onLeftClickUp(wxMouseEvent& event ) + void mBarRange::onLeftClickUp(wxMouseEvent& event ) { acceptedClick = false; } +//EED 20 Juillet 2011 + void mBarRange::onKey(wxKeyEvent& event) + { + int step=0; + if ((event.GetKeyCode()==314) || (event.GetKeyCode()==317)) + { + step=-1; + } + + if ((event.GetKeyCode()==315) || (event.GetKeyCode()==316)) + { + step=1; + } + + if (step!=0) + { + if (_selectionMoveId == 1) // start + { + SetStart(GetStart()+step); + createAndSendEvent( wxEVT_TSBAR_START ); + } + + if (_selectionMoveId == 2) // end + { + SetEnd(GetEnd()+step); + createAndSendEvent( wxEVT_TSBAR_END ); + } + + if (_selectionMoveId == 3) // actual + { + SetActual(GetActual()+step); + createAndSendEvent( wxEVT_TSBAR_ACTUAL ); + } + + if (_selectionMoveId == 4) // bar + { + if (( GetStart()+step>=_min ) && ( GetEnd()+step<=_max )) + { + SetStart(GetStart()+step); + SetEnd(GetEnd()+step); + if (_moveActualWithBar) + { + SetActual(GetActual()+step); + } + createAndSendEvent( wxEVT_TSBAR_START ); + createAndSendEvent( wxEVT_TSBAR_END ); + createAndSendEvent( wxEVT_TSBAR_ACTUAL ); + createAndSendEvent( wxEVT_TSBAR_MOVED ); + } // Start>_min && End<_max + }// _selectionMoveId == 4 + } // step + } +