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

copy all toXML() from master commit 4b82c3a0c4 into the current branch, because the new concept will be used only for user properties

Browse Source
This commit is contained in:
Martin Marmsoler
2021-03-07 10:09:45 +01:00
parent 058824f29a
commit 5d3710c4b2
26 changed files with 267 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/borderproperties.cpp
View File

@@ -90,12 +90,12 @@ bool BorderProperties::operator!=(const BorderProperties &bp) {
\~French Element XML auquel seront ajoutes des attributs \~French Element XML auquel seront ajoutes des attributs
*/ */
void BorderProperties::toXmlPriv(QDomElement& e) const { void BorderProperties::toXmlPriv(QDomElement& e) const {
e.appendChild(QETXML::createXmlProperty("cols", columns_count)); e.setAttribute("cols", columns_count);
e.appendChild(QETXML::createXmlProperty("colsize", columns_width)); e.setAttribute("colsize", QString("%1").arg(columns_width));
e.appendChild(QETXML::createXmlProperty("rows", rows_count)); e.setAttribute("rows", rows_count);
e.appendChild(QETXML::createXmlProperty("rowsize", rows_height)); e.setAttribute("rowsize", QString("%1").arg(rows_height));
e.appendChild(QETXML::createXmlProperty("displayrows", display_rows)); e.setAttribute("displaycols", display_columns ? "true" : "false");
e.appendChild(QETXML::createXmlProperty("displaycols", display_columns)); e.setAttribute("displayrows", display_rows ? "true" : "false");
} }
/*!RETURNS True /*!RETURNS True

64
sources/conductorproperties.cpp
View File

@@ -215,12 +215,10 @@ void SingleLineProperties::drawPen(QPainter *painter,
*/ */
void SingleLineProperties::toXmlPriv(QDomElement& e) const { void SingleLineProperties::toXmlPriv(QDomElement& e) const {
e.appendChild(QETXML::createXmlProperty("ground", hasGround)); e.setAttribute("ground", hasGround ? "true" : "false");
e.appendChild(QETXML::createXmlProperty("neutral", hasNeutral)); e.setAttribute("neutral", hasNeutral ? "true" : "false");
e.appendChild(QETXML::createXmlProperty("phase", phases)); e.setAttribute("phase", phases);
if (isPen()) e.setAttribute("pen", "true");
if (isPen())
e.appendChild(QETXML::createXmlProperty("pen", true));
} }
/** /**
@@ -284,42 +282,44 @@ ConductorProperties::~ConductorProperties()
void ConductorProperties::toXmlPriv(QDomElement& e) const void ConductorProperties::toXmlPriv(QDomElement& e) const
{ {
e.appendChild(QETXML::createXmlProperty("type", typeToString(type))); e.setAttribute("type", typeToString(type));
e.appendChild(QETXML::createXmlProperty("color", color));
e.appendChild(QETXML::createXmlProperty("bicolor", m_bicolor)); if (color != QColor(Qt::black))
e.appendChild(QETXML::createXmlProperty("color2", m_color_2)); e.setAttribute("color", color.name());
e.appendChild(QETXML::createXmlProperty("dash-size", m_dash_size));
e.setAttribute("bicolor", m_bicolor? "true" : "false");
e.setAttribute("color2", m_color_2.name());
e.setAttribute("dash-size", QString::number(m_dash_size));
if (type == Single) if (type == Single)
{ {
QDomDocument doc; QDomDocument doc = e.ownerDocument();
e.appendChild(singleLineProperties.toXml(doc)); singleLineProperties.toXml(doc);
} }
e.appendChild(QETXML::createXmlProperty("num", text)); e.setAttribute("num", text);
e.appendChild(QETXML::createXmlProperty("text_color", text_color)); e.setAttribute("text_color", text_color.name());
e.appendChild(QETXML::createXmlProperty("formula", m_formula)); e.setAttribute("formula", m_formula);
e.appendChild(QETXML::createXmlProperty("function", m_function)); e.setAttribute("cable", m_cable);
e.appendChild(QETXML::createXmlProperty("tension_protocol", m_tension_protocol)); e.setAttribute("bus", m_bus);
e.appendChild(QETXML::createXmlProperty("conductor_color", m_wire_color)); e.setAttribute("function", m_function);
e.appendChild(QETXML::createXmlProperty("conductor_section", m_wire_section)); e.setAttribute("tension_protocol", m_tension_protocol);
e.appendChild(QETXML::createXmlProperty("numsize", text_size)); e.setAttribute("conductor_color", m_wire_color);
e.appendChild(QETXML::createXmlProperty("condsize", cond_size)); e.setAttribute("conductor_section", m_wire_section);
e.appendChild(QETXML::createXmlProperty("displaytext", m_show_text)); e.setAttribute("numsize", QString::number(text_size));
e.appendChild(QETXML::createXmlProperty("onetextperfolio", m_one_text_per_folio)); e.setAttribute("condsize", QString::number(cond_size));
e.appendChild(QETXML::createXmlProperty("vertirotatetext", verti_rotate_text)); e.setAttribute("displaytext", m_show_text);
e.appendChild(QETXML::createXmlProperty("horizrotatetext", horiz_rotate_text)); e.setAttribute("onetextperfolio", m_one_text_per_folio);
// TODO: implement e.setAttribute("vertirotatetext", QString::number(verti_rotate_text));
//e.setAttribute("cable", m_cable); e.setAttribute("horizrotatetext", QString::number(horiz_rotate_text));
// e.setAttribute("bus", m_bus);
QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>(); QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
e.appendChild(QETXML::createXmlProperty("horizontal-alignment", me.valueToKey(m_horizontal_alignment))); e.setAttribute("horizontal-alignment", me.valueToKey(m_horizontal_alignment));
e.appendChild(QETXML::createXmlProperty("vertical-alignment", me.valueToKey(m_vertical_alignment))); e.setAttribute("vertical-alignment", me.valueToKey(m_vertical_alignment));
QString conductor_style = writeStyle(); QString conductor_style = writeStyle();
if (!conductor_style.isEmpty()) if (!conductor_style.isEmpty())
e.appendChild(QETXML::createXmlProperty("style", conductor_style)); e.setAttribute("style", conductor_style);
} }

22
sources/editor/graphicspart/partarc.cpp
View File

@@ -103,22 +103,18 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
@param xml_document : Xml document to use for create the xml element. @param xml_document : Xml document to use for create the xml element.
@return : an xml element that describe this arc @return : an xml element that describe this arc
*/ */
void PartArc::toXmlPriv(QDomElement& e) const void PartArc::toXmlPriv(QDomElement& xml_element) const
{ {
e.setTagName("arc"); xml_element.setTagName("arc");
QPointF top_left(sceneTopLeft()); QPointF top_left(sceneTopLeft());
xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
e.appendChild(QETXML::createXmlProperty("x", top_left.x())); xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
e.appendChild(QETXML::createXmlProperty("y", top_left.y())); xml_element.setAttribute("width", QString("%1").arg(rect().width()));
e.appendChild(QETXML::createXmlProperty("width", rect().width())); xml_element.setAttribute("height", QString("%1").arg(rect().height()));
e.appendChild(QETXML::createXmlProperty("height", rect().height()));
//to maintain compatibility with the previous version, we write the angle in degrees. //to maintain compatibility with the previous version, we write the angle in degrees.
e.appendChild(QETXML::createXmlProperty("start", m_start_angle / 16)); xml_element.setAttribute("start", QString("%1").arg(m_start_angle / 16));
e.appendChild(QETXML::createXmlProperty("angle", m_span_angle / 16)); xml_element.setAttribute("angle", QString("%1").arg(m_span_angle / 16));
stylesToXml(xml_element);
stylesToXml(e);
} }
/** /**

2
sources/editor/graphicspart/partarc.h
View File

@@ -51,7 +51,7 @@ class PartArc : public AbstractPartEllipse
//Name and XML //Name and XML
QString name() const override { return(QObject::tr("arc", "element part name")); } QString name() const override { return(QObject::tr("arc", "element part name")); }
QString xmlName() const override { return(QString("arc")); } QString xmlName() const override { return(QString("arc")); }
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
bool fromXmlPriv (const QDomElement &) override; bool fromXmlPriv (const QDomElement &) override;
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}

61
sources/editor/graphicspart/partdynamictextfield.cpp
View File

@@ -96,64 +96,59 @@ void PartDynamicTextField::handleUserTransformation(
@param dom_doc @param dom_doc
@return @return
*/ */
void PartDynamicTextField::toXmlPriv(QDomElement& e) const void PartDynamicTextField::toXmlPriv(QDomElement& root_element) const
{ {
e.appendChild(QETXML::createXmlProperty("x", pos().x())); root_element.setAttribute("x", QString::number(pos().x()));
e.appendChild(QETXML::createXmlProperty("y", pos().y())); root_element.setAttribute("y", QString::number(pos().y()));
e.appendChild(QETXML::createXmlProperty("z", zValue())); root_element.setAttribute("z", QString::number(zValue()));
e.appendChild(QETXML::createXmlProperty("rotation", QET::correctAngle(rotation()))); root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation())));
root_element.setAttribute("font", font().toString());
e.appendChild(QETXML::createXmlProperty("font", font().toString())); root_element.setAttribute("uuid", m_uuid.toString());
e.appendChild(QETXML::createXmlProperty("uuid", m_uuid)); root_element.setAttribute("frame", m_frame? "true" : "false");
e.appendChild(QETXML::createXmlProperty("frame", m_frame)); root_element.setAttribute("text_width", QString::number(m_text_width));
e.appendChild(QETXML::createXmlProperty("text_width", m_text_width));
QMetaEnum me = DynamicElementTextItem::textFromMetaEnum(); QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
e.appendChild(QETXML::createXmlProperty("text_from", me.valueToKey(m_text_from))); root_element.setAttribute("text_from", me.valueToKey(m_text_from));
me = QMetaEnum::fromType<Qt::Alignment>(); me = QMetaEnum::fromType<Qt::Alignment>();
if(this -> alignment() &Qt::AlignRight) if(this -> alignment() &Qt::AlignRight)
e.appendChild(QETXML::createXmlProperty("Halignment", me.valueToKey(Qt::AlignRight))); root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignRight));
else if(this -> alignment() &Qt::AlignLeft) else if(this -> alignment() &Qt::AlignLeft)
e.appendChild(QETXML::createXmlProperty("Halignment", me.valueToKey(Qt::AlignLeft))); root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignLeft));
else if(this -> alignment() &Qt::AlignHCenter) else if(this -> alignment() &Qt::AlignHCenter)
e.appendChild(QETXML::createXmlProperty("Halignment", me.valueToKey(Qt::AlignHCenter))); root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignHCenter));
if(this -> alignment() &Qt::AlignBottom) if(this -> alignment() &Qt::AlignBottom)
e.appendChild(QETXML::createXmlProperty("Valignment", me.valueToKey(Qt::AlignBottom))); root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignBottom));
else if(this -> alignment() & Qt::AlignTop) else if(this -> alignment() & Qt::AlignTop)
e.appendChild(QETXML::createXmlProperty("Valignment", me.valueToKey(Qt::AlignTop))); root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignTop));
else if(this -> alignment() &Qt::AlignVCenter) else if(this -> alignment() &Qt::AlignVCenter)
e.appendChild(QETXML::createXmlProperty("Valignment", me.valueToKey(Qt::AlignVCenter))); root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignVCenter));
QDomDocument dom_doc; QDomElement dom_text = root_element.ownerDocument().createElement("text");
QDomElement dom_text = dom_doc.createElement("text"); dom_text.appendChild(root_element.ownerDocument().createTextNode(toPlainText()));
dom_text.appendChild(dom_doc.createTextNode(toPlainText())); root_element.appendChild(dom_text);
e.appendChild(dom_text);
//Info name //Info name
// TODO: move it into a property
if(!m_info_name.isEmpty()) { if(!m_info_name.isEmpty()) {
QDomElement dom_info_name = dom_doc.createElement("info_name"); QDomElement dom_info_name = root_element.ownerDocument().createElement("info_name");
dom_info_name.appendChild(dom_doc.createTextNode(m_info_name)); dom_info_name.appendChild(root_element.ownerDocument().createTextNode(m_info_name));
e.appendChild(dom_info_name); root_element.appendChild(dom_info_name);
} }
//Composite text //Composite text
// TODO: move it into a property
if(!m_composite_text.isEmpty()) { if(!m_composite_text.isEmpty()) {
QDomElement dom_comp_text = dom_doc.createElement("composite_text"); QDomElement dom_comp_text = root_element.ownerDocument().createElement("composite_text");
dom_comp_text.appendChild(dom_doc.createTextNode(m_composite_text)); dom_comp_text.appendChild(root_element.ownerDocument().createTextNode(m_composite_text));
e.appendChild(dom_comp_text); root_element.appendChild(dom_comp_text);
} }
//Color //Color
// TODO: move it into a property
if(color() != QColor(Qt::black)) { if(color() != QColor(Qt::black)) {
QDomElement dom_color = dom_doc.createElement("color"); QDomElement dom_color = root_element.ownerDocument().createElement("color");
dom_color.appendChild(dom_doc.createTextNode(color().name())); dom_color.appendChild(root_element.ownerDocument().createTextNode(color().name()));
e.appendChild(dom_color); root_element.appendChild(dom_color);
} }
} }

