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

Fixed adding arc to wxGraphicsPath with Direct2D renderer

Browse Source 
Modified calculations of sweep angle to get its correct value for all combinations of start/end angle values and clockwise/counter-clockwise drawing.

See #17552
This commit is contained in:
Artur Wieczorek
2016-05-29 17:39:03 +02:00
parent 5e500de7e8
commit eb2fc93a9b
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/graphicsd2d.cpp
View File

@@ -1428,31 +1428,33 @@ void wxD2DPathData::AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAng
} }
double angle = (end.GetVectorAngle() - start.GetVectorAngle()); double angle = (end.GetVectorAngle() - start.GetVectorAngle());
if ( angle == 360 || angle == -360 )
if (!clockwise)
{ {
angle = 360 - angle; AddCircle(center.m_x, center.m_y, r);
return;
} }
if ( !clockwise )
angle = -angle;
if ( angle < 0 )
angle += 360;
while (abs(angle) > 360) while (abs(angle) > 360)
{ {
angle -= (angle / abs(angle)) * 360; angle -= (angle / abs(angle)) * 360;
} }
if (angle == 360) D2D1_SWEEP_DIRECTION sweepDirection = clockwise ?
{ D2D1_SWEEP_DIRECTION_CLOCKWISE : D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE;
AddCircle(center.m_x, center.m_y, start.GetVectorLength());
return;
}
D2D1_SWEEP_DIRECTION sweepDirection = clockwise ? D2D1_SWEEP_DIRECTION_CLOCKWISE : D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE; D2D1_ARC_SIZE arcSize = angle > 180 ?
D2D1_ARC_SIZE_LARGE : D2D1_ARC_SIZE_SMALL;
D2D1_ARC_SIZE arcSize = angle > 180 ? D2D1_ARC_SIZE_LARGE : D2D1_ARC_SIZE_SMALL;
D2D1_ARC_SEGMENT arcSegment = { D2D1_ARC_SEGMENT arcSegment = {
{ (FLOAT)(end.m_x + x), (FLOAT)(end.m_y + y) }, // end point D2D1::Point2((FLOAT)(end.m_x + x), (FLOAT)(end.m_y + y)), // end point
{ (FLOAT)r, (FLOAT) r }, // size D2D1::SizeF((FLOAT)r, (FLOAT)r), // size
0, // rotation 0.0f, // rotation
sweepDirection, // sweep direction sweepDirection, // sweep direction
arcSize // arc size arcSize // arc size
}; };