mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-10 06:04:12 +02:00
Merge branch 'master' into fix-nonfinite-coordinate-validation
This commit is contained in:
@@ -812,6 +812,7 @@ bool Element::fromXml(QDomElement &e,
|
||||
setZValue(e.attribute(QStringLiteral("z"), QString::number(this->zValue())).toDouble());
|
||||
setFlags(QGraphicsItem::ItemIsMovable
|
||||
| QGraphicsItem::ItemIsSelectable);
|
||||
is_movable_ = e.attribute(QStringLiteral("is_movable"), QStringLiteral("1")).toInt();
|
||||
|
||||
// orientation
|
||||
bool conv_ok;
|
||||
@@ -943,6 +944,7 @@ QDomElement Element::toXml(
|
||||
element.setAttribute(QStringLiteral("y"), QString::number(pos().y()));
|
||||
element.setAttribute(QStringLiteral("z"), QString::number(this->zValue()));
|
||||
element.setAttribute(QStringLiteral("orientation"), QString::number(orientation()));
|
||||
element.setAttribute(QStringLiteral("is_movable"), bool(is_movable_));
|
||||
|
||||
/* get the first id to use for the bounds of this element
|
||||
* recupere le premier id a utiliser pour les bornes de cet element */
|
||||
|
||||
Reference in New Issue
Block a user