2
sources/editor/graphicspart/partdynamictextfield.h
View File

@@ -75,7 +75,7 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
void startUserTransformation(const QRectF &initial_selection_rect) override; void startUserTransformation(const QRectF &initial_selection_rect) override;
void handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect) override; void handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect) override;
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&root_element) const override;
bool fromXmlPriv(const QDomElement &dom_elmt) override; bool fromXmlPriv(const QDomElement &dom_elmt) override;
void fromTextFieldXml(const QDomElement &dom_element); void fromTextFieldXml(const QDomElement &dom_element);
static bool valideXml(QDomElement& dom_elmt); static bool valideXml(QDomElement& dom_elmt);

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

@@ -85,25 +85,25 @@ void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
Export this ellipse in xml Export this ellipse in xml
@return : an xml element that describe this ellipse @return : an xml element that describe this ellipse
*/ */
void PartEllipse::toXmlPriv(QDomElement& e) const void PartEllipse::toXmlPriv(QDomElement& xml_element) const
{ {
if (qFuzzyCompare(rect().width(), rect().height())) if (qFuzzyCompare(rect().width(), rect().height()))
{ {
e.setTagName("circle"); xml_element.setTagName("circle");
e.appendChild(QETXML::createXmlProperty("diameter", rect().width())); xml_element.setAttribute("diameter", QString("%1").arg(rect().width()));
} }
else else
{ {
e.setTagName("ellipse"); xml_element.setTagName("ellipse");
e.appendChild(QETXML::createXmlProperty("width", rect().width())); xml_element.setAttribute("width", QString("%1").arg(rect().width()));
e.appendChild(QETXML::createXmlProperty("height", rect().height())); xml_element.setAttribute("height", QString("%1").arg(rect().height()));
} }
QPointF top_left(sceneTopLeft()); QPointF top_left(sceneTopLeft());
e.appendChild(QETXML::createXmlProperty("x", top_left.x())); xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
e.appendChild(QETXML::createXmlProperty("y", top_left.y())); xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
stylesToXml(e); stylesToXml(xml_element);
} }
/** /**

2
sources/editor/graphicspart/partellipse.h
View File

@@ -52,7 +52,7 @@ class PartEllipse : public AbstractPartEllipse
//Name and XML //Name and XML
QString name() const override { return(QObject::tr("ellipse", "element part name")); } QString name() const override { return(QObject::tr("ellipse", "element part name")); }
QString xmlName() const override { return(QString("ellipse")); } QString xmlName() const override { return(QString("ellipse")); }
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
bool fromXmlPriv(const QDomElement &) override; bool fromXmlPriv(const QDomElement &) override;
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}

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

@@ -109,22 +109,21 @@ void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
@param xml_document : Xml document to use for create the xml element. @param xml_document : Xml document to use for create the xml element.
@return an xml element that describe this line @return an xml element that describe this line
*/ */
void PartLine::toXmlPriv(QDomElement& e) const void PartLine::toXmlPriv(QDomElement& xml_element) const
{ {
QPointF p1(sceneP1()); QPointF p1(sceneP1());
QPointF p2(sceneP2()); QPointF p2(sceneP2());
e.appendChild(QETXML::createXmlProperty("x1", p1.x())); xml_element.setAttribute("x1", QString("%1").arg(p1.x()));
e.appendChild(QETXML::createXmlProperty("y1", p1.y())); xml_element.setAttribute("y1", QString("%1").arg(p1.y()));
e.appendChild(QETXML::createXmlProperty("x2", p2.x())); xml_element.setAttribute("x2", QString("%1").arg(p2.x()));
e.appendChild(QETXML::createXmlProperty("y2", p2.y())); xml_element.setAttribute("y2", QString("%1").arg(p2.y()));
xml_element.setAttribute("end1", Qet::endTypeToString(first_end));
xml_element.setAttribute("length1", QString("%1").arg(first_length));
xml_element.setAttribute("end2", Qet::endTypeToString(second_end));
xml_element.setAttribute("length2", QString("%1").arg(second_length));
e.appendChild(QETXML::createXmlProperty("end1", Qet::endTypeToString(first_end))); stylesToXml(xml_element);
e.appendChild(QETXML::createXmlProperty("length1", first_length));
e.appendChild(QETXML::createXmlProperty("end2", Qet::endTypeToString(second_end)));
e.appendChild(QETXML::createXmlProperty("length2", second_length));
stylesToXml(e);
} }
/** /**

2
sources/editor/graphicspart/partline.h
View File

@@ -70,7 +70,7 @@ class PartLine : public CustomElementGraphicPart
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override; void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
QString name() const override { return(QObject::tr("ligne", "element part name")); } QString name() const override { return(QObject::tr("ligne", "element part name")); }
QString xmlName() const override { return(QString("line")); } QString xmlName() const override { return(QString("line")); }
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
bool fromXmlPriv(const QDomElement &) override; bool fromXmlPriv(const QDomElement &) override;
bool valideXml(QDomElement& element) const; bool valideXml(QDomElement& element) const;
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}

12
sources/editor/graphicspart/partpolygon.cpp
View File

@@ -130,19 +130,17 @@ bool PartPolygon::fromXmlPriv(const QDomElement &qde)
Export this polygin in xml Export this polygin in xml
@param e: properties get part of this DomElement @param e: properties get part of this DomElement
*/ */
void PartPolygon::toXmlPriv(QDomElement& e) const void PartPolygon::toXmlPriv(QDomElement& xml_element) const
{ {
int i = 1; int i = 1;
foreach(QPointF point, m_polygon) { foreach(QPointF point, m_polygon) {
point = mapToScene(point); point = mapToScene(point);
e.appendChild(QETXML::createXmlProperty(QString("x%1").arg(i), point.x())); xml_element.setAttribute(QString("x%1").arg(i), QString("%1").arg(point.x()));
e.appendChild(QETXML::createXmlProperty(QString("y%1").arg(i), point.y())); xml_element.setAttribute(QString("y%1").arg(i), QString("%1").arg(point.y()));
++ i; ++ i;
} }
if (!m_closed) xml_element.setAttribute("closed", "false");
e.appendChild(QETXML::createXmlProperty("closed", m_closed)); stylesToXml(xml_element);
stylesToXml(e);
} }
bool PartPolygon::valideXml(QDomElement& element) { bool PartPolygon::valideXml(QDomElement& element) {

2
sources/editor/graphicspart/partpolygon.h
View File

@@ -62,7 +62,7 @@ class PartPolygon : public CustomElementGraphicPart
QString name() const override { return(QObject::tr("polygone", "element part name")); } QString name() const override { return(QObject::tr("polygone", "element part name")); }
QString xmlName() const override { return(QString("polygon")); } QString xmlName() const override { return(QString("polygon")); }
bool fromXmlPriv(const QDomElement &) override; bool fromXmlPriv(const QDomElement &) override;
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/} void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}

