Merge branch 'XMLProperties' of ssh://git.tuxfamily.org/gitroot/qet/qet into XMLProperties

- move inital values to header file

elements/10_electric/91_en_60617/en_60617_11/qet_directory

@@ -3,7 +3,5 @@
         <name lang="fr">11- Schémas et plans d'installation, architecturaux et topographiques</name>
         <name lang="es">11- Dibujos y planos arquitectónicos y topográficos</name>
         <name lang="da">11- Bygningsmæssige og topografiske installationstegninger og -skemaer</name>
-        <name lang="en">11- Installation, architectural and topographical diagrams and plans</name>
-        <name lang="be">11- Installatie, bouwkundig en topografische schema's en plannen</name>
     </names>
 </qet-directory>

sources/ElementsCollection/fileelementcollectionitem.cpp

@@ -183,13 +183,14 @@ QString FileElementCollectionItem::name() const
  */
 QString FileElementCollectionItem::collectionPath() const
 {
+    QStandardItem* parent_ = parent();
 	if (isCollectionRoot()) {
 		if (m_path == QETApp::commonElementsDirN())
 			return "common://";
 		else
 			return "custom://";
 	}
-	else if (parent() && parent()->type() == FileElementCollectionItem::Type) {
+    else if (parent_ && parent()->type() == FileElementCollectionItem::Type) {
 		ElementCollectionItem *eci = static_cast<ElementCollectionItem*>(parent());
 		if (eci->isCollectionRoot())
 			return eci->collectionPath() + m_path;

sources/QetGraphicsItemModeler/qetgraphicshandleritem.h

@@ -46,7 +46,7 @@ class QetGraphicsHandlerItem : public QGraphicsItem
 		QRectF m_handler_rect,
 			   m_br;
         qreal m_size;
-		QColor m_color;
+        QColor m_color{Qt::black};
 		QPen m_pen;
 		
 	public:

sources/borderproperties.cpp

@@ -27,20 +27,12 @@
 	- 17 columns of 60.0 px wide by 20.0px high
 	- 8    lines of 80.0 px high by 20.0px wide
 
-	\~French Initialise un objet BorderProperties avec les proprietes par
+	Initialise un objet BorderProperties avec les proprietes par
 	defaut suivantes :
 	- 17 colonnes affichees de 60.0 px de large pour 20.0px de haut
 	- 8    lignes affichees de 80.0 px de haut pour 20.0px de large
 */
-BorderProperties::BorderProperties() :
+BorderProperties::BorderProperties()
-	columns_count(17),
-	columns_width(60.0),
-	columns_header_height(20.0),
-	display_columns(true),
-	rows_count(8),
-	rows_height(80.0),
-	rows_header_width(20.0),
-	display_rows(true)
 {
 }
 
@@ -53,11 +45,12 @@ BorderProperties::~BorderProperties() {
 
 /**
 	@brief BorderProperties::operator ==
-
+	@param bp :
-	\~ @param bp : Other BorderProperties container/class.
+	- other BorderProperties container/class
-	\~French Autre conteneur BorderProperties
+	- autre conteneur BorderProperties
-	\~ @return True if it and this container are identical, false otherwise.
+	@return
-	\~French True si ip et ce conteneur sont identiques, false sinon
+	- true if it and this container are identical, false otherwise
+	- true si ip et ce conteneur sont identiques, false sinon
 */
 bool BorderProperties::operator==(const BorderProperties &bp) {
 	return(
@@ -74,13 +67,12 @@ bool BorderProperties::operator==(const BorderProperties &bp) {
 
 /**
 	@brief BorderProperties::operator !=
-
+	@param bp :
-	\~ @param bp :
+	- other BorderProperties container/class
-	Other BorderProperties container/class.
+	- autre conteneur BorderProperties
-	\~French Autre conteneur BorderProperties
+	@return
-	\~ @return
+	- false if it and this container are identical, true otherwise
-	False if it and this container are identical, true otherwise.
+	- false si bp et ce conteneur sont identiques, true sinon
-	\~French False si bp et ce conteneur sont identiques, true sinon
 */
 bool BorderProperties::operator!=(const BorderProperties &bp) {
 	return(!(*this == bp));
@@ -88,51 +80,69 @@ bool BorderProperties::operator!=(const BorderProperties &bp) {
 
 /**
 	@brief BorderProperties::toXml
-	Exports dimensions as XML attributes added to element e.
+	- Exports dimensions as XML attributes added to element e.
-	\~French Exporte les dimensions sous formes d'attributs XML ajoutes a l'element e.
+	- Exporte les dimensions sous formes d'attributs XML ajoutes a l'element e.
-
+	@param e :
-	\~ @param e :
+	- XML element to which attributes will be added
-	XML element to which attributes will be added
+	- Element XML auquel seront ajoutes des attributs
-	\~French Element XML auquel seront ajoutes des attributs
 */
-void BorderProperties::toXml(QDomElement &e) const {
+QDomElement BorderProperties::toXml(QDomDocument &dom_doc) const {
-	e.setAttribute("cols",        columns_count);
+
-	e.setAttribute("colsize",     QString("%1").arg(columns_width));
+    QDomElement e = dom_doc.createElement("border");
-	e.setAttribute("rows",        rows_count);
+
-	e.setAttribute("rowsize",     QString("%1").arg(rows_height));
+    e.appendChild(createXmlProperty(dom_doc, "cols", columns_count));
-	e.setAttribute("displaycols", display_columns ? "true" : "false");
+    e.appendChild(createXmlProperty(dom_doc, "colsize", columns_width));
-	e.setAttribute("displayrows", display_rows    ? "true" : "false");
+    e.appendChild(createXmlProperty(dom_doc, "rows", rows_count));
+    e.appendChild(createXmlProperty(dom_doc, "rowsize", rows_height));
+    e.appendChild(createXmlProperty(dom_doc, "displayrows", display_rows));
+    e.appendChild(createXmlProperty(dom_doc, "displaycols", display_columns));
+
+    return e;
 }
 
-/**
+/**RETURNS True
 	@brief BorderProperties::fromXml
-	Import dimensions from XML attributes of element e
+	- Import dimensions from XML attributes of element e
-	\~French Importe les dimensions a partir des attributs XML de l'element e
+	- Importe les dimensions a partir des attributs XML de l'element e
-
+	@param e :
-	\~ @param e :
+	- XML element whose attributes will be read
-	XML element whose attributes will be read
+	- Element XML dont les attributs seront lus
-	\~French Element XML dont les attributs seront lus
 */
-void BorderProperties::fromXml(QDomElement &e) {
+bool BorderProperties::fromXml(const QDomElement &e) {
-	if (e.hasAttribute("cols"))        columns_count   = e.attribute("cols").toInt();
+
-	if (e.hasAttribute("colsize"))     columns_width   = e.attribute("colsize").toInt();
+    if (propertyInteger(e, "cols", &columns_count) == PropertyFlags::NoValidConversion ||
-	if (e.hasAttribute("rows"))        rows_count      = e.attribute("rows").toInt();
+        propertyDouble(e, "colsize", &columns_width) == PropertyFlags::NoValidConversion ||
-	if (e.hasAttribute("rowsize"))     rows_height     = e.attribute("rowsize").toInt();
+        propertyInteger(e, "rows", &rows_count) == PropertyFlags::NoValidConversion ||
-	if (e.hasAttribute("displaycols")) display_columns = e.attribute("displaycols") == "true";
+        propertyDouble(e, "rowsize", &rows_height) == PropertyFlags::NoValidConversion ||
-	if (e.hasAttribute("displayrows")) display_rows    = e.attribute("displayrows") == "true";
+        propertyBool(e, "displaycols", &display_columns) == PropertyFlags::NoValidConversion ||
+        propertyBool(e, "displayrows", &display_rows) == PropertyFlags::NoValidConversion)
+        return false;
+
+    return true;
+}
+
+bool BorderProperties::valideXml(QDomElement& e) {
+
+    if (propertyInteger(e, "cols") == PropertyFlags::Success ||
+        propertyDouble(e, "colsize") == PropertyFlags::Success ||
+        propertyInteger(e, "rows") == PropertyFlags::Success ||
+        propertyDouble(e, "rowsize") == PropertyFlags::Success ||
+        propertyBool(e, "displaycols") == PropertyFlags::Success ||
+        propertyBool(e, "displayrows") == PropertyFlags::Success)
+        return true;
+    return false;
 }
 
 /**
 	@brief BorderProperties::toSettings
-	Export dimensions in a QSettings object.
+	- Export dimensions in a QSettings object.
-	\~French Exporte les dimensions dans une configuration.
+	- Exporte les dimensions dans une configuration.
-
+	@param settings :
-	\~ @param settings :
+	- QSettings object to write
-	QSettings object to write
+	- Parametres a ecrire
-	\~French Parametres a ecrire
+	@param prefix :
-	\~ @param prefix :
+	- prefix to be added before the names of the parameters
-	prefix to be added before the names of the parameters
+	- prefixe a ajouter devant les noms des parametres
-	\~French prefixe a ajouter devant les noms des parametres
 */
 void BorderProperties::toSettings(QSettings &settings, const QString &prefix) const {
 	settings.setValue(prefix + "cols",        columns_count);
@@ -145,14 +155,16 @@ void BorderProperties::toSettings(QSettings &settings, const QString &prefix) co
 
 /**
 	@brief BorderProperties::fromSettings
-	Import dimensions from a QSettings object.
+	- Import dimensions from a QSettings object.
-	\~French Importe les dimensions depuis une configuration.
+	- Importe les dimensions depuis une configuration.
-	\~ @param settings : QSettings object to read
+	@param settings :
-	\~French Parametres a lire
+	- QSettings object to read
-	\~ @param prefix : prefix to be added before the names of the parameters
+	- Parametres a lire
-	\~French prefixe a ajouter devant les noms des parametres
+	@param prefix :
+	- prefix to be added before the names of the parameters
+	- prefixe a ajouter devant les noms des parametres
 */
-void BorderProperties::fromSettings(QSettings &settings, const QString &prefix) {
+void BorderProperties::fromSettings(const QSettings &settings, const QString &prefix) {
 	columns_count   = settings.value(prefix + "cols",            columns_count).toInt();
 	columns_width   = qRound(settings.value(prefix + "colsize",  columns_width).toDouble());
 	display_columns = settings.value(prefix + "displaycols",     display_columns).toBool();

sources/borderproperties.h

@@ -20,13 +20,15 @@
 #include <QtCore>
 #include <QtXml>
 
+#include "propertiesinterface.h"
+
 /**
 	@brief The BorderProperties class
 	This class is a container for dimensions and display properties of a
 	diagram.
 	@remark Attributes are public
 */
-class BorderProperties {
+class BorderProperties : public PropertiesInterface {
 	public:
 		// constructor, destructor, operators
 		BorderProperties();
@@ -35,22 +37,23 @@ class BorderProperties {
 		bool operator==(const BorderProperties &);
 		bool operator!=(const BorderProperties &);
 	
-		void toXml(QDomElement &) const;
+        QDomElement toXml(QDomDocument &dom_doc) const override;
-		void fromXml(QDomElement &);
+        bool fromXml(const QDomElement &) override;
-		void toSettings(QSettings &, const QString & = QString()) const;
+        static bool valideXml(QDomElement& e);
-		void fromSettings(QSettings &, const QString & = QString());
+        void toSettings(QSettings &, const QString & = QString()) const override;
+        void fromSettings(const QSettings &, const QString & = QString()) override;
 
 		static BorderProperties defaultProperties();
 	
 		// attributes
-		int columns_count;            ///< Columns count
+        int columns_count{17};            ///< Columns count
-		qreal columns_width;          ///< Columns width
+        qreal columns_width{60.0};          ///< Columns width
-		qreal columns_header_height;  ///< Column headers height
+        qreal columns_header_height{20.0};  ///< Column headers height
-		bool display_columns;         ///< Whether to display column headers
+        bool display_columns{true};         ///< Whether to display column headers
 	
-		int rows_count;               ///< Rows count
+        int rows_count{8};               ///< Rows count
-		qreal rows_height;            ///< Rows height
+        qreal rows_height{80.0};            ///< Rows height
-		qreal rows_header_width;      ///< Row headers width
+        qreal rows_header_width{20.0};      ///< Row headers width
-		bool display_rows;            ///< Whether to display row headers
+        bool display_rows{true};            ///< Whether to display row headers
 };
 #endif

sources/bordertitleblock.cpp

@@ -32,16 +32,9 @@
 #define MIN_ROW_HEIGHT 5.0
 
 /**
-	@brief BorderTitleBlock::BorderTitleBlock
+	Constructeur simple : construit une bordure en recuperant les dimensions
-	Simple constructor:
-	build a border by recovering the dimensions
-	in the application configuration.
-
-	\~French Constructeur simple :
-	construit une bordure en recuperant les dimensions
 	dans la configuration de l'application.
-	\~ @param parent :
+	@param parent QObject parent de ce BorderTitleBlock
-	\~French QObject parent de ce BorderTitleBlock
 */
 BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 	QObject(parent)
@@ -68,119 +61,95 @@ BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 }
 
 /**
-	@brief BorderTitleBlock::~BorderTitleBlock
+	Destructeur - ne fait rien
-	\~French Destructeur - ne fait rien
 */
 BorderTitleBlock::~BorderTitleBlock() {
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockRect
+ * @brief BorderTitleBlock::titleBlockRect
-	@return the rectangle of the titleblock in scene coordinate.
+ * @return the rectangle of the titleblock in scene coordinate.
  */
 QRectF BorderTitleBlock::titleBlockRect() const
 {
 	if (m_edge == Qt::BottomEdge)
-		return QRectF(diagram_rect_.bottomLeft(),
+		return QRectF(diagram_rect_.bottomLeft(), QSize(diagram_rect_.width(), m_titleblock_template_renderer -> height()));
-			      QSize(diagram_rect_.width(),
-				    m_titleblock_template_renderer -> height()
-				    ));
 	else
-		return QRectF(diagram_rect_.topRight(),
+		return QRectF(diagram_rect_.topRight(), QSize(m_titleblock_template_renderer -> height(), diagram_rect_.height()));
-			      QSize(m_titleblock_template_renderer -> height(),
-				    diagram_rect_.height()
-				    ));
 }
 
-/**
-	@brief BorderTitleBlock::titleblockInformation
-	@return
-*/
 DiagramContext BorderTitleBlock::titleblockInformation() const {
 	return m_titleblock_template_renderer->context();
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockRectForQPainter
+ * @brief BorderTitleBlock::titleBlockRectForQPainter
-	@return The title block rect to use with the QPainter in the method draw.
+ * @return The title block rect to use with the QPainter in the method draw.
-	The returned rect is alway horizontal
+ * The returned rect is alway horizontal (like displayed at the bottom of rect) only the top left change of pos
-	(like displayed at the bottom of rect) only the top left change of pos
+ * according to the edge where the title block need to be displayed.
-	according to the edge where the title block need to be displayed.
+ * Rect according to edge:
-	Rect according to edge:
+ * Bottom : top left is at the bottom left edge of the diagram rect.
-	Bottom : top left is at the bottom left edge of the diagram rect.
+ * Right : top left is at the bottom right of diagram rect. Befor use this rect you need to rotate the QPainter by -90°
-	Right : top left is at the bottom right of diagram rect.
+ * for snap the rect at the right edge of diagram.
-	Befor use this rect you need to rotate the QPainter by -90°
-	for snap the rect at the right edge of diagram.
  */
 QRectF BorderTitleBlock::titleBlockRectForQPainter() const
 {
-	//Rect at bottom have same position and dimension of displayed rect
+	if (m_edge == Qt::BottomEdge) //Rect at bottom have same position and dimension of displayed rect
-	if (m_edge == Qt::BottomEdge)
 		return titleBlockRect();
 	else
-		return QRectF (diagram_rect_.bottomRight(),
+		return QRectF (diagram_rect_.bottomRight(), QSize(diagram_rect_.height(), m_titleblock_template_renderer -> height()));
-			       QSize(diagram_rect_.height(),
-				     m_titleblock_template_renderer -> height()
-				     ));
 
 }
 
 /**
-	@brief BorderTitleBlock::borderAndTitleBlockRect
+ * @brief BorderTitleBlock::borderAndTitleBlockRect
-	@return the bounding rectangle of diagram and titleblock.
+ * @return the bounding rectangle of diagram and titleblock.
-	It's like unite outsideBorderRect and titleBlockRect.
+ * It's like unite outsideBorderRect and titleBlockRect.
-	The rect is in scene coordinate
+ * The rect is in scene coordinate
  */
 QRectF BorderTitleBlock::borderAndTitleBlockRect() const {
 	return diagram_rect_ | titleBlockRect();
 }
 
 /**
-	@brief BorderTitleBlock::columnsRect
+ * @brief BorderTitleBlock::columnsRect
-	@return The columns rect in scene coordinate.
+ * @return The columns rect in scene coordinate.
-	If column is not displayed, return a null QRectF
+ * If column is not displayed, return a null QRectF
  */
 QRectF BorderTitleBlock::columnsRect() const
 {
 	if (!display_columns_) return QRectF();
-	return QRectF (Diagram::margin,
+	return QRectF (Diagram::margin, Diagram::margin, (columns_count_*columns_width_) + rows_header_width_, columns_header_height_);
-		       Diagram::margin,
-		       (columns_count_*columns_width_) + rows_header_width_,
-		       columns_header_height_);
 }
 
 /**
-	@brief BorderTitleBlock::rowsRect
+ * @brief BorderTitleBlock::rowsRect
-	@return The rows rect in scene coordinate.
+ * @return The rows rect in scene coordinate.
-	If row is not displayed, return a null QRectF
+ * If row is not displayed, return a null QRectF
  */
 QRectF BorderTitleBlock::rowsRect() const
 {
 	if (!display_rows_) return QRectF();
-	return QRectF (Diagram::margin,
+	return QRectF (Diagram::margin, Diagram::margin, rows_header_width_, (rows_count_*rows_height_) + columns_header_height_);
-		       Diagram::margin,
-		       rows_header_width_,
-		       (rows_count_*rows_height_) + columns_header_height_);
 }
 
 /**
-	@brief BorderTitleBlock::outsideBorderRect
+ * @brief BorderTitleBlock::outsideBorderRect
-	@return The rect of outside border (diagram with columns and rows)
+ * @return The rect of outside border (diagram with columns and rows)
-	The rect is in scene coordinate
+ * The rect is in scene coordinate
  */
 QRectF BorderTitleBlock::outsideBorderRect() const
 {
-	return QRectF (Diagram::margin,
+	return QRectF (Diagram::margin, Diagram::margin,
-		       Diagram::margin,
 				  (columns_width_*columns_count_) + rows_header_width_,
 				  (rows_height_*rows_count_) + columns_header_height_);
 }
 
 /**
-	@brief BorderTitleBlock::insideBorderRect
+ * @brief BorderTitleBlock::insideBorderRect
-	@return The rect of the inside border, in other word, the drawing area.
+ * @return The rect of the inside border, in other word, the drawing area.
-	This method take care about if rows or columns are displayed or not.
+ * This method take care about if rows or columns are displayed or not.
-	The rect is in scene coordinate
+ * The rect is in scene coordinate
  */
 QRectF BorderTitleBlock::insideBorderRect() const
 {
@@ -196,16 +165,14 @@ QRectF BorderTitleBlock::insideBorderRect() const
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockToXml
 	Exports the title block current values to XML.
 	@param xml_elmt the XML element attributes will be added to
 */
-void BorderTitleBlock::titleBlockToXml(QDomElement &xml_elmt) {
+void BorderTitleBlock::titleBlockToXml(QDomElement& doc) {
-	exportTitleBlock().toXml(xml_elmt);
+    exportTitleBlock().toXml(doc);
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockFromXml
 	Reads the title block values from XML.
 	@param xml_elmt the XML element values will be read from
 */
@@ -216,7 +183,6 @@ void BorderTitleBlock::titleBlockFromXml(const QDomElement &xml_elmt) {
 }
 
 /**
-	@brief BorderTitleBlock::borderToXml
 	Exports the border current settings to XML.
 	@param xml_elmt the XML element attributes will be added to
 */
@@ -234,7 +200,6 @@ void BorderTitleBlock::borderToXml(QDomElement &xml_elmt) {
 }
 
 /**
-	@brief BorderTitleBlock::borderFromXml
 	Reads the border settings from XML.
 	@param xml_elmt the XML element values will be read from
 */
@@ -248,8 +213,7 @@ void BorderTitleBlock::borderFromXml(const QDomElement &xml_elmt) {
 	double cols_width = xml_elmt.attribute("colsize").toDouble(&ok);
 	if (ok) setColumnsWidth(cols_width);
 	
-	// backward compatibility:
+	// backward compatibility: diagrams saved with 0.1 version have a "height" attribute
-	//	diagrams saved with 0.1 version have a "height" attribute
 	if (xml_elmt.hasAttribute("rows") && xml_elmt.hasAttribute("rowsize")) {
 		// rows counts
 		int rows_count = xml_elmt.attribute("rows").toInt(&ok);
@@ -272,9 +236,7 @@ void BorderTitleBlock::borderFromXml(const QDomElement &xml_elmt) {
 }
 
 /**
-	@brief BorderTitleBlock::exportTitleBlock
+	@return les proprietes du cartouches
-	@return the properties of the titleblock
-	\~French les proprietes du cartouches
 */
 TitleBlockProperties BorderTitleBlock::exportTitleBlock() {
 	TitleBlockProperties ip;
@@ -298,8 +260,8 @@ TitleBlockProperties BorderTitleBlock::exportTitleBlock() {
 }
 
 /**
-	@brief BorderTitleBlock::importTitleBlock
+ * @brief BorderTitleBlock::importTitleBlock
-	@param ip the new properties of titleblock
+ * @param ip the new properties of titleblock
  */
 void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) {
 	setAuthor(ip.author);
@@ -320,15 +282,12 @@ void BorderTitleBlock::importTitleBlock(const TitleBlockProperties &ip) {
 	additional_fields_ = ip.context;
 	
 	emit(needFolioData()); // Note: we expect additional data to be provided
-	// through setFolioData(),
+	// through setFolioData(), which in turn calls updateDiagramContextForTitleBlock().
-	// which in turn calls updateDiagramContextForTitleBlock().
 	emit(needTitleBlockTemplate(ip.template_name));
 }
 
 /**
-	@brief BorderTitleBlock::exportBorder
+	@return les proprietes de la bordure
-	@return border properties
-	\~French les proprietes de la bordure
 */
 BorderProperties BorderTitleBlock::exportBorder() {
 	BorderProperties bp;
@@ -344,9 +303,7 @@ BorderProperties BorderTitleBlock::exportBorder() {
 }
 
 /**
-	@brief BorderTitleBlock::importBorder
+	@param bp les nouvelles proprietes de la bordure
-	@param bp : the new properties of the border
-	\~French les nouvelles proprietes de la bordure
 */
 void BorderTitleBlock::importBorder(const BorderProperties &bp) {
 	setColumnsHeaderHeight(bp.columns_header_height);
@@ -360,7 +317,6 @@ void BorderTitleBlock::importBorder(const BorderProperties &bp) {
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockTemplate
 	@return the titleblock template used to render the titleblock
 	@see TitleBlockTemplateRenderer::titleBlockTemplate()
 */
@@ -369,19 +325,14 @@ const TitleBlockTemplate *BorderTitleBlock::titleBlockTemplate() {
 }
 
 /**
-	@brief BorderTitleBlock::setTitleBlockTemplate
+	@param titleblock_template The new titleblock template to use to render the titleblock
-	@param titleblock_template:
-	The new titleblock template to use to render the titleblock
 	@see TitleBlockTemplateRenderer::setTitleBlockTemplate()
 */
-void BorderTitleBlock::setTitleBlockTemplate(
+void BorderTitleBlock::setTitleBlockTemplate(const TitleBlockTemplate *titleblock_template) {
-		const TitleBlockTemplate *titleblock_template) {
+	m_titleblock_template_renderer -> setTitleBlockTemplate(titleblock_template);
-	m_titleblock_template_renderer -> setTitleBlockTemplate(
-				titleblock_template);
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockTemplateName
 	@return The name of the template used to render the titleblock.
 */
 QString BorderTitleBlock::titleBlockTemplateName() const {
@@ -390,11 +341,10 @@ QString BorderTitleBlock::titleBlockTemplateName() const {
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockTemplateChanged
 	This slot may be used to inform this class that the given title block
-	template has changed.
+	template has changed. The title block-dedicated rendering cache will thus be
-	The title block-dedicated rendering cache will thus be flushed.
+	flushed.
-	@param template_name : Name of the title block template that has changed
+	@param template_name Name of the title block template that has changed
 */
 void BorderTitleBlock::titleBlockTemplateChanged(const QString &template_name) {
 	if (titleBlockTemplateName() != template_name) return;
@@ -402,18 +352,14 @@ void BorderTitleBlock::titleBlockTemplateChanged(const QString &template_name) {
 }
 
 /**
-	@brief BorderTitleBlock::titleBlockTemplateRemoved
 	This slot has to be used to inform this class that the given title block
 	template is about to be removed and is no longer accessible. This class
 	will either use the provided optional TitleBlockTemplate or the default
 	title block provided by QETApp::defaultTitleBlockTemplate()
-	@param removed_template_name :
+	@param template_name Name of the title block template that has changed
-	Name of the title block template that has changed
 	@param new_template (Optional) title block template to use instead
 */
-void BorderTitleBlock::titleBlockTemplateRemoved(
+void BorderTitleBlock::titleBlockTemplateRemoved(const QString &removed_template_name, const TitleBlockTemplate *new_template) {
-		const QString &removed_template_name,
-		const TitleBlockTemplate *new_template) {
 	if (titleBlockTemplateName() != removed_template_name) return;
 	
 	if (new_template) {
@@ -424,9 +370,7 @@ void BorderTitleBlock::titleBlockTemplateRemoved(
 }
 
 /**
-	@brief BorderTitleBlock::displayTitleBlock
+	@param di true pour afficher le cartouche, false sinon
-	@param di : true to display the title block, false otherwise
-	\~French true pour afficher le cartouche, false sinon
 */
 void BorderTitleBlock::displayTitleBlock(bool di) {
 	bool change = (di != display_titleblock_);
@@ -435,9 +379,7 @@ void BorderTitleBlock::displayTitleBlock(bool di) {
 }
 
 /**
-	@brief BorderTitleBlock::displayColumns
+	@param dc true pour afficher les entetes des colonnes, false sinon
-	@param dc : true to display the column headers, false otherwise
-	\~French true pour afficher les entetes des colonnes, false sinon
 */
 void BorderTitleBlock::displayColumns(bool dc) {
 	bool change = (dc != display_columns_);
@@ -446,9 +388,7 @@ void BorderTitleBlock::displayColumns(bool dc) {
 }
 
 /**
-	@brief BorderTitleBlock::displayRows
+	@param dr true pour afficher les entetes des lignes, false sinon
-	@param dr : true to display line headers, false otherwise
-	\~French true pour afficher les entetes des lignes, false sinon
 */
 void BorderTitleBlock::displayRows(bool dr) {
 	bool change = (dr != display_rows_);
@@ -457,13 +397,9 @@ void BorderTitleBlock::displayRows(bool dr) {
 }
 
 /**
-	@brief BorderTitleBlock::displayBorder
+	@param db true pour afficher la bordure du schema, false sinon
-	@param db : true to display the border of the diagram, false otherwise
+	Note : si l'affichage de la bordure est ainsi desactivee, les lignes et
-	\~French true pour afficher la bordure du schema, false sinon
+	colonnes ne seront pas dessinees.
-	\~ @note : if the border display is deactivated,
-	the rows and columns will not be drawn.
-	\~French si l'affichage de la bordure est ainsi desactivee,
-	les lignes et colonnes ne seront pas dessinees.
 */
 void BorderTitleBlock::displayBorder(bool db) {
 	bool change = (db != display_border_);
@@ -472,34 +408,29 @@ void BorderTitleBlock::displayBorder(bool db) {
 }
 
 /**
-	@brief BorderTitleBlock::slot_setAutoPageNum
+ * @brief BorderTitleBlock::slot_setAutoPageNum
-	@param pageAutoNum :
+ * @param pageAutoNum
-	Set Page (Folio) Auto Num
+ * Set Page (Folio) Auto Num
  */
 void BorderTitleBlock::slot_setAutoPageNum(QString pageAutoNum) {
 	btb_auto_page_num_=std::move(pageAutoNum);
 }
 
 /**
-	@brief BorderTitleBlock::updateRectangles
+ * @brief BorderTitleBlock::updateRectangles
-	This method update the diagram rect according
+ * This method update the diagram rect according to the value of rows and columns (number and size)
-	to the value of rows and columns (number and size)
  */
 void BorderTitleBlock::updateRectangles()
 {
 	QRectF previous_diagram = diagram_rect_;
-	diagram_rect_ = QRectF(Diagram::margin,
+	diagram_rect_ = QRectF(Diagram::margin, Diagram::margin, diagramWidth(), diagramHeight());
-			       Diagram::margin,
+	if (diagram_rect_ != previous_diagram) emit(borderChanged(previous_diagram, diagram_rect_));
-			       diagramWidth(),
-			       diagramHeight());
-	if (diagram_rect_ != previous_diagram)
-		emit(borderChanged(previous_diagram, diagram_rect_));
 }
 
 /**
-	@brief BorderTitleBlock::draw
+ * @brief BorderTitleBlock::draw
-	Draw the border and the titleblock.
+ * Draw the border and the titleblock.
-	@param painter, QPainter to use for draw this.
+ * @param painter, QPainter to use for draw this.
  */
 void BorderTitleBlock::draw(QPainter *painter)
 {
@@ -533,24 +464,16 @@ void BorderTitleBlock::draw(QPainter *painter)
 	if (display_border_ && display_columns_) {
 		for (int i = 1 ; i <= columns_count_ ; ++ i) {
 			QRectF numbered_rectangle = QRectF(
-				diagram_rect_.topLeft().x()
+				diagram_rect_.topLeft().x() + (rows_header_width_ + ((i - 1) * columns_width_)),
-					+ (rows_header_width_
-					   + ((i - 1) * columns_width_)),
 				diagram_rect_.topLeft().y(),
 				columns_width_,
 				columns_header_height_
 			);
 			painter -> drawRect(numbered_rectangle);
 			if (settings.value("border-columns_0", true).toBool()){
-			painter -> drawText(numbered_rectangle,
+			painter -> drawText(numbered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(i - 1));
-					    Qt::AlignVCenter
-					    | Qt::AlignCenter,
-					    QString("%1").arg(i - 1));
 			}else{
-			painter -> drawText(numbered_rectangle,
+			painter -> drawText(numbered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, QString("%1").arg(i));
-					    Qt::AlignVCenter
-					    | Qt::AlignCenter,
-					    QString("%1").arg(i));
 			}
 		}
 	}
@@ -561,19 +484,12 @@ void BorderTitleBlock::draw(QPainter *painter)
 		for (int i = 1 ; i <= rows_count_ ; ++ i) {
 			QRectF lettered_rectangle = QRectF(
 				diagram_rect_.topLeft().x(),
-				diagram_rect_.topLeft().y()
+				diagram_rect_.topLeft().y() + (columns_header_height_ + ((i - 1) * rows_height_)),
-					+ (
-						columns_header_height_
-						+ ((i - 1)* rows_height_)
-						),
 				rows_header_width_,
 				rows_height_
 			);
 			painter -> drawRect(lettered_rectangle);
-			painter -> drawText(lettered_rectangle,
+			painter -> drawText(lettered_rectangle, Qt::AlignVCenter | Qt::AlignCenter, row_string);
-					    Qt::AlignVCenter
-					    | Qt::AlignCenter,
-					    row_string);
 			row_string = incrementLetters(row_string);
 		}
 	}
@@ -584,18 +500,14 @@ void BorderTitleBlock::draw(QPainter *painter)
 		if (m_edge == Qt::BottomEdge)
 		{
 			painter -> translate(tbt_rect.topLeft());
-			m_titleblock_template_renderer -> render(
+			m_titleblock_template_renderer -> render(painter, tbt_rect.width());
-						painter,
-						tbt_rect.width());
 			painter -> translate(-tbt_rect.topLeft());
 		}
 		else
 		{
 			painter->translate(tbt_rect.topLeft());
 			painter->rotate(-90);
-			m_titleblock_template_renderer -> render(
+			m_titleblock_template_renderer -> render(painter, tbt_rect.width());
-						painter,
-						tbt_rect.width());
 			painter->rotate(90);
 			painter -> translate(-tbt_rect.topLeft());
 		}
@@ -604,20 +516,7 @@ void BorderTitleBlock::draw(QPainter *painter)
 	painter -> restore();
 }
 
-/**
+void BorderTitleBlock::drawDxf(int width, int height, bool keep_aspect_ratio, QString &file_path, int color) {
- * @brief BorderTitleBlock::drawDxf
- * @param width
- * @param height
- * @param keep_aspect_ratio
- * @param file_path
- * @param color
- */
-void BorderTitleBlock::drawDxf(
-		int width,
-		int height,
-		bool keep_aspect_ratio,
-		QString &file_path,
-		int color) {
 	Q_UNUSED (width); Q_UNUSED (height); Q_UNUSED (keep_aspect_ratio);
 
 	// Transform to DXF scale.
@@ -626,7 +525,6 @@ void BorderTitleBlock::drawDxf(
 	rows_header_width_     *= Createdxf::xScale;
 	columns_width_         *= Createdxf::xScale;
 
-	// draw the empty box that appears as soon as there is a header
 	// dessine la case vide qui apparait des qu'il y a un entete
 	if (display_border_ &&
 		(display_columns_ ||
@@ -635,10 +533,7 @@ void BorderTitleBlock::drawDxf(
 		Createdxf::drawRectangle(
 			file_path,
 			double(diagram_rect_.topLeft().x()) * Createdxf::xScale,
-			Createdxf::sheetHeight
+			Createdxf::sheetHeight - double(diagram_rect_.topLeft().y()) * Createdxf::yScale - columns_header_height_,
-					- double(diagram_rect_.topLeft().y())
-					* Createdxf::yScale
-					- columns_header_height_,
 			rows_header_width_,
 			columns_header_height_,
 			color
@@ -647,7 +542,6 @@ void BorderTitleBlock::drawDxf(
 
 	QSettings settings;
 	
-	// draw the numbering of the columns
 	// dessine la numerotation des colonnes
 	if (display_border_ &&
 		display_columns_) {
@@ -655,74 +549,34 @@ void BorderTitleBlock::drawDxf(
 			double xCoord = diagram_rect_.topLeft().x() +
 					(rows_header_width_ + ((i - 1) *
 					 columns_width_));
-			double yCoord = Createdxf::sheetHeight
+			double yCoord = Createdxf::sheetHeight - diagram_rect_.topLeft().y() - columns_header_height_;
-					- diagram_rect_.topLeft().y()
-					- columns_header_height_;
 			double recWidth = columns_width_;
 			double recHeight = columns_header_height_;
-			Createdxf::drawRectangle(file_path, xCoord, yCoord,
+			Createdxf::drawRectangle(file_path, xCoord, yCoord, recWidth, recHeight, color);
-						 recWidth, recHeight, color);
 			if (settings.value("border-columns_0", true).toBool()){
-			Createdxf::drawTextAligned(file_path,
+			Createdxf::drawTextAligned(file_path, QString::number(i - 1), xCoord,
-						   QString::number(i - 1),
+									   yCoord + recHeight*0.5, recHeight*0.7, 0, 0, 1, 2, xCoord+recWidth/2, color, 0);
-						   xCoord,
-						   yCoord + recHeight*0.5,
-						   recHeight*0.7,
-						   0,
-						   0,
-						   1,
-						   2,
-						   xCoord+recWidth/2,
-						   color,
-						   0);
 			}else{
-			Createdxf::drawTextAligned(file_path,
+			Createdxf::drawTextAligned(file_path, QString::number(i), xCoord,
-						   QString::number(i),
+									   yCoord + recHeight*0.5, recHeight*0.7, 0, 0, 1, 2, xCoord+recWidth/2, color, 0);
-						   xCoord,
-						   yCoord + recHeight*0.5,
-						   recHeight*0.7,
-						   0,
-						   0,
-						   1,
-						   2,
-						   xCoord+recWidth/2,
-						   color,
-						   0);
 			}
 		}
 	}
 
-	// draw line numbering
 	// dessine la numerotation des lignes
+
 	if (display_border_ && display_rows_) {
 		QString row_string("A");
 		for (int i = 1 ; i <= rows_count_ ; ++ i) {
-			double xCoord = diagram_rect_.topLeft().x()
+			double xCoord = diagram_rect_.topLeft().x() * Createdxf::xScale;
-					* Createdxf::xScale;
+			double yCoord = Createdxf::sheetHeight - diagram_rect_.topLeft().y()*Createdxf::yScale
-			double yCoord = Createdxf::sheetHeight
+							- (columns_header_height_ + ((i - 1) * rows_height_))
-					- diagram_rect_.topLeft().y()
-					*Createdxf::yScale
-					- (
-						columns_header_height_
-						+ ((i - 1)
-						   * rows_height_) )
 							- rows_height_;
 			double recWidth = rows_header_width_;
 			double recHeight = rows_height_;
-			Createdxf::drawRectangle(file_path, xCoord, yCoord,
+			Createdxf::drawRectangle(file_path, xCoord, yCoord, recWidth, recHeight, color);
-						 recWidth, recHeight, color);
+			Createdxf::drawTextAligned(file_path, row_string, xCoord,
-			Createdxf::drawTextAligned(file_path,
+									   yCoord + recHeight*0.5, recWidth*0.7, 0, 0, 1, 2, xCoord+recWidth/2, color, 0);
-						   row_string,
-						   xCoord,
-						   yCoord + recHeight*0.5,
-						   recWidth*0.7,
-						   0,
-						   0,
-						   1,
-						   2,
-						   xCoord+recWidth/2,
-						   color,
-						   0);
 			row_string = incrementLetters(row_string);
 		}
 	}
@@ -731,10 +585,7 @@ void BorderTitleBlock::drawDxf(
 	if (display_titleblock_) {
 		//qp -> translate(titleblock_rect_.topLeft());
 		QRectF rect = titleBlockRect();
-		m_titleblock_template_renderer -> renderDxf(rect,
+		m_titleblock_template_renderer -> renderDxf(rect, rect.width(), file_path, color);
-							    rect.width(),
-							    file_path,
-							    color);
 		//qp -> translate(-titleblock_rect_.topLeft());
 	}
 
@@ -747,17 +598,11 @@ void BorderTitleBlock::drawDxf(
 }
 
 /**
-	@brief BorderTitleBlock::setColumnsCount
+	Permet de changer le nombre de colonnes.
-	Allows you to change the number of columns.
+	Si ce nombre de colonnes est inferieur au minimum requis, c'est ce minimum
-	If this number of columns is less than the minimum required,
+	qui est utilise.
-	it is this minimum which is used.
+	@param nb_c nouveau nombre de colonnes
-
+	@see minNbColumns()
-	\~French Permet de changer le nombre de colonnes.
-	Si ce nombre de colonnes est inferieur au minimum requis,
-	c'est ce minimum qui est utilise.
-	\~ @param nb_c : new number of columns
-	\~French nouveau nombre de colonnes
-	\~ @see minNbColumns()
 */
 void BorderTitleBlock::setColumnsCount(int nb_c) {
 	if (nb_c == columnsCount()) return;
@@ -766,17 +611,11 @@ void BorderTitleBlock::setColumnsCount(int nb_c) {
 }
 
 /**
-	@brief BorderTitleBlock::setColumnsWidth
+	Change la largeur des colonnes.
-	Change the width of the columns.
+	Si la largeur indiquee est inferieure au minimum requis, c'est ce minimum
-	If the width indicated is less than the minimum required,
+	qui est utilise.
-	it is this minimum which is used.
+	@param new_cw nouvelle largeur des colonnes
-
+	@see minColumnsWidth()
-	\~French Change la largeur des colonnes.
-	Si la largeur indiquee est inferieure au minimum requis,
-	c'est ce minimum qui est utilise.
-	\~ @param new_cw : new column width
-	\~French nouvelle largeur des colonnes
-	\~ @see minColumnsWidth()
 */
 void BorderTitleBlock::setColumnsWidth(const qreal &new_cw) {
 	if (new_cw == columnsWidth()) return;
@@ -785,14 +624,9 @@ void BorderTitleBlock::setColumnsWidth(const qreal &new_cw) {
 }
 
 /**
-	@brief BorderTitleBlock::setColumnsHeaderHeight
+	Change la hauteur des en-tetes contenant les numeros de colonnes. Celle-ci
-	Change the height of the headers containing the column numbers.
+	doit rester comprise entre 5 et 50 px.
-	This must remain between 5 and 50 px.
+	@param new_chh nouvelle hauteur des en-tetes de colonnes
-
-	\~French Change la hauteur des en-tetes contenant les numeros de colonnes.
-	Celle-ci doit rester comprise entre 5 et 50 px.
-	\~ @param new_chh : new height of column headers
-	\~French nouvelle hauteur des en-tetes de colonnes
 */
 void BorderTitleBlock::setColumnsHeaderHeight(const qreal &new_chh) {
 	columns_header_height_ = qBound(qreal(5.0), new_chh, qreal(50.0));
@@ -800,17 +634,11 @@ void BorderTitleBlock::setColumnsHeaderHeight(const qreal &new_chh) {
 }
 
 /**
-	@brief BorderTitleBlock::setRowsCount
+	Permet de changer le nombre de lignes.
-	Allows you to change the number of lines.
+	Si ce nombre de lignes est inferieur au minimum requis, cette fonction ne
-	If this number of lines is lower than the minimum required,
+	fait rien
-	this function does nothing
+	@param nb_r nouveau nombre de lignes
-
+	@see minNbRows()
-	\~French Permet de changer le nombre de lignes.
-	Si ce nombre de lignes est inferieur au minimum requis,
-	cette fonction ne fait rien
-	\~ @param nb_r : new number of lines
-	\~French nouveau nombre de lignes
-	\~ @see minNbRows()
 */
 void BorderTitleBlock::setRowsCount(int nb_r) {
 	if (nb_r == rowsCount()) return;
@@ -819,17 +647,11 @@ void BorderTitleBlock::setRowsCount(int nb_r) {
 }
 
 /**
-	@brief BorderTitleBlock::setRowsHeight
+	Change la hauteur des lignes.
-	Change the height of the lines.
+	Si la hauteur indiquee est inferieure au minimum requis, c'est ce minimum
-	If the indicated height is lower than the minimum required,
+	qui est utilise.
-	it is this minimum which is used.
+	@param new_rh nouvelle hauteur des lignes
-
+	@see minRowsHeight()
-	\~French Change la hauteur des lignes.
-	Si la hauteur indiquee est inferieure au minimum requis,
-	c'est ce minimum qui est utilise.
-	\~ @param new_rh : new row height
-	\~French nouvelle hauteur des lignes
-	\~ @see minRowsHeight()
 */
 void BorderTitleBlock::setRowsHeight(const qreal &new_rh) {
 	if (new_rh == rowsHeight()) return;
@@ -838,14 +660,9 @@ void BorderTitleBlock::setRowsHeight(const qreal &new_rh) {
 }
 
 /**
-	@brief BorderTitleBlock::setRowsHeaderWidth
+	Change la largeur des en-tetes contenant les numeros de lignes. Celle-ci
-	Change the width of the headers containing the line numbers.
+	doit rester comprise entre 5 et 50 px.
-	This must remain between 5 and 50 px.
+	@param new_rhw nouvelle largeur des en-tetes des lignes
-
-	\~French Change la largeur des en-tetes contenant les numeros de lignes.
-	Celle-ci doit rester comprise entre 5 et 50 px.
-	\~ @param new_rhw : new width of line headers
-	\~French nouvelle largeur des en-tetes des lignes
 */
 void BorderTitleBlock::setRowsHeaderWidth(const qreal &new_rhw) {
 	rows_header_width_ = qBound(qreal(5.0), new_rhw, qreal(50.0));
@@ -853,26 +670,19 @@ void BorderTitleBlock::setRowsHeaderWidth(const qreal &new_rhw) {
 }
 
 /**
-	@brief BorderTitleBlock::setDiagramHeight
+	Cette methode essaye de se rapprocher le plus possible de la hauteur donnee
-	This method tries to get as close as possible to the given height
+	en parametre en modifiant le nombre de lignes en cours.
-	as a parameter by modifying the number of rows in progress.
-
-	\~French Cette methode essaye de se rapprocher le plus possible de la
-	hauteur donnee en parametre en modifiant le nombre de lignes en cours.
-	\~ @param height :
 */
 void BorderTitleBlock::setDiagramHeight(const qreal &height) {
-	//          size of rows to use = rows_height
 	// taille des lignes a utiliser = rows_height
 	setRowsCount(qRound(ceil(height / rows_height_)));
 }
 
 /**
-	@brief BorderTitleBlock::convertPosition
+ * @brief BorderTitleBlock::convertPosition
-	Convert a Point in cartesian coordinate (x : 12.5, 56.9)
+ * Convert a Point in cartesian coordinate (x : 12.5, 56.9) to a point in grid coordinate (ex : B2)
-	to a point in grid coordinate (ex : B2)
+ * @param pos : position to convert
-	@param pos : position to convert
+ * @return the converted point in grid coordinate.
-	@return the converted point in grid coordinate.
  */
 DiagramPosition BorderTitleBlock::convertPosition(const QPointF &pos)
 {
@@ -891,24 +701,24 @@ DiagramPosition BorderTitleBlock::convertPosition(const QPointF &pos)
 }
 
 /**
-	@brief BorderTitleBlock::setAuthor
+ * @brief BorderTitleBlock::setAuthor
-	@param author the new value of the "Author" field
+ * @param author the new value of the "Author" field
  */
 void BorderTitleBlock::setAuthor(const QString &author) {
 	btb_author_ = author;
 }
 
 /**
-	@brief BorderTitleBlock::setDate
+ * @brief BorderTitleBlock::setDate
-	@param date the new value of the "Date" field
+ * @param date the new value of the "Date" field
  */
 void BorderTitleBlock::setDate(const QDate &date) {
 	btb_date_ = date;
 }
 
 /**
-	@brief BorderTitleBlock::setTitle
+ * @brief BorderTitleBlock::setTitle
-	@param title the new value of the "Title" field
+ * @param title the new value of the "Title" field
  */
 void BorderTitleBlock::setTitle(const QString &title)
 {
@@ -920,8 +730,8 @@ void BorderTitleBlock::setTitle(const QString &title)
 }
 
 /**
-	@brief BorderTitleBlock::setFolio
+ * @brief BorderTitleBlock::setFolio
-	@param folio the new value of the "Folio" field
+ * @param folio the new value of the "Folio" field
  */
 void BorderTitleBlock::setFolio(const QString &folio)
 {
@@ -930,14 +740,12 @@ void BorderTitleBlock::setFolio(const QString &folio)
 }
 
 /**
-	@brief BorderTitleBlock::updateDiagramContextForTitleBlock
+	Update the informations given to the titleblock template by regenerating a
-	Update the informations given to the titleblock template
+	DiagramContext object.
-	by regenerating a DiagramContext object.
+	@param initial_context Base diagram context that will be overridden by
-	@param initial_context :
+	diagram-wide values
-	Base diagram context that will be overridden by diagram-wide values
 */
-void BorderTitleBlock::updateDiagramContextForTitleBlock(
+void BorderTitleBlock::updateDiagramContextForTitleBlock(const DiagramContext &initial_context) {
-		const DiagramContext &initial_context) {
 	// Our final DiagramContext is the initial one (which is supposed to bring
 	// project-wide properties), overridden by the "additional fields" one...
 	DiagramContext context = initial_context;
@@ -947,8 +755,7 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
 	
 	// ... overridden by the historical and/or dynamically generated fields
 	context.addValue("author",      btb_author_);
-	context.addValue("date",        btb_date_.toString(
+	context.addValue("date",        btb_date_.toString(Qt::SystemLocaleShortDate));
-				 Qt::SystemLocaleShortDate));
 	context.addValue("title",       btb_title_);
 	context.addValue("filename",    btb_filename_);
 	context.addValue("plant",     btb_plant_);
@@ -965,25 +772,14 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
 	m_titleblock_template_renderer -> setContext(context);
 }
 
-/**
-	@brief BorderTitleBlock::incrementLetters
-	increments string with Letters A to Z
-	@param string
-	@return string ++Letters
-	eg:
-	- A-> B
-	- Z -> AA
-*/
 QString BorderTitleBlock::incrementLetters(const QString &string) {
 	if (string.isEmpty()) {
 		return("A");
 	} else {
-		// separate previous digits from last digit
 		// separe les digits precedents du dernier digit
 		QString first_digits(string.left(string.count() - 1));
 		QChar last_digit(string.at(string.count() - 1));
 		if (last_digit != 'Z') {
-			// increments the last digit
 			// incremente le dernier digit
 			last_digit = last_digit.toLatin1() + 1;
 			return(first_digits + QString(last_digit));
@@ -994,32 +790,17 @@ QString BorderTitleBlock::incrementLetters(const QString &string) {
 }
 
 /**
-	@brief BorderTitleBlock::setFolioData
+	@param index numero du schema (de 1 a total)
-
+	@param total nombre total de schemas dans le projet
-	\~ @param index : schema number (from 1 to total)
+	@param project_properties Project-wide properties, to be merged with diagram-wide ones.
-	\~French numero du schema (de 1 a total)
-
-	\~ @param total : total number of diagrams in the project
-	\~French nombre total de schemas dans le projet
-
-	\~ @param autonum :
-
-	\~ @param project_properties : Project-wide properties,
-	to be merged with diagram-wide ones.
 */
-void BorderTitleBlock::setFolioData(
+void BorderTitleBlock::setFolioData(int index, int total, const QString& autonum, const DiagramContext &project_properties) {
-		int index,
-		int total,
-		const QString& autonum,
-		const DiagramContext &project_properties) {
 	if (index < 1 || total < 1 || index > total) return;
 	
-	// memorize information
 	// memorise les informations
 	folio_index_ = index;
 	folio_total_ = total;
 	
-	// regenerate the content of the folio field
 	// regenere le contenu du champ folio
 	btb_final_folio_ = btb_folio_;
 
@@ -1030,60 +811,61 @@ void BorderTitleBlock::setFolioData(
 	btb_final_folio_.replace("%id",    QString::number(folio_index_));
 	btb_final_folio_.replace("%total", QString::number(folio_total_));
 
+
 	updateDiagramContextForTitleBlock(project_properties);
 }
 
 /**
-	@brief BorderTitleBlock::setPlant
+ * @brief BorderTitleBlock::setPlant
-	@param plant the new value of the "plant" field
+ * @param plant the new value of the "plant" field
  */
 void BorderTitleBlock::setPlant(const QString &plant) {
 	btb_plant_ = plant;
 }
 
 /**
-	@brief BorderTitleBlock::setLocMach
+ * @brief BorderTitleBlock::setLocMach
-	@param locmach the new value of the "locmach" field
+ * @param locmach the new value of the "locmach" field
  */
 void BorderTitleBlock::setLocMach(const QString &locmach) {
 	btb_locmach_ = locmach;
 }
 
 /**
-	@brief BorderTitleBlock::setIndicerev
+ * @brief BorderTitleBlock::setIndicerev
-	@param indexrev the new value of the "indexrev" field
+ * @param indexrev the new value of the "indexrev" field
  */
 void BorderTitleBlock::setIndicerev(const QString &indexrev) {
 	btb_indexrev_ = indexrev;
 }
 
 /**
-	@brief BorderTitleBlock::setFileName
+ * @brief BorderTitleBlock::setFileName
-	@param filename the new value of the "filename" field
+ * @param filename the new value of the "filename" field
  */
 void BorderTitleBlock::setFileName(const QString &filename) {
 	btb_filename_ = filename;
 }
 
 /**
-	@brief BorderTitleBlock::setVersion
+ * @brief BorderTitleBlock::setVersion
-	@param version the new value of the "version" field
+ * @param version the new value of the "version" field
  */
 void BorderTitleBlock::setVersion(const QString &version) {
 	btb_version_ = version;
 }
 
 /**
-	@brief BorderTitleBlock::setAutoPageNum
+ * @brief BorderTitleBlock::setAutoPageNum
-	@param auto_page_num the new value of the "auto_page_num" field
+ * @param auto_page_num the new value of the "auto_page_num" field
  */
 void BorderTitleBlock::setAutoPageNum(const QString &auto_page_num) {
 	btb_auto_page_num_ = auto_page_num;
 }
 
 /**
-	@brief BorderTitleBlock::setPreviousFolioNum
+ * @brief BorderTitleBlock::setPreviousFolioNum
-	@param previous the new value of the "previous-folio-num" field
+ * @param previous the new value of the "previous-folio-num" field
  */
 void BorderTitleBlock::setPreviousFolioNum(const QString &previous)
 {
@@ -1094,8 +876,8 @@ void BorderTitleBlock::setPreviousFolioNum(const QString &previous)
 }
 
 /**
-	@brief BorderTitleBlock::setNextFolioNum
+ * @brief BorderTitleBlock::setNextFolioNum
-	@param next the new value of the "next-folio-num" field
+ * @param next the new value of the "next-folio-num" field
  */
 void BorderTitleBlock::setNextFolioNum(const QString &next)
 {

sources/bordertitleblock.h

@@ -29,7 +29,6 @@ class DiagramPosition;
 class TitleBlockTemplate;
 class TitleBlockTemplateRenderer;
 /**
-	@brief The BorderTitleBlock class
 	This class represents the border and the titleblock which frame a
 	particular electric diagram.
 */
@@ -56,11 +55,9 @@ class BorderTitleBlock : public QObject
 			/// @return the columns width, in pixels
 		qreal columnsWidth() const { return(columns_width_); }
 			/// @return the total width of all columns, headers excluded
-		qreal columnsTotalWidth() const {
+		qreal columnsTotalWidth() const { return(columns_count_ * columns_width_); }
-			return(columns_count_ * columns_width_); }
 			/// @return the column headers height, in pixels
-		qreal columnsHeaderHeight() const {
+		qreal columnsHeaderHeight() const { return(columns_header_height_); }
-			return(columns_header_height_); }
 	
 		//ROWS
 			/// @return the number of rows
@@ -68,26 +65,15 @@ class BorderTitleBlock : public QObject
 			/// @return the rows height, in pixels
 		qreal rowsHeight() const { return(rows_height_); }
 			/// @return the total height of all rows, headers excluded
-		qreal rowsTotalHeight() const {
+		qreal rowsTotalHeight() const { return(rows_count_ * rows_height_); }
-			return(rows_count_ * rows_height_); }
 			/// @return la rows header width, in pixels
 		qreal rowsHeaderWidth() const { return(rows_header_width_); }
 	
 		// border - title block = diagram
-		/**
+			/// @return the diagram width, i.e. the width of the border without title block
-			@brief diagramWidth
+		qreal diagramWidth() const { return(columnsTotalWidth() + rowsHeaderWidth()); }
-			@return the diagram width,
+			/// @return the diagram height, i.e. the height of the border without title block
-			i.e. the width of the border without title block
+		qreal diagramHeight() const { return(rowsTotalHeight() + columnsHeaderHeight()); }
-		*/
-		qreal diagramWidth() const {
-			return(columnsTotalWidth() + rowsHeaderWidth()); }
-		/**
-			@brief diagramHeight
-			@return the diagram height,
-			i.e. the height of the border without title block
-		*/
-		qreal diagramHeight() const {
-			return(rowsTotalHeight() + columnsHeaderHeight()); }
 
 		QRectF titleBlockRect () const;
 
@@ -124,8 +110,7 @@ class BorderTitleBlock : public QObject
 			/// @return the value of the title block Additional Fields
 		QString version() const { return(btb_version_); }
 			/// @return the value of the title block Additional Fields
-		DiagramContext additionalFields() const {
+		DiagramContext additionalFields() const { return (additional_fields_); }
-			return (additional_fields_); }
 			/// @return the value of the title block
 		QString autoPageNum() const { return(btb_auto_page_num_); }
 			/// @return the value of the total number of folios
@@ -133,13 +118,10 @@ class BorderTitleBlock : public QObject
 	
 			// methods to get display options
 			/// @return true si le cartouche est affiche, false sinon
-		bool titleBlockIsDisplayed() const {
+		bool titleBlockIsDisplayed() const { return(display_titleblock_); }
-			return(display_titleblock_); }
+			/// @return true si les entetes des colonnes sont affiches, false sinon
-		/// @return true si les entetes des colonnes sont affiches,
-		/// false sinon
 		bool columnsAreDisplayed() const { return(display_columns_); }
-		/// @return true si les entetes des lignes sont affiches,
+			/// @return true si les entetes des lignes sont affiches, false sinon
-		/// false sinon
 		bool rowsAreDisplayed() const { return(display_rows_); }
 			/// @return true si la bordure est affichee, false sinon
 		bool borderIsDisplayed() const { return(display_border_); }
@@ -160,8 +142,7 @@ class BorderTitleBlock : public QObject
 		void setDate(const QDate &date);
 		void setTitle(const QString &title);
 		void setFolio(const QString &folio);
-		void setFolioData(int, int, const QString& = nullptr,
+		void setFolioData(int, int, const QString& = nullptr, const DiagramContext & = DiagramContext());
-				  const DiagramContext & = DiagramContext());
 		void setPlant(const QString &plant);
 		void setLocMach(const QString &locmach);
 		void setIndicerev(const QString &indexrev);
@@ -171,7 +152,7 @@ class BorderTitleBlock : public QObject
 		void setPreviousFolioNum(const QString &previous);
 		void setNextFolioNum(const QString &next);
 		
-		void titleBlockToXml(QDomElement &);
+        void titleBlockToXml(QDomElement &doc);
 		void titleBlockFromXml(const QDomElement &);
 		void borderToXml(QDomElement &);
 		void borderFromXml(const QDomElement &);
@@ -187,9 +168,7 @@ class BorderTitleBlock : public QObject
 		
 	public slots:
 		void titleBlockTemplateChanged(const QString &);
-		void titleBlockTemplateRemoved(
+		void titleBlockTemplateRemoved(const QString &, const TitleBlockTemplate * = nullptr);
-				const QString &,
-				const TitleBlockTemplate * = nullptr);
 		
 			// methods to set display options
 		void displayTitleBlock(bool);
@@ -200,25 +179,21 @@ class BorderTitleBlock : public QObject
 	
 	private:
 		void updateRectangles();
-		void updateDiagramContextForTitleBlock(
+		void updateDiagramContextForTitleBlock(const DiagramContext & = DiagramContext());
-				const DiagramContext & = DiagramContext());
 		QString incrementLetters(const QString &);
 	
 		signals:
 			/**
-			@brief borderChanged
 				Signal emitted after the border has changed
 				@param old_border Former border
 				@param new_border New border
 			*/
 		void borderChanged(QRectF old_border, QRectF new_border);
 			/**
-			@brief displayChanged
 				Signal emitted after display options have changed
 			*/
 		void displayChanged();
 			/**
-			@brief diagramTitleChanged
 				Signal emitted after the title has changed
 			*/
 		void diagramTitleChanged(const QString &);
@@ -228,53 +203,48 @@ class BorderTitleBlock : public QObject
 			*/
 		void titleBlockFolioChanged(const QString &);
 			/**
-			@brief needFolioData
+				Signal emitted when the title block requires its data to be updated in order
-			Signal emitted when the title block
+				to generate the folio field.
-			requires its data to be updated
-			in order to generate the folio field.
 			*/
 		void needFolioData();
 			/**
-			@brief needTitleBlockTemplate
+				Signal emitted when this object needs to set a specific title block
-			Signal emitted when this object needs to
+				template. This object cannot handle the job since it does not know of
-			set a specific title block template.
+				its parent project.
-			This object cannot handle the job
-			since it does not know of its parent project.
 			*/
 		void needTitleBlockTemplate(const QString &);
 	
 		// attributes
 	private:
 			// titleblock basic data
-		QString btb_author_;        ///< titleblock author
+		QString btb_author_;
-		QDate   btb_date_;          ///< titleblock date
+		QDate   btb_date_;
-		QString btb_title_;         ///< titleblock title
+		QString btb_title_;
-		QString btb_folio_;         ///< titleblock folio
+		QString btb_folio_;
-		QString btb_plant_;         ///< titleblock plant
+		QString btb_plant_;
-		QString btb_locmach_;       ///< titleblock locmach
+		QString btb_locmach_;
-		QString btb_indexrev_;      ///< titleblock index rev
+		QString btb_indexrev_;
-		QString btb_final_folio_;   ///< titleblock final folio
+		QString btb_final_folio_;
-		QString btb_auto_page_num_; ///< titleblock auto page num
+		QString btb_auto_page_num_;
-		int folio_index_;           ///< titleblock index
+		int folio_index_;
-		int folio_total_;           ///< titleblock total
+		int folio_total_;
-		QString btb_filename_;      ///< titleblock filename
+		QString btb_filename_;
-		QString btb_version_;       ///< titleblock version
+		QString btb_version_;
-		/// titleblock additional fields
 		DiagramContext additional_fields_;
-		Qt::Edge m_edge;              ///< titleblock edge
+		Qt::Edge m_edge;
-		QString m_next_folio_num;     ///< titleblock next folio num
+		QString m_next_folio_num,
-		QString m_previous_folio_num; ///< titleblock previous folio num
+				m_previous_folio_num;
 	
 			// border dimensions (rows and columns)
 			// columns: number and dimensions
-		int columns_count_;           ///< columns count
+		int columns_count_;
-		qreal columns_width_;         ///< columns width
+		qreal columns_width_;
-		qreal columns_header_height_; ///< columns header height
+		qreal columns_header_height_;
 	
 			// rows: number and dimensions
-		int rows_count_;          ///< rows count
+		int rows_count_;
-		qreal rows_height_;       ///< rows height
+		qreal rows_height_;
-		qreal rows_header_width_; ///< rows header width
+		qreal rows_header_width_;
 	
 			// title block dimensions
 		qreal titleblock_height_;

sources/conductorautonumerotation.cpp

@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech team
+	Copyright 2006-2014 The QElectroTech team
 	This file is part of QElectroTech.
 
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -26,23 +26,16 @@
 #include "assignvariables.h"
 
 /**
-	@brief ConductorAutoNumerotation::ConductorAutoNumerotation
+ * @brief ConductorAutoNumerotation::ConductorAutoNumerotation
-	Constructor of autonum, after create a class,
+ * Constructor of autonum, after create a class, call numerate to apply the autonum.
-	call numerate to apply the autonum.
+ * When autonum is applyed, they do with an undo command added to the stack of diagram.
-	When autonum is applyed,
+ * If you give a parent_undo at constructor, the undo command create in this class have parent_undo for parent,
-	they do with an undo command added to the stack of diagram.
+ * and wasn't added to the stack of diagram (it's the responsabillty of the parent_undo)
-	If you give a parent_undo at constructor,
+ * @param conductor   : the conductor to apply automatic numerotation
-	the undo command create in this class have parent_undo for parent,
+ * @param diagram     : the diagram of conductor
-	and wasn't added to the stack of diagram
+ * @param parent_undo : parent undo command
-	(it's the responsabillty of the parent_undo)
-	@param conductor   : the conductor to apply automatic numerotation
-	@param diagram     : the diagram of conductor
-	@param parent_undo : parent undo command
  */
-ConductorAutoNumerotation::ConductorAutoNumerotation(
+ConductorAutoNumerotation::ConductorAutoNumerotation(Conductor *conductor, Diagram *diagram, QUndoCommand *parent_undo) :
-		Conductor *conductor,
-		Diagram *diagram,
-		QUndoCommand *parent_undo) :
 	m_diagram      (diagram),
 	m_conductor     (conductor),
 	conductor_list (conductor -> relatedPotentialConductors().values()),
@@ -50,21 +43,18 @@ ConductorAutoNumerotation::ConductorAutoNumerotation(
 {}
 
 /**
-	@brief ConductorAutoNumerotation::numerate
+ * @brief ConductorAutoNumerotation::numerate
-	execute the automatic numerotation
+ * execute the automatic numerotation
  */
 void ConductorAutoNumerotation::numerate() {
 	if (!m_conductor) return;
 	if (conductor_list.size() >= 1 ) numeratePotential();
-	else if (m_conductor -> properties().type == ConductorProperties::Multi)
+	else if (m_conductor -> properties().type == ConductorProperties::Multi) numerateNewConductor();
-		numerateNewConductor();
 }
 
 /**
-	@brief ConductorAutoNumerotation::applyText
+ * @brief ConductorAutoNumerotation::applyText
-	apply the text @t to @conductor_
+ * apply the text @t to @conductor_ and all conductors at the same potential
-	and all conductors at the same potential
-	@param t : Conductor text
  */
 void ConductorAutoNumerotation::applyText(const QString& t)
 {
@@ -80,36 +70,20 @@ void ConductorAutoNumerotation::applyText(const QString& t)
 
 	if (m_parent_undo)
 	{
-		new QPropertyUndoCommand(
+		new QPropertyUndoCommand(m_conductor, "properties", old_value, new_value, m_parent_undo);
-					m_conductor,
-					"properties",
-					old_value,
-					new_value,
-					m_parent_undo);
 		undo = m_parent_undo;
 	}
 	else
 	{
 		undo = new QUndoCommand();
-		new QPropertyUndoCommand(
+		new QPropertyUndoCommand(m_conductor, "properties", old_value, new_value, undo);
-					m_conductor,
+		undo->setText(QObject::tr("Modifier les propriétés d'un conducteur", "undo caption"));
-					"properties",
-					old_value,
-					new_value,
-					undo);
-		undo->setText(
-			QObject::tr(
-				"Modifier les propriétés d'un conducteur",
-				"undo caption"));
 	}
 
 	if (!conductor_list.isEmpty())
 	{
 		if (!m_parent_undo)
-			undo->setText(
+			undo->setText(QObject::tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
-				QObject::tr(
-					"Modifier les propriétés de plusieurs conducteurs",
-					"undo caption"));
 
 		foreach (Conductor *cond, conductor_list)
 		{
@@ -117,12 +91,7 @@ void ConductorAutoNumerotation::applyText(const QString& t)
 			old_value.setValue(cp2);
 			cp2.text = t;
 			new_value.setValue(cp2);
-			new QPropertyUndoCommand(
+			new QPropertyUndoCommand(cond, "properties", old_value, new_value, undo);
-						cond,
-						"properties",
-						old_value,
-						new_value,
-						undo);
 		}
 	}
 
@@ -131,19 +100,15 @@ void ConductorAutoNumerotation::applyText(const QString& t)
 }
 
 /**
-	@brief ConductorAutoNumerotation::newProperties
+ * @brief ConductorAutoNumerotation::newProperties
-	Create a new properties according to the current autonum rule of diagram
+ * Create a new properties according to the current autonum rule of diagram
-	@param diagram : Diagram class
+ * @param d
-	@param cp : ConductorProperties
+ * @param cp
-	@param seq : sequentialNumbers
+ * @param seq
  */
-void ConductorAutoNumerotation::newProperties(
+void ConductorAutoNumerotation::newProperties(Diagram *diagram, ConductorProperties &cp, autonum::sequentialNumbers &seq)
-		Diagram *diagram,
-		ConductorProperties &cp,
-		autonum::sequentialNumbers &seq)
 {	
-	NumerotationContext context = diagram->project()->conductorAutoNum(
+	NumerotationContext context = diagram->project()->conductorAutoNum(diagram->conductorsAutonumName());
-				diagram->conductorsAutonumName());
 	if (context.isEmpty()) {
 		return;
 	}
@@ -159,8 +124,8 @@ void ConductorAutoNumerotation::newProperties(
 }
 
 /**
-	@brief ConductorAutoNumerotation::numeratePotential
+ * @brief ConductorAutoNumerotation::numeratePotential
-	Numerate a conductor on an existing potential
+ * Numerate a conductor on an existing potential
  */
 void ConductorAutoNumerotation::numeratePotential()
 {
@@ -171,8 +136,7 @@ void ConductorAutoNumerotation::numeratePotential()
 		if (conductor->properties() != cp)
 			properties_equal = false;
 	}
-	// Every properties of the potential is equal,
+		//Every properties of the potential is equal, so we apply it to m_conductor
-	// so we apply it to m_conductor
 	if (properties_equal)
 	{
 		m_conductor->setProperties(cp);
@@ -205,25 +169,21 @@ void ConductorAutoNumerotation::numeratePotential()
 		//the texts isn't identicals
 	else
 	{
-		PotentialSelectorDialog psd(
+		PotentialSelectorDialog psd(m_conductor, m_parent_undo, m_conductor->diagramEditor());
-					m_conductor,
-					m_parent_undo,
-					m_conductor->diagramEditor());
 		psd.exec();
 	}
 }
 
 /**
-	@brief ConductorAutoNumerotation::numerateNewConductor
+ * @brief ConductorAutoNumerotation::numerateNewConductor
-	create and apply a new numerotation to @m_conductor
+ * create and apply a new numerotation to @m_conductor
  */
 void ConductorAutoNumerotation::numerateNewConductor()
 {
 	if (!m_conductor || m_diagram->conductorsAutonumName().isEmpty())
 		return;
 
-	NumerotationContext context = m_diagram->project()->conductorAutoNum(
+	NumerotationContext context = m_diagram->project()->conductorAutoNum(m_diagram -> conductorsAutonumName());
-				m_diagram -> conductorsAutonumName());
 	if (context.isEmpty())
 		return;
 
@@ -234,17 +194,10 @@ void ConductorAutoNumerotation::numerateNewConductor()
 	cp.m_formula = formula;
 	m_conductor->setProperties(cp);
 
-	autonum::setSequential(formula,
+	autonum::setSequential(formula, m_conductor->rSequenceNum(), context, m_diagram, autoNum_name);
-			       m_conductor->rSequenceNum(),
-			       context,
-			       m_diagram,
-			       autoNum_name);
 
 	NumerotationContextCommands ncc (context, m_diagram);
 	m_diagram->project()->addConductorAutoNum(autoNum_name, ncc.next());
 
-	applyText(autonum::AssignVariables::formulaToLabel(
+	applyText(autonum::AssignVariables::formulaToLabel(formula, m_conductor->rSequenceNum(), m_diagram));
-			  formula,
-			  m_conductor->rSequenceNum(),
-			  m_diagram));
 }

sources/conductorautonumerotation.h

@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech team
+	Copyright 2006-2014 The QElectroTech team
 	This file is part of QElectroTech.
 
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -26,23 +26,16 @@ class Conductor;
 class QUndoCommand;
 class ConductorProperties;
 
-/**
-	@brief The ConductorAutoNumerotation class
-*/
 class ConductorAutoNumerotation
 {
 	public:
 		//constructors & destructor
-		ConductorAutoNumerotation (Conductor *conductor,
+		ConductorAutoNumerotation (Conductor *conductor, Diagram *diagram, QUndoCommand *undo_parent = nullptr);
-					   Diagram *diagram,
-					   QUndoCommand *undo_parent = nullptr);
 
 			//methods
 		void        numerate       ();
 		void        applyText      (const QString&);
-		static void newProperties(Diagram *diagram,
+		static void newProperties(Diagram *diagram, ConductorProperties &cp, autonum::sequentialNumbers &seq);
-					  ConductorProperties &cp,
-					  autonum::sequentialNumbers &seq);
 
 	private:
 			//methods

sources/conductorproperties.cpp

@@ -22,11 +22,7 @@
 /**
 	Constructeur par defaut
 */
-SingleLineProperties::SingleLineProperties() :
+SingleLineProperties::SingleLineProperties()
-	hasGround(true),
-	hasNeutral(true),
-	is_pen(false),
-	phases(1)
 {
 }
 
@@ -196,11 +192,17 @@ void SingleLineProperties::drawPen(QPainter *painter, QET::ConductorSegmentType
 	ajoutes a l'element e.
 	@param e Element XML auquel seront ajoutes des attributs
 */
-void SingleLineProperties::toXml(QDomElement &e) const {
+QDomElement SingleLineProperties::toXml(QDomDocument &doc) const {
-	e.setAttribute("ground",  hasGround  ? "true" : "false");
+
-	e.setAttribute("neutral", hasNeutral ? "true" : "false");
+    QDomElement e = doc.createElement("SingleLine");
-	e.setAttribute("phase",   phases);
+    e.appendChild(createXmlProperty(doc, "ground", hasGround));
-	if (isPen()) e.setAttribute("pen", "true");
+    e.appendChild(createXmlProperty(doc, "neutral", hasNeutral));
+    e.appendChild(createXmlProperty(doc, "phase", phases));
+
+    if (isPen())
+        e.appendChild(createXmlProperty(doc, "pen", true));
+
+    return e;
 }
 
 /**
@@ -208,11 +210,36 @@ void SingleLineProperties::toXml(QDomElement &e) const {
 	de l'element e
 	@param e Element XML dont les attributs seront lus
 */
-void SingleLineProperties::fromXml(QDomElement &e) {
+bool SingleLineProperties::fromXml(const QDomElement &e) {
-	hasGround  = e.attribute("ground")  == "true";
+    if (propertyBool(e, "ground", &hasGround) != PropertyFlags::Success ||
-	hasNeutral = e.attribute("neutral") == "true";
+        propertyBool(e, "neutral", &hasNeutral) != PropertyFlags::Success)
-	setPhasesCount(e.attribute("phase").toInt());
+        return false;
-	is_pen = (hasGround && hasNeutral && e.attribute("pen", "false") == "true");
+
+    int phase;
+    if (propertyInteger(e, "phase", &phase) != PropertyFlags::Success)
+        return false;
+    setPhasesCount(phase);
+
+    bool pen;
+    if (propertyBool(e, "pen", &pen) != PropertyFlags::Success)
+        return false;
+    is_pen = (hasGround && hasNeutral && pen);
+
+    return true;
+}
+
+bool SingleLineProperties::valideXml(QDomElement& e) {
+    if (propertyBool(e, "ground") != PropertyFlags::Success ||
+        propertyBool(e, "neutral") != PropertyFlags::Success)
+        return false;
+
+    if (propertyInteger(e, "phase") != PropertyFlags::Success)
+        return false;
+
+    if (propertyBool(e, "pen") != PropertyFlags::Success)
+        return false;
+
+    return true;
 }
 
 /**
@@ -245,99 +272,134 @@ ConductorProperties::~ConductorProperties() {
  * Export conductor propertie, in the XML element 'e'
  * @param e the xml element
  */
-void ConductorProperties::toXml(QDomElement &e) const
+QDomElement ConductorProperties::toXml(QDomDocument& doc) const
 {
-	e.setAttribute("type", typeToString(type));
 
-	if (color != QColor(Qt::black))
+    QDomElement e = doc.createElement("defaultconductor");
-		e.setAttribute("color", color.name());
 
-	e.setAttribute("bicolor", m_bicolor? "true" : "false");
+    e.appendChild(createXmlProperty(doc, "type", typeToString(type)));
-	e.setAttribute("color2", m_color_2.name());
+    e.appendChild(createXmlProperty(doc, "color", color));
-	e.setAttribute("dash-size", QString::number(m_dash_size));
+
+    e.appendChild(createXmlProperty(doc, "bicolor", m_bicolor));
+    e.appendChild(createXmlProperty(doc, "color2", m_color_2));
+    e.appendChild(createXmlProperty(doc, "dash-size", m_dash_size));
 	
 	if (type == Single)
-		singleLineProperties.toXml(e);
+        e.appendChild(singleLineProperties.toXml(doc));
 
-	e.setAttribute("num", text);
+    e.appendChild(createXmlProperty(doc, "num", text));
-	e.setAttribute("text_color", text_color.name());
+    e.appendChild(createXmlProperty(doc, "text_color", text_color));
-	e.setAttribute("formula", m_formula);
+    e.appendChild(createXmlProperty(doc, "formula", m_formula));
-	e.setAttribute("function", m_function);
+    e.appendChild(createXmlProperty(doc, "function", m_function));
-	e.setAttribute("tension_protocol", m_tension_protocol);
+    e.appendChild(createXmlProperty(doc, "tension_protocol", m_tension_protocol));
-	e.setAttribute("conductor_color", m_wire_color);
+    e.appendChild(createXmlProperty(doc, "conductor_color", m_wire_color));
-	e.setAttribute("conductor_section", m_wire_section);
+    e.appendChild(createXmlProperty(doc, "conductor_section", m_wire_section));
-	e.setAttribute("numsize", QString::number(text_size));
+    e.appendChild(createXmlProperty(doc, "numsize", text_size));
-	e.setAttribute("condsize", QString::number(cond_size));
+    e.appendChild(createXmlProperty(doc, "condsize", cond_size));
-	e.setAttribute("displaytext", m_show_text);
+    e.appendChild(createXmlProperty(doc, "displaytext", m_show_text));
-	e.setAttribute("onetextperfolio", m_one_text_per_folio);
+    e.appendChild(createXmlProperty(doc, "onetextperfolio", m_one_text_per_folio));
-	e.setAttribute("vertirotatetext", QString::number(verti_rotate_text));
+    e.appendChild(createXmlProperty(doc, "onetextperfolio", verti_rotate_text));
-	e.setAttribute("horizrotatetext", QString::number(horiz_rotate_text));
+    e.appendChild(createXmlProperty(doc, "horizrotatetext", horiz_rotate_text));
 	
 	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
-	e.setAttribute("horizontal-alignment", me.valueToKey(m_horizontal_alignment));
+    e.appendChild(createXmlProperty(doc, "horizontal-alignment", me.valueToKey(m_horizontal_alignment)));
-	e.setAttribute("vertical-alignment", me.valueToKey(m_vertical_alignment));
+    e.appendChild(createXmlProperty(doc, "vertical-alignment", me.valueToKey(m_vertical_alignment)));
 	
 	QString conductor_style = writeStyle();
 	if (!conductor_style.isEmpty())
-		e.setAttribute("style", conductor_style);
+        e.appendChild(createXmlProperty(doc, "style", conductor_style));
+
+    return e;
 }
 
 
-/**
+/** RETURNS True
  * @brief ConductorProperties::fromXml
  * Import conductor propertie, from the attribute of the xml element 'e'
  * @param e the xml document
  */
-void ConductorProperties::fromXml(QDomElement &e)
+bool ConductorProperties::fromXml(const QDomElement &e)
 {
 		// get conductor color
-	QColor xml_color= QColor(e.attribute("color"));
+    propertyColor(e, "color", &color);
-	color = (xml_color.isValid()? xml_color : QColor(Qt::black));
+    propertyBool(e, "bicolor", &m_bicolor);
-
+    propertyColor(e, "color2", &m_color_2);
-	QString bicolor_str = e.attribute("bicolor", "false");
+    propertyInteger(e, "dash-size", &m_dash_size);
-	m_bicolor = bicolor_str == "true"? true : false;
-	
-	QColor xml_color_2 = QColor(e.attribute("color2"));
-	m_color_2 = xml_color_2.isValid()? xml_color_2 : QColor(Qt::black);
-	
-	m_dash_size = e.attribute("dash-size", QString::number(1)).toInt();
 	
 		// read style of conductor
-	readStyle(e.attribute("style"));
+    QString style_string;
+    propertyString(e, "style", &style_string);
+    readStyle(style_string);
 
-	if (e.attribute("type") == typeToString(Single))
+    QString type_t;
+    if (propertyString(e, "type", &type_t) == PropertyFlags::Success) {
+        if (type_t == typeToString(Single))
         {
                 // get specific properties for single conductor
             singleLineProperties.fromXml(e);
             type = Single;
         }
-	else
+        else if (type_t == typeToString(Multi))
             type = Multi;
-
+        else {
-	text                 = e.attribute("num");
-	// get text color
-	QColor xml_text_color= QColor(e.attribute("text_color"));
-	text_color = (xml_text_color.isValid()? xml_text_color : QColor(Qt::black));
-	m_formula            = e.attribute("formula");
-	m_function           = e.attribute("function");
-	m_tension_protocol   = e.attribute("tension_protocol");
-	m_wire_color         = e.attribute("conductor_color");
-	m_wire_section       = e.attribute("conductor_section");
-	text_size            = e.attribute("numsize", QString::number(9)).toInt();
-	cond_size            = e.attribute("condsize", QString::number(1)).toDouble();
-	m_show_text          = e.attribute("displaytext", QString::number(1)).toInt();
-	m_one_text_per_folio = e.attribute("onetextperfolio", QString::number(0)).toInt();
-	verti_rotate_text    = e.attribute("vertirotatetext").toDouble();
-	horiz_rotate_text    = e.attribute("horizrotatetext").toDouble();
-	
-	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
-	m_horizontal_alignment = Qt::Alignment(me.keyToValue(e.attribute("horizontal-alignment", "AlignBottom").toStdString().data()));
-	m_vertical_alignment = Qt::Alignment(me.keyToValue(e.attribute("vertical-alignment", "AlignRight").toStdString().data()));
-
             //Keep retrocompatible with version older than 0,4
             //If the propertie @type is simple (removed since QET 0,4), we set text no visible.
             //@TODO remove this code for qet 0.6 or later
-	if (e.attribute("type") == "simple") m_show_text = false;
+
+            if (type_t == "simple") m_show_text = false;
+        }
+    }
+
+    propertyString(e, "num", &text);
+
+	// get text color
+    propertyColor(e, "text_color", &text_color);
+    propertyString(e, "formula", &m_formula);
+    propertyString(e, "function", &m_function);
+    propertyString(e, "tension_protocol", &m_tension_protocol);
+    propertyString(e, "conductor_color", &m_wire_color);
+    propertyString(e, "conductor_section", &m_wire_section);
+    propertyInteger(e, "numsize", &text_size);
+    propertyDouble(e, "condsize", &cond_size);
+    propertyBool(e, "displaytext", &m_show_text);
+    propertyBool(e, "onetextperfolio", &m_one_text_per_folio);
+    propertyDouble(e, "vertirotatetext", &verti_rotate_text);
+    propertyDouble(e, "horizrotatetext", &horiz_rotate_text);
+	
+	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
+
+    QString alinment_temp;
+    if (propertyString(e, "horizontal-alignment", &alinment_temp) == PropertyFlags::Success)
+        m_horizontal_alignment = Qt::Alignment(me.keyToValue(alinment_temp.toStdString().data()));
+    if (propertyString(e, "vertical-alignment", &alinment_temp) == PropertyFlags::Success)
+        m_vertical_alignment = Qt::Alignment(me.keyToValue(alinment_temp.toStdString().data()));
+
+    return true;
+}
+
+bool ConductorProperties::valideXml(QDomElement& e) {
+    if (propertyColor(e, "color") ||
+        propertyBool(e, "bicolor") ||
+        propertyColor(e, "color2") ||
+        propertyInteger(e, "dash-size") ||
+        propertyString(e, "type") ||
+        propertyString(e, "num") ||
+        propertyColor(e, "text_color") ||
+        propertyString(e, "formula") ||
+        propertyString(e, "function") ||
+        propertyString(e, "tension_protocol") ||
+        propertyString(e, "conductor_color") ||
+        propertyString(e, "conductor_section") ||
+        propertyInteger(e, "numsize") ||
+        propertyDouble(e, "condsize") ||
+        propertyBool(e, "displaytext") ||
+        propertyBool(e, "onetextperfolio") ||
+        propertyDouble(e, "vertirotatetext") ||
+        propertyDouble(e, "horizrotatetext") ||
+        propertyString(e, "horizontal-alignment") ||
+        propertyString(e, "vertical-alignment"))
+        return false;
+    return true;
 }
 
 /**
@@ -377,7 +439,7 @@ void ConductorProperties::toSettings(QSettings &settings, const QString &prefix)
 	@param settings Parametres a lire
 	@param prefix prefixe a ajouter devant les noms des parametres
 */
-void ConductorProperties::fromSettings(QSettings &settings, const QString &prefix)
+void ConductorProperties::fromSettings(const QSettings &settings, const QString &prefix)
 {
 	QColor settings_color = QColor(settings.value(prefix + "color").toString());
 	color = (settings_color.isValid()? settings_color : QColor(Qt::black));
@@ -821,7 +883,7 @@ void SingleLineProperties::toSettings(QSettings &settings, const QString &prefix
 	@param settings Parametres a lire
 	@param prefix prefix a ajouter devant les noms des parametres
 */
-void SingleLineProperties::fromSettings(QSettings &settings, const QString &prefix) {
+void SingleLineProperties::fromSettings(const QSettings &settings, const QString &prefix) {
 	hasGround  = settings.value(prefix + "hasGround",  true).toBool();
 	hasNeutral = settings.value(prefix + "hasNeutral", true).toBool();
 	phases     = settings.value(prefix + "phases",     1).toInt();

sources/conductorproperties.h

@@ -22,12 +22,14 @@
 #include <QColor>
 #include <QSettings>
 
+#include "propertiesinterface.h"
+
 class QPainter;
 
 /**
 	This class represents the properties of a singleline conductor.
 */
-class SingleLineProperties {
+class SingleLineProperties: public PropertiesInterface {
 	public:
 	SingleLineProperties();
 	virtual ~SingleLineProperties();
@@ -36,23 +38,24 @@ class SingleLineProperties {
 	unsigned short int phasesCount();
 	bool isPen() const;
 	void draw(QPainter *, QET::ConductorSegmentType, const QRectF &);
-	void toXml(QDomElement &) const;
+    QDomElement toXml(QDomDocument& doc) const override;
-	void fromXml(QDomElement &);
+    bool fromXml(const QDomElement &) override;
-	void toSettings(QSettings &, const QString & = QString()) const;
+    static bool valideXml(QDomElement& element);
-	void fromSettings(QSettings &, const QString & = QString());
+    void toSettings(QSettings &, const QString & = QString()) const override;
+    void fromSettings(const QSettings &, const QString & = QString()) override;  
 	
 	/// Whether the singleline conductor should display the ground symbol
-	bool hasGround;
+    bool hasGround{true};
 	/// Whether the singleline conductor should display the neutral symbol
-	bool hasNeutral;
+    bool hasNeutral{true};
 	/// Protective Earth Neutral: visually merge neutral and ground
-	bool is_pen;
+    bool is_pen{false};
 	
 	int operator==(const SingleLineProperties &) const;
 	int operator!=(const SingleLineProperties &) const;
 	
 	private:
-	unsigned short int phases;
+    unsigned short int phases{1};
 	void drawGround (QPainter *, QET::ConductorSegmentType, QPointF, qreal);
 	void drawNeutral(QPainter *, QET::ConductorSegmentType, QPointF, qreal);
 	void drawPen(QPainter *, QET::ConductorSegmentType, QPointF, qreal);
@@ -62,7 +65,7 @@ class SingleLineProperties {
 	This class represents the functional properties of a particular conductor,
 	i.e. properties other than path and terminals.
 */
-class ConductorProperties
+class ConductorProperties: public PropertiesInterface
 {
 	public:
 		ConductorProperties();
@@ -77,11 +80,12 @@ class ConductorProperties
 
 
 			//Attributes
-		ConductorType type;
+        ConductorType type{ConductorType::Single};
 		
-		QColor		color,
+        // TODO: set default values!
-				m_color_2,
+        QColor		color{QColor(Qt::black)},
-				text_color;
+                m_color_2{QColor(Qt::black)},
+                text_color{QColor(Qt::black)};
 		
 		QString text,
 				m_function,
@@ -90,29 +94,30 @@ class ConductorProperties
 				m_wire_section,
 				m_formula;
 		
-		int text_size,
+        int text_size{9},
 			m_dash_size = 1;
 		
-		double  cond_size,
+            double  cond_size{1},
 				verti_rotate_text,
 				horiz_rotate_text;
 		
-		bool	m_show_text,
+        bool	m_show_text{true},
-				m_one_text_per_folio,
+                m_one_text_per_folio{true},
 				m_bicolor = false;
 		
 		Qt::Alignment m_horizontal_alignment = Qt::AlignBottom,
 					  m_vertical_alignment = Qt::AlignRight;
 		
-		Qt::PenStyle style;
+        Qt::PenStyle style{Qt::PenStyle::SolidLine};
 		
 		SingleLineProperties singleLineProperties;
 	
 			// methods
-		void toXml(QDomElement &) const;
+        QDomElement toXml(QDomDocument &doc) const override;
-		void fromXml(QDomElement &);
+        bool fromXml(const QDomElement &) override;
-		void toSettings(QSettings &, const QString & = QString()) const;
+        static bool valideXml(QDomElement& element);
-		void fromSettings(QSettings &, const QString & = QString());
+        void toSettings(QSettings &, const QString & = QString()) const override;
+        void fromSettings(const QSettings &, const QString & = QString()) override;
 		static QString typeToString(ConductorType);
 		void applyForEqualAttributes(QList<ConductorProperties> list);
 

sources/diagram.cpp

@@ -624,13 +624,12 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	
 	// proprietes du schema
 	if (whole_content) {
+        // TODO: compare with old version
         border_and_titleblock.titleBlockToXml(dom_root);
 		border_and_titleblock.borderToXml(dom_root);
 		
 		// Default conductor properties
-		QDomElement default_conductor = document.createElement("defaultconductor");
+        dom_root.appendChild(defaultConductorProperties.toXml(document));
-		defaultConductorProperties.toXml(default_conductor);
-		dom_root.appendChild(default_conductor);
 
 		// Conductor autonum
 		if (!m_conductors_autonum_name.isEmpty()) {
@@ -751,12 +750,11 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	}
 	
 		// table de correspondance entre les adresses des bornes et leurs ids
-	QHash<Terminal *, int> table_adr_id;
 	
 	if (!list_elements.isEmpty()) {
 		auto dom_elements = document.createElement("elements");
 		for (auto elmt : list_elements) {
-			dom_elements.appendChild(elmt->toXml(document, table_adr_id));
+            dom_elements.appendChild(elmt->toXml(document));
 		}
 		dom_root.appendChild(dom_elements);
 	}
@@ -764,7 +762,7 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	if (!list_conductors.isEmpty()) {
 		auto dom_conductors = document.createElement("conductors");
 		for (auto cond : list_conductors) {
-			dom_conductors.appendChild(cond->toXml(document, table_adr_id));
+            dom_conductors.appendChild(cond->toXml(document));
 		}
 		dom_root.appendChild(dom_conductors);
 	}
@@ -872,14 +870,14 @@ bool Diagram::initFromXml(QDomElement &document, QPointF position, bool consider
  * \param added_elements Elements found in the xml file
  * \return
  */
-Terminal* findTerminal(int conductor_index, QDomElement& f, QHash<int, Terminal *>& table_adr_id, QList<Element *>& added_elements) {
+Terminal* findTerminal(int conductor_index, QDomElement& conductor, QHash<int, Terminal *>& table_adr_id, QList<Element *>& added_elements) {
 	assert(conductor_index == 1 || conductor_index == 2);
 
 	QString element_index = "element" + QString::number(conductor_index);
 	QString terminal_index = "terminal" + QString::number(conductor_index);
 
-	if (f.hasAttribute(element_index)) {
+    QUuid element_uuid;
-		QUuid element_uuid = QUuid(f.attribute(element_index));
+    if (PropertiesInterface::propertyUuid(conductor, element_index, &element_uuid) == PropertiesInterface::PropertyFlags::Success) {
 		// element1 did not exist in the conductor part of the xml until prior 0.7
 		// It is used as an indicator that uuid's are used to identify terminals
 		bool element_found = false;
@@ -887,7 +885,8 @@ Terminal* findTerminal(int conductor_index, QDomElement& f, QHash<int, Terminal
 			if (element->uuid() != element_uuid)
 				continue;
 			element_found = true;
-			QUuid terminal_uuid = QUuid(f.attribute(terminal_index));
+            QUuid terminal_uuid;
+            PropertiesInterface::propertyUuid(conductor, terminal_index, &terminal_uuid);
 			for (auto terminal: element->terminals()) {
 				if (terminal->uuid() != terminal_uuid)
 					continue;
@@ -901,12 +900,16 @@ Terminal* findTerminal(int conductor_index, QDomElement& f, QHash<int, Terminal
 			qDebug() << "Diagram::fromXml() : " <<  element_index << ": " << element_uuid << "not found";
 	} else {
 		// Backward compatibility. Until version 0.7 a generated id is used to link the terminal.
-		int id_p1 = f.attribute(terminal_index).toInt();
+        int id_p1 = -1;
+        if (PropertiesInterface::propertyInteger(conductor, terminal_index, &id_p1) != PropertiesInterface::PropertyFlags::Success) {
+            qDebug() << "diagramm.cpp:findTerminal(): Reading Id was not successfull";
+        }
 		if (!table_adr_id.contains(id_p1)) {
 			qDebug() << "Diagram::fromXml() : terminal id " << id_p1 << " not found";
 		} else
 			return table_adr_id.value(id_p1);
 	}
+    qDebug() << "Diagram::findTerminal(): No terminal found.";
 	return nullptr;
 }
 
@@ -928,6 +931,8 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 	// The first element must be a diagram
 	if (root.tagName() != "diagram") return(false);
 
+    qDebug() << "Diagram::fromXml; Diagram: " << root.attribute("title");
+	
 	// Read attributes of this diagram
 	if (consider_informations) {
 		// Version of diagram
@@ -948,6 +953,7 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 			defaultConductorProperties.fromXml(default_conductor_elmt);
 		}
 
+
 		// Load the autonum
 		m_conductors_autonum_name = root.attribute("conductorAutonum");
 
@@ -1005,10 +1011,10 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 			}
 		}
 	}
-		//Load all elements from the XML
+        //Load all elements from the collection in the XML
 	QList<Element *> added_elements;
 	QHash<int, Terminal *> table_adr_id;
-	foreach (QDomElement element_xml, QET::findInDomElement(root, "elements", "element"))
+    foreach (QDomElement element_xml, QET::findInDomElement(root, "elements", "element")) // read all elements from the diagram
 	{
 		if (!Element::valideXml(element_xml)) continue;
 		
@@ -1023,7 +1029,8 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 		}
 		
 		int state = 0;
-		Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, nullptr, &state);
+        // Create element from the collection
+        Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, nullptr, &state); // read element definition from the collection!
 		if (state)
 		{
 			QString debug_message = QString("Diagram::fromXml() : Le chargement de la description de l'element %1 a echoue avec le code d'erreur %2").arg(element_location.path()).arg(state);
@@ -1034,7 +1041,7 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 		
 		addItem(nvel_elmt);
 			//Loading fail, remove item from the diagram
-		if (!nvel_elmt->fromXml(element_xml, table_adr_id, handle_inputs_rotation))
+        if (!nvel_elmt->fromXml(element_xml, table_adr_id, handle_inputs_rotation)) // load element definition from the diagram
 		{
 			removeItem(nvel_elmt);
 			delete nvel_elmt;
@@ -1073,26 +1080,28 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 
 		// Load conductor
 	QList<Conductor *> added_conductors;
-	foreach (QDomElement f, QET::findInDomElement(root, "conductors", "conductor"))
+    foreach (QDomElement conductorElement, QET::findInDomElement(root, "conductors", "conductor"))
 	{
-		if (!Conductor::valideXml(f)) continue;
+        if (!Conductor::valideXml(conductorElement)) continue;
 
 			//Check if terminal that conductor must be linked is know
 
-		Terminal* p1 = findTerminal(1, f, table_adr_id, added_elements);
+        Terminal* p1 = findTerminal(1, conductorElement, table_adr_id, added_elements);
-		Terminal* p2 = findTerminal(2, f, table_adr_id, added_elements);
+        Terminal* p2 = findTerminal(2, conductorElement, table_adr_id, added_elements);
 
-		if (p1 && p2 && p1 != p2)
+        if (p1 && p2 && p1 != p2) // why the condition for unequal is required?
 		{
 			Conductor *c = new Conductor(p1, p2);
 			if (c->isValid())
 			{
 				addItem(c);
-				c -> fromXml(f);
+                c -> fromXml(conductorElement);
 				added_conductors << c;
 			}
 			else
 				delete c;
+        } else {
+            qDebug() << "Diagramm::fromXML(): No matching terminals found.";
         }
 	}
 

sources/diagram.h

@@ -96,7 +96,7 @@ class Diagram : public QGraphicsScene
 		/// margin around the diagram
 		static const qreal margin;
 		/// background color of diagram
-		static QColor background_color;
+        static QColor background_color; // default value set in cpp file
 		/// Hash containing max values for folio sequential autonums in this diagram
 		QHash <QString, QStringList> m_elmt_unitfolio_max;
 		QHash <QString, QStringList> m_elmt_tenfolio_max;

sources/diagramcontext.cpp

@@ -197,15 +197,17 @@ void DiagramContext::toSettings(QSettings &settings, const QString &array_name)
 	Read this context properties from \a settings by running through the array
 	named \a array_name.
 */
-void DiagramContext::fromSettings(QSettings &settings, const QString &array_name) {
+void DiagramContext::fromSettings(const QSettings &settings, const QString &array_name) {
-	int size = settings.beginReadArray(array_name);
+    // TODO: find better solution than const cast
+    QSettings& s = const_cast<QSettings&>(settings);
+    int size = s.beginReadArray(array_name);
 	for (int i = 0 ; i < size; ++ i) {
-		settings.setArrayIndex(i);
+        s.setArrayIndex(i);
 		QString key = settings.value("name").toString();
 		if (key.isEmpty()) continue;
 		addValue(key, settings.value("value").toString());
 	}
-	settings.endArray();
+    s.endArray();
 }
 
 /**

sources/diagramcontext.h

@@ -79,7 +79,7 @@ class DiagramContext
 		void fromXml(const QDomElement &, const QString & = "property");
 		void fromXml(const pugi::xml_node &dom_element, const QString &tag_name = "property");
 		void toSettings(QSettings &, const QString &) const;
-		void fromSettings(QSettings &, const QString &);
+        void fromSettings(const QSettings &, const QString &);
 		
 		static QString validKeyRegExp();
 	

sources/diagramprintdialog.cpp

@@ -41,7 +41,6 @@ DiagramPrintDialog::DiagramPrintDialog(QETProject *project, QWidget *parent) :
 	
 	// orientation paysage par defaut
 	printer_ -> setOrientation(QPrinter::Landscape);
-	backup_diagram_background_color = Diagram::background_color;
 	Diagram::background_color = Qt::white;
 }
 

sources/diagramprintdialog.h

@@ -88,6 +88,6 @@ class DiagramPrintDialog : public QWidget
 	QLineEdit *filepath_field_;
 	QPushButton *browse_button_;
 	QDialogButtonBox *buttons_;
-	QColor backup_diagram_background_color;
+    QColor backup_diagram_background_color{Diagram::background_color};
 };
 #endif

sources/editor/graphicspart/customelementgraphicpart.cpp

@@ -144,7 +144,7 @@ void CustomElementGraphicPart::setAntialiased(const bool b)
  * Each style separate by ; and name-style/value are separate by :
  * @param qde : QDOmElement used to write the style.
  */
-void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
+void CustomElementGraphicPart::stylesToXml(QDomDocument &xml_document, QDomElement &qde) const
 {
 	QString css_like_styles;
 	
@@ -479,9 +479,8 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
 	else if (_color == HTMLGrayBlackColor)  css_like_styles += "HTMLGrayBlack";
 	else if (_color == NoneColor)  css_like_styles += "none";
 
-
+    qde.appendChild(createXmlProperty(xml_document, "style", css_like_styles));
-	qde.setAttribute("style", css_like_styles);
+    qde.appendChild(createXmlProperty(xml_document, "antialias", _antialiased ? "true" : "false"));
-	qde.setAttribute("antialias", _antialiased ? "true" : "false");
 }
 
 
@@ -494,13 +493,18 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 {
 	resetStyles();
 
+    QString style_string;
+    propertyString(qde, "style", &style_string);
+	
 		//Get the list of pair style/value
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-	QStringList styles = qde.attribute("style").split(";", QString::SkipEmptyParts);
+    QStringList styles = style_string.split(";", QString::SkipEmptyParts);
 #else
-	QStringList styles = qde.attribute("style").split(";", Qt::SkipEmptyParts);
+    QStringList styles = style_string.split(";", Qt::SkipEmptyParts);
 #endif
 
+
+	
 		//Check each pair of style
 	QRegExp rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");
 	foreach (QString style, styles)
@@ -843,7 +847,9 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 		}
 	}
 		//Get antialiasing
-	_antialiased = qde.attribute("antialias") == "true";
+    QString a;
+    propertyString(qde, "antialias", &a);
+    _antialiased = a == "true";
 }
 
 

sources/editor/graphicspart/customelementgraphicpart.h

@@ -95,7 +95,7 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
         virtual void resetAllHandlerColor() {}
 
 	protected:
-		void stylesToXml  (QDomElement &) const;
+        void stylesToXml  (QDomDocument &xml_document, QDomElement &) const;
 		void stylesFromXml(const QDomElement &);
 		void resetStyles  ();
 		void applyStylesToQPainter(QPainter &) const;

sources/editor/graphicspart/customelementpart.h

@@ -19,6 +19,7 @@
 #define CUSTOM_ELEMENT_PART_H
 
 #include "qet.h"
+#include "propertiesinterface.h"
 
 class CustomElement;
 class ElementPrimitiveDecorator;
@@ -35,7 +36,7 @@ class QGraphicsSceneMouseEvent;
 	is no point for those classes to store their visual representation with
 	anything more complex than a QImage.
 */
-class CustomElementPart {
+class CustomElementPart: public PropertiesInterface {
 	// constructors, destructor
 	public:
 	/**
@@ -55,14 +56,6 @@ class CustomElementPart {
 	
 	// methods
 	public:
-	/**
-		Load the primitive from an XML element that describes it
-	*/
-	virtual void fromXml(const QDomElement &) = 0;
-	/**
-		Export the primitive as an XML element
-	*/
-	virtual const QDomElement toXml(QDomDocument &) const = 0;
 	/**
 		Set a specific property of the primitive
 	*/

sources/editor/graphicspart/partarc.cpp

@@ -95,17 +95,21 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
  * @param xml_document : Xml document to use for create the xml element.
  * @return : an xml element that describe this arc
  */
-const QDomElement PartArc::toXml(QDomDocument &xml_document) const {
+QDomElement PartArc::toXml(QDomDocument &xml_document) const {
 	QDomElement xml_element = xml_document.createElement("arc");
 	QPointF top_left(sceneTopLeft());
-	xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
+
-	xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
+    xml_element.appendChild(createXmlProperty(xml_document, "x", top_left.x()));
-	xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y", top_left.y()));
-	xml_element.setAttribute("height", QString("%1").arg(rect().height()));
+    xml_element.appendChild(createXmlProperty(xml_document, "width", rect().width()));
+    xml_element.appendChild(createXmlProperty(xml_document, "height", rect().height()));
+
     //to maintain compatibility with the previous version, we write the angle in degrees.
-	xml_element.setAttribute("start", QString("%1").arg(m_start_angle / 16));
+    xml_element.appendChild(createXmlProperty(xml_document, "start", m_start_angle / 16));
-	xml_element.setAttribute("angle", QString("%1").arg(m_span_angle / 16));
+    xml_element.appendChild(createXmlProperty(xml_document, "angle", m_span_angle / 16));
-	stylesToXml(xml_element);
+
+
+	stylesToXml(xml_document, xml_element);
 	return(xml_element);
 }
 
@@ -114,15 +118,41 @@ const QDomElement PartArc::toXml(QDomDocument &xml_document) const {
  * Import the properties of this arc from a xml element.
  * @param qde : Xml document to use.
  */
-void PartArc::fromXml(const QDomElement &qde) {
+bool PartArc::fromXml(const QDomElement &qde) {
     stylesFromXml(qde);
-	m_rect = QRectF(mapFromScene(qde.attribute("x", "0").toDouble(),
-								 qde.attribute("y", "0").toDouble()),
-					QSizeF(qde.attribute("width",  "0").toDouble(),
-						   qde.attribute("height", "0").toDouble()) );
 
-	m_start_angle = qde.attribute("start", "0").toDouble() * 16;
+    double x=0, y=0, w=0, h=0;
-	m_span_angle  = qde.attribute("angle", "-1440").toDouble() * 16;
+    if (propertyDouble(qde, "x", &x) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "y", &y) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "width", &w) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "height", &h) == PropertyFlags::NoValidConversion)
+        return false;
+
+    m_rect = QRectF(mapFromScene(x, y), QSizeF(w, h) );
+
+    m_start_angle = 0;
+    if (propertyDouble(qde, "start", &m_start_angle)  == PropertyFlags::NoValidConversion)
+        return false;
+    m_start_angle *= 16;
+
+    m_span_angle = -1440;
+    if (propertyDouble(qde, "angle", &m_span_angle) == PropertyFlags::NoValidConversion)
+        return false;
+    m_span_angle *= 16;
+
+    return true;
+}
+
+bool PartArc::valideXml(QDomElement& element) {
+
+    if (propertyDouble(element, "x") == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "y") == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "width") == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "height") == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "start")  == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "angle") == PropertyFlags::NoValidConversion)
+        return false;
+    return true;
 }
 
 /**

sources/editor/graphicspart/partarc.h

@@ -51,8 +51,9 @@ class PartArc : public AbstractPartEllipse
 			//Name and XML
 		QString name()    const override { return(QObject::tr("arc", "element part name")); }
 		QString xmlName() const override { return(QString("arc")); }
-		const QDomElement toXml   (QDomDocument &) const override;
+        QDomElement toXml   (QDomDocument &) const override;
-		void              fromXml (const QDomElement &) override;
+        bool fromXml (const QDomElement &) override;
+        static bool valideXml(QDomElement& element);
 
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;

sources/editor/graphicspart/partdynamictextfield.cpp

@@ -85,37 +85,38 @@ void PartDynamicTextField::handleUserTransformation(const QRectF &initial_select
  * @param document
  * @return 
  */
-const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
+QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 {
 	QDomElement root_element = dom_doc.createElement(xmlName());
 
-	root_element.setAttribute("x", QString::number(pos().x()));
+    root_element.appendChild(createXmlProperty(dom_doc, "x", pos().x()));
-	root_element.setAttribute("y", QString::number(pos().y()));
+    root_element.appendChild(createXmlProperty(dom_doc, "y", pos().y()));
-	root_element.setAttribute("z", QString::number(zValue()));
+    root_element.appendChild(createXmlProperty(dom_doc, "z", zValue()));
-	root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation())));
+    root_element.appendChild(createXmlProperty(dom_doc, "rotation", QET::correctAngle(rotation())));
-	root_element.setAttribute("font", font().toString());
+
-	root_element.setAttribute("uuid", m_uuid.toString());
+    root_element.appendChild(createXmlProperty(dom_doc, "font", font().toString()));
-	root_element.setAttribute("frame", m_frame? "true" : "false");
+    root_element.appendChild(createXmlProperty(dom_doc, "uuid", m_uuid));
-	root_element.setAttribute("text_width", QString::number(m_text_width));
+    root_element.appendChild(createXmlProperty(dom_doc, "frame", m_frame));
+    root_element.appendChild(createXmlProperty(dom_doc, "text_width", m_text_width));
 	
 
 	QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
-	root_element.setAttribute("text_from", me.valueToKey(m_text_from));
+    root_element.appendChild(createXmlProperty(dom_doc, "text_from", me.valueToKey(m_text_from)));
 	
 	me = QMetaEnum::fromType<Qt::Alignment>();
 	if(this->alignment() &Qt::AlignRight)
-		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignRight));
+        root_element.appendChild(createXmlProperty(dom_doc, "Halignment", me.valueToKey(Qt::AlignRight)));
 	else if(this->alignment() &Qt::AlignLeft)
-		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignLeft));
+        root_element.appendChild(createXmlProperty(dom_doc, "Halignment", me.valueToKey(Qt::AlignLeft)));
 	else if(this->alignment() &Qt::AlignHCenter)
-		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignHCenter));
+        root_element.appendChild(createXmlProperty(dom_doc, "Halignment", me.valueToKey(Qt::AlignHCenter)));
 	
 	if(this->alignment() &Qt::AlignBottom)
-		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignBottom));
+        root_element.appendChild(createXmlProperty(dom_doc, "Valignment", me.valueToKey(Qt::AlignBottom)));
 	else if(this->alignment() & Qt::AlignTop)
-		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignTop));
+        root_element.appendChild(createXmlProperty(dom_doc, "Valignment", me.valueToKey(Qt::AlignTop)));
 	else if(this->alignment() &Qt::AlignVCenter)
-		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignVCenter));
+        root_element.appendChild(createXmlProperty(dom_doc, "Valignment", me.valueToKey(Qt::AlignVCenter)));
 	
     QDomElement dom_text = dom_doc.createElement("text");
     dom_text.appendChild(dom_doc.createTextNode(toPlainText()));
@@ -152,39 +153,54 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
  * @brief PartDynamicTextField::fromXml
  * @param element
  */
-void PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
+bool PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 {
 	if (dom_elmt.tagName() != xmlName()) {
 		qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name";
-		return;
+        return false;
 	}
 
-	QGraphicsTextItem::setPos(dom_elmt.attribute("x", QString::number(0)).toDouble(),
+    double x=0, y=0, z=0, rot=0;
-							  dom_elmt.attribute("y", QString::number(0)).toDouble());
-	setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble());
-	QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble());
 
-	if (dom_elmt.hasAttribute("font"))
+    if (propertyDouble(dom_elmt, "x", &x) == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "y", &y) == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "z", &z) == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "rotation", &rot) == PropertyFlags::NoValidConversion)
+        return false;
+	
+    QGraphicsTextItem::setPos(x, y);
+    setZValue(z);
+    QGraphicsTextItem::setRotation(rot);
+
+    QString font;
+    if (propertyString(dom_elmt, "font", &font) == PropertyFlags::Success)
 	{
 		QFont font_;
-		font_.fromString(dom_elmt.attribute("font"));
+        font_.fromString(font);
 		setFont(font_);
 	} else {	//Keep compatibility TODO remove in futur
 		setFont(QETApp::dynamicTextsItemFont(9));
 	}
 
-	m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString()));
+    propertyUuid(dom_elmt, "uuid", &m_uuid);
-	setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false);
+    bool frame;
-	setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());
+    propertyBool(dom_elmt, "frame", &frame);
+
+    double text_width=-1;
+    propertyDouble(dom_elmt, "text_width", &text_width);
+    setTextWidth(text_width);
 	
 	QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
-	m_text_from = DynamicElementTextItem::TextFrom(me.keyToValue(dom_elmt.attribute("text_from").toStdString().data()));
+    QString text_from;
+    propertyString(dom_elmt, "text_from", &text_from);
+    m_text_from = DynamicElementTextItem::TextFrom(me.keyToValue(text_from.toStdString().data()));
 	
 	me = QMetaEnum::fromType<Qt::Alignment>();
-	if(dom_elmt.hasAttribute("Halignment"))
+    QString alignment;
-		setAlignment(Qt::Alignment(me.keyToValue(dom_elmt.attribute("Halignment").toStdString().data())));
+    if(propertyString(dom_elmt, "Halignment", &alignment) != PropertyFlags::NotFound)
-	if(dom_elmt.hasAttribute(("Valignment")))
+        setAlignment(Qt::Alignment(me.keyToValue(alignment.toStdString().data())));
-		setAlignment(Qt::Alignment(me.keyToValue(dom_elmt.attribute("Valignment").toStdString().data())) | this->alignment());
+    if(propertyString(dom_elmt, "Valignment", &alignment) != PropertyFlags::NotFound)
+        setAlignment(Qt::Alignment(me.keyToValue(alignment.toStdString().data())) | this->alignment());
 
 		//Text
     QDomElement dom_text = dom_elmt.firstChildElement("text");
@@ -210,6 +226,29 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 	QDomElement dom_color = dom_elmt.firstChildElement("color");
 	if(!dom_color.isNull())
 		setColor(QColor(dom_color.text()));
+
+    return true;
+}
+
+bool PartDynamicTextField::valideXml(QDomElement& dom_elmt) {
+    if (propertyDouble(dom_elmt, "x") == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "y") == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "z") == PropertyFlags::NoValidConversion ||
+        propertyDouble(dom_elmt, "rotation") == PropertyFlags::NoValidConversion)
+        return false;
+
+    if (propertyUuid(dom_elmt, "uuid") == PropertyFlags::NoValidConversion)
+        return false;
+
+    if (propertyString(dom_elmt, "text_from"))
+        return false;
+
+    if(propertyString(dom_elmt, "Halignment") == PropertyFlags::NotFound)
+        return false;
+    if(propertyString(dom_elmt, "Valignment") == PropertyFlags::NotFound)
+        return false;
+
+    return true;
 }
 
 /**

sources/editor/graphicspart/partdynamictextfield.h

@@ -74,9 +74,10 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 		void startUserTransformation(const QRectF &initial_selection_rect) override;
 		void handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect) override;
 		
-		const QDomElement toXml(QDomDocument &dom_doc) const override;
+        QDomElement toXml(QDomDocument &dom_doc) const override;
-		void fromXml(const QDomElement &dom_elmt) override;
+        bool fromXml(const QDomElement &dom_elmt) override;
 		void fromTextFieldXml(const QDomElement &dom_element);
+        static bool valideXml(QDomElement& dom_elmt);
 		
 		DynamicElementTextItem::TextFrom textFrom() const;
 		void setTextFrom (DynamicElementTextItem::TextFrom text_from);
@@ -116,7 +117,7 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 				m_info_name,
 				m_composite_text;
 		DynamicElementTextItem::TextFrom m_text_from = DynamicElementTextItem::UserText;
-		QUuid m_uuid;
+        QUuid m_uuid{QUuid::createUuid()};
 		bool m_frame = false,
 			 m_first_add = true,
 			 m_block_alignment = false;

sources/editor/graphicspart/partellipse.cpp

@@ -76,26 +76,26 @@ 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()))
 	{
 		xml_element = xml_document.createElement("circle");
-		xml_element.setAttribute("diameter", QString("%1").arg(rect().width()));
+        xml_element.appendChild(createXmlProperty(xml_document, "diameter", rect().width()));
 	}
 	else
 	{
 		xml_element = xml_document.createElement("ellipse");
-		xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
+        xml_element.appendChild(createXmlProperty(xml_document, "width", rect().width()));
-		xml_element.setAttribute("height", QString("%1").arg(rect().height()));
+        xml_element.appendChild(createXmlProperty(xml_document, "height", rect().height()));
 	}
 
 	QPointF top_left(sceneTopLeft());
-	xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
+    xml_element.appendChild(createXmlProperty(xml_document, "x", top_left.x()));
-	xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y", top_left.y()));
 
-	stylesToXml(xml_element);
+	stylesToXml(xml_document, xml_element);
 
 	return(xml_element);
 }
@@ -105,22 +105,51 @@ 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);
-	qreal width, height;
+    double x=0, y=0, width=0, height=0;
 
 	if (qde.tagName() == "ellipse")
 	{
-		width = qde.attribute("width",  "0").toDouble();
+        if (propertyDouble(qde, "width", &width) == PropertyFlags::NoValidConversion ||
-		height = qde.attribute("height", "0").toDouble();
+            propertyDouble(qde, "height", &height) == PropertyFlags::NoValidConversion)
+            return false;
+	}
+    else {
+        if (propertyDouble(qde, "diameter", &width) == PropertyFlags::NoValidConversion)
+            return false;
+        height = width;
     }
-	else
-		width = height = qde.attribute("diameter", "0").toDouble();
 
-	m_rect = QRectF(mapFromScene(qde.attribute("x", "0").toDouble(),
+
-								 qde.attribute("y", "0").toDouble()),
+    if (propertyDouble(qde, "x", &x) == PropertyFlags::NoValidConversion ||
-					QSizeF(width, height));
+        propertyDouble(qde, "y", &y) == PropertyFlags::NoValidConversion)
+        return false;
+
+    m_rect = QRectF(mapFromScene(x, y), QSizeF(width, height));
+
+    return true;
+}
+
+bool PartEllipse::valideXml(QDomElement& element) {
+    if (element.tagName() == "ellipse")
+    {
+        if (propertyDouble(element, "width") & PropertyFlags::NoValidConversion ||
+            propertyDouble(element, "height") & PropertyFlags::NoValidConversion)
+            return false;
+    }
+    else {
+        if (propertyDouble(element, "diameter") & PropertyFlags::NoValidConversion)
+            return false;
+    }
+
+
+    if ((propertyDouble(element, "x") & PropertyFlags::NoValidConversion) ||
+        (propertyDouble(element, "y") & PropertyFlags::NoValidConversion))
+        return false;
+
+    return true;
 }
 
 /**

sources/editor/graphicspart/partellipse.h

@@ -52,8 +52,9 @@ class PartEllipse : public  AbstractPartEllipse
 			//Name and XML
 		QString name()    const override { return(QObject::tr("ellipse", "element part name")); }
 		QString xmlName() const override { return(QString("ellipse")); }
-		const QDomElement toXml   (QDomDocument &) const override;
+        QDomElement toXml   (QDomDocument &) const override;
-		void              fromXml (const QDomElement &) override;
+        bool  fromXml (const QDomElement &) override;
+        static bool valideXml(QDomElement& element);
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;
 		void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();}

sources/editor/graphicspart/partline.cpp

@@ -102,22 +102,24 @@ void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
  * @param xml_document : Xml document to use for create the xml element.
  * @return an xml element that describe this line
  */
-const QDomElement PartLine::toXml(QDomDocument &xml_document) const
+QDomElement PartLine::toXml(QDomDocument &xml_document) const
 {
 	QPointF p1(sceneP1());
 	QPointF p2(sceneP2());
 	
 	QDomElement xml_element = xml_document.createElement("line");
-	xml_element.setAttribute("x1", QString("%1").arg(p1.x()));
-	xml_element.setAttribute("y1", QString("%1").arg(p1.y()));
-	xml_element.setAttribute("x2", QString("%1").arg(p2.x()));
-	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));
 
-	stylesToXml(xml_element);
+    xml_element.appendChild(createXmlProperty(xml_document, "x1", p1.x()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y1", p1.y()));
+    xml_element.appendChild(createXmlProperty(xml_document, "x2", p2.x()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y2", p2.y()));
+
+    xml_element.appendChild(createXmlProperty(xml_document, "end1", Qet::endTypeToString(first_end)));
+    xml_element.appendChild(createXmlProperty(xml_document, "length1", first_length));
+    xml_element.appendChild(createXmlProperty(xml_document, "end2", Qet::endTypeToString(second_end)));
+    xml_element.appendChild(createXmlProperty(xml_document, "length2", second_length));
+	
+	stylesToXml(xml_document, xml_element);
 	return(xml_element);
 }
 
@@ -126,17 +128,48 @@ const QDomElement PartLine::toXml(QDomDocument &xml_document) const
  * Import the properties of this line from a xml element.
  * @param qde : Xml document to use
  */
-void PartLine::fromXml(const QDomElement &qde) {
+bool PartLine::fromXml(const QDomElement &qde) {
 	stylesFromXml(qde);
-	m_line = QLineF(mapFromScene(qde.attribute("x1", "0").toDouble(),
-								 qde.attribute("y1", "0").toDouble()),
-					mapFromScene(qde.attribute("x2", "0").toDouble(),
-								 qde.attribute("y2", "0").toDouble()));
 
-	first_end     = Qet::endTypeFromString(qde.attribute("end1"));
+    double x1 = 0, y1 = 0, x2 = 0, y2 = 0;
-	first_length  = qde.attribute("length1", "1.5").toDouble();
+    if (propertyDouble(qde, "x1", &x1) == PropertyFlags::NoValidConversion ||
-	second_end    = Qet::endTypeFromString(qde.attribute("end2"));
+    propertyDouble(qde, "y1", &y1) == PropertyFlags::NoValidConversion ||
-	second_length = qde.attribute("length2", "1.5").toDouble();
+    propertyDouble(qde, "x2", &x2) == PropertyFlags::NoValidConversion ||
+    propertyDouble(qde, "y2", &y2) == PropertyFlags::NoValidConversion)
+        return false;
+
+    m_line = QLineF(mapFromScene(x1, y1),
+                    mapFromScene(x2, y2));
+
+    QString s;
+    if (propertyString(qde, "end1", &s) != PropertyFlags::Success)
+        return false;
+    first_end = Qet::endTypeFromString(s);
+
+    if (propertyString(qde, "end2", &s) != PropertyFlags::Success)
+        return false;
+
+    first_end = Qet::endTypeFromString(s);
+
+    if (propertyDouble(qde, "length1", &first_length) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "length2", &second_length) == PropertyFlags::NoValidConversion)
+        return false;
+
+    return true;
+}
+
+bool PartLine::valideXml(QDomElement& element) const {
+    if (propertyDouble(element, "x1") ||
+        propertyDouble(element, "y1") ||
+        propertyDouble(element, "x2") ||
+        propertyDouble(element, "y2") ||
+        propertyString(element, "end1") ||
+        propertyString(element, "end2") ||
+        propertyDouble(element, "length1") ||
+        propertyDouble(element, "length2") )
+        return false;
+
+    return true;
 }
 
 /**

sources/editor/graphicspart/partline.h

@@ -70,8 +70,9 @@ class PartLine : public CustomElementGraphicPart
 		void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
 		QString name() const override { return(QObject::tr("ligne", "element part name")); }
 		QString xmlName() const override { return(QString("line")); }
-		const QDomElement toXml(QDomDocument &) const override;
+        QDomElement toXml(QDomDocument &) const override;
-		void fromXml(const QDomElement &) override;
+        bool fromXml(const QDomElement &) override;
+        bool valideXml(QDomElement& element) const;
 		virtual QPointF sceneP1() const;
 		virtual QPointF sceneP2() const;
 		QPainterPath shape() const override;
@@ -117,10 +118,10 @@ class PartLine : public CustomElementGraphicPart
 
 		/*****************/
 		Qet::EndType first_end;
-		qreal        first_length;
+        qreal        first_length{1.5};
 
 		Qet::EndType second_end;
-		qreal        second_length;
+        qreal        second_length{1.5};
 		QList<QPointF> saved_points_;
 		QLineF m_line;
 		int m_vector_index = -1;

sources/editor/graphicspart/partpolygon.cpp

@@ -82,29 +82,37 @@ void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
  * Import the properties of this polygon from a xml element
  * @param qde : Xml document to use
  */
-void PartPolygon::fromXml(const QDomElement &qde)
+bool PartPolygon::fromXml(const QDomElement &qde)
 {
 	stylesFromXml(qde);
 
+    int error_counter = 0;
 	int i = 1;
 	while(true)
 	{
-		if (QET::attributeIsAReal(qde, QString("x%1").arg(i)) &&\
+        if (propertyDouble(qde, QString("x%1").arg(i)) == PropertyFlags::Success &&
-			QET::attributeIsAReal(qde, QString("y%1").arg(i)))
+            propertyDouble(qde, QString("y%1").arg(i)) == PropertyFlags::Success)
-			++ i;
+            i++;
 
 		else break;
 	}
 	
 	QPolygonF temp_polygon;
+    double x, y;
 	for (int j = 1 ; j < i ; ++ j)
 	{
-		temp_polygon << QPointF(qde.attribute(QString("x%1").arg(j)).toDouble(),
+        error_counter += propertyDouble(qde, QString("x%1").arg(j), &x);
-								qde.attribute(QString("y%1").arg(j)).toDouble());
+        error_counter += propertyDouble(qde, QString("y%1").arg(j), &y);
+        if (error_counter)
+            return false;
+        temp_polygon << QPointF(x, y);
 	}
 	m_polygon = temp_polygon;
 	
-	m_closed = qde.attribute("closed") != "false";
+    if (propertyBool(qde, "closed", &m_closed) != PropertyFlags::Success)
+        return false;
+
+    return true;
 }
 
 /**
@@ -113,21 +121,28 @@ void PartPolygon::fromXml(const QDomElement &qde)
  * @param xml_document : Xml document to use for create the xml element
  * @return an xml element that describe this polygon
  */
-const QDomElement PartPolygon::toXml(QDomDocument &xml_document) const
+QDomElement PartPolygon::toXml(QDomDocument &xml_document) const
 {
 	QDomElement xml_element = xml_document.createElement("polygon");
 	int i = 1;
 	foreach(QPointF point, m_polygon) {
 		point = mapToScene(point);
-		xml_element.setAttribute(QString("x%1").arg(i), QString("%1").arg(point.x()));
+        xml_element.appendChild(createXmlProperty(xml_document, QString("x%1").arg(i), point.x()));
-		xml_element.setAttribute(QString("y%1").arg(i), QString("%1").arg(point.y()));
+        xml_element.appendChild(createXmlProperty(xml_document, QString("y%1").arg(i), point.y()));
 		++ i;
 	}
-	if (!m_closed) xml_element.setAttribute("closed", "false");
+
-	stylesToXml(xml_element);
+    xml_element.appendChild(createXmlProperty(xml_document, "closed", m_closed));
+
+    stylesToXml(xml_document, xml_element);
 	return(xml_element);
 }
 
+bool PartPolygon::valideXml(QDomElement& element) {
+    // TODO: implement
+    return true;
+}
+
 /**
  * @brief PartPolygon::isUseless
  * @return true if this part is irrelevant and does not deserve to be Retained / registered.

sources/editor/graphicspart/partpolygon.h

@@ -61,8 +61,10 @@ class PartPolygon : public CustomElementGraphicPart
 
 		QString name() const override { return(QObject::tr("polygone", "element part name")); }
 		QString xmlName() const override { return(QString("polygon")); }
-		void fromXml(const QDomElement &) override;
+        bool fromXml(const QDomElement &) override;
-		const QDomElement toXml(QDomDocument &) const override;
+        QDomElement toXml(QDomDocument &) const override;
+        static bool valideXml(QDomElement& element);
+
 
 		QPainterPath shape () const override;
 		QPainterPath shadowShape() const override;

sources/editor/graphicspart/partrectangle.cpp

@@ -77,14 +77,15 @@ void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
  * @param xml_document : Xml document to use for create the xml element.
  * @return an xml element that describe this ellipse
  */
-const QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
+QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
 {
 	QDomElement xml_element = xml_document.createElement("rect");
 	QPointF top_left(sceneTopLeft());
-	xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
+
-	xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
+    xml_element.appendChild(createXmlProperty(xml_document, "x", top_left.x()));
-	xml_element.setAttribute("width",  QString("%1").arg(m_rect.width()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y", top_left.y()));
-	xml_element.setAttribute("height", QString("%1").arg(m_rect.height()));
+    xml_element.appendChild(createXmlProperty(xml_document, "width", m_rect.width()));
+    xml_element.appendChild(createXmlProperty(xml_document, "height", m_rect.height()));
 	
 	QRectF rect = m_rect.normalized();
 	qreal x = m_xRadius;
@@ -99,7 +100,10 @@ const QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
 	xml_element.setAttribute("rx", QString::number(m_xRadius));
 	xml_element.setAttribute("ry", QString::number(m_yRadius));
 
-	stylesToXml(xml_element);
+    xml_element.appendChild(createXmlProperty(xml_document, "rx", m_xRadius));
+    xml_element.appendChild(createXmlProperty(xml_document, "ry", m_yRadius));
+	
+    stylesToXml(xml_document, xml_element);
 	return(xml_element);
 }
 
@@ -108,18 +112,45 @@ const QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
  * Import the properties of this rectangle from a xml element.
  * @param qde : Xml document to use.
  */
-void PartRectangle::fromXml(const QDomElement &qde)
+bool PartRectangle::fromXml(const QDomElement &qde)
 {
 	stylesFromXml(qde);
-	setPos(mapFromScene(qde.attribute("x", "0").toDouble(),
-						qde.attribute("y", "0").toDouble()));
 
-	QRectF rect(QPointF(0,0), QSizeF(qde.attribute("width",  "0").toDouble(),
+    double x=0, y=0, w=0, h=0, rx=0, ry=0;
-									 qde.attribute("height", "0").toDouble()));
+    if (propertyDouble(qde, "x", &x) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "y", &y) == PropertyFlags::NoValidConversion)
+        return false;
+
+    setPos(mapFromScene(x, y));
+
+    if (propertyDouble(qde, "width", &w) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "width", &h) == PropertyFlags::NoValidConversion)
+        return false;
+
+    QRectF rect(QPointF(x,y), QSizeF(w, h));
 
 	setRect(rect.normalized());
-	setXRadius(qde.attribute("rx", "0").toDouble());
+
-	setYRadius(qde.attribute("ry", "0").toDouble());
+    if (propertyDouble(qde, "rx", &rx) == PropertyFlags::NoValidConversion ||
+        propertyDouble(qde, "ry", &ry) == PropertyFlags::NoValidConversion)
+        return false;
+
+    setXRadius(rx);
+    setYRadius(ry);
+
+    return true;
+}
+
+bool PartRectangle::valideXml(QDomElement& element) {
+    // parameters have default values so no value is not a non valid xml element
+    if ((propertyDouble(element, "x") & PropertyFlags::NoValidConversion) |
+        (propertyDouble(element, "y") & PropertyFlags::NoValidConversion) |
+        (propertyDouble(element, "width") & PropertyFlags::NoValidConversion) |
+        (propertyDouble(element, "width") & PropertyFlags::NoValidConversion) |
+        (propertyDouble(element, "rx") & PropertyFlags::NoValidConversion) |
+        (propertyDouble(element, "ry") & PropertyFlags::NoValidConversion))
+        return false;
+    return true;
 }
 
 /**

sources/editor/graphicspart/partrectangle.h

@@ -60,8 +60,9 @@ class PartRectangle :  public CustomElementGraphicPart
 		QString name  () const override { return(QObject::tr("rectangle", "element part name")); }
 
 		QString           xmlName () const override { return(QString("rect")); }
-		const QDomElement toXml   (QDomDocument &) const override;
+        QDomElement toXml   (QDomDocument &) const override;
-		void              fromXml (const QDomElement &) override;
+        bool fromXml (const QDomElement &) override;
+        static bool valideXml(QDomElement& element);
 
 		QRectF rect() const;
 		void   setRect(const QRectF &rect);

sources/editor/graphicspart/partterminal.cpp

@@ -28,6 +28,7 @@ PartTerminal::PartTerminal(QETElementEditor *editor, QGraphicsItem *parent) :
     CustomElementGraphicPart(editor, parent)
 {
     d = new TerminalData(this);
+    d->m_name = tr("terminal");
     d->m_orientation = Qet::North;
     d->m_uuid = QUuid::createUuid(); // if part is loaded this uuid will be overwritten, but being sure that terminal has a uuid
 	updateSecondPoint();
@@ -42,10 +43,21 @@ PartTerminal::~PartTerminal() {
 	Importe les proprietes d'une borne depuis un element XML
 	@param xml_elmt Element XML a lire
 */
-void PartTerminal::fromXml(const QDomElement &xml_elmt) {
+bool PartTerminal::fromXml(const QDomElement &xml_elmt) {
-    d->fromXml(xml_elmt);
+
+    QUuid uuid;
+    // update part and add uuid, which is used in the new version to connect terminals together
+    // if the attribute not exists, means, the element is created with an older version of qet. So use the legacy approach
+    // to identify terminals
+    propertyUuid(xml_elmt, "uuid", &d->m_uuid);
+
+    if (!d->fromXml(xml_elmt))
+        return false;
+
     setPos(d->m_pos);
 	updateSecondPoint();
+
+    return true;
 }
 
 /**
@@ -53,8 +65,25 @@ void PartTerminal::fromXml(const QDomElement &xml_elmt) {
 	@param xml_document Document XML a utiliser pour creer l'element XML
 	@return un element XML decrivant la borne
 */
-const QDomElement PartTerminal::toXml(QDomDocument &xml_document) const {
+QDomElement PartTerminal::toXml(QDomDocument &xml_document) const {
-    return d->toXml(xml_document);
+
+    QDomElement qdo = xml_document.createElement("terminal");
+
+    qdo.appendChild(createXmlProperty(xml_document, "uuid", d->m_uuid));
+
+    d->m_pos = pos();
+
+    // Do not store terminal data in its own child
+    QDomElement terminalDataElement = d->toXml(xml_document);
+    for (int i=0; i < terminalDataElement.childNodes().length(); i++) {
+        qdo.appendChild(terminalDataElement.childNodes().at(i).cloneNode()); // cloneNode() is important, otherwise no deep clone is made
+    }
+
+    return qdo;
+}
+
+bool PartTerminal::valideXml(QDomElement& element) {
+    return TerminalData::valideXml(element);
 }
 
 /**

sources/editor/graphicspart/partterminal.h

@@ -57,8 +57,10 @@ class PartTerminal : public CustomElementGraphicPart
 		int type() const override { return Type; }
         QString name() const override { return d->m_name; }
 		QString xmlName() const override { return(QString("terminal")); }
-		void fromXml(const QDomElement &) override;
+        bool fromXml(const QDomElement &) override;
-		const QDomElement toXml(QDomDocument &) const override;
+        QDomElement toXml(QDomDocument &) const override;
+        static bool valideXml(QDomElement& element);
+
 		void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
 
 		QPainterPath shape() const override;

sources/editor/graphicspart/parttext.cpp

@@ -55,32 +55,49 @@ PartText::~PartText() {
 	Importe les proprietes d'un texte statique depuis un element XML
 	@param xml_element Element XML a lire
 */
-void PartText::fromXml(const QDomElement &xml_element)
+bool PartText::fromXml(const QDomElement &xml_element)
 {
-	bool ok;
+    int size;
+    QString font;
 
-	if (xml_element.hasAttribute("size"))
+    if (propertyInteger(xml_element, "size", &size) != PropertyFlags::NotFound)
 	{
-		int font_size = xml_element.attribute("size").toInt(&ok);
+        if (size < 1) {
-		if (!ok || font_size < 1) {
+            size = 20;
-			font_size = 20;
 		}
 		QFont font_ = this->font();
-		font_.setPointSize(font_size);
+        font_.setPointSize(size);
 		setFont(font_);
 	}
-	else if (xml_element.hasAttribute("font"))
+    else if (propertyString(xml_element, "font", &font) != PropertyFlags::NotFound)
 	{
 		QFont font_;
-		font_.fromString(xml_element.attribute("font"));
+        font_.fromString(font);
 		setFont(font_);
+    } else {
+        return false;
     }
 	
-	setDefaultTextColor(QColor(xml_element.attribute("color", "#000000")));
+    QColor color;
-	setPlainText(xml_element.attribute("text"));
+    QString text;
-	setPos(xml_element.attribute("x").toDouble(),
+    propertyColor(xml_element, "color", &color);
-		   xml_element.attribute("y").toDouble());
+    setDefaultTextColor(color);
-	setRotation(xml_element.attribute("rotation", QString::number(0)).toDouble());
+
+
+    propertyString(xml_element, "text", &text);
+    setPlainText(text);
+
+    double x=0, y=0, rot=0;
+    if (propertyDouble(xml_element, "x", &x) == PropertyFlags::NoValidConversion ||
+        propertyDouble(xml_element, "y", &y) == PropertyFlags::NoValidConversion)
+        return false;
+    setPos(x, y);
+
+    if (propertyDouble(xml_element, "rotation", &rot) == PropertyFlags::NoValidConversion)
+        return false;
+    setRotation(rot);
+
+    return true;
 }
 
 /**
@@ -88,20 +105,44 @@ void PartText::fromXml(const QDomElement &xml_element)
 	@param xml_document Document XML a utiliser pour creer l'element XML
 	@return un element XML decrivant le texte statique
 */
-const QDomElement PartText::toXml(QDomDocument &xml_document) const
+QDomElement PartText::toXml(QDomDocument &xml_document) const
 {
 	QDomElement xml_element = xml_document.createElement(xmlName());
 
-	xml_element.setAttribute("x", QString::number(pos().x()));
+    xml_element.appendChild(createXmlProperty(xml_document, "x", pos().x()));
-	xml_element.setAttribute("y", QString::number(pos().y()));
+    xml_element.appendChild(createXmlProperty(xml_document, "y", pos().y()));
-	xml_element.setAttribute("text", toPlainText());
+    xml_element.appendChild(createXmlProperty(xml_document, "text", toPlainText()));
-	xml_element.setAttribute("font", font().toString());
+    xml_element.appendChild(createXmlProperty(xml_document, "font", font().toString()));
-	xml_element.setAttribute("rotation", QString::number(rotation()));
+    xml_element.appendChild(createXmlProperty(xml_document, "rotation", rotation()));
-	xml_element.setAttribute("color", defaultTextColor().name());
+    xml_element.appendChild(createXmlProperty(xml_document, "color", defaultTextColor().name()));
 
 	return(xml_element);
 }
 
+bool PartText::valideXml(QDomElement& element) {
+
+    if (propertyInteger(element, "size") == PropertyFlags::NotFound ||
+        propertyString(element, "font") == PropertyFlags::NotFound) {
+        return false;
+    }
+
+    if (propertyString(element, "color") == PropertyFlags::NoValidConversion)
+        return false;
+
+
+    if (propertyString(element, "text"))
+        return false;
+
+    if (propertyDouble(element, "x") == PropertyFlags::NoValidConversion ||
+        propertyDouble(element, "y") == PropertyFlags::NoValidConversion)
+        return false;
+
+    if (propertyDouble(element, "rotation", 0) == PropertyFlags::NoValidConversion)
+        return false;
+
+    return true;
+}
+
 /**
 	@return Les coordonnees du point situe en bas a gauche du texte.
 */

sources/editor/graphicspart/parttext.h

@@ -59,8 +59,9 @@ class PartText : public QGraphicsTextItem, public CustomElementPart
 		int type() const override { return Type; }
 		QString name() const override { return(QObject::tr("texte", "element part name")); }
 		QString xmlName() const override { return(QString("text")); }
-		void fromXml(const QDomElement &) override;
+        bool fromXml(const QDomElement &) override;
-		const QDomElement toXml(QDomDocument &) const override;
+        static bool valideXml(QDomElement& element);
+        QDomElement toXml(QDomDocument &) const override;
 		void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
 		bool isUseless() const override;
 		QRectF sceneGeometricRect() const override;

sources/elementtextpattern.cpp

@@ -108,8 +108,7 @@ QDomDocument ExportElementTextPattern::xmlConf() const
 	root.setAttribute("name", m_name);
 	doc.appendChild(root);
 	
-	QHash<Terminal *, int> H;
+    QDomElement elmt = m_element->toXml(doc);
-	QDomElement elmt = m_element->toXml(doc, H);
 	QDomElement texts = elmt.firstChildElement("dynamic_texts");
 	QDomElement groups = elmt.firstChildElement("texts_groups");
 	

sources/properties/propertiesinterface.cpp

@@ -17,11 +17,313 @@
 */
 #include "propertiesinterface.h"
 
+#include <QDebug>
+
+/*!
+ * Available property types
+ */
+namespace  {
+    const QString integerS = "int";
+    const QString doubleS = "double";
+    const QString boolS = "bool";
+    const QString stringS = "string";
+    const QString uuidS = "uuid";
+    const QString colorS = "color";
+}
+
 PropertiesInterface::PropertiesInterface()
 {
 }
 
-PropertiesInterface::~PropertiesInterface()
+bool PropertiesInterface::valideXml(QDomElement& element) {
-{
+    qDebug(QString("ValideXml() is not implemented. File: %1, Line: %2").arg(__FILE__).arg(__LINE__).toStdString().data());
+    return false;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument &doc, const QString& name, const QString value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", stringS);
+    p.setAttribute("value", value);
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument &doc, const QString& name, const char* value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", stringS);
+    p.setAttribute("value", value);
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument& doc, const QString& name, const int value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", integerS);
+    p.setAttribute("value", QString::number(value));
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument& doc, const QString& name, const double value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", doubleS);
+    p.setAttribute("value", QString::number(value));
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument& doc, const QString& name, const bool value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", boolS);
+    p.setAttribute("value", QString::number(value));
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument& doc, const QString& name, const QUuid value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", uuidS);
+    p.setAttribute("value", value.toString());
+    return p;
+}
+
+QDomElement PropertiesInterface::createXmlProperty(QDomDocument& doc, const QString& name, const QColor value) {
+    QDomElement p = doc.createElement("property");
+    p.setAttribute("name", name);
+    p.setAttribute("type", colorS);
+    p.setAttribute("value", value.name());
+    return p;
+}
+
+QDomElement PropertiesInterface::property(const QDomElement& e, const QString& name) {
+    for (int i=0; i < e.childNodes().count(); i++) {
+        QDomElement child = e.childNodes().at(i).toElement();
+        if (!validXmlProperty(child))
+            continue; // there might also non property childs
+
+        if (child.attribute("name") == name)
+            return child;
+    }
+    return QDomElement();
+}
+
+/*!
+ * \brief PropertiesInterface::attribute
+ * Returns the property with the name \p attribute_name and type \p type
+ * \param e Xml element which contains the property
+ * \param attribute_name
+ * \param type Type of the property
+ * \param attr
+ * \return
+ */
+bool PropertiesInterface::attribute(const QDomElement& e, const QString& attribute_name, const QString& type, QString* attr) {
+    QDomElement p = property(e, attribute_name);
+    if (p.isNull()) {
+        // check if legacy property is available,
+        // where the property is inside the element as attribute
+        if (!e.hasAttribute(attribute_name)) {
+            qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "Property " << attribute_name << "is not available";
+            return false;
+        }
+
+        *attr = e.attribute(attribute_name);
+
+    } else {
+        if (p.attribute("type") != type) {
+            qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ", Property: " << attribute_name << "(" << p.attribute("type") << ") has not type: " << type;
+            return false;
+        }
+
+        *attr = p.attribute("value");
 
     }
+    return true;
+}
+
+/*!
+ * \brief PropertiesInterface::propertyInteger
+ * Reads an interger from the XML element.
+ * \param e DomElement which contains the property attribute
+ * \param attribute_name Name of the attribute
+ * \param entier Return value if success
+ * \return True if reading an integer was successful, else False. If the attribute was not found,
+ *          \p entier is not valid and the return value is False
+ */
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyInteger(const QDomElement &e, const QString& attribute_name, int* entier) {
+
+    QString attr;
+
+    if (!attribute(e, attribute_name, integerS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    // verifie la validite de l'attribut
+    bool ok;
+    int tmp = attr.toInt(&ok);
+    if (!ok) {
+        qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "No valid Conversion: " << attribute_name << ". type: " << integerS << ". value: " << attr;
+        return PropertyFlags::NoValidConversion;
+    }
+
+    if (entier != nullptr)
+        *entier = tmp;
+
+    return PropertyFlags::Success;
+}
+
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyDouble(const QDomElement &e, const QString& attribute_name, double* reel) {
+
+    QString attr;
+
+    if (!attribute(e, attribute_name, doubleS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    // verifie la validite de l'attribut
+    bool ok;
+    double tmp = attr.toDouble(&ok);
+    if (!ok) {
+        qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "No valid Conversion: " << attribute_name << ". type: " << doubleS << ". value: " << attr;
+        return PropertyFlags::NoValidConversion;
+    }
+
+    if (reel != nullptr)
+        *reel = tmp;
+
+    return PropertyFlags::Success;
+}
+
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyBool(const QDomElement &e, const QString& attribute_name, bool* boolean) {
+
+    QString attr;
+
+    if (!attribute(e, attribute_name, boolS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    // verifie la validite de l'attribut
+    bool ok;
+    bool tmp = attr.toInt(&ok);
+    if (!ok) {
+        if (attr == "true" || attr == "1")
+            tmp = true;
+        else if (attr == "false" || attr == "0")
+            tmp = false;
+        else {
+            qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "No valid Conversion: " << attribute_name << ". type: " << integerS << ". value: " << attr;
+            return PropertyFlags::NoValidConversion;
+        }
+    }
+
+    if (boolean != nullptr)
+        *boolean = tmp;
+
+    return PropertyFlags::Success;
+}
+
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyColor(const QDomElement &e, const QString& attribute_name, QColor* color) {
+
+    QString attr;
+
+    if (!attribute(e, attribute_name, colorS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    // verifie la validite de l'attribut
+    QColor tmp = QColor(attr);
+    if (!tmp.isValid()) {
+        qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "No valid Conversion: " << attribute_name << ". type: " << colorS << ". value: " << attr;
+        return PropertyFlags::NoValidConversion;
+    }
+
+    if (color != nullptr)
+        *color = tmp;
+
+    return PropertyFlags::Success;
+}
+
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyUuid(const QDomElement &e, const QString& attribute_name, QUuid* uuid) {
+    QString attr;
+
+    if (!attribute(e, attribute_name, uuidS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    if (QUuid(attr).isNull()){
+        qDebug() << "\t\t\t" << "Tagname: " << e.tagName() << ". " << "No valid Conversion: " << attribute_name << ". type: " << uuidS << ". value: " << attr;
+        return PropertyFlags::NoValidConversion;
+    }
+
+
+    if (uuid != nullptr)
+        *uuid = QUuid(attr);
+
+    return PropertyFlags::Success;
+}
+
+PropertiesInterface::PropertyFlags PropertiesInterface::propertyString(const QDomElement& e, const QString& attribute_name, QString* string) {
+
+    QString attr;
+    if (!attribute(e, attribute_name, stringS, &attr)) {
+        return PropertyFlags::NotFound;
+    }
+
+    // verifie la validite de l'attribut
+    if (string != nullptr)
+        *string = attr;
+
+    return PropertyFlags::Success;
+}
+
+/*!
+ * \brief PropertiesInterface::validXmlProperty
+ * Check if the Xml element contains the needed fields
+ * \param e Xml Property
+ * \return True if name, type, value attribute are available, else false
+ */
+bool PropertiesInterface::validXmlProperty(const QDomElement& e) {
+    if (!e.hasAttribute("name"))
+        return false;
+
+    if (!e.hasAttribute("type"))
+        return false;
+
+    if (!e.hasAttribute("value"))
+        return false;
+
+    return true;
+}
+
+/**
+    Permet de convertir une chaine de caracteres ("n", "s", "e" ou "w")
+    en orientation. Si la chaine fait plusieurs caracteres, seul le
+    premier est pris en compte. En cas d'incoherence, Qet::North est
+    retourne.
+    @param s Chaine de caractere cense representer une orientation
+    @return l'orientation designee par la chaine de caractere
+*/
+Qet::Orientation PropertiesInterface::orientationFromString(const QString &s) {
+    QChar c = s[0];
+    // in some cases/ old projects? (affuteuse_250h.qet) numbers instead of characters are
+    // used for the orientation
+    if (c == 'e' || c == '1') return(Qet::East);
+    else if (c == 's' || c == '2') return(Qet::South);
+    else if (c == 'w' || c == '3') return (Qet::West);
+    else return(Qet::North); // c == '0'
+}
+
+/**
+    @param o une orientation
+    @return une chaine de caractere representant l'orientation
+*/
+QString PropertiesInterface::orientationToString(Qet::Orientation o) {
+    QString ret;
+    switch(o) {
+        case Qet::North: ret = "n"; break;
+        case Qet::East : ret = "e"; break;
+        case Qet::South: ret = "s"; break;
+        case Qet::West : ret = "w"; break;
+    }
+    return(ret);
+}

sources/properties/propertiesinterface.h

@@ -20,7 +20,11 @@
 
 #include <QString>
 #include <QSettings>
+#include <QColor>
 #include <QDomElement>
+#include <limits>
+#include "qet.h"
+#include <QUuid>
 
 /**
  * @brief The PropertiesInterface class
@@ -30,13 +34,65 @@ class PropertiesInterface
 {
 	public:
 	PropertiesInterface();
-	virtual ~PropertiesInterface();
 	// Save/load properties to setting file. QString is use for prefix a word befor the name of each paramètre
-	virtual void toSettings	  (QSettings &settings, const QString = QString()) const =0;
+    virtual void toSettings	  (QSettings &settings, const QString& = QString()) const {Q_UNUSED(settings)};
-	virtual void fromSettings (const QSettings &settings, const QString = QString()) =0;
+    virtual void fromSettings (const QSettings &settings, const QString& = QString()) {Q_UNUSED(settings)};
 	// Save/load properties to xml element
     virtual QDomElement toXml		  (QDomDocument &xml_document) const =0;
     virtual bool fromXml	  (const QDomElement &xml_element) =0;
+    static bool valideXml(QDomElement& element);
+
+    /*!
+     * Use this functions to add properties to the xml document
+     */
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const QString value);
+    static QDomElement createXmlProperty(QDomDocument &doc, const QString& name, const char* value);
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const int value);
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const double value);
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const bool value);
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const QUuid value);
+    static QDomElement createXmlProperty(QDomDocument& doc, const QString& name, const QColor value);
+
+    static QDomElement property(const QDomElement& e, const QString& name);
+    static bool attribute(const QDomElement& e, const QString& attribute_name, const QString& type, QString* attr);
+
+    enum PropertyFlags {
+        Success = 0,
+        NotFound = 1,
+        NoValidConversion = 2,
+        // = 4
+    };
+
+    /*!
+     * Try not using the default Value feature. It is better to initialize the class members in the class definition!
+     */
+    static PropertyFlags propertyInteger(const QDomElement &e, const QString& attribute_name, int *entier = nullptr);
+    static PropertyFlags propertyDouble(const QDomElement &e, const QString& attribute_name, double *reel = nullptr);
+    static PropertyFlags propertyString(const QDomElement& e, const QString& attribute_name, QString* string = nullptr);
+    static PropertyFlags propertyBool(const QDomElement &e, const QString& attribute_name, bool* boolean = nullptr);
+    static PropertyFlags propertyUuid(const QDomElement &e, const QString& attribute_name, QUuid* uuid = nullptr);
+    static PropertyFlags propertyColor(const QDomElement &e, const QString& attribute_name, QColor* color = nullptr);
+
+
+    static bool validXmlProperty(const QDomElement& e);
+
+    QVariant XmlProperty(const QDomElement& element);
+
+    /**
+        Permet de convertir une chaine de caracteres ("n", "s", "e" ou "w")
+        en orientation. Si la chaine fait plusieurs caracteres, seul le
+        premier est pris en compte. En cas d'incoherence, Qet::North est
+        retourne.
+        @param s Chaine de caractere cense representer une orientation
+        @return l'orientation designee par la chaine de caractere
+    */
+    static Qet::Orientation orientationFromString(const QString &s);
+
+    /**
+        @param o une orientation
+        @return une chaine de caractere representant l'orientation
+    */
+    static QString orientationToString(Qet::Orientation o);
 };
 
 #endif // PROPERTIESINTERFACE_H

sources/properties/terminaldata.cpp

@@ -28,60 +28,81 @@ void TerminalData::setParent(QGraphicsObject* parent)
     q = parent;
 }
 
-void TerminalData::toSettings(QSettings &settings, const QString) const
+void TerminalData::toSettings(QSettings& settings, const QString&) const
 
 {
 	Q_UNUSED(settings);
 }
 
-void TerminalData::fromSettings(const QSettings &settings, const QString)
+void TerminalData::fromSettings(const QSettings& settings, const QString&)
 {
 	Q_UNUSED(settings);
 }
 
 QDomElement TerminalData::toXml(QDomDocument &xml_document) const
 {
-    QDomElement xml_element = xml_document.createElement("terminal");
+    QDomElement xml_element = xml_document.createElement("terminaldata");
-
-    // ecrit la position de la borne
-    xml_element.setAttribute("x", QString("%1").arg(q->scenePos().x()));
-    xml_element.setAttribute("y", QString("%1").arg(q->scenePos().y()));
 
 
-    xml_element.setAttribute("uuid", m_uuid.toString());
+    // m_pos cannot be stored, because in the partterminal it will not be updated.
-    xml_element.setAttribute("name", m_name);
+    // In PartTerminal m_pos is the position of the dock, in Terminal m_pos is the second side of the terminal
-
+    // This is hold for legacy compability reason
-    // ecrit l'orientation de la borne
+    xml_element.appendChild(createXmlProperty(xml_document, "x", m_pos.x()));
-    xml_element.setAttribute("orientation", Qet::orientationToString(m_orientation));
+    xml_element.appendChild(createXmlProperty(xml_document, "y", m_pos.y()));
-    // Write name and number to XML
+    xml_element.appendChild(createXmlProperty(xml_document, "name", m_name));
+    xml_element.appendChild(createXmlProperty(xml_document, "orientation", orientationToString(m_orientation)));
 
     return(xml_element);
 }
-bool TerminalData::fromXml (const QDomElement &xml_element)
+
+bool TerminalData::fromXml (const QDomElement &xml_element) // RETURNS True
 {
     // lit la position de la borne
     qreal term_x = 0.0, term_y = 0.0;
-    if (!QET::attributeIsAReal(xml_element, "x", &term_x))
+
+    if (propertyDouble(xml_element, "x", &term_x))
         return false;
 
-    if (!QET::attributeIsAReal(xml_element, "y", &term_y))
+    if (propertyDouble(xml_element, "y", &term_y))
         return false;
 
     m_pos = QPointF(term_x, term_y);
 
 //    emit posFromXML(QPointF(term_x, term_y));
 
-    QString uuid = xml_element.attribute("uuid");
+    // do not write uuid from this class, because only PartTerminal::fromXml need
-    // update part and add uuid, which is used in the new version to connect terminals together
+    // to write it to xml file. Terminal::fromXml does not need.
-    // if the attribute not exists, means, the element is created with an older version of qet. So use the legacy approach
-    // to identify terminals
-    if (!uuid.isEmpty())
-        m_uuid = QUuid(uuid);
 
-    m_name = xml_element.attribute("name");
+
+    //if (propertyString(xml_element, "name", &m_name))
+    //    return false;
+    propertyString(xml_element, "name", &m_name); // some parts do not have a name. Example: affuteuse_250h.qet, Terminal at x="0" y="-20"
+
+    QString o;
+    if (propertyString(xml_element, "orientation", &o))
+        return false;
 
     // lit l'orientation de la borne
-    m_orientation = Qet::orientationFromString(xml_element.attribute("orientation"));
+    m_orientation = orientationFromString(o);
 
     return true;
 }
+
+bool TerminalData::valideXml(const QDomElement& xml_element) {
+    if (propertyDouble(xml_element, "x"))
+        return false;
+
+    if (propertyDouble(xml_element, "y"))
+        return false;
+
+      // legacy elements do not have an uuid
+//    if (propertyUuid(xml_element, "uuid"))
+//        return false;
+
+    //if (propertyString(xml_element, "name")) // some parts do not have a name. Example: affuteuse_250h.qet, Terminal at x="0" y="-20"
+    //    return false;
+
+    if (propertyString(xml_element, "orientation"))
+        return false;
+    return true;
+}

sources/properties/terminaldata.h

@@ -28,13 +28,15 @@ public:
     void setParent(QGraphicsObject* parent);
 
     // Save/load properties to setting file. QString is use for prefix a word befor the name of each paramètre
-    void toSettings(QSettings &settings, const QString = QString()) const override;
+    void toSettings(QSettings &settings, const QString& = QString()) const override;
-    void fromSettings(const QSettings &settings, const QString = QString()) override;
+    void fromSettings(const QSettings &settings, const QString& = QString()) override;
     // Save/load properties to xml element
     // This method is only called from the PartTerminal and should never called from the Terminal class
     QDomElement toXml(QDomDocument &xml_element) const override;
     bool fromXml(const QDomElement &xml_element) override;
 
+    static bool valideXml(const QDomElement &xml_element);
+
     // must be public, because this class is a private member of PartTerminal/Terminal and they must
     // access this data
 public:
@@ -42,12 +44,12 @@ public:
      * \brief m_orientation
      * Orientation of the terminal
      */
-    Qet::Orientation m_orientation;
+    Qet::Orientation m_orientation{Qet::Orientation::North};
     /*!
      * \brief second_point
      * Position of the second point of the terminal in scene coordinates
      */
-    QPointF second_point;
+    QPointF second_point{0,0};
     /*!
      * \brief m_uuid
      * Uuid of the terminal.
@@ -58,7 +60,7 @@ public:
      * uuid, the conductor after updating the part is anymore valid. So if in the loaded document a uuid exists,
      * use this one and don't create a new one.
      */
-    QUuid m_uuid;
+    QUuid m_uuid; // default is an invalid uuid.
     /*!
      * \brief m_name
      * Name of the element. It can be used to create wiring harness tables
@@ -71,7 +73,7 @@ public:
      * Important: this variable is only updated during read from xml and not during mouse move!
      * It is used to store the initial position so that PartTerminal and Terminal have access to it.
      */
-    QPointF m_pos;
+    QPointF m_pos{0,0};
 private:
     QGraphicsObject* q{nullptr};
 };

sources/properties/xrefproperties.cpp

@@ -25,14 +25,6 @@
  */
 XRefProperties::XRefProperties()
 {
-	m_show_power_ctc = true;
-	m_display = Cross;
-	m_snap_to = Bottom;
-	m_prefix_keys << "power" << "delay" << "switch";
-	m_master_label = "%f-%l%c";
-	m_slave_label = "(%f-%l%c)";
-	m_offset = 0;
-	m_xref_pos = Qt::AlignBottom;
 }
 
 /**
@@ -41,7 +33,7 @@ XRefProperties::XRefProperties()
  * @param settings: QSettings to use
  * @param prefix: prefix before properties name
  */
-void XRefProperties::toSettings(QSettings &settings, const QString prefix) const {
+void XRefProperties::toSettings(QSettings &settings, const QString &prefix) const {
 	settings.setValue(prefix + "showpowerctc", m_show_power_ctc);
 	QString display = m_display == Cross? "cross" : "contacts";
 	settings.setValue(prefix + "displayhas", display);
@@ -69,7 +61,7 @@ void XRefProperties::toSettings(QSettings &settings, const QString prefix) const
  * @param settings: QSettings to use
  * @param prefix: prefix before properties name
  */
-void XRefProperties::fromSettings(const QSettings &settings, const QString prefix)
+void XRefProperties::fromSettings(const QSettings &settings, const QString &prefix)
 {
 	m_show_power_ctc = settings.value(prefix + "showpowerctc", true).toBool();
 	QString display = settings.value(prefix + "displayhas", "cross").toString();
@@ -96,58 +88,60 @@ void XRefProperties::fromSettings(const QSettings &settings, const QString prefi
 QDomElement XRefProperties::toXml(QDomDocument &xml_document) const {
 
     QDomElement xml_element = xml_document.createElement("xref");
-    xml_element.setAttribute("type", m_key);
 
-    xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
+    xml_element.appendChild(createXmlProperty(xml_document, "type", m_key));
-	QString display = m_display == Cross? "cross" : "contacts";
+    xml_element.appendChild(createXmlProperty(xml_document, "showpowerctc", m_show_power_ctc));
-	xml_element.setAttribute("displayhas", display);
+    xml_element.appendChild(createXmlProperty(xml_document, "displayhas", m_display == Cross? "cross" : "contacts"));
-	QString snap = m_snap_to == Bottom? "bottom" : "label";
+    xml_element.appendChild(createXmlProperty(xml_document, "snapto", m_snap_to == Bottom? "bottom" : "label"));
-	xml_element.setAttribute("snapto", snap);
 
-	QString xrefpos;
 
     QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
-	xml_element.setAttribute("xrefpos",  var.valueToKey(m_xref_pos));
+    xml_element.appendChild(createXmlProperty(xml_document, "xrefpos", var.valueToKey(m_xref_pos)));
+    xml_element.appendChild(createXmlProperty(xml_document, "offset", m_offset));
+    xml_element.appendChild(createXmlProperty(xml_document, "master_label", m_master_label));
+    xml_element.appendChild(createXmlProperty(xml_document, "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()) {
-		xml_element.setAttribute(key + "prefix", m_prefix.value(key));
+        xml_element.appendChild(createXmlProperty(xml_document, key + "prefix", m_prefix.value(key)));
 	}
 
     return xml_element;
 }
 
-/**
+/** RETURNS True
  * @brief XRefProperties::fromXml
  * Load from xml
  * @param xml_element: QDomElement to use for load
  */
 bool XRefProperties::fromXml(const QDomElement &xml_element) {
-	m_show_power_ctc = xml_element.attribute("showpowerctc")  == "true";
+
-	QString display = xml_element.attribute("displayhas", "cross");
+    if (propertyBool(xml_element, "showpowerctc", &m_show_power_ctc))
+        return false;
+
+    QString display;
+    if (propertyString(xml_element, "displayhas", &display) != PropertyFlags::NotFound) {
         display == "cross"? m_display = Cross : m_display = Contacts;
-	QString snap = xml_element.attribute("snapto", "label");
+    }
+
+
+    QString snap;
+    if (propertyString(xml_element, "snapto", &snap)  != PropertyFlags::NotFound) {
         snap == "bottom"? m_snap_to = Bottom : m_snap_to = Label;
+    }
 
-	QString xrefpos = xml_element.attribute("xrefpos","Left");
+    QString xrefpos;
-
+    if (propertyString(xml_element, "xrefpos", &xrefpos) != PropertyFlags::NotFound) {
         QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
-
+        m_xref_pos = Qt::AlignmentFlag(var.keyToValue(xrefpos.toStdString().data()));
-	if(xml_element.hasAttribute("xrefpos"))
+    }
-		m_xref_pos = Qt::AlignmentFlag(var.keyToValue(xml_element.attribute("xrefpos").toStdString().data()));
+    // TODO: why it compiles without this true??
-	else
+    propertyInteger(xml_element, "offset", &m_offset);
-		m_xref_pos = Qt::AlignBottom;
+    propertyString(xml_element, "master_label", &m_master_label);
-
+    propertyString(xml_element, "slave_label", &m_slave_label);
-	m_offset = xml_element.attribute("offset", "0").toInt();
+    QString value;
-	m_master_label = xml_element.attribute("master_label", "%f-%l%c");
-	m_slave_label = xml_element.attribute("slave_label","(%f-%l%c)");
 	foreach (QString key, m_prefix_keys) {
-		m_prefix.insert(key, xml_element.attribute(key + "prefix"));
+        if (!propertyString(xml_element, key + "prefix", &value));
+            m_prefix.insert(key, value);
 	}
     return true;
 }

sources/properties/xrefproperties.h

@@ -40,8 +40,8 @@ class XRefProperties : public PropertiesInterface
 		Label
 	};
 
-	void toSettings	  (QSettings &settings, const QString = QString()) const override;
+    void toSettings	  (QSettings &settings, const QString& = QString()) const override;
-	void fromSettings (const QSettings &settings, const QString = QString()) override;
+    void fromSettings (const QSettings &settings, const QString& = QString()) override;
     QDomElement toXml		  (QDomDocument &xml_document) const override;
     bool fromXml(const QDomElement &xml_element) override;
 
@@ -76,15 +76,15 @@ class XRefProperties : public PropertiesInterface
     void setKey(QString& key) {m_key = key;}
 
 	private:
-	bool m_show_power_ctc;
+    bool m_show_power_ctc{true};
-	DisplayHas m_display;
+    DisplayHas m_display{Cross};
-	SnapTo m_snap_to;
+    SnapTo m_snap_to{Bottom};
-	Qt::AlignmentFlag m_xref_pos;
+    Qt::AlignmentFlag m_xref_pos{Qt::AlignBottom};
 	QHash <QString, QString> m_prefix;
-	QStringList m_prefix_keys;
+    QStringList m_prefix_keys{"power","delay","switch"};
-	QString m_master_label;
+    QString m_master_label{"%f-%l%c"};
-	QString m_slave_label;
+    QString m_slave_label{"(%f-%l%c)"};
-	int     m_offset;
+    int     m_offset{0};
     QString m_key;
 };
 

sources/qet.cpp

@@ -25,37 +25,6 @@
 #include <QSaveFile>
 #include <QTextStream>
 
-/**
-	Permet de convertir une chaine de caracteres ("n", "s", "e" ou "w")
-	en orientation. Si la chaine fait plusieurs caracteres, seul le
-	premier est pris en compte. En cas d'incoherence, Qet::North est
-	retourne.
-	@param s Chaine de caractere cense representer une orientation
-	@return l'orientation designee par la chaine de caractere
-*/
-Qet::Orientation Qet::orientationFromString(const QString &s) {
-	QChar c = s[0];
-	if (c == 'e') return(Qet::East);
-	else if (c == 's') return(Qet::South);
-	else if (c == 'w') return (Qet::West);
-	else return(Qet::North);
-}
-
-/**
-	@param o une orientation
-	@return une chaine de caractere representant l'orientation
-*/
-QString Qet::orientationToString(Qet::Orientation o) {
-	QString ret;
-	switch(o) {
-		case Qet::North: ret = "n"; break;
-		case Qet::East : ret = "e"; break;
-		case Qet::South: ret = "s"; break;
-		case Qet::West : ret = "w"; break;
-	}
-	return(ret);
-}
-
 /**
 	Indique si deux orientations de Borne sont sur le meme axe (Vertical / Horizontal).
 	@param a La premiere orientation de Borne

sources/qetgraphicsitem/conductor.cpp

@@ -76,14 +76,7 @@ class ConductorXmlRetroCompatibility
  */
 Conductor::Conductor(Terminal *p1, Terminal* p2) :
 	terminal1(p1),
-	terminal2(p2),
+    terminal2(p2)
-	m_mouse_over(false),
-	m_text_item(nullptr),
-	segments(nullptr),
-	m_moving_segment(false),
-	modified_path(false),
-	has_to_save_profile(false),
-	must_highlight_(Conductor::None)
 {
 		//set Zvalue at 11 to be upper than the DiagramImageItem and element
 	setZValue(11);
@@ -573,36 +566,16 @@ ConductorTextItem *Conductor::textItem() const {
 	@return true si l'element XML represente bien un Conducteur ; false sinon
 */
 bool Conductor::valideXml(QDomElement &e){
-	// verifie le nom du tag
-	if (e.tagName() != "conductor") return(false);
 
-	// verifie la presence des attributs minimaux
+//    // TODO: seems to short! (see fromXML)
-	if (!e.hasAttribute("terminal1")) return(false);
+//    if (propertyDouble(e, "x") ||
-	if (!e.hasAttribute("terminal2")) return(false);
+//        propertyDouble(e, "y"))
+//        return false;
 
-	bool conv_ok;
+//    if (propertyBool(e, "freezeLabel"))
-	// parse l'abscisse
+//        return false;
-	if (e.hasAttribute("element1")) {
-		if (QUuid(e.attribute("element1")).isNull())
-			return false;
-		if (QUuid(e.attribute("terminal1")).isNull())
-			return false;
-	} else {
-		e.attribute("terminal1").toInt(&conv_ok);
-		if (!conv_ok) return(false);
-	}
 
-	// parse l'ordonnee
+    return true;
-	if (e.hasAttribute("element2")) {
-		if (QUuid(e.attribute("element2")).isNull())
-			return false;
-		if (QUuid(e.attribute("terminal2")).isNull())
-			return false;
-	} else {
-		e.attribute("terminal2").toInt(&conv_ok);
-		if (!conv_ok) return(false);
-	}
-	return(true);
 }
 
 /**
@@ -973,10 +946,13 @@ void Conductor::pointsToSegments(const QList<QPointF>& points_list) {
  * @param e
  * @return true is loading success else return false
  */
-bool Conductor::fromXml(QDomElement &dom_element)
+bool Conductor::fromXml(const QDomElement &dom_element)
 {
-	setPos(dom_element.attribute("x", nullptr).toDouble(),
+    // TODO: seems to short!
-		   dom_element.attribute("y", nullptr).toDouble());
+    double x=0, y=0;
+    propertyDouble(dom_element, "x", &x);
+    propertyDouble(dom_element, "y", &y);
+    setPos(x, y);
 
 	bool return_ = pathFromXml(dom_element);
 
@@ -990,44 +966,46 @@ bool Conductor::fromXml(QDomElement &dom_element)
 	else
 		m_autoNum_seq.fromXml(dom_element.firstChildElement("sequentialNumbers"));
 
-	m_freeze_label = dom_element.attribute("freezeLabel") == "true"? true : false;
+    propertyBool(dom_element, "freezeLabel", &m_freeze_label);
-
 	setProperties(pr);
 
 	return return_;
 }
 
-/**
+// does not support legacy method
-	Exporte les caracteristiques du conducteur sous forme d'une element XML.
+// dom_element.setAttribute("terminal1", table_adr_id.value(terminal1));
-	@param d Le document XML a utiliser pour creer l'element XML
+QDomElement Conductor::toXml(QDomDocument & doc) const {
-	@param table_adr_id Hash stockant les correspondances entre les ids des
+    QDomElement dom_element = doc.createElement("conductor");
-	bornes dans le document XML et leur adresse en memoire
-	@return Un element XML representant le conducteur
-*/
-QDomElement Conductor::toXml(QDomDocument &dom_document, QHash<Terminal *, int> &table_adr_id) const
-{
-	QDomElement dom_element = dom_document.createElement("conductor");
 
-	dom_element.setAttribute("x", QString::number(pos().x()));
+    dom_element.appendChild(createXmlProperty(doc, "x", pos().x()));
-	dom_element.setAttribute("y", QString::number(pos().y()));
+    dom_element.appendChild(createXmlProperty(doc, "y", pos().y()));
 
     // Terminal is uniquely identified by the uuid of the terminal and the element
-    if (terminal1->uuid().isNull()) {
+    QUuid terminal = terminal1->uuid();
-        // legacy method to identify the terminal
+    QUuid terminalParent = terminal1->parentElement()->uuid();
-        dom_element.setAttribute("terminal1", table_adr_id.value(terminal1)); // for backward compability
+    if (terminalParent.isNull() || terminal.isNull()) {
+        // 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
+        dom_element.appendChild(createXmlProperty(doc, "terminal1", terminal1->ID()));
     } else {
-        dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
+        dom_element.appendChild(createXmlProperty(doc, "element1", terminalParent));
-        dom_element.setAttribute("terminal1", terminal1->uuid().toString());
+        dom_element.appendChild(createXmlProperty(doc, "terminal1", terminal));
     }
 
-    if (terminal2->uuid().isNull()) {
+    terminal = terminal2->uuid();
-        // legacy method to identify the terminal
+    terminalParent = terminal2->parentElement()->uuid();
-        dom_element.setAttribute("terminal2", table_adr_id.value(terminal2)); // for backward compability
+    if (terminalParent.isNull() || terminal.isNull()) {
+        // 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
+        dom_element.appendChild(createXmlProperty(doc, "terminal2", terminal2->ID()));
     } else {
-        dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
+        dom_element.appendChild(createXmlProperty(doc, "element2", terminal2->parentElement()->uuid()));
-        dom_element.setAttribute("terminal2", terminal2->uuid().toString());
+        dom_element.appendChild(createXmlProperty(doc, "terminal2", terminal2->uuid()));
     }
-	dom_element.setAttribute("freezeLabel", m_freeze_label? "true" : "false");
+
+    dom_element.appendChild(createXmlProperty(doc, "freezeLabel", m_freeze_label));
 
     // on n'exporte les segments du conducteur que si ceux-ci ont
     // ete modifies par l'utilisateur
@@ -1037,29 +1015,91 @@ QDomElement Conductor::toXml(QDomDocument &dom_document, QHash<Terminal *, int>
         QDomElement current_segment;
         foreach(ConductorSegment *segment, segmentsList())
         {
-			current_segment = dom_document.createElement("segment");
+            current_segment = doc.createElement("segment");
-			current_segment.setAttribute("orientation", segment -> isHorizontal() ? "horizontal" : "vertical");
+            current_segment.appendChild(createXmlProperty(doc, "orientation", segment->isHorizontal() ? "horizontal": "vertical"));
-			current_segment.setAttribute("length", QString("%1").arg(segment -> length()));
+            current_segment.appendChild(createXmlProperty(doc, "length", segment -> length()));
             dom_element.appendChild(current_segment);
         }
     }
 
-	QDomElement dom_seq = m_autoNum_seq.toXml(dom_document);
+    QDomElement dom_seq = m_autoNum_seq.toXml(doc); // swquentialNumbers tag
     dom_element.appendChild(dom_seq);
 
         // Export the properties and text
-	m_properties. toXml(dom_element);
+    QDomElement conductorProperties = m_properties.toXml(doc);
-	if(m_text_item->wasMovedByUser())
+    for (int i=0; i < conductorProperties.childNodes().count(); i++) {
-	{
+        QDomNode node = conductorProperties.childNodes().at(i).cloneNode(); // cloneNode() is important!
-		dom_element.setAttribute("userx", QString::number(m_text_item->pos().x()));
+        dom_element.appendChild(node);
-		dom_element.setAttribute("usery", QString::number(m_text_item->pos().y()));
     }
-	if(m_text_item->wasRotateByUser())
+
-		dom_element.setAttribute("rotation", QString::number(m_text_item->rotation()));
+    m_text_item->toXml(doc, dom_element);
 
     return(dom_element);
 }
 
+/**
+	Exporte les caracteristiques du conducteur sous forme d'une element XML.
+	@param d Le document XML a utiliser pour creer l'element XML
+	@param table_adr_id Hash stockant les correspondances entre les ids des
+	bornes dans le document XML et leur adresse en memoire
+	@return Un element XML representant le conducteur
+*/
+//QDomElement Conductor::toXml(QDomDocument &dom_document, QHash<Terminal *, int> &table_adr_id) const
+//{
+//	QDomElement dom_element = dom_document.createElement("conductor");
+
+//	dom_element.setAttribute("x", QString::number(pos().x()));
+//	dom_element.setAttribute("y", QString::number(pos().y()));
+
+//    // Terminal is uniquely identified by the uuid of the terminal and the element
+//    if (terminal1->uuid().isNull()) {
+//        // legacy method to identify the terminal
+//        dom_element.setAttribute("terminal1", table_adr_id.value(terminal1)); // for backward compability
+//    } else {
+//        dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
+//        dom_element.setAttribute("terminal1", terminal1->uuid().toString());
+//    }
+
+//    if (terminal2->uuid().isNull()) {
+//        // legacy method to identify the terminal
+//        dom_element.setAttribute("terminal2", table_adr_id.value(terminal2)); // for backward compability
+//    } else {
+//        dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
+//        dom_element.setAttribute("terminal2", terminal2->uuid().toString());
+//    }
+//	dom_element.setAttribute("freezeLabel", m_freeze_label? "true" : "false");
+	
+//	// on n'exporte les segments du conducteur que si ceux-ci ont
+//	// ete modifies par l'utilisateur
+//	if (modified_path)
+//	{
+//		// parcours et export des segments
+//		QDomElement current_segment;
+//		foreach(ConductorSegment *segment, segmentsList())
+//		{
+//			current_segment = dom_document.createElement("segment");
+//			current_segment.setAttribute("orientation", segment -> isHorizontal() ? "horizontal" : "vertical");
+//			current_segment.setAttribute("length", QString("%1").arg(segment -> length()));
+//			dom_element.appendChild(current_segment);
+//		}
+//	}
+
+//	QDomElement dom_seq = m_autoNum_seq.toXml(dom_document);
+//	dom_element.appendChild(dom_seq);
+	
+//		// Export the properties and text
+//    m_properties.toXml(dom_document);
+//	if(m_text_item->wasMovedByUser())
+//	{
+//		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())
+//		dom_element.setAttribute("rotation", QString::number(m_text_item->rotation()));
+
+//	return(dom_element);
+//}
+
 /**
  * @brief Conductor::pathFromXml
  * Generate the path (of the line) from xml file by checking the segments in the xml
@@ -1077,14 +1117,21 @@ bool Conductor::pathFromXml(const QDomElement &e) {
 		if (current_segment.isNull() || current_segment.tagName() != "segment") continue;
 
 		// le segment doit avoir une longueur
-		if (!current_segment.hasAttribute("length")) continue;
+        qreal segment_length;
+        if (propertyDouble(current_segment, "length", & segment_length))
+            continue;
 
-		// cette longueur doit etre un reel
+        bool isHorizontal = false;
-		bool ok;
+        QString orientation;
-		qreal segment_length = current_segment.attribute("length").toDouble(&ok);
+        if (propertyString(current_segment, "orientation", &orientation) == PropertyFlags::Success) {
-		if (!ok) continue;
+            if (orientation == "horizontal")
+                isHorizontal = true;
+        } else {
+            qDebug() << "PathFromXML failed";
+            return false;
+        }
 
-		if (current_segment.attribute("orientation") == "horizontal") {
+        if (isHorizontal) {
 			segments_x << segment_length;
 			segments_y << 0.0;
 		} else {

sources/qetgraphicsitem/conductor.h

@@ -19,6 +19,7 @@
 #define CONDUCTOR_H
 
 #include "conductorproperties.h"
+#include "propertiesinterface.h"
 #include <QGraphicsPathItem>
 #include "assignvariables.h"
 
@@ -39,7 +40,7 @@ typedef QHash<Qt::Corner, ConductorProfile> ConductorProfilesGroup;
 	This class represents a conductor, i.e. a wire between two element
 	terminals.
 */
-class Conductor : public QGraphicsObject
+class Conductor : public QGraphicsObject, public PropertiesInterface
 {
 	Q_OBJECT
 
@@ -95,8 +96,9 @@ class Conductor : public QGraphicsObject
 
 	public:
 		static bool valideXml (QDomElement &);
-		bool        fromXml   (QDomElement &);
+        bool        fromXml   (const QDomElement &) override;
-		QDomElement toXml     (QDomDocument &, QHash<Terminal *, int> &) const;
+        //QDomElement toXml     (QDomDocument &, QHash<Terminal *, int> &) const;
+        QDomElement toXml     (QDomDocument &doc) const override;
 	private:
 		bool pathFromXml(const QDomElement &);
 
@@ -154,28 +156,28 @@ class Conductor : public QGraphicsObject
 		
 		QVector<QetGraphicsHandlerItem *> m_handler_vector;
 		int m_vector_index = -1;
-		bool m_mouse_over;
+        bool m_mouse_over{false};
 			/// Functional properties
 		ConductorProperties m_properties;
 			/// Text input for non simple, non-singleline conductors
-		ConductorTextItem *m_text_item;
+        ConductorTextItem *m_text_item{nullptr};
 			/// Segments composing the conductor
-		ConductorSegment *segments;
+        ConductorSegment *segments{nullptr};
 			/// Attributs related to mouse interaction
-		bool m_moving_segment;
+        bool m_moving_segment{false};
 		int moved_point;
 		qreal m_previous_z_value;
 		ConductorSegment *m_moved_segment;
 		QPointF before_mov_text_pos_;
 			/// Whether the conductor was manually modified by users
-		bool modified_path;
+        bool modified_path{false};
 			/// Whether the current profile should be saved as soon as possible
-		bool has_to_save_profile;
+        bool has_to_save_profile{false};
 			/// conductor profile: "photography" of what the conductor is supposed to look
 			/// like - there is one profile per kind of traject
 		ConductorProfilesGroup conductor_profiles;
 			/// Define whether and how the conductor should be highlighted
-		Highlight must_highlight_;
+        Highlight must_highlight_{Conductor::None};
 		bool m_valid;
 		bool m_freeze_label = false;
 

sources/qetgraphicsitem/conductortextitem.cpp

@@ -27,9 +27,7 @@
 */
 ConductorTextItem::ConductorTextItem(Conductor *parent_conductor) :
 	DiagramTextItem(parent_conductor),
-	parent_conductor_(parent_conductor),
+    parent_conductor_(parent_conductor)
-	moved_by_user_(false),
-	rotate_by_user_(false)
 {
 	setAcceptHoverEvents(true);
 }
@@ -61,19 +59,34 @@ Conductor *ConductorTextItem::parentConductor() const {
 	return(parent_conductor_);
 }
 
+void ConductorTextItem::toXml(QDomDocument& doc, QDomElement& e) {
+    if(moved_by_user_)
+    {
+        e.appendChild(PropertiesInterface::createXmlProperty(doc, "userx", pos().x()));
+        e.appendChild(PropertiesInterface::createXmlProperty(doc, "usery", pos().y()));
+    }
+    if(rotate_by_user_)
+        e.appendChild(PropertiesInterface::createXmlProperty(doc, "rotation", rotation()));
+}
+
+
 /**
  * @brief ConductorTextItem::fromXml
  * Read the properties stored in the xml element given in parameter
  * @param e
  */
 void ConductorTextItem::fromXml(const QDomElement &e) {
-	if (e.hasAttribute("userx")) {
+
-		setPos(e.attribute("userx").toDouble(),
+    double userx=0, usery=0;
-			   e.attribute("usery").toDouble());
+    if (PropertiesInterface::propertyDouble(e, "userx", &userx) == PropertiesInterface::PropertyFlags::Success &&
+        PropertiesInterface::propertyDouble(e, "usery", &usery) == PropertiesInterface::PropertyFlags::Success) {
+        setPos(userx, usery);
         moved_by_user_ = true;
     }
-	if (e.hasAttribute("rotation")) {
+
-		setRotation(e.attribute("rotation").toDouble());
+    double rotation;
+    if (PropertiesInterface::propertyDouble(e, "rotation", &rotation) == PropertiesInterface::PropertyFlags::Success) {
+        setRotation(rotation);
         rotate_by_user_ = true;
     }
 }

sources/qetgraphicsitem/conductortextitem.h

@@ -42,6 +42,7 @@ class ConductorTextItem : public DiagramTextItem
         enum { Type = UserType + 1006 };
         Conductor *parentConductor() const;
         void fromXml(const QDomElement &) override;
+        void toXml(QDomDocument& doc, QDomElement& e);
         int type() const override { return Type; }
         virtual bool wasMovedByUser() const;
         virtual bool wasRotateByUser() const;
@@ -61,8 +62,8 @@ class ConductorTextItem : public DiagramTextItem
         // attributes
 	private:
         Conductor *parent_conductor_;
-        bool moved_by_user_;
+        bool moved_by_user_{false};
-        bool rotate_by_user_;
+        bool rotate_by_user_{false};
         QPointF before_mov_pos_;
 };
 #endif

sources/qetgraphicsitem/diagramtextitem.cpp

@@ -20,6 +20,8 @@
 #include "qetapp.h"
 #include "richtext/richtexteditor_p.h"
 #include "diagram.h"
+#include "dynamicelementtextitem.h"
+
 
 /**
  * @brief DiagramTextItem::DiagramTextItem
@@ -211,12 +213,24 @@ QRectF DiagramTextItem::frameRect() const
 
 void DiagramTextItem::setHtml(const QString &text)
 {
+    DynamicElementTextItem* abc = dynamic_cast<DynamicElementTextItem*>(this);
+    if (abc) {
+        if (abc->searchedElement) {
+            int stop = 1;
+        }
+    }
 	QGraphicsTextItem::setHtml(text);
 	m_is_html = true;
 }
 
 void DiagramTextItem::setPlainText(const QString &text)
 {
+    DynamicElementTextItem* abc = dynamic_cast<DynamicElementTextItem*>(this);
+    if (abc) {
+        if (abc->searchedElement) {
+            int stop = 1;
+        }
+    }
 	QGraphicsTextItem::setPlainText(text);
 	m_is_html = false;
 }
@@ -235,6 +249,16 @@ bool DiagramTextItem::isHtml() const {
  */
 void DiagramTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
+
+    DynamicElementTextItem* abc = dynamic_cast<DynamicElementTextItem*>(this);
+    if (abc) {
+        if (abc->searchedElement) {
+            int stop = 1;
+            QString text = toPlainText();
+            qDebug() << text;
+        }
+    }
+
 	painter -> setRenderHint(QPainter::Antialiasing, false);
 	QGraphicsTextItem::paint(painter, option, widget);
 

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -212,7 +212,7 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt)
 		setColor(QColor(dom_color.text()));
 	
 		//Force the update of the displayed text
-	setTextFrom(m_text_from);
+    setTextFrom(m_text_from); // TODO: does not update because there is a retrun inside if the textfrom argument is the same as m_text_from
 	
 	QGraphicsTextItem::setPos(dom_elmt.attribute("x", QString::number(0)).toDouble(),
 							  dom_elmt.attribute("y", QString::number(0)).toDouble());
@@ -323,6 +323,9 @@ DynamicElementTextItem::TextFrom DynamicElementTextItem::textFrom() const {
  */
 void DynamicElementTextItem::setTextFrom(DynamicElementTextItem::TextFrom text_from)
 {
+
+    if (searchedElement)
+        int stop = true;
 	if(m_text_from == text_from)
 		return;
 
@@ -386,6 +389,9 @@ QString DynamicElementTextItem::text() const {
  */
 void DynamicElementTextItem::setText(const QString &text)
 {
+    if (m_text == "14" && text == "")
+        int a = 54;
+    m_text_old = m_text;
 	m_text = text;
 	if(m_text_from == DynamicElementTextItem::UserText)
 		setPlainText(m_text);
@@ -402,6 +408,9 @@ void DynamicElementTextItem::setInfoName(const QString &info_name)
 	QString old_info_name = m_info_name;
 	m_info_name = info_name;
 
+    if (searchedElement)
+        int stop = true;
+
 	
 	if(old_info_name == "label")
 	{
@@ -1321,6 +1330,17 @@ void DynamicElementTextItem::updateXref()
 
 void DynamicElementTextItem::setPlainText(const QString &text)
 {
+    DynamicElementTextItem* abc = this;
+
+    int abcedwer;
+    abcedwer += 5;
+
+    if (text == "14")
+        searchedElement = true;
+    if (text == "")
+        int a = 5;
+    if (m_text_old == "14" && m_text == "")
+        int a = 5;
 	if (toPlainText() == text)
 		return;
 

sources/qetgraphicsitem/dynamicelementtextitem.h

@@ -103,6 +103,7 @@ class DynamicElementTextItem : public DiagramTextItem
 		void setPlainText(const QString &text);
 		void setTextWidth(qreal width);
 		void setXref_item(Qt::AlignmentFlag m_exHrefPos);
+        bool searchedElement{false};
 		
 	protected:
 		void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
@@ -141,6 +142,7 @@ class DynamicElementTextItem : public DiagramTextItem
 						   m_other_report;
 		QPointer <Conductor> m_watched_conductor;
 		QString m_text,
+                m_text_old,
 				m_info_name,
 				m_composite_text,
 				m_report_formula,
@@ -150,7 +152,7 @@ class DynamicElementTextItem : public DiagramTextItem
 		QMetaObject::Connection m_report_formula_con;
 		QList<QMetaObject::Connection> m_formula_connection,
 									   m_update_slave_Xref_connection;
-		QColor m_user_color;
+        QColor m_user_color{QColor()};
 		bool m_frame = false,
 			 m_first_scene_change = true;
 		CrossRefItem *m_Xref_item = nullptr;

sources/qetgraphicsitem/element.cpp

@@ -65,6 +65,7 @@ class ElementXmlRetroCompatibility
 
 /**
  * @brief Element::Element
+ * New element from xml
  * @param location, location of this element
  * @param parent, parent graphics item
  * @param state, state of the instanciation
@@ -83,7 +84,8 @@ Element::Element(const ElementsLocation &location, QGraphicsItem *parent, int *s
 		}
 	}
 	int elmt_state;
-	buildFromXml(location.xml(), &elmt_state);
+    qDebug() << "\tCollection Path: " << location.collectionPath();
+    buildFromXml(location.xml(), &elmt_state); // build from the collection definition
 	if (state) {
 		*state = elmt_state;
 	}
@@ -336,7 +338,7 @@ void Element::drawHighlight(QPainter *painter, const QStyleOptionGraphicsItem *o
 
 /**
  * @brief Element::buildFromXml
- * Build this element from an xml description
+ * Build this element from an xml description (from the collection)
  * @param xml_def_elmt
  * @param state
  * Optional pointer which define the status of build
@@ -417,7 +419,8 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 		if (elmts.tagName() == "description")
 		{
 				//Minor workaround to find if there is a "input" tagg as label.
-				//If not, we set the tagg "label" to the first "input.
+                //If not, we set the tagg "label" to the first "input. Why one must have a tagg label?
+                // is label a required field?
 			QList <QDomElement> input_field;
 			bool have_label = false;
 			for (QDomElement input_node = node.firstChildElement("input") ; !input_node.isNull() ; input_node = input_node.nextSiblingElement("input"))
@@ -439,11 +442,15 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 				if (qde.isNull())
 					continue;
 
-				if (parseElement(qde)) {
+                qDebug() << "\t\tElement.cpp:buildFromXml;parseElement: " << qde.tagName();
+				
+                if (parseElement(qde)) { // TODO: why lines are not parsed here?
+                    qDebug() << "\t\t\tParsing Element success";
 					++ parsed_elements_count;
 				}
 				else
 				{
+                    qDebug() << "\t\t\tParsing Element no success";
 					if (state)
 						*state = 7;
 					m_state = QET::GIOK;
@@ -467,14 +474,12 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 		m_state = QET::GIOK;
 		return(false);
 	}
-	else
+
-	{
     if (state)
         *state = 0;
     m_state = QET::GIOK;
     return(true);
 }
-}
 
 /**
  * @brief Element::parseElement
@@ -570,13 +575,11 @@ DynamicElementTextItem *Element::parseDynamicText(const QDomElement &dom_element
 Terminal *Element::parseTerminal(const QDomElement &dom_element)
 {
 
-    TerminalData* data = new TerminalData();
+    if (!Terminal::valideXml(dom_element))
-    if (!data->fromXml(dom_element)) {
-        delete data;
         return nullptr;
-    }
 	
-    Terminal *new_terminal = new Terminal(data, this);
+    Terminal *new_terminal = new Terminal(0, 0, Qet::Orientation::North, this); // does not matter which values are typed in here, because they get overwritten by the fromXML() function
+    new_terminal->fromXml(dom_element);
 	m_terminals << new_terminal;
 	
 		//Sort from top to bottom and left to rigth
@@ -588,7 +591,7 @@ Terminal *Element::parseTerminal(const QDomElement &dom_element)
 			return (a->dockConductor().y() < b->dockConductor().y());
 	});
 	
-	return(new_terminal);
+    return(new_terminal); // TODO: makes not sense
 }
 
 /**
@@ -636,18 +639,35 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 		les bornes vont maintenant etre recensees pour associer leurs id a leur adresse reelle
 		ce recensement servira lors de la mise en place des fils
 	*/
-	QList<QDomElement> liste_terminals;
+    QList<QDomElement> liste_terminals; // terminals in the element in the diagram
 	foreach(QDomElement qde, QET::findInDomElement(e, "terminals", "terminal")) {
 		if (Terminal::valideXml(qde)) liste_terminals << qde;
 	}
 	
 	QHash<int, Terminal *> priv_id_adr;
 	int terminals_non_trouvees = 0;
-	foreach(QGraphicsItem *qgi, childItems()) {
+    // The added childs from the collection now must match with the terminals from the diagram. Iterate through
+    // all Terminals in the collection and in the diagram to link them together
+    for(QGraphicsItem *qgi: childItems()) { // TODO: Where the Terminals are added as childs?
 		if (Terminal *p = qgraphicsitem_cast<Terminal *>(qgi)) {
 			bool terminal_trouvee = false;
-			foreach(QDomElement qde, liste_terminals) {
+            for(QDomElement qde: liste_terminals) {
-				if (p -> fromXml(qde)) {
+                // The position in the collection element definition is the origin position (originPos).
+                // The position in the diagram element definition  is the position where the conductor is connected (dock position)
+                // Therefore a simple operator overloading is not possible.
+                Terminal diagramTerminal(0,0, Qet::Orientation::East);
+                diagramTerminal.fromXml(qde);
+                QPointF dockPos1 = diagramTerminal.originPos(); // position here is directly the dock_elmt_ position (stored in the diagram)
+                QPointF dockPos2 = p->dockPos();
+                if (qFuzzyCompare(dockPos1.x(), dockPos2.x()) &&
+                    qFuzzyCompare(dockPos1.y(), dockPos2.y()) &&
+                    p->orientation() == diagramTerminal.orientation()) { // check if the part in the collection is the same as in the diagram stored
+                    qDebug() << "Matching Terminal found.";
+                    // store id for legacy purpose, because when opening a old project in the collection the terminal does not have an uuid. Therefore the id must be used
+                    if (p->uuid().isNull()) {
+                        p->setID(qde.attribute("id").toInt());
+                    }
+
 					priv_id_adr.insert(qde.attribute("id").toInt(), p);
 					terminal_trouvee = true;
 					// We used to break here, because we did not expect
@@ -661,6 +681,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 	
 	if (terminals_non_trouvees > 0)
 	{
+        qDebug() << "element.cpp: Element::fromXML; Elements not found: " << terminals_non_trouvees;
 		m_state = QET::GIOK;
 		return(false);
 	} 
@@ -695,6 +716,8 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 	QString fl = e.attribute("freezeLabel", "false");
 	m_freeze_label = fl == "false"? false : true;
 
+    // TODO: why element information is not read?
+
 		//Load Sequential Values
 	if (e.hasAttribute("sequ_1") || e.hasAttribute("sequf_1") || e.hasAttribute("seqt_1") || e.hasAttribute("seqtf_1") || e.hasAttribute("seqh_1") || e.hasAttribute("sequf_1"))
 		ElementXmlRetroCompatibility::loadSequential(e, this);
@@ -726,6 +749,8 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 		//************************//
 		//***Dynamic texts item***//
         //************************//
+        // read from the diagram section
+        // this is not done in the older versions, because there only inputs are available.
 	for (const QDomElement& qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTagName()))
     {
         DynamicElementTextItem *deti = new DynamicElementTextItem(this);
@@ -737,20 +762,22 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 		//************************//
 		//***Element texts item***//
 		//************************//
-	QList<QDomElement> inputs = QET::findInDomElement(e, "inputs", "input");
+    QList<QDomElement> inputs = QET::findInDomElement(e, "inputs", "input"); // inputs in diagram section
 	
 		//First case, we check for the text item converted to dynamic text item
 	const QList <DynamicElementTextItem *> conv_deti_list = m_converted_text_from_xml_description.keys();
 	QList <DynamicElementTextItem *> successfully_converted; 
 	const QList <QDomElement> dom_inputs = inputs;
-	
+    // TODO: Legacy (0.7 and prior)
-	for (DynamicElementTextItem *deti : conv_deti_list)
+    for (DynamicElementTextItem *deti : conv_deti_list) // elements read from the element collection definition
 	{
-		for(const QDomElement& dom_input : dom_inputs)
+        for(const QDomElement& dom_input : dom_inputs) // elements in the diagram section
 		{
 				//we use the same method used in ElementTextItem::fromXml to compar and know if the input dom element is for one of the text stored.
 				//The comparaison is made from the text position : if the position of the text is the same as the position stored in 'input' dom element
 				//that mean this is the good text
+                // This is only used when in the diagram description the text elements are stored in the "inputs" section. In 0.8 and higher,
+                // texts are stored in directly in the "dynamic_elmt_text" section
 			if (qFuzzyCompare(qreal(dom_input.attribute("x").toDouble()), m_converted_text_from_xml_description.value(deti).x()) &&
 				qFuzzyCompare(qreal(dom_input.attribute("y").toDouble()), m_converted_text_from_xml_description.value(deti).y()))
 			{
@@ -1003,7 +1030,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 	methode
 	@return L'element XML representant cet element electrique
 */
-QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table_adr_id) const
+QDomElement Element::toXml(QDomDocument &document) const
 {
 	QDomElement element = document.createElement("element");
 	
@@ -1030,25 +1057,16 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
 	element.setAttribute("z", QString::number(this->zValue()));
 	element.setAttribute("orientation", QString::number(orientation()));
 	
-	/* recupere le premier id a utiliser pour les bornes de cet element */
-	int id_terminal = 0;
-	if (!table_adr_id.isEmpty()) {
-		// trouve le plus grand id
-		int max_id_t = -1;
-		foreach (int id_t, table_adr_id.values()) {
-			if (id_t > max_id_t) max_id_t = id_t;
-		}
-		id_terminal = max_id_t + 1;
-	}
-	
 	// enregistrement des bornes de l'appareil
 	QDomElement xml_terminals = document.createElement("terminals");
 	// pour chaque enfant de l'element
 	foreach(Terminal *t, terminals()) {
 		// alors on enregistre la borne
 		QDomElement terminal = t -> toXml(document);
-        terminal.setAttribute("id", id_terminal); // for backward compatibility
+        if (t->ID() > 0) {
-		table_adr_id.insert(t, id_terminal ++);
+            // for backward compatibility
+            terminal.setAttribute("id", t->ID()); // for backward compatibility
+        }
 		xml_terminals.appendChild(terminal);
 	}
 	element.appendChild(xml_terminals);

sources/qetgraphicsitem/element.h

@@ -37,7 +37,7 @@ class ElementTextItemGroup;
 /**
 	This is the base class for electrical elements.
 */
-class Element : public QetGraphicsItem
+class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 {
 	friend class DiagramEventAddElement;
 	
@@ -55,7 +55,7 @@ class Element : public QetGraphicsItem
 				   Slave = 16,
 				   Terminale = 32};
 
-		Element(const ElementsLocation &location, QGraphicsItem * = nullptr, int *state = nullptr, Element::kind link_type = Element::Simple);
+        Element(const ElementsLocation &location, QGraphicsItem * parent= nullptr, int *state = nullptr, Element::kind link_type = Element::Simple);
 		~Element() override;
 	private:
 		Element(const Element &);
@@ -113,7 +113,7 @@ class Element : public QetGraphicsItem
         void editProperty() override;
         static bool valideXml(QDomElement &);
         virtual bool fromXml(QDomElement &, QHash<int, Terminal *> &, bool = false);
-        virtual QDomElement toXml(QDomDocument &, QHash<Terminal *, int> &) const;
+        virtual QDomElement toXml(QDomDocument &) const;
         QUuid uuid() const;
         int orientation() const;
 		

sources/qetgraphicsitem/elementtextitemgroup.cpp

@@ -384,6 +384,7 @@ QDomElement ElementTextItemGroup::toXml(QDomDocument &dom_document) const
 	return dom_element;
 }
 
+// TOOD: inherit from propertiesinterface
 /**
  * @brief ElementTextItemGroup::fromXml
  * Import data of this group from xml

sources/qetgraphicsitem/elementtextitemgroup.h

@@ -32,7 +32,7 @@ class CrossRefItem;
  * This class represent a group of element text
  * Texts in the group can be aligned left / center /right
  */
-class ElementTextItemGroup : public QObject, public  QGraphicsItemGroup
+class ElementTextItemGroup : public QObject, public  QGraphicsItemGroup // TODO: derive from PropertiesInterface
 {
 	Q_OBJECT
 	
@@ -108,7 +108,7 @@ class ElementTextItemGroup : public QObject, public  QGraphicsItemGroup
 			 m_hold_to_bottom_of_page = false,
 			 m_block_alignment_update = false,
 			 m_frame = false;
-		QPointF m_initial_position;
+        QPointF m_initial_position{QPointF(0,0)};
 		int m_vertical_adjustment = 0;
 		CrossRefItem *m_Xref_item = nullptr;
 		Element *m_parent_element = nullptr;

sources/qetgraphicsitem/independenttextitem.cpp

@@ -49,6 +49,7 @@ IndependentTextItem::IndependentTextItem(const QString &text) :
 IndependentTextItem::~IndependentTextItem() {
 }
 
+// TODO: inherit from PropertiesInterface
 /**
 	Permet de lire le texte a mettre dans le champ a partir d'un element XML.
 	Cette methode se base sur la position du champ pour assigner ou non la

sources/qetgraphicsitem/qetgraphicsitem.cpp

@@ -25,10 +25,7 @@
  * @param parent, Parent Item
  */
 QetGraphicsItem::QetGraphicsItem(QGraphicsItem *parent):
-	QGraphicsObject(parent),
+    QGraphicsObject(parent)
-	is_movable_(true),
-	m_first_move(true),
-	snap_to_grid_(true)
 {}
 
 QetGraphicsItem::~QetGraphicsItem()

sources/qetgraphicsitem/qetgraphicsitem.h

@@ -53,10 +53,10 @@ class QetGraphicsItem : public QGraphicsObject
 		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
 
 	protected:
-		bool is_movable_;
+        bool is_movable_{true};
-		bool m_first_move;
+        bool m_first_move{true};
-		bool snap_to_grid_;
+        bool snap_to_grid_{true};
-		QPointF m_mouse_to_origin_movement;
+        QPointF m_mouse_to_origin_movement{QPointF(0,0)};
 		QET::GraphicsItemState m_state = QET:: GIOK;
 
 };

sources/qetgraphicsitem/qetshapeitem.cpp

@@ -830,6 +830,7 @@ void QetShapeItem::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraph
 	}
 }
 
+// TODO: inherit from Propertiesinterface!
 /**
  * @brief QetShapeItem::fromXml
  * Build this item from the xml description

sources/qetgraphicsitem/slaveelement.cpp

@@ -29,10 +29,10 @@
  * @param s parent diagram
  * @param state int used to know if the creation of element have error
  */
-SlaveElement::SlaveElement(const ElementsLocation &location, QGraphicsItem *qgi, int *state) :
+SlaveElement::SlaveElement(const ElementsLocation &location, QGraphicsItem *parent, int *state) :
-	Element(location, qgi, state, Element::Slave)
+    Element(location, parent, state, Element::Slave)
 {
-	m_xref_item = nullptr;
+
 }
 
 /**

sources/qetgraphicsitem/slaveelement.h

@@ -25,14 +25,14 @@ class SlaveElement : public Element
 {
 	Q_OBJECT
 	public:
-		explicit SlaveElement (const ElementsLocation &, QGraphicsItem * = nullptr, int * = nullptr);
+        explicit SlaveElement (const ElementsLocation &, QGraphicsItem * parent= nullptr, int * = nullptr);
 		~SlaveElement() override;
 		void linkToElement(Element *elmt) override;
 		void unlinkAllElements() override;
 		void unlinkElement(Element *elmt) override;
 	
 	private:
-		QGraphicsTextItem *m_xref_item;
+        QGraphicsTextItem *m_xref_item{nullptr};
 };
 
 #endif // SLAVEELEMENT_H

sources/qetgraphicsitem/terminal.cpp

@@ -30,7 +30,7 @@ QColor Terminal::neutralColor      = QColor(Qt::blue);
 QColor Terminal::allowedColor      = QColor(Qt::darkGreen);
 QColor Terminal::warningColor      = QColor("#ff8000");
 QColor Terminal::forbiddenColor    = QColor(Qt::red);
-const qreal Terminal::terminalSize = 4.0;
+const qreal Terminal::terminalSize = 4.0; // TODO: store terminalSize in terminaldata, because in PartTerminal there is the same parameter. So only one is needed
 const qreal Terminal::Z = 1000;
 
 /**
@@ -42,8 +42,6 @@ const qreal Terminal::Z = 1000;
 */
 void Terminal::init(QString number, QString name, bool hiddenName) {
 	
-	hovered_color_  = Terminal::neutralColor;
-	
 	// calcul de la position du point d'amarrage a l'element
 	dock_elmt_ = d->m_pos;
 	switch(d->m_orientation) {
@@ -56,17 +54,15 @@ void Terminal::init(QString number, QString name, bool hiddenName) {
 	// Number of terminal
 	number_terminal_ = std::move(number);
 	// Name of terminal
-	name_terminal_ = std::move(name);
+    d->m_name = std::move(name);
 	name_terminal_hidden = hiddenName;
 	// par defaut : pas de conducteur
 	
 	// QRectF null
 	br_ = new QRectF();
-	previous_terminal_ = nullptr;
 	// divers
 	setAcceptHoverEvents(true);
 	setAcceptedMouseButtons(Qt::LeftButton);
-	hovered_ = false;
 	setToolTip(QObject::tr("Borne", "tooltip"));
 	setZValue(Z);
 }
@@ -197,10 +193,18 @@ void Terminal::setNumber(QString number) {
 	@param name
 */
 void Terminal::setName(QString name, bool hiddenName) {
-	name_terminal_ = std::move(name);
+    d->m_name = std::move(name);
 	name_terminal_hidden = hiddenName;
 }
 
+/**
+    @brief Terminal::name
+    @return the name of terminal.
+*/
+inline QString Terminal::name() const {
+    return(d->m_name);
+}
+
 /**
 	@brief Terminal::addConductor
 	Add a conductor to this terminal
@@ -702,6 +706,10 @@ bool Terminal::canBeLinkedTo(Terminal *other_terminal)
 	return true;
 }
 
+void Terminal::setID(int id) {
+    m_id = id;
+}
+
 /**
 	@brief Terminal::conductors
 	@return La liste des conducteurs lies a cette borne
@@ -719,15 +727,24 @@ QList<Conductor *> Terminal::conductors() const {
 QDomElement Terminal::toXml(QDomDocument &doc) const {
 	QDomElement qdo = doc.createElement("terminal");
 
-	// for backward compatibility
+    qdo.appendChild(createXmlProperty(doc, "number", number_terminal_));
-	qdo.setAttribute("x", QString("%1").arg(dock_elmt_.x()));
+    qdo.appendChild(createXmlProperty(doc, "nameHidden", name_terminal_hidden));
-	qdo.setAttribute("y",  QString("%1").arg(dock_elmt_.y()));
+
-	// end for backward compatibility
+    // store terminal data too!
+
+    // Do not store terminal data in its own child
+    // 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_;
+    QDomElement terminalDataElement = d->toXml(doc);
+    d->m_pos = tempPos;
+
+    int childsCount = terminalDataElement.childNodes().count();
+    for (int i=0; i < childsCount; i++) {
+        QDomNode node = terminalDataElement.childNodes().at(i).cloneNode(); // cloneNode() is important, otherwise no deep clone is made
+        qdo.appendChild(node);
+    }
 
-	qdo.setAttribute("orientation", d->m_orientation);
-	qdo.setAttribute("number", number_terminal_);
-	qdo.setAttribute("name", name_terminal_);
-	qdo.setAttribute("nameHidden", name_terminal_hidden);
 	return(qdo);
 }
 
@@ -737,41 +754,24 @@ QDomElement Terminal::toXml(QDomDocument &doc) const {
 	@param terminal Le QDomElement a analyser
 	@return true si le QDomElement passe en parametre est une borne, false sinon
 */
-bool Terminal::valideXml(QDomElement &terminal) {
+bool Terminal::valideXml(const QDomElement &terminal) {
-	// verifie le nom du tag
 	if (terminal.tagName() != "terminal") return(false);
 
-	// verifie la presence des attributs minimaux
+// affuteuse_250h.qet contains in line 8398 terminals which do not have this
-	if (!terminal.hasAttribute("x")) return(false);
+//    if (propertyString(terminal, "number"))
-	if (!terminal.hasAttribute("y")) return(false);
+//        return false;
-	if (!terminal.hasAttribute("orientation")) return(false);
+// affuteuse_250h.qet contains in line 8398 terminals which do not have this
+//    if (propertyBool(terminal, "nameHidden"))
+//        return false;
 
-	bool conv_ok;
+    if (!TerminalData::valideXml(terminal))
-	// parse l'abscisse
+        return false;
-	terminal.attribute("x").toDouble(&conv_ok);
-	if (!conv_ok) return(false);
-	
-	// parse l'ordonnee
-	terminal.attribute("y").toDouble(&conv_ok);
-	if (!conv_ok) return(false);
-	
-	// parse l'id
-	terminal.attribute("id").toInt(&conv_ok);
-	if (!conv_ok) return(false);
-	
-	// parse l'orientation
-	int terminal_or = terminal.attribute("orientation").toInt(&conv_ok);
-	if (!conv_ok) return(false);
-	if (terminal_or != Qet::North
-			&& terminal_or != Qet::South
-			&& terminal_or != Qet::East
-			&& terminal_or != Qet::West) return(false);
 	
     // a ce stade, la borne est syntaxiquement correcte
-	return(true);
+    return true;
 }
 
-/**
+/** RETURNS True
 	@brief Terminal::fromXml
 	Permet de savoir si un element XML represente cette borne. Attention,
 	l'element XML n'est pas verifie
@@ -779,16 +779,17 @@ bool Terminal::valideXml(QDomElement &terminal) {
 	@return true si la borne "se reconnait"
 	(memes coordonnes, meme orientation), false sinon
 */
-bool Terminal::fromXml(QDomElement &terminal) {
+bool Terminal::fromXml(const QDomElement &terminal) {
-	number_terminal_ = terminal.attribute("number");
+    propertyString(terminal, "number", &number_terminal_);
-	name_terminal_ = terminal.attribute("name");
-	name_terminal_hidden = terminal.attribute("nameHidden").toInt();
 
-	return (
+    propertyBool(terminal, "nameHidden", &name_terminal_hidden);
-		qFuzzyCompare(terminal.attribute("x").toDouble(), dock_elmt_.x()) &&
+
-		qFuzzyCompare(terminal.attribute("y").toDouble(), dock_elmt_.y()) &&
+    if(!d->fromXml(terminal))
-		(terminal.attribute("orientation").toInt() == d->m_orientation)
+        return false;
-	);
+
+
+    init(number_terminal_, d->m_name, name_terminal_hidden); // initialize dock_elmt_. This must be done after Terminal data is initialized
+    return true;
 }
 
 /**
@@ -821,6 +822,18 @@ QUuid Terminal::uuid() const {
 	return d->m_uuid;
 }
 
+int Terminal::ID() const {
+    return m_id;
+}
+
+QPointF Terminal::dockPos() {
+    return dock_elmt_;
+}
+
+QPointF Terminal::originPos() {
+    return d->m_pos;
+}
+
 /**
 	@brief Conductor::relatedPotentialTerminal
 	Return terminal at the same potential from the same

sources/qetgraphicsitem/terminal.h

@@ -20,6 +20,8 @@
 #include <QtWidgets>
 #include <QtXml>
 #include "qet.h"
+#include "propertiesinterface.h"
+
 class Conductor;
 class Diagram;
 class Element;
@@ -31,7 +33,7 @@ class TerminalData;
 	plug point for conductors.
 	This class handles all mouse events for connecting conductors
 */
-class Terminal : public QGraphicsObject
+class Terminal : public QGraphicsObject, public PropertiesInterface
 {
 	Q_OBJECT
 
@@ -75,6 +77,9 @@ class Terminal : public QGraphicsObject
 		Diagram  *diagram             () const;
 		Element  *parentElement       () const;
 		QUuid uuid                    () const;
+        int ID() const;
+        QPointF dockPos();
+        QPointF originPos();
 	
 		QList<Conductor *> conductors() const;
 		Qet::Orientation orientation() const;
@@ -86,11 +91,12 @@ class Terminal : public QGraphicsObject
 		void updateConductor();
 		bool isLinkedTo(Terminal *);
 		bool canBeLinkedTo(Terminal *);
+        void setID(int id);
 	
 		// methods related to XML import/export
-		static bool valideXml(QDomElement  &);
+        static bool valideXml(const QDomElement  &);
-		bool fromXml (QDomElement &);
+        bool fromXml (const QDomElement &) override;
-		QDomElement toXml (QDomDocument &) const;
+        QDomElement toXml (QDomDocument &) const override;
 	
 	protected:
 		// methods related to events management
@@ -107,7 +113,8 @@ class Terminal : public QGraphicsObject
 
 		static const qreal terminalSize;
 		static const qreal Z;
-		// Various static colors used for hover effects
+        // Various static colors used for hover effects.
+        // The assignement is in the cpp file
 		/// default color
         static QColor neutralColor;
 		/// color for legal actions
@@ -138,16 +145,17 @@ class Terminal : public QGraphicsObject
 		*/
 		QRectF *br_{nullptr};
 		/// Last terminal seen through an attached conductor
-		Terminal *previous_terminal_;
+        Terminal *previous_terminal_{nullptr};
 		/// Whether the mouse pointer is hovering the terminal
-		bool hovered_;
+        bool hovered_{false};
 		/// Color used for the hover effect
-		QColor hovered_color_;
+        QColor hovered_color_{Terminal::hovered_color_};
 		/// Number of Terminal
 		QString number_terminal_;
-		/// Name of Terminal
+        bool name_terminal_hidden{true};
-		QString name_terminal_;
+
-		bool name_terminal_hidden;
+        /// legacy id used by the conductor to find the terminal. From 0.8x on the uuid is used instead.
+        int m_id{-1};
 	
 	private:
 		void init(QString number, QString name, bool hiddenName);
@@ -171,14 +179,6 @@ inline QString Terminal::number() const {
 	return(number_terminal_);
 }
 
-/**
-	@brief Terminal::name
-	@return the name of terminal.
-*/
-inline QString Terminal::name() const {
-	return(name_terminal_);
-}
-
 QList<Terminal *> relatedPotentialTerminal (const Terminal *terminal,
 					    const bool all_diagram = true);
 

sources/qetproject.cpp

@@ -1425,7 +1425,11 @@ void QETProject::readDefaultPropertiesXml(QDomDocument &xml_project)
 		{
 			XRefProperties xrp;
 			xrp.fromXml(elmt);
-			m_default_xref_properties.insert(elmt.attribute("type"), xrp);
+            QString type;
+            if (PropertiesInterface::propertyString(elmt, "type", &type) == PropertiesInterface::PropertyFlags::Success)
+                m_default_xref_properties.insert(type, xrp);
+            else
+                qDebug() << "xref Property was not added to m_default_xref_properties.";
 		}
 	}
 	if (!conds_autonums.isNull())
@@ -1483,19 +1487,13 @@ void QETProject::writeDefaultPropertiesXml(QDomElement &xml_element)
 	QDomDocument xml_document = xml_element.ownerDocument();
 	
 	// export size of border
-	QDomElement border_elmt = xml_document.createElement("border");
+    xml_element.appendChild(default_border_properties_.toXml(xml_document));
-	default_border_properties_.toXml(border_elmt);
-	xml_element.appendChild(border_elmt);
 	
 	// export content of titleblock
-	QDomElement titleblock_elmt = xml_document.createElement("inset");
+    xml_element.appendChild(default_titleblock_properties_.toXml(xml_document));
-	default_titleblock_properties_.toXml(titleblock_elmt);
-	xml_element.appendChild(titleblock_elmt);
 	
 	// exporte default conductor
-	QDomElement conductor_elmt = xml_document.createElement("conductors");
+    xml_element.appendChild(default_conductor_properties_.toXml(xml_document));
-	default_conductor_properties_.toXml(conductor_elmt);
-	xml_element.appendChild(conductor_elmt);
 
 	// export default report properties
 	QDomElement report_elmt = xml_document.createElement("report");

sources/titleblock/helpercell.cpp

@@ -23,12 +23,7 @@
 */
 HelperCell::HelperCell(QGraphicsItem *parent) :
 	QGraphicsObject(parent),
-	QGraphicsLayoutItem(),
+    QGraphicsLayoutItem()
-	background_color(Qt::white),
-	foreground_color(Qt::black),
-	label(),
-	orientation(Qt::Horizontal),
-	index(-1)
 {
 	setGraphicsItem(this);
 	setFlag(QGraphicsItem::ItemIsSelectable, false);

sources/titleblock/helpercell.h

@@ -37,11 +37,11 @@ class HelperCell : public QGraphicsObject, public QGraphicsLayoutItem {
 	
 	// attributes
 	public:
-	QColor background_color;     ///< Background color when rendering this cell
+    QColor background_color{Qt::white};     ///< Background color when rendering this cell
-	QColor foreground_color;     ///< Text color when rendering this cell
+    QColor foreground_color{Qt::black};     ///< Text color when rendering this cell
 	QString label;               ///< Label displayed in this cell
-	Qt::Orientation orientation; ///< Orientation of this cell
+    Qt::Orientation orientation{Qt::Horizontal}; ///< Orientation of this cell
-	int index;                   ///< Index of this cell
+    int index{-1};                   ///< Index of this cell
 	
 	// methods
 	public:

sources/titleblock/splittedhelpercell.h

@@ -36,6 +36,7 @@ class SplittedHelperCell : public HelperCell {
 	void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
 	
 	// attributes
+    // colors are set in the constructor
 	QColor split_background_color; ///< Background color on the split side
 	QColor split_foreground_color; ///< Text color on the split side
 	QString split_label;           ///< Text displayed on the split side

sources/titleblockproperties.cpp

@@ -23,11 +23,7 @@
 	Constructeur. Initialise un objet TitleBlockProperties avec tous les champs
 	vides (date vide + useDate a UseDateValue).
 */
-TitleBlockProperties::TitleBlockProperties() :
+TitleBlockProperties::TitleBlockProperties()
-	date(),
-	useDate(UseDateValue),
-	display_at(Qt::BottomEdge),
-	collection (QET::QetCollection::Common)
 {
 }
 
@@ -74,6 +70,7 @@ bool TitleBlockProperties::operator!=(const TitleBlockProperties &ip) {
 	@param e Element XML auquel seront ajoutes des attributs
 */
 void TitleBlockProperties::toXml(QDomElement &e) const {
+
     e.setAttribute("author",   author);
     e.setAttribute("title",    title);
     e.setAttribute("filename", filename);
@@ -98,29 +95,42 @@ void TitleBlockProperties::toXml(QDomElement &e) const {
     }
 }
 
-/**
+QDomElement TitleBlockProperties::toXml(QDomDocument &d) const {
+    Q_UNUSED(d)
+    qDebug() << "NOT IMPLEMENTED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+    return QDomElement();
+}
+
+/** RETURNS True
 	Importe le cartouche a partir des attributs XML de l'element e
 	@param e Element XML dont les attributs seront lus
 */
-void TitleBlockProperties::fromXml(const QDomElement &e) {
+bool TitleBlockProperties::fromXml(const QDomElement &e) {
+
+
     // reads the historical fields
-	if (e.hasAttribute("author"))      author   = e.attribute("author");
+    propertyString(e, "author", &author);
-	if (e.hasAttribute("title"))       title    = e.attribute("title");
+    propertyString(e, "title", &title);
-	if (e.hasAttribute("filename"))    filename = e.attribute("filename");
+    propertyString(e, "filename", &filename);
-	if (e.hasAttribute("plant"))       plant   = e.attribute("plant");
+    propertyString(e, "plant", &plant);
-	if (e.hasAttribute("locmach"))     locmach  = e.attribute("locmach");
+    propertyString(e, "locmach", &locmach);
-	if (e.hasAttribute("indexrev"))    indexrev  = e.attribute("indexrev");
+    propertyString(e, "indexrev", &indexrev);
-	if (e.hasAttribute("version"))     version   = e.attribute("version");
+    propertyString(e, "version", &version);
-	if (e.hasAttribute("folio"))       folio    = e.attribute("folio");
+    propertyString(e, "folio", &folio);
-	if (e.hasAttribute("auto_page_num")) auto_page_num = e.attribute("auto_page_num");
+    propertyString(e, "auto_page_num", &auto_page_num);
-	if (e.hasAttribute("date"))        setDateFromString(e.attribute("date"));
+    QString date;
-	if (e.hasAttribute("displayAt")) display_at = (e.attribute("displayAt") == "bottom" ? Qt::BottomEdge : Qt::RightEdge);
+    propertyString(e, "date", &date);
+    setDateFromString(date);
+
+    QString display_at_temp;
+    if (propertyString(e, "displayAt", &display_at_temp) == PropertyFlags::Success)
+        display_at = (display_at_temp == "bottom" ? Qt::BottomEdge : Qt::RightEdge); // otherwise it gets default in header file
 
     // reads the template used to render the title block
-	if (e.hasAttribute("titleblocktemplate"))
+    if (propertyString(e, "titleblocktemplate", &template_name) == PropertyFlags::Success) {
-	{
+        QString tbc;
-		template_name = e.attribute("titleblocktemplate");
+        if (propertyString(e, "titleblocktemplateCollection", &tbc) == PropertyFlags::Success)
-		collection = QET::qetCollectionFromString(e.attribute("titleblocktemplateCollection"));
+            collection = QET::qetCollectionFromString(tbc);
 	}
 	
 	// reads the additional fields used to fill the title block
@@ -128,6 +138,7 @@ void TitleBlockProperties::fromXml(const QDomElement &e) {
 	foreach (QDomElement e, QET::findInDomElement(e, "properties")) {
 		context.fromXml(e);
 	}
+    return true;
 }
 
 /**
@@ -158,7 +169,7 @@ void TitleBlockProperties::toSettings(QSettings &settings, const QString &prefix
 	@param settings Parametres a lire
 	@param prefix prefixe a ajouter devant les noms des parametres
 */
-void TitleBlockProperties::fromSettings(QSettings &settings, const QString &prefix) {
+void TitleBlockProperties::fromSettings(const QSettings &settings, const QString &prefix) {
 	title    = settings.value(prefix + "title").toString();
 	author   = settings.value(prefix + "author").toString();
 	filename = settings.value(prefix + "filename").toString();

sources/titleblockproperties.h

@@ -21,12 +21,14 @@
 #include "diagramcontext.h"
 #include "qet.h"
 
+#include "propertiesinterface.h"
+
 /**
 	This class provides a container for the properties of a particular title
 	block, i.e. title, author, date, filename, folio, template, custom
 	properties, ...
 */
-class TitleBlockProperties {
+class TitleBlockProperties: public PropertiesInterface {
 	public:
 	TitleBlockProperties();
 	virtual ~TitleBlockProperties();
@@ -39,10 +41,11 @@ class TitleBlockProperties {
 	bool operator==(const TitleBlockProperties &);
 	bool operator!=(const TitleBlockProperties &);
 	
-	void toXml(QDomElement &) const;
+    QDomElement toXml(QDomDocument &e) const override;
-	void fromXml(const QDomElement &);
+    void toXml(QDomElement &e) const;
-	void toSettings(QSettings &, const QString & = QString()) const;
+    bool fromXml(const QDomElement &) override;
-	void fromSettings(QSettings &, const QString & = QString());
+    void toSettings(QSettings &, const QString & = QString()) const override;
+    void fromSettings(const QSettings &, const QString & = QString()) override;
 
 	void setAutoPageNum(QString autonum) {auto_page_num = autonum;}
 
@@ -61,11 +64,11 @@ class TitleBlockProperties {
 	QString version;          ///< Version (displayed by the default template)
 	QString folio;            ///< Folio information (displayed by the default template)
 	QString auto_page_num;
-	DateManagement useDate;   ///< Wheter to use the date attribute
+    DateManagement useDate{UseDateValue};   ///< Wheter to use the date attribute
 	QString template_name;    ///< Name of the template used to render the title block - an empty string means "the default template provided by the application"
 	DiagramContext context;   ///< Container for the additional, user-defined fields
-	Qt::Edge display_at;       ///< Edge to display the titleblock
+    Qt::Edge display_at{Qt::Edge::BottomEdge};       ///< Edge to display the titleblock
-	QET::QetCollection collection; ///<Specify the location of the title block
+    QET::QetCollection collection{QET::QetCollection::Common}; ///<Specify the location of the title block
 
 	private:
 	QString exportDate() const;

sources/ui/dynamicelementtextmodel.cpp

@@ -1158,6 +1158,8 @@ void DynamicElementTextModel::enableGroupRotationAndPos(ElementTextItemGroup *gr
 void DynamicElementTextModel::itemDataChanged(QStandardItem *qsi)
 {
 	DynamicElementTextItem *deti = textFromItem(qsi);
+    if (deti->searchedElement)
+        int stop = 1;
 	ElementTextItemGroup *etig = groupFromItem(qsi);
 	if (!deti && !etig)
 		return;
@@ -1297,6 +1299,10 @@ void DynamicElementTextModel::setConnection(ElementTextItemGroup *group, bool se
 
 void DynamicElementTextModel::updateDataFromText(DynamicElementTextItem *deti, ValueType type)
 {
+
+    if (deti->searchedElement)
+        int stop = 1;
+
 	QStandardItem *qsi = m_texts_list.value(deti);
 	if (!qsi)
 		return;