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

update

Browse Source
This commit is contained in:
Martin Marmsoler
2020-08-24 20:34:18 +02:00
parent 385d0ffd69
commit a10709157d
27 changed files with 276 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sources/editor/graphicspart/partellipse.cpp
View File

@@ -76,7 +76,7 @@ void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
* @param xml_document : Xml document to use for create the xml element.
* @return : an xml element that describe this ellipse
*/
const QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
{
QDomElement xml_element;
if (qFuzzyCompare(rect().width(), rect().height()))
@@ -105,26 +105,31 @@ const QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
* Import the properties of this ellipse from a xml element.
* @param qde : Xml document to use.
*/
void PartEllipse::fromXml(const QDomElement &qde)
bool PartEllipse::fromXml(const QDomElement &qde)
{
stylesFromXml(qde);
double x = 0, y = 0, width = 0, height = 0;
double x, y, width, height;
if (qde.tagName() == "ellipse")
{
propertyDouble(qde, "width", &width);
propertyDouble(qde, "height", &height);
if (propertyDouble(qde, "width", &width, 0) == PropertyFlags::NoValidConversion ||
propertyDouble(qde, "height", &height, 0) == PropertyFlags::NoValidConversion)
return false;
}
else {
propertyDouble(qde, "diameter", &width);
if (propertyDouble(qde, "diameter", &width, 0) == PropertyFlags::NoValidConversion)
return false;
height = width;
}
propertyDouble(qde, "x", &x);
propertyDouble(qde, "y", &y);
if (propertyDouble(qde, "x", &x, 0) == PropertyFlags::NoValidConversion ||
propertyDouble(qde, "y", &y, 0) == PropertyFlags::NoValidConversion)
return false;
m_rect = QRectF(mapFromScene(x, y), QSizeF(width, height));
return true;
}
/**