20
sources/editor/graphicspart/partrectangle.cpp
View File

@@ -89,14 +89,13 @@ void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
@param xml_document : Xml document to use for create the xml element. @param xml_document : Xml document to use for create the xml element.
@return an xml element that describe this ellipse @return an xml element that describe this ellipse
*/ */
void PartRectangle::toXmlPriv(QDomElement& e) const void PartRectangle::toXmlPriv(QDomElement& xml_element) const
{ {
QPointF top_left(sceneTopLeft()); QPointF top_left(sceneTopLeft());
xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
e.appendChild(QETXML::createXmlProperty("x", top_left.x())); xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
e.appendChild(QETXML::createXmlProperty("y", top_left.y())); xml_element.setAttribute("width", QString("%1").arg(m_rect.width()));
e.appendChild(QETXML::createXmlProperty("width", m_rect.width())); xml_element.setAttribute("height", QString("%1").arg(m_rect.height()));
e.appendChild(QETXML::createXmlProperty("height", m_rect.height()));
QRectF rect = m_rect.normalized(); QRectF rect = m_rect.normalized();
qreal x = m_xRadius; qreal x = m_xRadius;
@@ -108,13 +107,10 @@ void PartRectangle::toXmlPriv(QDomElement& e) const
y = rect.height()/2; y = rect.height()/2;
} }
e.setAttribute("rx", QString::number(m_xRadius)); xml_element.setAttribute("rx", QString::number(m_xRadius));
e.setAttribute("ry", QString::number(m_yRadius)); xml_element.setAttribute("ry", QString::number(m_yRadius));
e.appendChild(QETXML::createXmlProperty("rx", m_xRadius)); stylesToXml(xml_element);
e.appendChild(QETXML::createXmlProperty("ry", m_yRadius));
stylesToXml(e);
} }
/** /**

2
sources/editor/graphicspart/partrectangle.h
View File

@@ -60,7 +60,7 @@ class PartRectangle : public CustomElementGraphicPart
QString name () const override { return(QObject::tr("rectangle", "element part name")); } QString name () const override { return(QObject::tr("rectangle", "element part name")); }
QString xmlName () const override { return(QString("rect")); } QString xmlName () const override { return(QString("rect")); }
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
bool fromXmlPriv (const QDomElement &) override; bool fromXmlPriv (const QDomElement &) override;
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}

5
sources/editor/graphicspart/partterminal.cpp
View File

@@ -72,13 +72,12 @@ bool PartTerminal::fromXmlPriv(const QDomElement &xml_elmt) {
*/ */
void PartTerminal::toXmlPriv(QDomElement& e) const { void PartTerminal::toXmlPriv(QDomElement& e) const {
e.appendChild(QETXML::createXmlProperty("uuid", d->m_uuid)); e.setAttribute("uuid", d->m_uuid.toString());
d->m_pos = pos(); d->m_pos = pos();
// Do not store terminal data in its own child
QDomDocument doc = e.ownerDocument(); QDomDocument doc = e.ownerDocument();
e.appendChild(d->toXml(doc)); e.appendChild(d -> toXml(doc));
} }

