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

translate the wxRegion from device to user coordinates, swap angles for the arc drawing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-11-06 08:06:09 +00:00
parent 3925a44ce0
commit 4bae004c61
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/dcgraph.cpp
View File

@@ -158,6 +158,7 @@ void wxGCDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region ) void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
{ {
// region is in device coordinates
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") ); wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
if (region.Empty()) if (region.Empty())
@@ -166,10 +167,13 @@ void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
return; return;
} }
wxRegion logRegion( region );
wxCoord x, y, w, h; wxCoord x, y, w, h;
region.GetBox( x, y, w, h );
m_graphicContext->Clip( region ); logRegion.Offset( DeviceToLogicalX(0), DeviceToLogicalY(0) );
logRegion.GetBox( x, y, w, h );
m_graphicContext->Clip( logRegion );
if ( m_clipping ) if ( m_clipping )
{ {
m_clipX1 = wxMax( m_clipX1, x ); m_clipX1 = wxMax( m_clipX1, x );
@@ -480,7 +484,9 @@ void wxGCDC::DoDrawArc( wxCoord x1, wxCoord y1,
wxGraphicsPath path = m_graphicContext->CreatePath(); wxGraphicsPath path = m_graphicContext->CreatePath();
if ( fill && ((x1!=x2)||(y1!=y2)) ) if ( fill && ((x1!=x2)||(y1!=y2)) )
path.MoveToPoint( xc, yc ); path.MoveToPoint( xc, yc );
path.AddArc( xc, yc , rad , DegToRad(sa) , DegToRad(ea), false ); // since these angles (ea,sa) are measured counter-clockwise, we invert them to
// get clockwise angles
path.AddArc( xc, yc , rad , DegToRad(-sa) , DegToRad(-ea), false );
if ( fill && ((x1!=x2)||(y1!=y2)) ) if ( fill && ((x1!=x2)||(y1!=y2)) )
path.AddLineToPoint( xc, yc ); path.AddLineToPoint( xc, yc );
m_graphicContext->DrawPath(path); m_graphicContext->DrawPath(path);