Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use native methods to draw some geometric figures using Cairo renderer

Browse Source 
There are straightforward ways to draw rectangles, circles and ellipses using native methods provided by Cairo renderer and they should be used instead of generic implementations.

See #17554
This commit is contained in:
Artur Wieczorek
2016-05-31 20:59:25 +02:00
parent b58d58adc0
commit a5d4a99bb0
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/generic/graphicc.cpp
View File

@@ -155,13 +155,16 @@ public :
// using the primitives from above
//
/*
// appends a rectangle as a new closed subpath
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ;
// appends an ellipsis as a new closed subpath fitting the passed rectangle
virtual void AddEllipsis( wxDouble x, wxDouble y, wxDouble w , wxDouble h ) ;
virtual void AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE;
// appends a circle as a new closed subpath
virtual void AddCircle(wxDouble x, wxDouble y, wxDouble r) wxOVERRIDE;
// appends an ellipse as a new closed subpath fitting the passed rectangle
virtual void AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE;
/*
// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
*/
@@ -1208,6 +1211,33 @@ bool wxCairoPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillSt
return cairo_in_fill( m_pathContext, x, y) != 0;
}
// Convenience functions
void wxCairoPathData::AddRectangle(wxDouble x, wxDouble y, wxDouble w, wxDouble h)
{
cairo_rectangle(m_pathContext, x, y, w, h);
}
void wxCairoPathData::AddCircle(wxDouble x, wxDouble y, wxDouble r)
{
cairo_move_to(m_pathContext, x+r, y);
cairo_arc(m_pathContext, x, y, r, 0.0, 2*M_PI);
cairo_close_path(m_pathContext);
}
void wxCairoPathData::AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h)
{
cairo_move_to(m_pathContext, x+w, y+h/2.0);
w /= 2.0;
h /= 2.0;
cairo_save(m_pathContext);
cairo_translate(m_pathContext, x+w, y+h);
cairo_scale(m_pathContext, w, h);
cairo_arc(m_pathContext, 0.0, 0.0, 1.0, 0.0, 2*M_PI);
cairo_restore(m_pathContext);
cairo_close_path(m_pathContext);
}
//-----------------------------------------------------------------------------
// wxCairoMatrixData implementation
//-----------------------------------------------------------------------------