2
sources/editor/graphicspart/partterminal.h
View File

@@ -57,7 +57,7 @@ class PartTerminal : public CustomElementGraphicPart
int type() const override { return Type; } int type() const override { return Type; }
QString xmlName() const override { return(QString("terminal")); } QString xmlName() const override { return(QString("terminal")); }
bool fromXmlPriv(const QDomElement &) override; bool fromXmlPriv(const QDomElement &) override;
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/} void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}

16
sources/editor/graphicspart/parttext.cpp
View File

@@ -119,16 +119,14 @@ bool PartText::fromXmlPriv(const QDomElement &xml_element)
@param xml_document Document XML a utiliser pour creer l'element XML @param xml_document Document XML a utiliser pour creer l'element XML
@return un element XML decrivant le texte statique @return un element XML decrivant le texte statique
*/ */
void PartText::toXmlPriv(QDomElement& e) const void PartText::toXmlPriv(QDomElement& xml_element) const
{ {
//QDomElement xml_element = xml_document.createElement(xmlName()); xml_element.setAttribute("x", QString::number(pos().x()));
xml_element.setAttribute("y", QString::number(pos().y()));
e.appendChild(QETXML::createXmlProperty("x", pos().x())); xml_element.setAttribute("text", toPlainText());
e.appendChild(QETXML::createXmlProperty("y", pos().y())); xml_element.setAttribute("font", font().toString());
e.appendChild(QETXML::createXmlProperty("text", toPlainText())); xml_element.setAttribute("rotation", QString::number(rotation()));
e.appendChild(QETXML::createXmlProperty("font", font().toString())); xml_element.setAttribute("color", defaultTextColor().name());
e.appendChild(QETXML::createXmlProperty("rotation", rotation()));
e.appendChild(QETXML::createXmlProperty("color", defaultTextColor().name()));
} }
bool PartText::valideXml(QDomElement& element) { bool PartText::valideXml(QDomElement& element) {

2
sources/editor/graphicspart/parttext.h
View File

@@ -63,7 +63,7 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
static bool valideXml(QDomElement& element); static bool valideXml(QDomElement& element);
void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/} void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/} void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));} void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
bool isUseless() const override; bool isUseless() const override;
QRectF sceneGeometricRect() const override; QRectF sceneGeometricRect() const override;

