#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)
DEFINE_EVENT_TYPE(wxEVT_TSBAR_MOVED)
DEFINE_EVENT_TYPE(wxEVT_SELECTION_END)
+
+
//----------------------------------------------------------------------------
//EVENT TABLE
//----------------------------------------------------------------------------
mBarRange::mBarRange(wxWindow *parent, int w, int h)
:wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL)
{
- acceptedClick = true;
+ acceptedClick = true;
_bitmap_bar = NULL;
SetWidth (w);
SetHeight(h);
_initialPoint = 0;
- trianglesHalfWidth = 5;
+ trianglesHalfWidth = 5;
wxColour start_Colour;
wxPoint points[3];
- int largestNumberWidthInPixels = 15;
- int pxStart=GetPixelStart();
- int pxEnd=GetPixelEnd();
- int pxActual=GetPixelActual();
+ //int largestNumberWidthInPixels = 15; // JPRx
+ 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 );
// 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 )
{
//fprintf( ff , "mBarRange :: OnMouseMove 01\n" );
//fclose(ff);
- int px1=GetPixelStart();
- int px2=GetPixelEnd();
- int px3=GetPixelActual();
+ //int px1=GetPixelStart(); // JPRx
+ //int px2=GetPixelEnd(); // JPRx
+ //int px3=GetPixelActual(); // JPRx
if (activeState)
{
wxPoint point = event.GetPosition();
//-------------------------------------------
// 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)
//-------------------------------------------
// Sending the event of start triangle moved
//-------------------------------------------
- createAndSendEvent( wxEVT_TSBAR_START );
+ createAndSendEvent( wxEVT_TSBAR_START );
}
}
} // _selectionMoveId == 1
//-------------------------------------------
//Sending the event of actual triangle moved
//-------------------------------------------
- createAndSendEvent( wxEVT_TSBAR_ACTUAL );
+ createAndSendEvent( wxEVT_TSBAR_ACTUAL );
+// createAndSendEvent( 98765 );
+
+//printf("EED creaMaracasVisu mBarRange::OnMouseMove XXXXXXX \n");
+
}
else if( validPos_ActualTri && _in_rangeProperty )
// the tringle in between start and end
return withActualDrawed;
}
- void mBarRange :: createAndSendEvent(WXTYPE theEventType)
+ void mBarRange::createAndSendEvent(WXTYPE theEventType)
{
wxCommandEvent cevent( theEventType, GetId() );
cevent.SetEventObject( this );