kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug N°202 : Wrong bounding rect for primitive arc.

Browse Source 
https://qelectrotech.org/bugtracker/view.php?id=202
This commit is contained in:
Claveau Joshua
2020-09-11 19:11:14 +02:00
parent 989cd93a14
commit 726b300999
4 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
View File

@@ -87,7 +87,6 @@ QVector<QPointF> QetGraphicsHandlerUtility::pointsForArc(const QRectF &rect,
path.arcTo(rect, start_angle, span_angle);
vector.append(path.currentPosition());
return vector;
}
/**
@@ -187,6 +186,52 @@ QRectF QetGraphicsHandlerUtility::mirrorRectForPosAtIndex(
return rect;
}
/**
* @brief QetGraphicsHandlerUtility::rectForArc
* @param rect : the rect where the arc is defined
* @param start_angle : start angle in degree
* @param span_angle : span angle in degree
* @return Return the rect that bound the arc.
*/
QRectF QetGraphicsHandlerUtility::rectForArc(const QRectF &rect, qreal start_angle, qreal span_angle)
{
auto point = pointsForArc (rect, start_angle, span_angle);
auto end_angle =start_angle + span_angle;
auto normalized_end_angle = end_angle;
if (normalized_end_angle > 360)
normalized_end_angle -= 360;
QPointF top_left;
if ((start_angle <= 180 && normalized_end_angle >= 180) ||
(end_angle > 360 && normalized_end_angle >= 180)) {
top_left.setX(rect.left());
} else {
top_left.setX(std::min(point[0].x(), point[1].x()));
}
if ((start_angle <= 90 && end_angle >= 90) ||
(start_angle > 90 && end_angle > 360 && normalized_end_angle >= 90)) {
top_left.setY(rect.top());
} else {
top_left.setY(std::min(point[0].y(), point[1].y()));
}
QPointF bottom_right;
if (end_angle >= 360) {
bottom_right.setX(rect.right());
} else {
bottom_right.setX(std::max(point[0].x(), point[1].x()));
}
if ((start_angle <= 270 && end_angle >= 270) ||
(end_angle > 360 && normalized_end_angle >= 270)) {
bottom_right.setY(rect.bottom());
} else {
bottom_right.setY(std::max(point[0].y(), point[1].y()));
}
return QRectF(top_left, bottom_right);
}
/**
@brief QetGraphicsHandlerUtility::lineForPosAtIndex
Return a line after modification of pos at index index of old_line.