21
sources/properties/terminaldata.cpp
View File

@@ -93,19 +93,18 @@ void TerminalData::fromSettings(QSettings &settings, const QString& prefix)
@param e: element to store the properties @param e: element to store the properties
the name, number, position and orientation of the terminal the name, number, position and orientation of the terminal
*/ */
void TerminalData::toXmlPriv(QDomElement& e) const void TerminalData::toXmlPriv(QDomElement& xml_element) const
{ {
// TODO: xml_element.setAttribute("x", QString("%1").arg(q->scenePos().x()));
//QDomElement xml_element = xml_document.createElement("terminaldata"); xml_element.setAttribute("y", QString("%1").arg(q->scenePos().y()));
// m_pos cannot be stored, because in the partterminal it will not be updated. xml_element.setAttribute("uuid", m_uuid.toString());
// In PartTerminal m_pos is the position of the dock, in Terminal m_pos is the second side of the terminal xml_element.setAttribute("name", m_name);
// This is hold for legacy compability reason
e.appendChild(QETXML::createXmlProperty("x", m_pos.x())); xml_element.setAttribute("orientation",
e.appendChild(QETXML::createXmlProperty("y", m_pos.y())); orientationToString(m_orientation));
e.appendChild(QETXML::createXmlProperty("name", m_name));
e.appendChild(QETXML::createXmlProperty("orientation", orientationToString(m_orientation))); xml_element.setAttribute("type", typeToString(m_type));
e.appendChild(QETXML::createXmlProperty("type", typeToString(m_type)));
} }
/* /*

2
sources/properties/terminaldata.h
View File

@@ -56,7 +56,7 @@ class TerminalData : public PropertiesInterface
const QString& prefix = QString()) const override; const QString& prefix = QString()) const override;
void fromSettings(QSettings &settings, void fromSettings(QSettings &settings,
const QString& = QString()) override; const QString& = QString()) override;
void toXmlPriv(QDomElement &) const override; void toXmlPriv(QDomElement &xml_element) const override;
bool fromXmlPriv(const QDomElement &xml_element) override; bool fromXmlPriv(const QDomElement &xml_element) override;
static bool valideXml(const QDomElement &xml_element); static bool valideXml(const QDomElement &xml_element);

26
sources/properties/xrefproperties.cpp
View File

@@ -95,23 +95,29 @@ void XRefProperties::fromSettings(QSettings &settings,
@param xml_document : QDomElement to use for saving @param xml_document : QDomElement to use for saving
@return QDomElement @return QDomElement
*/ */
void XRefProperties::toXmlPriv(QDomElement& e) const void XRefProperties::toXmlPriv(QDomElement& xml_element) const
{ {
xml_element.setAttribute("type", m_key);
e.appendChild(QETXML::createXmlProperty("type", m_key)); xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
e.appendChild(QETXML::createXmlProperty("showpowerctc", m_show_power_ctc)); QString display = m_display == Cross? "cross" : "contacts";
e.appendChild(QETXML::createXmlProperty("displayhas", m_display == Cross? "cross" : "contacts")); xml_element.setAttribute("displayhas", display);
e.appendChild(QETXML::createXmlProperty("snapto", m_snap_to == Bottom? "bottom" : "label")); QString snap = m_snap_to == Bottom? "bottom" : "label";
xml_element.setAttribute("snapto", snap);
QString xrefpos;
QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>(); QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
e.appendChild(QETXML::createXmlProperty("xrefpos", var.valueToKey(m_xref_pos))); xml_element.setAttribute("xrefpos", var.valueToKey(m_xref_pos));
e.appendChild(QETXML::createXmlProperty("offset", m_offset));
e.appendChild(QETXML::createXmlProperty("master_label", m_master_label));
e.appendChild(QETXML::createXmlProperty("slave_label", m_slave_label));
int offset = m_offset;
xml_element.setAttribute("offset", QString::number(offset));
QString master_label = m_master_label;
xml_element.setAttribute("master_label", master_label);
QString slave_label = m_slave_label;
xml_element.setAttribute("slave_label", slave_label);
foreach (QString key, m_prefix.keys()) { foreach (QString key, m_prefix.keys()) {
e.appendChild(QETXML::createXmlProperty(key + "prefix", m_prefix.value(key))); xml_element.setAttribute(key + "prefix", m_prefix.value(key));
} }
} }

