added groups of canvasobject and references to groups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
parent
afdefa8e84
commit
fcbb6b37bf
@ -41,7 +41,7 @@ public:
|
||||
// These are for screen output only therefore use
|
||||
// int as coordinates.
|
||||
virtual bool IsHit( int x, int y, int margin = 0 );
|
||||
virtual void Render( int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
|
||||
// use doubles later
|
||||
virtual void Move( int x, int y );
|
||||
@ -55,7 +55,7 @@ public:
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
|
||||
wxCanvas *GetOwner() { return m_owner; }
|
||||
void SetOwner( wxCanvas *owner ) { m_owner = owner; }
|
||||
virtual void SetOwner( wxCanvas *owner ) { m_owner = owner; }
|
||||
|
||||
bool IsControl() { return m_isControl; }
|
||||
bool IsVector() { return m_isVector; }
|
||||
@ -74,11 +74,99 @@ protected:
|
||||
bool m_isControl;
|
||||
bool m_isVector;
|
||||
bool m_isImage;
|
||||
|
||||
//relative boundingbox in parent in pixels
|
||||
wxRect m_area;
|
||||
|
||||
friend class wxCanvas;
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasObjectGroup
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
class wxCanvasObjectGroup
|
||||
{
|
||||
public:
|
||||
wxCanvasObjectGroup();
|
||||
|
||||
void SetOwner(wxCanvas* canvas);
|
||||
wxCanvas *GetOwner() { return m_owner; }
|
||||
|
||||
virtual void Prepend( wxCanvasObject* obj );
|
||||
virtual void Append( wxCanvasObject* obj );
|
||||
virtual void Insert( size_t before, wxCanvasObject* obj );
|
||||
virtual void Remove( wxCanvasObject* obj );
|
||||
|
||||
virtual void Recreate();
|
||||
void DeleteContents( bool );
|
||||
virtual void Render(int xabs, int yabs,int x, int y, int width, int height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
virtual bool IsHit( int x, int y, int margin );
|
||||
virtual wxCanvasObject* IsHitObject( int x, int y, int margin );
|
||||
|
||||
void ExtendArea(int x, int y);
|
||||
|
||||
inline int GetXMin() { return m_minx; }
|
||||
inline int GetYMin() { return m_miny; }
|
||||
inline int GetXMax() { return m_maxx; }
|
||||
inline int GetYMax() { return m_maxy; }
|
||||
|
||||
protected:
|
||||
wxCanvas *m_owner;
|
||||
|
||||
//bounding box
|
||||
double m_minx;
|
||||
double m_miny;
|
||||
double m_maxx;
|
||||
double m_maxy;
|
||||
bool m_validbounds;
|
||||
|
||||
wxList m_objects;
|
||||
|
||||
friend class wxCanvas;
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasObjectGroupRef
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
class wxCanvasObjectGroupRef: public wxCanvasObject
|
||||
{
|
||||
public:
|
||||
wxCanvasObjectGroupRef(double x, double y,wxCanvasObjectGroup* group);
|
||||
|
||||
void SetOwner(wxCanvas* canvas);
|
||||
|
||||
virtual void Recreate();
|
||||
virtual void Render(int xabs, int yabs,int x, int y, int width, int height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
virtual bool IsHit( int x, int y, int margin );
|
||||
void Move( int x, int y );
|
||||
|
||||
inline int GetPosX() { return m_x; }
|
||||
inline int GetPosY() { return m_y; }
|
||||
|
||||
void ExtendArea(int x, int y);
|
||||
virtual wxCanvasObject* IsHitObject( int x, int y, int margin );
|
||||
|
||||
protected:
|
||||
//position of the group
|
||||
double m_x;
|
||||
double m_y;
|
||||
|
||||
//reference to the group
|
||||
wxCanvasObjectGroup* m_group;
|
||||
|
||||
//bounding box
|
||||
double m_minx;
|
||||
double m_miny;
|
||||
double m_maxx;
|
||||
double m_maxy;
|
||||
bool m_validbounds;
|
||||
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasRect
|
||||
//----------------------------------------------------------------------------
|
||||
@ -91,7 +179,7 @@ public:
|
||||
|
||||
virtual void Recreate();
|
||||
|
||||
virtual void Render( int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
|
||||
private:
|
||||
@ -117,7 +205,7 @@ public:
|
||||
|
||||
virtual void Recreate();
|
||||
|
||||
virtual void Render( int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
|
||||
private:
|
||||
@ -142,7 +230,7 @@ public:
|
||||
|
||||
virtual void Recreate();
|
||||
|
||||
virtual void Render( int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
|
||||
private:
|
||||
@ -185,7 +273,7 @@ public:
|
||||
|
||||
void Recreate();
|
||||
|
||||
virtual void Render( int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height );
|
||||
virtual void WriteSVG( wxTextOutputStream &stream );
|
||||
|
||||
void SetRGB( unsigned char red, unsigned char green, unsigned char blue );
|
||||
@ -264,7 +352,8 @@ private:
|
||||
int m_bufferY;
|
||||
bool m_needUpdate;
|
||||
wxList m_updateRects;
|
||||
wxList m_objects;
|
||||
wxCanvasObjectGroup* m_root;
|
||||
|
||||
unsigned char m_green,m_red,m_blue;
|
||||
bool m_frozen;
|
||||
bool m_requestNewBuffer;
|
||||
|
||||
@ -76,6 +76,53 @@ void MywxCanvasImage::OnMouse(wxMouseEvent &event)
|
||||
}
|
||||
}
|
||||
|
||||
class MywxCanvasObjectGroupRef: public wxCanvasObjectGroupRef
|
||||
{
|
||||
public:
|
||||
MywxCanvasObjectGroupRef(double x, double y, wxCanvasObjectGroup* group);
|
||||
|
||||
void OnMouse(wxMouseEvent &event);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(MywxCanvasObjectGroupRef,wxCanvasObjectGroupRef)
|
||||
EVT_MOUSE_EVENTS( MywxCanvasObjectGroupRef::OnMouse )
|
||||
END_EVENT_TABLE()
|
||||
|
||||
MywxCanvasObjectGroupRef::MywxCanvasObjectGroupRef(double x, double y,wxCanvasObjectGroup* group)
|
||||
:wxCanvasObjectGroupRef(x,y,group)
|
||||
{
|
||||
}
|
||||
|
||||
void MywxCanvasObjectGroupRef::OnMouse(wxMouseEvent &event)
|
||||
{
|
||||
static bool first=false;
|
||||
static dx=0;
|
||||
static dy=0;
|
||||
|
||||
//new position of object
|
||||
int x = m_owner->GetDeviceX( event.GetX());
|
||||
int y = m_owner->GetDeviceY( event.GetY());
|
||||
|
||||
if (event.m_leftDown)
|
||||
{ if (!first)
|
||||
{
|
||||
first=true;
|
||||
dx=x;
|
||||
dy=y;
|
||||
}
|
||||
Move(m_x+x-dx,m_y+y-dy);
|
||||
CaptureMouse();
|
||||
}
|
||||
else if (IsCapturedMouse())
|
||||
{
|
||||
ReleaseMouse();
|
||||
first=false;
|
||||
dx=0;dy=0;
|
||||
}
|
||||
}
|
||||
|
||||
class MyFrame;
|
||||
class MyApp;
|
||||
|
||||
@ -97,6 +144,10 @@ public:
|
||||
wxCanvasObject *m_sm2;
|
||||
wxCanvasObject *m_sm3;
|
||||
wxCanvasObject *m_sm4;
|
||||
|
||||
MywxCanvasObjectGroupRef *m_ref;
|
||||
MywxCanvasObjectGroupRef *m_ref2;
|
||||
|
||||
wxTimer *m_timer;
|
||||
wxTextCtrl *m_log;
|
||||
|
||||
@ -137,7 +188,7 @@ END_EVENT_TABLE()
|
||||
|
||||
MyFrame::MyFrame()
|
||||
: wxFrame( (wxFrame *)NULL, -1, "wxCanvas sample",
|
||||
wxPoint(20,20), wxSize(470,460) )
|
||||
wxPoint(20,20), wxSize(470,860) )
|
||||
{
|
||||
wxMenu *file_menu = new wxMenu();
|
||||
file_menu->Append( ID_ABOUT, "&About...");
|
||||
@ -158,6 +209,7 @@ MyFrame::MyFrame()
|
||||
m_canvas->SetArea( 1400, 600 );
|
||||
m_canvas->SetColour( 255, 255, 255 );
|
||||
|
||||
|
||||
wxBitmap bitmap( smile_xpm );
|
||||
wxImage image( bitmap );
|
||||
|
||||
@ -189,9 +241,35 @@ MyFrame::MyFrame()
|
||||
m_sm4 = new MywxCanvasImage( image, 0,270,64,32 );
|
||||
m_canvas->Append( m_sm4 );
|
||||
|
||||
|
||||
// m_canvas->Append( new wxCanvasLine( 10,-1500e6,50,300000e6, 0,255,0 ) );
|
||||
// m_canvas->Append( new wxCanvasLine( 10,-150000,50,300000, 0,255,0 ) );
|
||||
|
||||
//make a group of wxCanvasObjects
|
||||
wxCanvasObjectGroup* group1 = new wxCanvasObjectGroup();
|
||||
group1->Prepend( new wxCanvasLine( 10,-35,50,190,100,255,0 ) );
|
||||
group1->Prepend( new wxCanvasImage( image, 4,38,32,32 ) );
|
||||
group1->Prepend( new wxCanvasRect(20,-20,50,170,0,20,240 ) );
|
||||
group1->Prepend( new wxCanvasRect(10,20,104,52,0,240,240 ) );
|
||||
|
||||
|
||||
//make another group of wxCanvasObjects
|
||||
wxCanvasObjectGroup* group2 = new wxCanvasObjectGroup();
|
||||
group2->Prepend( new wxCanvasImage( image, 60,38,52,32 ) );
|
||||
group2->Prepend( new wxCanvasRect(10,20,104,52,10,40,10 ) );
|
||||
|
||||
//this a reference to group2 put into group1
|
||||
wxCanvasObjectGroupRef* m_subref = new wxCanvasObjectGroupRef(60,50, group2);
|
||||
group1->Prepend( m_subref );
|
||||
|
||||
//now make two refrences to group1 into root group of the canvas
|
||||
m_ref = new MywxCanvasObjectGroupRef(40,200, group1);
|
||||
m_canvas->Prepend( m_ref );
|
||||
|
||||
m_ref2 = new MywxCanvasObjectGroupRef(80,350, group1);
|
||||
m_canvas->Prepend( m_ref2 );
|
||||
|
||||
|
||||
m_log = new wxTextCtrl( this, -1, "", wxPoint(0,0), wxSize(100,100), wxTE_MULTILINE );
|
||||
wxLog *old_log = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
|
||||
delete old_log;
|
||||
@ -220,10 +298,12 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
|
||||
|
||||
void MyFrame::OnTimer( wxTimerEvent &WXUNUSED(event) )
|
||||
{
|
||||
m_sm1->Move( m_sm1->GetX()+1, m_sm1->GetY() );
|
||||
m_sm1->Move( m_sm1->GetX()+1, m_sm1 ->GetY() );
|
||||
m_sm2->Move( m_sm2->GetX()+1, m_sm2->GetY() );
|
||||
m_sm3->Move( m_sm3->GetX()+1, m_sm3->GetY() );
|
||||
m_sm4->Move( m_sm4->GetX()+1, m_sm4->GetY() );
|
||||
m_sm4->Move( m_sm4->GetX()+2, m_sm4->GetY() );
|
||||
m_ref->Move( m_ref->GetPosX()+1, m_ref->GetPosY() );
|
||||
m_ref2->Move( m_ref2->GetPosX()+2, m_ref2->GetPosY() );
|
||||
|
||||
wxWakeUpIdle();
|
||||
}
|
||||
@ -242,6 +322,7 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
|
||||
bool MyApp::OnInit()
|
||||
{
|
||||
m_fontpath = getenv("TRUETYPE");
|
||||
m_fontpath = "c:\WINNT\Fonts\times.ttf";
|
||||
if ( !m_fontpath )
|
||||
{
|
||||
wxLogError("Please set env var TRUETYPE to the path where times.ttf lives.");
|
||||
|
||||
@ -114,7 +114,7 @@ bool wxCanvasObject::IsCapturedMouse()
|
||||
}
|
||||
|
||||
|
||||
void wxCanvasObject::Render( int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
void wxCanvasObject::Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
{
|
||||
}
|
||||
|
||||
@ -126,6 +126,322 @@ void wxCanvasObject::WriteSVG( wxTextOutputStream &stream )
|
||||
{
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasObjectGroup
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
wxCanvasObjectGroup::wxCanvasObjectGroup()
|
||||
{
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::SetOwner(wxCanvas* canvas)
|
||||
{
|
||||
m_owner=canvas;
|
||||
wxNode *node = m_objects.First();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
|
||||
obj->SetOwner(canvas);
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::ExtendArea(int x, int y)
|
||||
{
|
||||
if (m_validbounds)
|
||||
{
|
||||
if ( x < m_minx ) m_minx = x;
|
||||
if ( y < m_miny ) m_miny = y;
|
||||
if ( x > m_maxx ) m_maxx = x;
|
||||
if ( y > m_maxy ) m_maxy = y;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_validbounds = true;
|
||||
|
||||
m_minx = x;
|
||||
m_miny = y;
|
||||
m_maxx = x;
|
||||
m_maxy = y;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
void wxCanvasObjectGroup::DeleteContents( bool flag)
|
||||
{
|
||||
m_objects.DeleteContents( flag );
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
|
||||
void wxCanvasObjectGroup::Prepend( wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Insert( obj );
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::Append( wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Append( obj );
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::Insert( size_t before, wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Insert( before, obj );
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::Remove( wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.DeleteObject( obj );
|
||||
m_validbounds=false;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::Recreate()
|
||||
{
|
||||
m_validbounds=false;
|
||||
wxNode *node = m_objects.First();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
|
||||
obj->Recreate();
|
||||
ExtendArea(obj->GetX(),obj->GetY());
|
||||
ExtendArea(obj->GetX()+obj->GetWidth(),obj->GetY()+obj->GetHeight());
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::Render(int xabs, int yabs, int x, int y, int width, int height )
|
||||
{
|
||||
wxImage *image = m_owner->GetBuffer();
|
||||
// cycle through all objects
|
||||
wxNode *node = m_objects.First();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
|
||||
if (!obj->IsControl())
|
||||
{
|
||||
// If we have 10.000 objects, we will go through
|
||||
// this 10.000 times for each update, so we have
|
||||
// to optimise carefully.
|
||||
int clip_x = xabs + obj->GetX();
|
||||
int clip_width = obj->GetWidth();
|
||||
if (clip_x < x)
|
||||
{
|
||||
clip_width -= x-clip_x;
|
||||
clip_x = x;
|
||||
}
|
||||
if (clip_width > 0)
|
||||
{
|
||||
if (clip_x + clip_width > x + width)
|
||||
clip_width = x+width-clip_x;
|
||||
|
||||
if (clip_width > 0)
|
||||
{
|
||||
int clip_y = yabs + obj->GetY();
|
||||
int clip_height = obj->GetHeight();
|
||||
if (clip_y < y)
|
||||
{
|
||||
clip_height -= y-clip_y;
|
||||
clip_y = y;
|
||||
}
|
||||
if (clip_height > 0)
|
||||
{
|
||||
if (clip_y + clip_height > y + height)
|
||||
clip_height = y+height-clip_y;
|
||||
|
||||
if (clip_height > 0)
|
||||
obj->Render(xabs,yabs, clip_x, clip_y, clip_width, clip_height );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroup::WriteSVG( wxTextOutputStream &stream )
|
||||
{
|
||||
}
|
||||
|
||||
bool wxCanvasObjectGroup::IsHit( int x, int y, int margin )
|
||||
{
|
||||
wxNode *node = m_objects.Last();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
|
||||
if (!obj->IsControl())
|
||||
{
|
||||
if (obj->IsHit(x,y,margin))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
node = node->Previous();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
wxCanvasObject* wxCanvasObjectGroup::IsHitObject( int x, int y, int margin )
|
||||
{
|
||||
wxCanvasObject *obj=0;
|
||||
wxNode *node = m_objects.Last();
|
||||
while (node)
|
||||
{
|
||||
obj=(wxCanvasObject*) node->Data();
|
||||
|
||||
if (!obj->IsControl())
|
||||
{
|
||||
if (obj->IsHit(x,y,margin))
|
||||
{
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
node = node->Previous();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasObjectGroupRef
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
wxCanvasObjectGroupRef::wxCanvasObjectGroupRef(double x, double y, wxCanvasObjectGroup* group)
|
||||
: wxCanvasObject()
|
||||
{
|
||||
m_x = x;
|
||||
m_y = y;
|
||||
m_validbounds=false;
|
||||
m_group=group;
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::SetOwner(wxCanvas* canvas)
|
||||
{
|
||||
m_owner=canvas;
|
||||
m_group->SetOwner(canvas);
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::ExtendArea(int x, int y)
|
||||
{
|
||||
if (m_validbounds)
|
||||
{
|
||||
if ( x < m_minx ) m_minx = x;
|
||||
if ( y < m_miny ) m_miny = y;
|
||||
if ( x > m_maxx ) m_maxx = x;
|
||||
if ( y > m_maxy ) m_maxy = y;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_validbounds = true;
|
||||
|
||||
m_minx = x;
|
||||
m_miny = y;
|
||||
m_maxx = x;
|
||||
m_maxy = y;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::Recreate()
|
||||
{
|
||||
m_validbounds=false;
|
||||
m_group->Recreate();
|
||||
ExtendArea(m_group->GetXMin(),m_group->GetYMin());
|
||||
ExtendArea(m_group->GetXMax(),m_group->GetYMax());
|
||||
|
||||
//set the area in pixels relative to the parent
|
||||
SetArea( m_owner->GetDeviceX( m_x + m_minx ),
|
||||
m_owner->GetDeviceY( m_y + m_miny ),
|
||||
m_owner->GetDeviceWidth( m_maxx-m_minx ),
|
||||
m_owner->GetDeviceHeight( m_maxy-m_miny ) );
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::Render(int xabs, int yabs, int x, int y, int width, int height )
|
||||
{
|
||||
wxImage *image = m_owner->GetBuffer();
|
||||
xabs+=m_owner->GetDeviceX(GetPosX());
|
||||
yabs+=m_owner->GetDeviceY(GetPosY());
|
||||
|
||||
int clip_x = xabs + m_group->GetXMin();
|
||||
int clip_width = m_group->GetXMax()-m_group->GetXMin();
|
||||
if (clip_x < x)
|
||||
{
|
||||
clip_width -= x-clip_x;
|
||||
clip_x = x;
|
||||
}
|
||||
if (clip_width > 0)
|
||||
{
|
||||
if (clip_x + clip_width > x + width)
|
||||
clip_width = x+width-clip_x;
|
||||
|
||||
if (clip_width > 0)
|
||||
{
|
||||
int clip_y = yabs + m_group->GetYMin();
|
||||
int clip_height = m_group->GetYMax()-m_group->GetYMin();
|
||||
if (clip_y < y)
|
||||
{
|
||||
clip_height -= y-clip_y;
|
||||
clip_y = y;
|
||||
}
|
||||
if (clip_height > 0)
|
||||
{
|
||||
if (clip_y + clip_height > y + height)
|
||||
clip_height = y+height-clip_y;
|
||||
|
||||
if (clip_height > 0)
|
||||
m_group->Render(xabs,yabs, clip_x, clip_y, clip_width, clip_height );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::WriteSVG( wxTextOutputStream &stream )
|
||||
{
|
||||
}
|
||||
|
||||
bool wxCanvasObjectGroupRef::IsHit( int x, int y, int margin )
|
||||
{
|
||||
return m_group->IsHit(x-GetPosX(),y-GetPosY(),margin);
|
||||
}
|
||||
|
||||
wxCanvasObject* wxCanvasObjectGroupRef::IsHitObject( int x, int y, int margin )
|
||||
{
|
||||
return m_group->IsHitObject(x-GetPosX(),y-GetPosY(),margin);
|
||||
}
|
||||
|
||||
void wxCanvasObjectGroupRef::Move( int x, int y )
|
||||
{
|
||||
int old_x = m_x;
|
||||
int old_y = m_y;
|
||||
|
||||
m_x = x;
|
||||
m_y = y;
|
||||
|
||||
if (!m_isControl)
|
||||
{
|
||||
// TODO: sometimes faster to merge into 1 Update or
|
||||
// to break up into four
|
||||
m_owner->Update(m_area.x, m_area.y, m_area.width, m_area.height );
|
||||
//calculate the new area in pixels relative to the parent
|
||||
SetArea( m_owner->GetDeviceX( m_x + m_minx ),
|
||||
m_owner->GetDeviceY( m_y + m_miny ),
|
||||
m_owner->GetDeviceWidth( m_maxx-m_minx ),
|
||||
m_owner->GetDeviceHeight( m_maxy-m_miny ) );
|
||||
m_owner->Update( m_area.x, m_area.y, m_area.width, m_area.height );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxCanvasRect
|
||||
//----------------------------------------------------------------------------
|
||||
@ -152,7 +468,7 @@ void wxCanvasRect::Recreate()
|
||||
m_owner->GetDeviceHeight( m_height ) );
|
||||
}
|
||||
|
||||
void wxCanvasRect::Render( int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
void wxCanvasRect::Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
{
|
||||
wxImage *image = m_owner->GetBuffer();
|
||||
int buffer_x = m_owner->GetBufferX();
|
||||
@ -213,7 +529,7 @@ void wxCanvasLine::Recreate()
|
||||
SetArea( x1, y1, x2-x1+1, y2-y1+1 );
|
||||
}
|
||||
|
||||
void wxCanvasLine::Render( int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
void wxCanvasLine::Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
{
|
||||
wxImage *image = m_owner->GetBuffer();
|
||||
int buffer_x = m_owner->GetBufferX();
|
||||
@ -225,10 +541,10 @@ void wxCanvasLine::Render( int clip_x, int clip_y, int clip_width, int clip_heig
|
||||
}
|
||||
else
|
||||
{
|
||||
int x1 = m_owner->GetDeviceX( m_x1 );
|
||||
int y1 = m_owner->GetDeviceY( m_y1 );
|
||||
int x2 = m_owner->GetDeviceX( m_x2 );
|
||||
int y2 = m_owner->GetDeviceY( m_y2 );
|
||||
int x1 = xabs + m_owner->GetDeviceX( m_x1 );
|
||||
int y1 = yabs + m_owner->GetDeviceY( m_y1 );
|
||||
int x2 = xabs + m_owner->GetDeviceX( m_x2 );
|
||||
int y2 = yabs + m_owner->GetDeviceY( m_y2 );
|
||||
|
||||
wxInt32 d, ii, jj, di, ai, si, dj, aj, sj;
|
||||
di = x1 - x2;
|
||||
@ -321,13 +637,13 @@ void wxCanvasImage::Recreate()
|
||||
m_tmp = m_image.Scale( m_area.width, m_area.height );
|
||||
}
|
||||
|
||||
void wxCanvasImage::Render( int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
void wxCanvasImage::Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
{
|
||||
int buffer_x = m_owner->GetBufferX();
|
||||
int buffer_y = m_owner->GetBufferY();
|
||||
|
||||
if ((clip_x == m_area.x) &&
|
||||
(clip_y == m_area.y) &&
|
||||
if ((clip_x == xabs + m_area.x) &&
|
||||
(clip_y == yabs + m_area.y) &&
|
||||
(clip_width == m_area.width) &&
|
||||
(clip_height == m_area.height))
|
||||
{
|
||||
@ -336,8 +652,8 @@ void wxCanvasImage::Render( int clip_x, int clip_y, int clip_width, int clip_hei
|
||||
else
|
||||
{
|
||||
// local coordinates
|
||||
int start_x = clip_x - m_area.x;
|
||||
int start_y = clip_y - m_area.y;
|
||||
int start_x = clip_x - (xabs + m_area.x);
|
||||
int start_y = clip_y - (yabs + m_area.y);
|
||||
|
||||
wxRect rect( start_x, start_y, clip_width, clip_height );
|
||||
wxImage sub_image( m_tmp.GetSubImage( rect ) );
|
||||
@ -446,7 +762,7 @@ void wxCanvasText::SetFlag( int flag )
|
||||
m_flag = flag;
|
||||
}
|
||||
|
||||
void wxCanvasText::Render( int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
void wxCanvasText::Render(int xabs, int yabs, int clip_x, int clip_y, int clip_width, int clip_height )
|
||||
{
|
||||
if (!m_alpha) return;
|
||||
|
||||
@ -565,7 +881,6 @@ wxCanvas::wxCanvas( wxWindow *parent, wxWindowID id,
|
||||
m_bufferX = 0;
|
||||
m_bufferY = 0;
|
||||
m_needUpdate = FALSE;
|
||||
m_objects.DeleteContents( TRUE );
|
||||
m_red = 0;
|
||||
m_green = 0;
|
||||
m_blue = 0;
|
||||
@ -573,6 +888,11 @@ wxCanvas::wxCanvas( wxWindow *parent, wxWindowID id,
|
||||
m_captureMouse = (wxCanvasObject*)NULL;
|
||||
m_frozen = TRUE;
|
||||
m_requestNewBuffer = TRUE;
|
||||
|
||||
//root group always at 0,0
|
||||
m_root = new wxCanvasObjectGroup();
|
||||
m_root->DeleteContents( TRUE );
|
||||
m_root->SetOwner(this);
|
||||
}
|
||||
|
||||
wxCanvas::~wxCanvas()
|
||||
@ -702,52 +1022,8 @@ void wxCanvas::Update( int x, int y, int width, int height, bool blit )
|
||||
for (int xx = start_x; xx < end_x; xx++)
|
||||
m_buffer.SetRGB( xx, yy, m_red, m_green, m_blue );
|
||||
|
||||
// cycle through all objects
|
||||
wxNode *node = m_objects.First();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
m_root->Render(0,0, x, y, width, height );
|
||||
|
||||
if (!obj->IsControl())
|
||||
{
|
||||
// If we have 10.000 objects, we will go through
|
||||
// this 10.000 times for each update, so we have
|
||||
// to optimise carefully.
|
||||
int clip_x = obj->GetX();
|
||||
int clip_width = obj->GetWidth();
|
||||
if (clip_x < x)
|
||||
{
|
||||
clip_width -= x-clip_x;
|
||||
clip_x = x;
|
||||
}
|
||||
if (clip_width > 0)
|
||||
{
|
||||
if (clip_x + clip_width > x + width)
|
||||
clip_width = x+width-clip_x;
|
||||
|
||||
if (clip_width > 0)
|
||||
{
|
||||
int clip_y = obj->GetY();
|
||||
int clip_height = obj->GetHeight();
|
||||
if (clip_y < y)
|
||||
{
|
||||
clip_height -= y-clip_y;
|
||||
clip_y = y;
|
||||
}
|
||||
if (clip_height > 0)
|
||||
{
|
||||
if (clip_y + clip_height > y + height)
|
||||
clip_height = y+height-clip_y;
|
||||
|
||||
if (clip_height > 0)
|
||||
obj->Render( clip_x, clip_y, clip_width, clip_height );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
void wxCanvas::BlitBuffer( wxDC &dc )
|
||||
@ -838,23 +1114,15 @@ int wxCanvas::GetDeviceHeight( double height )
|
||||
|
||||
void wxCanvas::Recreate()
|
||||
{
|
||||
wxNode *node = m_objects.First();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
|
||||
obj->Recreate();
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
m_root->Recreate();
|
||||
}
|
||||
|
||||
void wxCanvas::Prepend( wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Insert( obj );
|
||||
m_root->Prepend( obj );
|
||||
obj->SetOwner(this);
|
||||
|
||||
obj->SetOwner( this );
|
||||
obj->Recreate();
|
||||
m_root->Recreate();
|
||||
|
||||
if (!obj->IsControl())
|
||||
Update( obj->GetX(), obj->GetY(), obj->GetWidth(), obj->GetHeight() );
|
||||
@ -862,10 +1130,10 @@ void wxCanvas::Prepend( wxCanvasObject* obj )
|
||||
|
||||
void wxCanvas::Append( wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Append( obj );
|
||||
m_root->Append( obj );
|
||||
obj->SetOwner(this);
|
||||
|
||||
obj->SetOwner( this );
|
||||
obj->Recreate();
|
||||
m_root->Recreate();
|
||||
|
||||
if (!obj->IsControl())
|
||||
Update( obj->GetX(), obj->GetY(), obj->GetWidth(), obj->GetHeight() );
|
||||
@ -873,10 +1141,10 @@ void wxCanvas::Append( wxCanvasObject* obj )
|
||||
|
||||
void wxCanvas::Insert( size_t before, wxCanvasObject* obj )
|
||||
{
|
||||
m_objects.Insert( before, obj );
|
||||
m_root->Insert( before, obj );
|
||||
obj->SetOwner(this);
|
||||
|
||||
obj->SetOwner( this );
|
||||
obj->Recreate();
|
||||
m_root->Recreate();
|
||||
|
||||
if (!obj->IsControl())
|
||||
Update( obj->GetX(), obj->GetY(), obj->GetWidth(), obj->GetHeight() );
|
||||
@ -890,7 +1158,7 @@ void wxCanvas::Remove( wxCanvasObject* obj )
|
||||
int h = obj->GetHeight();
|
||||
bool ic = obj->IsControl();
|
||||
|
||||
m_objects.DeleteObject( obj );
|
||||
m_root->Remove( obj );
|
||||
|
||||
if (!ic)
|
||||
Update( x, y, w, h );
|
||||
@ -1035,14 +1303,9 @@ void wxCanvas::OnMouse(wxMouseEvent &event)
|
||||
}
|
||||
else
|
||||
{
|
||||
wxNode *node = m_objects.Last();
|
||||
while (node)
|
||||
{
|
||||
wxCanvasObject *obj = (wxCanvasObject*) node->Data();
|
||||
wxCanvasObject *obj = m_root->IsHitObject(x,y,0);
|
||||
|
||||
if (!obj->IsControl())
|
||||
{
|
||||
if (obj->IsHit(x,y))
|
||||
if (obj && !obj->IsControl())
|
||||
{
|
||||
wxMouseEvent child_event( wxEVT_MOTION );
|
||||
child_event.SetEventObject( obj );
|
||||
@ -1078,9 +1341,6 @@ void wxCanvas::OnMouse(wxMouseEvent &event)
|
||||
return;
|
||||
}
|
||||
}
|
||||
node = node->Previous();
|
||||
}
|
||||
}
|
||||
if (m_lastMouse)
|
||||
{
|
||||
wxMouseEvent child_event( wxEVT_LEAVE_WINDOW );
|
||||
@ -1100,6 +1360,7 @@ void wxCanvas::OnMouse(wxMouseEvent &event)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user