kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-19 20:44:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1542 from plc-user/master

Browse Source 
PartArc: normalize start and span to have positive values in element-file
This commit is contained in:
ispyisail
2026-10-19 14:17:57 +13:00
committed by GitHub
parent 9586bc16cd 3a92ec3fb1
commit afe2138feb
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/editor/graphicspart/partarc.cpp
+25 -2
View File
@@ -89,6 +89,21 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
drawCross(m_rect.center(), painter);
}
void PartArc::normalizeAngles(qreal &start, qreal &angle)
{
constexpr qreal CIRCLE = 360.0 * 16.0; // internal representation of angles in 1/16 degree
while (start < 0.0) { start += CIRCLE; } // always positive start
while (start > CIRCLE) { start -= CIRCLE; } // within 0 ... 360
if (angle < 0.0) {
start = (start + angle + CIRCLE);
while (start < 0.0) { start += CIRCLE; }
while (start > CIRCLE) { start -= CIRCLE; }
angle *= (-1.0);
}
}
/**
@brief PartArc::toXml
Export this arc in xml
@@ -100,12 +115,17 @@ const QDomElement PartArc::toXml(QDomDocument &xml_document) const
QDomElement xml_element = xml_document.createElement("arc");
QPointF top_left(sceneTopLeft());
// normalize the angles:
qreal start_angle = m_start_angle;
qreal span_angle = m_span_angle;
normalizeAngles(start_angle, span_angle);
qreal x = qRound(top_left.x() * 100.0) / 100.0;
qreal y = qRound(top_left.y() * 100.0) / 100.0;
qreal w = qRound(rect().width() * 100.0) / 100.0;
qreal h = qRound(rect().height() * 100.0) / 100.0;
qreal s = qRound(m_start_angle * 100.0) / 100.0;
qreal a = qRound(m_span_angle * 100.0) / 100.0;
qreal s = qRound(start_angle * 100.0) / 100.0;
qreal a = qRound(span_angle * 100.0) / 100.0;
xml_element.setAttribute("x", QString("%1").arg(x));
xml_element.setAttribute("y", QString("%1").arg(y));
@@ -132,6 +152,9 @@ void PartArc::fromXml(const QDomElement &qde) {
m_start_angle = qde.attribute("start", "0").toDouble() * 16;
m_span_angle = qde.attribute("angle", "-1440").toDouble() * 16;
// normalize the angles:
normalizeAngles(m_start_angle, m_span_angle);
}
/**
sources/editor/graphicspart/partarc.h
+1
View File
@@ -88,5 +88,6 @@ class PartArc : public AbstractPartEllipse
QPointF m_span_point;
QVector<QetGraphicsHandlerItem *> m_handler_vector;
qreal m_rot = 0;
static void normalizeAngles(qreal &start_angle, qreal &span_angle);
};
#endif