2
sources/properties/xrefproperties.h
View File

@@ -45,7 +45,7 @@ class XRefProperties : public PropertiesInterface
void toSettings (QSettings &settings, const QString& = QString()) const override; void toSettings (QSettings &settings, const QString& = QString()) const override;
void fromSettings (QSettings &settings, void fromSettings (QSettings &settings,
const QString& = QString()) override; const QString& = QString()) override;
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&xml_element) const override;
bool fromXmlPriv(const QDomElement &xml_element) override; bool fromXmlPriv(const QDomElement &xml_element) override;
static QHash<QString, XRefProperties> defaultProperties(); static QHash<QString, XRefProperties> defaultProperties();

66
sources/qetgraphicsitem/conductor.cpp
View File

@@ -1002,39 +1002,28 @@ bool Conductor::fromXmlPriv(const QDomElement &dom_element)
bornes dans le document XML et leur adresse en memoire bornes dans le document XML et leur adresse en memoire
@return Un element XML representant le conducteur @return Un element XML representant le conducteur
*/ */
void Conductor::toXmlPriv(QDomElement& e) const { void Conductor::toXmlPriv(QDomElement& dom_element) const {
e.appendChild(QETXML::createXmlProperty("x", pos().x())); dom_element.setAttribute("x", QString::number(pos().x()));
e.appendChild(QETXML::createXmlProperty("y", pos().y())); dom_element.setAttribute("y", QString::number(pos().y()));
// Terminal is uniquely identified by the uuid of the terminal and the element // Terminal is uniquely identified by the uuid of the terminal and the element
QUuid terminal = terminal1->uuid(); if (terminal1->uuid().isNull()) {
QUuid terminalParent = terminal1->parentElement()->uuid(); // legacy method to identify the terminal
if (terminalParent.isNull() || terminal.isNull()) { dom_element.setAttribute("terminal1", terminal1->ID()); // for backward compability
// legacy when the terminal does not have a valid uuid
// do not store element1 information, because this is used to determine in the fromXml
// process that legacy file format
e.appendChild(QETXML::createXmlProperty("terminal1", terminal1->ID()));
} else { } else {
e.appendChild(QETXML::createXmlProperty("element1", terminalParent)); dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
e.appendChild(QETXML::createXmlProperty("terminal1", terminal)); dom_element.setAttribute("terminal1", terminal1->uuid().toString());
} }
terminal = terminal2->uuid(); if (terminal2->uuid().isNull()) {
terminalParent = terminal2->parentElement()->uuid(); // legacy method to identify the terminal
if (terminalParent.isNull() || terminal.isNull()) { dom_element.setAttribute("terminal2", terminal2->ID()); // for backward compability
// legacy when the terminal does not have a valid uuid
// do not store element1 information, because this is used to determine in the fromXml
// process that legacy file format
e.appendChild(QETXML::createXmlProperty("terminal2", terminal2->ID()));
} else { } else {
e.appendChild(QETXML::createXmlProperty("element2", terminal2->parentElement()->uuid())); dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
e.appendChild(QETXML::createXmlProperty("terminal2", terminal2->uuid())); dom_element.setAttribute("terminal2", terminal2->uuid().toString());
} }
dom_element.setAttribute("freezeLabel", m_freeze_label? "true" : "false");
e.appendChild(QETXML::createXmlProperty("freezeLabel", m_freeze_label));
QDomDocument doc;
// on n'exporte les segments du conducteur que si ceux-ci ont // on n'exporte les segments du conducteur que si ceux-ci ont
// ete modifies par l'utilisateur // ete modifies par l'utilisateur
@@ -1044,24 +1033,25 @@ void Conductor::toXmlPriv(QDomElement& e) const {
QDomElement current_segment; QDomElement current_segment;
foreach(ConductorSegment *segment, segmentsList()) foreach(ConductorSegment *segment, segmentsList())
{ {
current_segment = doc.createElement("segment"); current_segment = dom_element.ownerDocument().createElement("segment");
current_segment.appendChild(QETXML::createXmlProperty("orientation", segment->isHorizontal() ? "horizontal": "vertical")); current_segment.setAttribute("orientation", segment -> isHorizontal() ? "horizontal" : "vertical");
current_segment.appendChild(QETXML::createXmlProperty("length", segment -> length())); current_segment.setAttribute("length", QString("%1").arg(segment -> length()));
e.appendChild(current_segment); dom_element.appendChild(current_segment);
} }
} }
QDomDocument doc = dom_element.ownerDocument();
QDomElement dom_seq = m_autoNum_seq.toXml(doc); // swquentialNumbers tag QDomElement dom_seq = m_autoNum_seq.toXml(doc);
e.appendChild(dom_seq); dom_element.appendChild(dom_seq);
// Export the properties and text // Export the properties and text
QDomElement conductorProperties = m_properties.toXml(doc); m_properties. toXml(doc);
for (int i=0; i < conductorProperties.childNodes().count(); i++) { if(m_text_item->wasMovedByUser())
QDomNode node = conductorProperties.childNodes().at(i).cloneNode(); // cloneNode() is important! {
e.appendChild(node); dom_element.setAttribute("userx", QString::number(m_text_item->pos().x()));
dom_element.setAttribute("usery", QString::number(m_text_item->pos().y()));
} }
if(m_text_item->wasRotateByUser())
m_text_item->toXml(e); dom_element.setAttribute("rotation", QString::number(m_text_item->rotation()));
} }
/** /**

2
sources/qetgraphicsitem/conductor.h
View File

@@ -103,7 +103,7 @@ class Conductor : public QGraphicsObject, public PropertiesInterface
public: public:
static bool valideXml (QDomElement &); static bool valideXml (QDomElement &);
bool fromXmlPriv(const QDomElement &) override; bool fromXmlPriv(const QDomElement &) override;
void toXmlPriv(QDomElement&) const override; void toXmlPriv(QDomElement&dom_element) const override;
void toSettings(QSettings &, const QString & = QString()) const override {} void toSettings(QSettings &, const QString & = QString()) const override {}
void fromSettings(QSettings &, const QString & = QString()) override {} void fromSettings(QSettings &, const QString & = QString()) override {}
private: private:

13
sources/qetgraphicsitem/terminal.cpp
View File

@@ -760,15 +760,12 @@ QList<Conductor *> Terminal::conductors() const
*/ */
void Terminal::toXmlPriv(QDomElement &qdo) const void Terminal::toXmlPriv(QDomElement &qdo) const
{ {
qdo.appendChild(QETXML::createXmlProperty("number", number_terminal_)); // for backward compatibility
qdo.appendChild(QETXML::createXmlProperty("nameHidden", name_terminal_hidden)); qdo.setAttribute("x", QString("%1").arg(dock_elmt_.x()));
qdo.setAttribute("y", QString("%1").arg(dock_elmt_.y()));
// end for backward compatibility
// Do not store terminal data in its own child qdo.setAttribute("orientation", d->m_orientation);
// Bad hack. The problem is that in the diagrams the terminal is described by the position and in the Collection by the dock.
QPointF tempPos = d->m_pos;
d->m_pos = dock_elmt_;
d->toXmlPriv(qdo); // TerminalData
d->m_pos = tempPos;
} }
/** /**

26
sources/titleblockproperties.cpp
View File

@@ -73,20 +73,21 @@ bool TitleBlockProperties::operator!=(const TitleBlockProperties &ip) {
@param e Element XML auquel seront ajoutes des attributs @param e Element XML auquel seront ajoutes des attributs
*/ */
void TitleBlockProperties::toXmlPriv(QDomElement& e) const { void TitleBlockProperties::toXmlPriv(QDomElement& e) const {
e.appendChild(QETXML::createXmlProperty("author", author)); e.setAttribute("author", author);
e.appendChild(QETXML::createXmlProperty("title", title)); e.setAttribute("title", title);
e.appendChild(QETXML::createXmlProperty("filename", filename)); e.setAttribute("filename", filename);
e.appendChild(QETXML::createXmlProperty("plant", plant)); e.setAttribute("plant", plant);
e.appendChild(QETXML::createXmlProperty("locmach", locmach)); e.setAttribute("locmach", locmach);
e.appendChild(QETXML::createXmlProperty("indexrev", indexrev)); e.setAttribute("indexrev",indexrev);
e.appendChild(QETXML::createXmlProperty("version", version)); e.setAttribute("version", version);
e.appendChild(QETXML::createXmlProperty("folio", folio)); e.setAttribute("folio", folio);
e.appendChild(QETXML::createXmlProperty("date", exportDate())); e.setAttribute("auto_page_num", auto_page_num);
e.appendChild(QETXML::createXmlProperty("display_at", display_at == Qt::BottomEdge? "bottom" : "right")); e.setAttribute("date", exportDate());
e.setAttribute("displayAt", (display_at == Qt::BottomEdge? "bottom" : "right"));
if (!template_name.isEmpty()) if (!template_name.isEmpty())
{ {
e.appendChild(QETXML::createXmlProperty("titleblocktemplate", template_name)); e.setAttribute("titleblocktemplate", template_name);
e.appendChild(QETXML::createXmlProperty("titleblocktemplateCollection", QET::qetCollectionToString(collection))); e.setAttribute("titleblocktemplateCollection", QET::qetCollectionToString(collection));
} }
if (context.keys().count()) { if (context.keys().count()) {
@@ -94,7 +95,6 @@ void TitleBlockProperties::toXmlPriv(QDomElement& e) const {
context.toXml(properties); context.toXml(properties);
e.appendChild(properties); e.appendChild(properties);
} }
} }
/** RETURNS True /** RETURNS True