//CONSTRUCTOR
//----------------------------------------------------------------------------
+//wxDefaultSize
mBarRange::mBarRange(wxWindow *parent, int w, int h)
-:wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL)
+//EED-2019-10-25 :wxScrolledWindow(parent,-1,wxDefaultPosition, wxSize(60,60) ,wxTAB_TRAVERSAL)
+ :wxPanel(parent,-1,wxDefaultPosition, wxSize(60,60) ,wxTAB_TRAVERSAL)
{
- acceptedClick = true;
- _bitmap_bar = NULL;
+ acceptedClick = true;
+ _bitmap_bar = NULL;
SetWidth (w);
SetHeight(h);
- _initialPoint = 0;
- trianglesHalfWidth = 5;
+ _initialPoint = 0;
+ trianglesHalfWidth = 5;
// Setting the default parts colors
start_Colour = wxColour(1,0,255,254);
actual_Colour = wxColour(255,255,202);
mBarRange::~mBarRange()
{
+ DeletePendingEvents ();
+ RemoveEventHandler ( GetEventHandler() );
}
//---------------------------------------------------------------------------
if(_orientation)
{
SetWindowStyle(wxNO_FULL_REPAINT_ON_RESIZE);
- _bitmap_bar = new wxBitmap(_w+1280,_h+100);
+ _bitmap_bar = new wxBitmap(_w+1280,_h+100);
//SIL//_bitmap_info = new wxBitmap(_w+100+1280, _h+100);
- }
- //vertical
- else
- {
+ } else {
SetWindowStyle(wxNO_FULL_REPAINT_ON_RESIZE);
- _bitmap_bar = new wxBitmap(_h+deviceStart_y+100,_w+1280);
- _bitmap_info = new wxBitmap(_h+deviceStart_y+100, _w+1280);
+ _bitmap_bar = new wxBitmap(_h+deviceStart_y+100,_w+1280);
+ _bitmap_info = new wxBitmap(_h+deviceStart_y+100, _w+1280);
}
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
void mBarRange::SetInRangeProperty(bool in)
{
- _in_rangeProperty=in;
+ _in_rangeProperty = in;
}
//----------------------------------------------------------------------------
//the information about the actual triangle in range or not, true if is between start and end
void mBarRange::Refresh(bool eraseBackground, const wxRect* rect)
{
- wxScrolledWindow::Refresh(false);
+//EED2019-10-25 wxScrolledWindow::Refresh(false);
+ wxPanel::Refresh(false);
}
if (barHeight <=_h)
{
bool in_StartTri = (clickedX>=GetPixelStart()-5+ deviceStart_x) && (clickedX<=GetPixelStart()+5+ deviceStart_x);
- bool in_EndTri = (clickedX>=GetPixelEnd()-5+ deviceStart_x) && (clickedX<=GetPixelEnd()+5+ deviceStart_x);
- bool in_actualT= withActualDrawed && (clickedX>=GetPixelActual()-5+ deviceStart_x) && (clickedX<=GetPixelActual()+5+ deviceStart_x);
- bool in_movingBar = (clickedX>GetPixelStart()+5+ deviceStart_x) && (clickedX<GetPixelEnd()-5+ deviceStart_x);
+ bool in_EndTri = (clickedX>=GetPixelEnd()-5+ deviceStart_x) && (clickedX<=GetPixelEnd()+5+ deviceStart_x);
+ bool in_actualT = withActualDrawed && (clickedX>=GetPixelActual()-5+ deviceStart_x) && (clickedX<=GetPixelActual()+5+ deviceStart_x);
+ bool in_movingBar= (clickedX>GetPixelStart()+5+ deviceStart_x) && (clickedX<GetPixelEnd()-5+ deviceStart_x);
if( in_actualT )
_selectionMoveId = 3;
else if( in_movingBar )
_selectionMoveId = 4;
}
- }
- else
- {
+ } else {
if(acceptedClick)
{
//is in start triagle
*/
void mBarRange :: setRepresentedValues ( double minRealValue, double maxRealValue)
{
- _min = minRealValue;
- _max = maxRealValue;
- _start=_min;
- _end=_max;
+ _min = minRealValue;
+ _max = maxRealValue;
+ _start =_min;
+ _end =_max;
}
/*
SetPixelStart(deviceStart_x);
SetPixelEnd(_w+deviceStart_x);
SetPixelActual(deviceStart_x);
- }
- else
- {
+ } else {
SetPixelStart(deviceStart_x);
SetPixelEnd(_h+deviceStart_x);
SetPixelActual(deviceStart_x);
if (getClickedX()<=_h)
{
- bool in_StartTri = (clickedX>=GetPixelStart()-5+ deviceStart_x) && (clickedX<=GetPixelStart()+5+ deviceStart_x);
- bool in_EndTri = (clickedX>=GetPixelEnd()-5+ deviceStart_x) && (clickedX<=GetPixelEnd()+5+ deviceStart_x);
- bool in_actualT= (clickedX>=GetPixelActual()-5+ deviceStart_x) && (clickedX<=GetPixelActual()+5+ deviceStart_x);
- bool in_movingBar = (clickedX>GetPixelStart()+5+ deviceStart_x) && (clickedX<GetPixelEnd()-5+ deviceStart_x);
+ bool in_StartTri = (clickedX>=GetPixelStart()-5+ deviceStart_x) && (clickedX<=GetPixelStart()+5+ deviceStart_x);
+ bool in_EndTri = (clickedX>=GetPixelEnd()-5+ deviceStart_x) && (clickedX<=GetPixelEnd()+5+ deviceStart_x);
+ bool in_actualT = (clickedX>=GetPixelActual()-5+ deviceStart_x) && (clickedX<=GetPixelActual()+5+ deviceStart_x);
+ bool in_movingBar = (clickedX>GetPixelStart()+5+ deviceStart_x) && (clickedX<GetPixelEnd()-5+ deviceStart_x);
if(in_StartTri)
_selectionMoveId = 1;