TEST a Merge branch 'XMLProperties'

it gets built let's test it for bugs

 Conflicts:
	sources/ElementsCollection/fileelementcollectionitem.cpp
	sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
	sources/borderproperties.cpp
	sources/conductorproperties.cpp
	sources/conductorproperties.h
	sources/diagram.cpp
	sources/diagram.h
	sources/diagramprintdialog.cpp
	sources/diagramprintdialog.h
	sources/editor/graphicspart/customelementgraphicpart.cpp
	sources/editor/graphicspart/partarc.cpp
	sources/editor/graphicspart/partdynamictextfield.cpp
	sources/editor/graphicspart/partdynamictextfield.h
	sources/editor/graphicspart/partellipse.cpp
	sources/editor/graphicspart/partline.cpp
	sources/editor/graphicspart/partpolygon.cpp
	sources/editor/graphicspart/partrectangle.cpp
	sources/editor/graphicspart/partterminal.cpp
	sources/editor/graphicspart/partterminal.h
	sources/editor/graphicspart/parttext.cpp
	sources/properties/propertiesinterface.cpp
	sources/properties/propertiesinterface.h
	sources/properties/terminaldata.cpp
	sources/properties/terminaldata.h
	sources/properties/xrefproperties.cpp
	sources/properties/xrefproperties.h
	sources/qetgraphicsitem/conductor.cpp
	sources/qetgraphicsitem/conductor.h
	sources/qetgraphicsitem/conductortextitem.h
	sources/qetgraphicsitem/dynamicelementtextitem.h
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/element.h
	sources/qetgraphicsitem/elementtextitemgroup.h
	sources/qetgraphicsitem/slaveelement.cpp
	sources/qetgraphicsitem/slaveelement.h
	sources/qetgraphicsitem/terminal.cpp
	sources/qetgraphicsitem/terminal.h
	sources/qetproject.cpp
	sources/titleblockproperties.cpp

sources/ElementsCollection/fileelementcollectionitem.cpp

@@ -190,16 +190,16 @@ 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) {
-		ElementCollectionItem *eci =
-				static_cast<ElementCollectionItem*>(parent());
+	else if (parent_ && parent()->type() == FileElementCollectionItem::Type)
+	{
+		ElementCollectionItem *eci = static_cast<ElementCollectionItem*>(parent());
 		if (eci->isCollectionRoot())
 			return eci->collectionPath() + m_path;
 		else

sources/QetGraphicsItemModeler/qetgraphicshandleritem.h

@@ -50,8 +50,7 @@ class QetGraphicsHandlerItem : public QGraphicsItem
 			   QWidget *widget) override;
 
 	private:
-		QRectF m_handler_rect,
-			   m_br;
+		QRectF m_handler_rect,m_br;
 		qreal m_size;
 		QColor m_color{Qt::black};
 		QPen m_pen;

sources/borderproperties.cpp

@@ -78,15 +78,10 @@ bool BorderProperties::operator==(const BorderProperties &bp) {
 bool BorderProperties::operator!=(const BorderProperties &bp) {
 	return(!(*this == bp));
 }
-
 /**
 	@brief BorderProperties::toXml
-	Exports dimensions as XML attributes added to element e.
-	\~French Exporte les dimensions sous formes d'attributs XML ajoutes a l'element e.
-
-	\~ @param e :
-	XML element to which attributes will be added
-	\~French Element XML auquel seront ajoutes des attributs
+	@param dom_doc
+	@return
 */
 QDomElement BorderProperties::toXml(QDomDocument &dom_doc) const {
 
@@ -167,7 +162,7 @@ void BorderProperties::toSettings(QSettings &settings, const QString &prefix) co
 	\~ @param prefix : prefix to be added before the names of the parameters
 	\~French 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

@@ -41,7 +41,7 @@ class BorderProperties : public PropertiesInterface {
         bool fromXml(const QDomElement &) override;
         static bool valideXml(QDomElement& e);
         void toSettings(QSettings &, const QString & = QString()) const override;
-        void fromSettings(QSettings &, const QString & = QString()) override;
+        void fromSettings(const QSettings &, const QString & = QString()) override;
 
 		static BorderProperties defaultProperties();
 	

sources/conductorproperties.cpp

@@ -207,12 +207,12 @@ void SingleLineProperties::drawPen(QPainter *painter,
 }
 
 /**
-	Exporte les parametres du conducteur unifilaire sous formes d'attributs XML
-	ajoutes a l'element e.
-	@param e Element XML auquel seront ajoutes des attributs
+	@brief SingleLineProperties::toXml
+	@param doc
+	@return
 */
-QDomElement SingleLineProperties::toXml(QDomDocument &doc) const {
-
+QDomElement SingleLineProperties::toXml(QDomDocument &doc) const
+{
 	QDomElement e = doc.createElement("SingleLine");
 	e.appendChild(createXmlProperty(doc, "ground", hasGround));
 	e.appendChild(createXmlProperty(doc, "neutral", hasNeutral));
@@ -294,7 +294,6 @@ ConductorProperties::~ConductorProperties()
 */
 QDomElement ConductorProperties::toXml(QDomDocument& doc) const
 {
-
 	QDomElement e = doc.createElement("defaultconductor");
 
 	e.appendChild(createXmlProperty(doc, "type", typeToString(type)));
@@ -320,9 +319,7 @@ QDomElement ConductorProperties::toXml(QDomDocument& doc) const
 	e.appendChild(createXmlProperty(doc, "onetextperfolio", m_one_text_per_folio));
 	e.appendChild(createXmlProperty(doc, "onetextperfolio", verti_rotate_text));
 	e.appendChild(createXmlProperty(doc, "horizrotatetext", horiz_rotate_text));
-// TODO: implement
-//e.setAttribute("cable", m_cable);
-// e.setAttribute("bus", m_bus);
+
 	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
 	e.appendChild(createXmlProperty(doc, "horizontal-alignment", me.valueToKey(m_horizontal_alignment)));
 	e.appendChild(createXmlProperty(doc, "vertical-alignment", me.valueToKey(m_vertical_alignment)));
@@ -354,7 +351,8 @@ bool ConductorProperties::fromXml(const QDomElement &e)
 	readStyle(style_string);
 
 	QString type_t;
-	if (propertyString(e, "type", &type_t) == PropertyFlags::Success) {
+	if (propertyString(e, "type", &type_t) == PropertyFlags::Success)
+	{
 		if (type_t == typeToString(Single))
 		{
 			// get specific properties for single conductor
@@ -367,15 +365,15 @@ bool ConductorProperties::fromXml(const QDomElement &e)
 			//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 TODO_LIST
+#pragma message("@TODO remove this code for qet 0.6 or later")
+#endif
 			if (type_t == "simple") m_show_text = false;
 		}
 	}
 
 	propertyString(e, "num", &text);
-	// TODO: implement:
-	//m_cable			  = e.attribute("cable");
-	//m_bus				= e.attribute("bus");
+
 	// get text color
 	propertyColor(e, "text_color", &text_color);
 	propertyString(e, "formula", &m_formula);
@@ -401,7 +399,13 @@ bool ConductorProperties::fromXml(const QDomElement &e)
 	return true;
 }
 
-bool ConductorProperties::valideXml(QDomElement& e) {
+/**
+	@brief ConductorProperties::valideXml
+	@param e
+	@return
+*/
+bool ConductorProperties::valideXml(QDomElement& e)
+{
 	if (propertyColor(e, "color") ||
 		propertyBool(e, "bicolor") ||
 		propertyColor(e, "color2") ||
@@ -441,8 +445,8 @@ void ConductorProperties::toSettings(QSettings &settings, const QString &prefix)
 	settings.setValue(prefix + "text", text);
 	settings.setValue(prefix + "text_color", text_color.name());
 	settings.setValue(prefix + "formula", m_formula);
-	settings.setValue(prefix + "cable", m_cable);
-	settings.setValue(prefix + "bus", m_bus);
+	//settings.setValue(prefix + "cable", m_cable);
+	//settings.setValue(prefix + "bus", m_bus);
 	settings.setValue(prefix + "function", m_function);
 	settings.setValue(prefix + "tension_protocol", m_tension_protocol);
 	settings.setValue(prefix + "conductor_color", m_wire_color);
@@ -465,7 +469,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));
@@ -485,8 +489,8 @@ void ConductorProperties::fromSettings(QSettings &settings, const QString &prefi
 	QColor settings_text_color = QColor(settings.value(prefix + "text_color").toString());
 	text_color = (settings_text_color.isValid()? settings_text_color : QColor(Qt::black));
 	m_formula            = settings.value(prefix + "formula", "").toString();
-	m_cable			  = settings.value(prefix + "cable", "").toString();
-	m_bus				= settings.value(prefix + "bus", "").toString();
+	//m_cable              = settings.value(prefix + "cable", "").toString();
+	//m_bus                = settings.value(prefix + "bus", "").toString();
 	m_function           = settings.value(prefix + "function", "").toString();
 	m_tension_protocol   = settings.value(prefix + "tension_protocol", "").toString();
 	m_wire_color         = settings.value(prefix + "conductor_color", "").toString();
@@ -541,8 +545,8 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
 		text                 = cp.text;
 		text_color           = cp.text_color;
 		m_formula            = cp.m_formula;
-		m_cable			  = cp.m_cable;
-		m_bus				= cp.m_bus;
+		//m_cable              = cp.m_cable;
+		//m_bus                = cp.m_bus;
 		m_function           = cp.m_function;
 		m_tension_protocol   = cp.m_tension_protocol;
 		m_wire_color         = cp.m_wire_color;
@@ -644,27 +648,27 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
 		m_formula = s_value;
 	equal = true;
 
-	//cable
-	s_value = clist.first().m_cable;
-	for(ConductorProperties cp : clist)
-	{
-		if (cp.m_cable != s_value)
-			equal = false;
-	}
-	if (equal)
-		m_cable = s_value;
-	equal = true;
+//	//cable
+//	s_value = clist.first().m_cable;
+//	for(ConductorProperties cp : clist)
+//	{
+//		if (cp.m_cable != s_value)
+//			equal = false;
+//	}
+//	if (equal)
+//		m_cable = s_value;
+//	equal = true;
 
-	//bus
-	s_value = clist.first().m_bus;
-	for(ConductorProperties cp : clist)
-	{
-		if (cp.m_bus != s_value)
-			equal = false;
-	}
-	if (equal)
-		m_bus = s_value;
-	equal = true;
+//	//bus
+//	s_value = clist.first().m_bus;
+//	for(ConductorProperties cp : clist)
+//	{
+//		if (cp.m_bus != s_value)
+//			equal = false;
+//	}
+//	if (equal)
+//		m_bus = s_value;
+//	equal = true;
 
 	//function
 	s_value = clist.first().m_function;
@@ -831,8 +835,9 @@ bool ConductorProperties::operator==(const ConductorProperties &other) const
 		other.text == text &&\
 		other.text_color == text_color &&\
 		other.m_formula == m_formula &&\
-		other.m_cable == m_cable &&\
+/*		other.m_cable == m_cable &&\
 		other.m_bus == m_bus &&\
+*/
 		other.m_function == m_function &&\
 		other.m_tension_protocol == m_tension_protocol &&\
 		other.m_wire_color == m_wire_color && \
@@ -962,8 +967,9 @@ void SingleLineProperties::toSettings(QSettings &settings,
 	@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

@@ -42,14 +42,15 @@ class SingleLineProperties: public PropertiesInterface {
 	QDomElement toXml(QDomDocument& doc) const override;
 	bool fromXml(const QDomElement &) override;
 	static bool valideXml(QDomElement& element);
-	void toSettings(QSettings &, const QString & = QString()) const;
-	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{true};
 	/// Whether the singleline conductor should display the neutral symbol
 	bool hasNeutral{true};
 	/// Protective Earth Neutral: visually merge neutral and ground
+
 	bool is_pen{false};
 
 	int operator==(const SingleLineProperties &) const;
@@ -81,7 +82,6 @@ class ConductorProperties: public PropertiesInterface
 			*/
 		enum ConductorType { Single, Multi };
 
-
 			//Attributes
 		ConductorType type{ConductorType::Single};
 
@@ -90,21 +90,17 @@ class ConductorProperties: public PropertiesInterface
 				m_color_2{QColor(Qt::black)},
 				text_color{QColor(Qt::black)};
 
-		QString
-		text,
+		QString text,
 				m_function,
 				m_tension_protocol,
 				m_wire_color,
 				m_wire_section,
-		m_formula,
-		m_bus,
-		m_cable;
+				m_formula;
 
 		int text_size{9},
 			m_dash_size = 1;
 
-            double
-        cond_size{1},
+			double  cond_size{1},
 				verti_rotate_text,
 				horiz_rotate_text;
 
@@ -112,8 +108,7 @@ class ConductorProperties: public PropertiesInterface
 				 m_one_text_per_folio{true},
 				m_bicolor = false;
 
-		Qt::Alignment 
-		m_horizontal_alignment = Qt::AlignBottom,        
+		Qt::Alignment m_horizontal_alignment = Qt::AlignBottom,
 					  m_vertical_alignment = Qt::AlignRight;
 
 		Qt::PenStyle style{Qt::PenStyle::SolidLine};
@@ -125,7 +120,7 @@ class ConductorProperties: public PropertiesInterface
 		bool fromXml(const QDomElement &) override;
 		static bool valideXml(QDomElement& element);
 		void toSettings(QSettings &, const QString & = QString()) const override;
-        void fromSettings(QSettings &, const QString & = QString()) override;
+		void fromSettings(const QSettings &, const QString & = QString()) override;
 		static QString typeToString(ConductorType);
 		void applyForEqualAttributes(QList<ConductorProperties> list);
 

sources/diagram.cpp

@@ -734,19 +734,20 @@ QDomDocument Diagram::toXml(bool whole_content) {
 
 	// schema properties
 	// proprietes du schema
-	if (whole_content) {
+	if (whole_content)
+	{
 		// TODO: compare with old version
 		border_and_titleblock.titleBlockToXml(dom_root);
 		border_and_titleblock.borderToXml(dom_root);
 
 		// Default conductor properties
 		dom_root.appendChild(defaultConductorProperties.toXml(document));
-				document.createElement("defaultconductor");
 
 		// Conductor autonum
-		if (!m_conductors_autonum_name.isEmpty()) {
-			dom_root.setAttribute("conductorAutonum",
-						  m_conductors_autonum_name);
+		if (!m_conductors_autonum_name.isEmpty())
+		{
+			dom_root.setAttribute(
+						"conductorAutonum",m_conductors_autonum_name);
 		}
 
 		//Default New Element
@@ -913,12 +914,12 @@ QDomDocument Diagram::toXml(bool whole_content) {
 		}
 	}
 
-	// correspondence table between the addresses of the terminals and their ids
 		// table de correspondance entre les adresses des bornes et leurs ids
 
 	if (!list_elements.isEmpty()) {
 		auto dom_elements = document.createElement("elements");
-		for (auto elmt : list_elements) {
+		for (auto elmt : list_elements)
+		{
 			dom_elements.appendChild(elmt->toXml(document));
 		}
 		dom_root.appendChild(dom_elements);
@@ -926,7 +927,8 @@ QDomDocument Diagram::toXml(bool whole_content) {
 
 	if (!list_conductors.isEmpty()) {
 		auto dom_conductors = document.createElement("conductors");
-		for (auto cond : list_conductors) {
+		for (auto cond : list_conductors)
+		{
 			dom_conductors.appendChild(cond->toXml(document));
 		}
 		dom_root.appendChild(dom_conductors);
@@ -1082,25 +1084,28 @@ bool Diagram::initFromXml(QDomElement &document,
 
 /**
 	@brief findTerminal
-	Find terminal to which the conductor should be connected
-	@param conductor_index 1 or 2 depending on which terminal is searched
-	@param f Conductor xml element
-	@param table_adr_id Hash table to all terminal id assignement (legacy)
-	@param added_elements Elements found in the xml file
+	@param conductor_index
+	@param conductor
+	@param table_adr_id
+	@param added_elements
 	@return
 */
-Terminal* findTerminal(int conductor_index,
+Terminal* findTerminal(
+			int conductor_index,
 			QDomElement& conductor,
-			   QHash<int,
-			   Terminal *>& table_adr_id,
-			   QList<Element *>& added_elements) {
+			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);
 
 	QUuid element_uuid;
-	if (PropertiesInterface::propertyUuid(conductor, element_index, &element_uuid) == PropertiesInterface::PropertyFlags::Success) {
+	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;
@@ -1109,7 +1114,8 @@ Terminal* findTerminal(int conductor_index,
 				continue;
 			element_found = true;
 			QUuid terminal_uuid;
-			PropertiesInterface::propertyUuid(conductor, terminal_index, &terminal_uuid);
+			PropertiesInterface::propertyUuid(
+						conductor, terminal_index, &terminal_uuid);
 			for (auto terminal: element->terminals()) {
 				if (terminal->uuid() != terminal_uuid)
 					continue;
@@ -1135,7 +1141,11 @@ Terminal* findTerminal(int conductor_index,
 	} else {
 		// Backward compatibility. Until version 0.7 a generated id is used to link the terminal.
 	int id_p1 = -1;
-		if (PropertiesInterface::propertyInteger(conductor, terminal_index, &id_p1) != PropertiesInterface::PropertyFlags::Success) {
+		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)) {
@@ -1151,39 +1161,18 @@ Terminal* findTerminal(int conductor_index,
 
 /**
 	@brief Diagram::fromXml
-	Imports the described schema in an XML element. If a position is
-	specified, the imported elements are positioned in such a way that the
-	upper left corner of the smallest rectangle that can surround them all
-	(the bounding rect) either at this position.
-	\~French Importe le schema decrit dans un element XML.
-	Si une position est precisee,
-	les elements importes sont positionnes de maniere a ce que le
-	coin superieur gauche du plus petit rectangle pouvant les entourant tous
-	(le bounding rect) soit a cette position.
-	\~ @param document :
-	The XML document to analyze
-	\~French Le document XML a analyser
-	\~ @param position :
-	The position of the diagram matters
-	\~French La position du schema importe
-	\~ @param consider_informations :
-	If true, additional information
-	(author, title, ...) will be taken into account
-	\~French Si vrai, les informations complementaires
-	(auteur, titre, ...) seront prises en compte
-	\~ @param content_ptr :
-	if this pointer to a DiagramContent is different from 0,
-	it will be filled with the content added to the schema by the fromXml
-	\~French si ce pointeur vers un DiagramContent est different de 0,
-	il sera rempli avec le contenu ajoute au schema par le fromXml
-	\~ @return
-	true if the import was successful, false otherwise
-	\~French true si l'import a reussi, false sinon
+	@param document
+	@param position
+	@param consider_informations
+	@param content_ptr
+	@return
 */
-bool Diagram::fromXml(QDomElement &document,
+bool Diagram::fromXml(
+			QDomElement &document,
 			QPointF position,
 			bool consider_informations,
-			  DiagramContent *content_ptr) {
+			DiagramContent *content_ptr)
+{
 	const QDomElement& root = document;
 	// The first element must be a diagram
 	if (root.tagName() != "diagram") return(false);
@@ -1191,8 +1180,14 @@ bool Diagram::fromXml(QDomElement &document,
 	qDebug() << "Diagram::fromXml; Diagram: " << root.attribute("title");
 
 	// Read attributes of this diagram
-	if (consider_informations)
-	{
+	if (consider_informations) {
+		// Version of diagram
+		bool conv_ok;
+		qreal version_value = root.attribute("version").toDouble(&conv_ok);
+		if (conv_ok) {
+			diagram_qet_version_ = version_value;
+		}
+
 		// Load border and titleblock
 		border_and_titleblock.titleBlockFromXml(root);
 		border_and_titleblock.borderFromXml(root);
@@ -1287,11 +1282,11 @@ bool Diagram::fromXml(QDomElement &document,
 			}
 		}
 	}
-		//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"))
+			 QET::findInDomElement(root, "elements", "element")) // read all elements from the diagram
 	{
 		if (!Element::valideXml(element_xml)) continue;
 
@@ -1306,9 +1301,9 @@ bool Diagram::fromXml(QDomElement &document,
 		}
 
 		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 =
@@ -1322,8 +1317,9 @@ bool Diagram::fromXml(QDomElement &document,
 		}
 
 		addItem(nvel_elmt);
+
 			//Loading fail, remove item from the diagram
-		if (!nvel_elmt->fromXml(element_xml, table_adr_id))
+		if (!nvel_elmt->fromXml(element_xml, table_adr_id)) // load element definition from the diagram
 		{
 			removeItem(nvel_elmt);
 			delete nvel_elmt;
@@ -1369,24 +1365,24 @@ bool Diagram::fromXml(QDomElement &document,
 
 		// 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* p2 = findTerminal(2, f, table_adr_id, added_elements);
+		Terminal* p1 = findTerminal(1, conductorElement, table_adr_id, added_elements);
+		Terminal* p2 = findTerminal(2, conductorElement, table_adr_id, added_elements);
 
-		if (p1 && p2 && p1 != p2)// TODO: why the condition for unequal is required?
+		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
@@ -1532,7 +1528,7 @@ void Diagram::refreshContents()
 
 /**
 	@brief Diagram::addItem
-	R??implemented from QGraphicsScene::addItem(QGraphicsItem *item)
+	Réimplemented from QGraphicsScene::addItem(QGraphicsItem *item)
 	Do some specific operation if item need it (for exemple an element)
 	@param item
 */

sources/diagram.h

@@ -168,31 +168,20 @@ class Diagram : public QGraphicsScene
 
 		// methods related to XML import/export
 		QDomDocument toXml(bool = true);
-		bool initFromXml(QDomElement &,
-				 QPointF = QPointF(),
-				 bool = true,
-				 DiagramContent * = nullptr);
-		bool fromXml(QDomDocument &,
-				 QPointF = QPointF(),
-				 bool = true,
-				 DiagramContent * = nullptr);
-		bool fromXml(QDomElement &,
-				 QPointF = QPointF(),
-				 bool = true,
-				 DiagramContent * = nullptr);
-		void folioSequentialsToXml(QHash<QString,
-					   QStringList>*,
-					   QDomElement *,
-					   const QString&,
-					   const QString&,
-					   QDomDocument *);
-		void folioSequentialsFromXml(const QDomElement&,
-						 QHash<QString,
-						 QStringList>*,
-						 const QString&,
-						 const QString&,
-						 const QString&,
-						 const QString&);
+		bool initFromXml(QDomElement &, QPointF = QPointF(),
+				bool = true, DiagramContent * = nullptr);
+		bool fromXml(
+				QDomDocument &, QPointF = QPointF(),
+				bool = true, DiagramContent * = nullptr);
+		bool fromXml(
+				QDomElement &, QPointF = QPointF(),
+				bool = true, DiagramContent * = nullptr);
+		void folioSequentialsToXml(
+				QHash<QString, QStringList>*, QDomElement *, const QString&,
+				const QString&, QDomDocument *);
+		void folioSequentialsFromXml(
+				const QDomElement&, QHash<QString,QStringList>*, const QString&,
+				const QString&, const QString&,const QString&);
 
 		void refreshContents();
 
@@ -282,8 +271,6 @@ class Diagram : public QGraphicsScene
 		/// from the diagram within elements collection
 		void findElementRequired(const ElementsLocation &);
 
-		/// Signal emitted when users wish to edit an element from the diagram
-		void editElementRequired(const ElementsLocation &);
 		void diagramActivated();
 };
 Q_DECLARE_METATYPE(Diagram *)

sources/diagramcontext.cpp

@@ -209,15 +209,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) {
-	int size = settings.beginReadArray(array_name);
+void DiagramContext::fromSettings(const QSettings &settings, const QString &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/editor/graphicspart/customelementgraphicpart.cpp

@@ -161,7 +161,8 @@ 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(QDomDocument &xml_document, QDomElement &qde) const
+void CustomElementGraphicPart::stylesToXml(
+		QDomDocument &xml_document, QDomElement &qde) const
 {
 	QString css_like_styles;
 
@@ -512,19 +513,15 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 
 	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
 #if TODO_LIST
 #pragma message("@TODO remove code for QT 5.14 or later")
 #endif
 	QStringList styles = qde.attribute("style").split(";", Qt::SkipEmptyParts);
 #endif
-
-
-	
 		//Check each pair of style
 	QRegularExpression rx("^\\s*([a-z-]+)\\s*:\\s*([a-zA-Z-]+)\\s*$");
 	foreach (QString style, styles)
@@ -1330,7 +1327,7 @@ void CustomElementGraphicPart::mouseReleaseEvent(QGraphicsSceneMouseEvent *event
 	if((event->button() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable) && m_origin_pos != pos())
 	{
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "pos", QVariant(m_origin_pos), QVariant(pos()));
-		undo->setText(tr("D??placer une primitive"));
+		undo->setText(tr("Déplacer une primitive"));
 		undo->enableAnimation();
 		elementScene()->undoStack().push(undo);
 	}

sources/editor/graphicspart/partarc.cpp

@@ -97,10 +97,10 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
 }
 
 /**
-	@brief PartArc::toXml
-	Export this arc in xml
-	@param xml_document : Xml document to use for create the xml element.
-	@return : an xml element that describe this arc
+ * @brief PartArc::toXml
+ * Export this arc in xml
+ * @param xml_document : Xml document to use for create the xml element.
+ * @return : an xml element that describe this arc
  */
 QDomElement PartArc::toXml(QDomDocument &xml_document) const
 	{
@@ -122,9 +122,9 @@ QDomElement PartArc::toXml(QDomDocument &xml_document) const
 }
 
 /**
-	@brief PartArc::fromXml
-	Import the properties of this arc from a xml element.
-	@param qde : Xml document to use.
+ * @brief PartArc::fromXml
+ * Import the properties of this arc from a xml element.
+ * @param qde : Xml document to use.
  */
 bool PartArc::fromXml(const QDomElement &qde) {
 	stylesFromXml(qde);

sources/editor/graphicspart/partarc.h

@@ -54,8 +54,6 @@ class PartArc : public AbstractPartEllipse
         QDomElement toXml   (QDomDocument &) const override;
         bool fromXml (const QDomElement &) override;
         static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;

sources/editor/graphicspart/partdynamictextfield.cpp

@@ -88,9 +88,9 @@ void PartDynamicTextField::handleUserTransformation(
 }
 
 /**
-	@brief PartDynamicTextField::toXml
-	@param dom_doc
-	@return
+ * @brief PartDynamicTextField::toXml
+ * @param document
+ * @return
  */
 QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 {
@@ -106,6 +106,7 @@ QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 	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.appendChild(createXmlProperty(dom_doc, "text_from", me.valueToKey(m_text_from)));
 
@@ -127,7 +128,6 @@ QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 	QDomElement dom_text = dom_doc.createElement("text");
 	dom_text.appendChild(dom_doc.createTextNode(toPlainText()));
 	root_element.appendChild(dom_text);
-
 		//Info name
 	if(!m_info_name.isEmpty()) {
 		QDomElement dom_info_name = dom_doc.createElement("info_name");
@@ -153,8 +153,8 @@ QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 }
 
 /**
-	@brief PartDynamicTextField::fromXml
-	@param dom_elmt
+ * @brief PartDynamicTextField::fromXml
+ * @param element
  */
 bool PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 {
@@ -162,8 +162,8 @@ bool PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 		qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name";
 		return false;
 	}
-
 	double x=0, y=0, z=0, rot=0;
+
 	if (propertyDouble(dom_elmt, "x", &x) == PropertyFlags::NoValidConversion ||
 		propertyDouble(dom_elmt, "y", &y) == PropertyFlags::NoValidConversion ||
 		propertyDouble(dom_elmt, "z", &z) == PropertyFlags::NoValidConversion ||
@@ -180,7 +180,8 @@ bool PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 		QFont font_;
 		font_.fromString(font);
 		setFont(font_);
-	} else {	//Keep compatibility TODO remove in futur
+	}
+	else {
 #if TODO_LIST
 #pragma message("@TODO remove in futur")
 #endif
@@ -206,8 +207,7 @@ bool PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 	if(propertyString(dom_elmt, "Halignment", &alignment) != PropertyFlags::NotFound)
 		setAlignment(Qt::Alignment(me.keyToValue(alignment.toStdString().data())));
 	if(propertyString(dom_elmt, "Valignment", &alignment) != PropertyFlags::NotFound)
-		setAlignment(Qt::Alignment(
-			me.keyToValue(dom_elmt.attribute("Valignment").toStdString().data())) | this -> alignment());
+		setAlignment(Qt::Alignment(me.keyToValue(alignment.toStdString().data())) | this->alignment());
 
 		//Text
 	QDomElement dom_text = dom_elmt.firstChildElement("text");
@@ -498,7 +498,7 @@ void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 		m_origine_pos != pos()) {
 			QPropertyUndoCommand *undo =\
 				new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos()));
-			undo -> setText(tr("D??placer un champ texte"));
+			undo -> setText(tr("Déplacer un champ texte"));
 			undo -> enableAnimation();
 			elementScene() -> undoStack().push(undo);
 	}

sources/editor/graphicspart/partdynamictextfield.h

@@ -79,9 +79,6 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 		bool fromXml(const QDomElement &dom_elmt) override;
 		void fromTextFieldXml(const QDomElement &dom_element);
 		static bool valideXml(QDomElement& dom_elmt);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
-
 		DynamicElementTextItem::TextFrom textFrom() const;
 		void setTextFrom (DynamicElementTextItem::TextFrom text_from);
 		QString text() const;

sources/editor/graphicspart/partellipse.cpp

@@ -78,10 +78,10 @@ void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
 }
 
 /**
-	@brief PartEllipse::toXml
-	Export this ellipse in xml
-	@param xml_document : Xml document to use for create the xml element.
-	@return : an xml element that describe this ellipse
+ * @brief PartEllipse::toXml
+ * Export this ellipse in xml
+ * @param xml_document : Xml document to use for create the xml element.
+ * @return : an xml element that describe this ellipse
  */
 QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
 {
@@ -108,9 +108,9 @@ QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
 }
 
 /**
-	@brief PartEllipse::fromXml
-	Import the properties of this ellipse from a xml element.
-	@param qde : Xml document to use.
+ * @brief PartEllipse::fromXml
+ * Import the properties of this ellipse from a xml element.
+ * @param qde : Xml document to use.
  */
 bool PartEllipse::fromXml(const QDomElement &qde)
 {

sources/editor/graphicspart/partellipse.h

@@ -55,8 +55,6 @@ class PartEllipse : public  AbstractPartEllipse
         QDomElement toXml   (QDomDocument &) const override;
         bool  fromXml (const QDomElement &) override;
         static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;
 		void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();}

sources/editor/graphicspart/partline.cpp

@@ -104,10 +104,10 @@ void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
 }
 
 /**
-	@brief PartLine::toXml
-	Export this line in xml
-	@param xml_document : Xml document to use for create the xml element.
-	@return an xml element that describe this line
+ * @brief PartLine::toXml
+ * Export this line in xml
+ * @param xml_document : Xml document to use for create the xml element.
+ * @return an xml element that describe this line
  */
 QDomElement PartLine::toXml(QDomDocument &xml_document) const
 {
@@ -131,11 +131,12 @@ QDomElement PartLine::toXml(QDomDocument &xml_document) const
 }
 
 /**
-	@brief PartLine::fromXml
-	Import the properties of this line from a xml element.
-	@param qde : Xml document to use
+ * @brief PartLine::fromXml
+ * Import the properties of this line from a xml element.
+ * @param qde : Xml document to use
  */
-bool PartLine::fromXml(const QDomElement &qde) {
+bool PartLine::fromXml(const QDomElement &qde)
+{
 	stylesFromXml(qde);
 
 	double x1 = 0, y1 = 0, x2 = 0, y2 = 0;

sources/editor/graphicspart/partline.h

@@ -73,8 +73,6 @@ class PartLine : public CustomElementGraphicPart
         QDomElement toXml(QDomDocument &) const override;
         bool fromXml(const QDomElement &) override;
         bool valideXml(QDomElement& element) const;
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 		virtual QPointF sceneP1() const;
 		virtual QPointF sceneP2() const;
 		QPainterPath shape() const override;

sources/editor/graphicspart/partpolygon.cpp

@@ -85,9 +85,9 @@ void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
 }
 
 /**
-	@brief PartPolygon::fromXml
-	Import the properties of this polygon from a xml element
-	@param qde : Xml document to use
+ * @brief PartPolygon::fromXml
+ * Import the properties of this polygon from a xml element
+ * @param qde : Xml document to use
  */
 bool PartPolygon::fromXml(const QDomElement &qde)
 {
@@ -123,10 +123,10 @@ bool PartPolygon::fromXml(const QDomElement &qde)
 }
 
 /**
-	@brief PartPolygon::toXml
-	Export this polygin in xml
-	@param xml_document : Xml document to use for create the xml element
-	@return an xml element that describe this polygon
+ * @brief PartPolygon::toXml
+ * Export this polygin in xml
+ * @param xml_document : Xml document to use for create the xml element
+ * @return an xml element that describe this polygon
  */
 QDomElement PartPolygon::toXml(QDomDocument &xml_document) const
 {
@@ -540,7 +540,7 @@ void PartPolygon::insertPoint()
 	if(new_polygon != m_polygon)
 	{
 			//Wrap the undo for avoid to merge the undo commands when user add several points.
-		QUndoCommand *undo = new QUndoCommand(tr("Ajouter un point ?? un polygone"));
+		QUndoCommand *undo = new QUndoCommand(tr("Ajouter un point à un polygone"));
 		new QPropertyUndoCommand(this, "polygon", m_polygon, new_polygon, undo);
 		elementScene()->undoStack().push(undo);
 	}

sources/editor/graphicspart/partpolygon.h

@@ -64,8 +64,6 @@ class PartPolygon : public CustomElementGraphicPart
         bool fromXml(const QDomElement &) override;
         QDomElement toXml(QDomDocument &) const override;
         static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 
 
 		QPainterPath shape () const override;

sources/editor/graphicspart/partrectangle.cpp

@@ -93,7 +93,6 @@ QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
 	xml_element.appendChild(createXmlProperty(xml_document, "y", top_left.y()));
 	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;
 	if (x > rect.width()/2) {
@@ -131,10 +130,10 @@ bool PartRectangle::fromXml(const QDomElement &qde)
 	setPos(mapFromScene(x, y));
 
 	if (propertyDouble(qde, "width", &w) == PropertyFlags::NoValidConversion ||
-        propertyDouble(qde, "height", &h) == PropertyFlags::NoValidConversion)
+		propertyDouble(qde, "width", &h) == PropertyFlags::NoValidConversion)
 		return false;
 
-    QRectF rect(QPointF(0,0), QSizeF(w, h));
+	QRectF rect(QPointF(x,y), QSizeF(w, h));
 
 	setRect(rect.normalized());
 
@@ -153,7 +152,7 @@ bool PartRectangle::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, "width") & PropertyFlags::NoValidConversion) |
 		(propertyDouble(element, "rx") & PropertyFlags::NoValidConversion) |
 		(propertyDouble(element, "ry") & PropertyFlags::NoValidConversion))
 		return false;

sources/editor/graphicspart/partrectangle.h

@@ -63,8 +63,6 @@ class PartRectangle :  public CustomElementGraphicPart
         QDomElement toXml   (QDomDocument &) const override;
         bool fromXml (const QDomElement &) override;
         static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 
 		QRectF rect() const;
 		void   setRect(const QRectF &rect);

sources/editor/graphicspart/partterminal.cpp

@@ -47,6 +47,7 @@ PartTerminal::~PartTerminal()
 */
 bool PartTerminal::fromXml(const QDomElement &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
@@ -66,8 +67,8 @@ bool 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
 */
-QDomElement PartTerminal::toXml(QDomDocument &xml_document) const {
-
+QDomElement PartTerminal::toXml(QDomDocument &xml_document) const
+{
 	QDomElement qdo = xml_document.createElement("terminal");
 
 	qdo.appendChild(createXmlProperty(xml_document, "uuid", d->m_uuid));
@@ -83,7 +84,8 @@ QDomElement PartTerminal::toXml(QDomDocument &xml_document) const {
 	return qdo;
 }
 
-bool PartTerminal::valideXml(QDomElement& element) {
+bool PartTerminal::valideXml(QDomElement& element)
+{
 	return TerminalData::valideXml(element);
 }
 

sources/editor/graphicspart/partterminal.h

@@ -56,12 +56,8 @@ class PartTerminal : public CustomElementGraphicPart {
 		bool fromXml(const QDomElement &) override;
 		QDomElement toXml(QDomDocument &) const override;
 		static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
-	void paint(
-				QPainter *painter,
-				const QStyleOptionGraphicsItem *,
-				QWidget *) override;
+
+		void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
 
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override {return shape();}
@@ -79,7 +75,7 @@ class PartTerminal : public CustomElementGraphicPart {
 
 	private:
 		void updateSecondPoint();
-        TerminalData* d{nullptr}; // pointer to the terminal data
+		TerminalData* d; // pointer to the terminal data
 
 	private:
 		QPointF saved_position_;

sources/editor/graphicspart/parttext.h

@@ -60,8 +60,6 @@ class PartText : public QGraphicsTextItem, public CustomElementPart {
 		QString xmlName() const override { return(QString("text")); }
         bool fromXml(const QDomElement &) override;
         static bool valideXml(QDomElement& element);
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
         QDomElement toXml(QDomDocument &) const override;
 		void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
 		bool isUseless() const override;

sources/machine_info.cpp

@@ -150,14 +150,6 @@ void Machine_info::send_info_to_debug()
 	}
 }
 
-/**
-	@brief Machine_info::~Machine_info
-	destructor
-*/
-Machine_info::~Machine_info()
-{
-}
-
 /**
 	@brief Machine_info::init_get_Screen_info
 	Finds the largest screen and saves the values

sources/machine_info.h

@@ -34,7 +34,6 @@ public:
 	int32_t i_max_screen_height();
 	QString compilation_info();
 	void send_info_to_debug();
-	~Machine_info();
 
 signals:
 

sources/properties/propertiesinterface.cpp

@@ -16,6 +16,7 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "propertiesinterface.h"
+
 #include <QDebug>
 
 /*!
@@ -30,20 +31,10 @@ namespace  {
 	const QString colorS = "color";
 }
 
-/**
-	@brief PropertiesInterface::PropertiesInterface
-*/
 PropertiesInterface::PropertiesInterface()
 {
 }
 
-/**
-	@brief 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;

sources/properties/propertiesinterface.h

@@ -35,38 +35,11 @@ class PropertiesInterface
 {
 	public:
 	PropertiesInterface();
-		virtual ~PropertiesInterface();
-		/**
-			@brief toSettings
-			Save properties to setting file.
-			@param settings : is use for prefix a word
-			befor the name of each paramètre
-			@param QString
-		*/
-        virtual void toSettings(QSettings &,
-                                const QString & = QString()) const =0;
-		/**
-			@brief fromSettings
-			load properties to setting file.
-			@param settings : is use for prefix a word
-			befor the name of each paramètre
-			@param QString
-		*/
-        virtual void fromSettings(QSettings &,
-                                  const QString & = QString()) = 0;
-		/**
-			@brief toXml
-			Save properties to xml element
-			@param xml_document
-			@return QDomElement
-		*/
+	// 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 {Q_UNUSED(settings)};
+	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;
-		/**
-			@brief fromXml
-			load properties to xml element
-			@param xml_element
-			@return true / false
-		*/
 	virtual bool fromXml	  (const QDomElement &xml_element) =0;
 	static bool valideXml(QDomElement& element);
 

sources/properties/terminaldata.cpp

@@ -33,33 +33,15 @@ void TerminalData::setParent(QGraphicsObject* parent)
 	q = parent;
 }
 
-/**
-	@brief TerminalData::toSettings
-	Save properties to setting file.
-
-	QString is use for prefix a word befor the name of each paramètre
-	@param settings UNUSED
-	@param prefix UNUSED
-*/
-void TerminalData::toSettings(QSettings &settings, const QString &prefix) const
+void TerminalData::toSettings(QSettings& settings, const QString&) const
 
 {
 	Q_UNUSED(settings);
-	Q_UNUSED(prefix);
 }
 
-/**
-	@brief TerminalData::fromSettings
-	load properties to setting file.
-
-	QString is use for prefix a word befor the name of each paramètre
-	@param settings UNUSED
-	@param prefix UNUSED
-*/
-void TerminalData::fromSettings(QSettings &settings, const QString& prefix)
+void TerminalData::fromSettings(const QSettings& settings, const QString&)
 {
 	Q_UNUSED(settings);
-	Q_UNUSED(prefix);
 }
 
 /**
@@ -78,8 +60,7 @@ QDomElement TerminalData::toXml(QDomDocument &xml_document) const
 {
 	QDomElement xml_element = xml_document.createElement("terminaldata");
 
-	// write the position of the terminal
-	// Write name and number to XML
+
 	// m_pos cannot be stored, because in the partterminal it will not be updated.
 	// 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
@@ -91,22 +72,10 @@ QDomElement TerminalData::toXml(QDomDocument &xml_document) const
 	return(xml_element);
 }
 
-/*
-	@brief TerminalData::fromXml
-	load properties to xml element
-
-	@note This method is only called from the PartTerminal
-	and should never called from the Terminal class
-	@param xml_element
-	@return true if succeeded / false if the attribute is not real
-*/
 bool TerminalData::fromXml (const QDomElement &xml_element) // RETURNS True
 {
-	qreal term_x = 0.0;
-	qreal term_y = 0.0;
-
-	// reads the position of the terminal
 	// lit la position de la borne
+	qreal term_x = 0.0, term_y = 0.0;
 
 	if (propertyDouble(xml_element, "x", &term_x))
 		return false;
@@ -120,8 +89,6 @@ bool TerminalData::fromXml (const QDomElement &xml_element) // RETURNS True
 
 	// do not write uuid from this class, because only PartTerminal::fromXml need
 	// 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
 
 
 	//if (propertyString(xml_element, "name", &m_name))
@@ -132,9 +99,9 @@ bool TerminalData::fromXml (const QDomElement &xml_element) // RETURNS True
 	if (propertyString(xml_element, "orientation", &o))
 		return false;
 
-	// read the orientation of the terminal
 	// lit l'orientation de la borne
 	m_orientation = orientationFromString(o);
+
 	return true;
 }
 

sources/properties/terminaldata.h

@@ -26,58 +26,54 @@ class TerminalData : public PropertiesInterface
 		void init();
 
 		void setParent(QGraphicsObject* parent);
-		void toSettings(QSettings &settings,
-                        const QString& prefix = QString()) const override;
-        void fromSettings(QSettings &settings,
-                          const QString& = QString()) override;
+
+	// 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 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:
-		/**
-			@brief m_orientation
-			Orientation of the terminal
+	/*!
+	 * \brief m_orientation
+	 * Orientation of the terminal
 	 */
 	Qet::Orientation m_orientation{Qet::Orientation::North};
-		/**
-			@brief second_point
-			Position of the second point of the terminal
-			in scene coordinates
+	/*!
+	 * \brief second_point
+	 * Position of the second point of the terminal in scene coordinates
 	 */
 	QPointF second_point{0,0};
-		/**
-			@brief m_uuid
-			Uuid of the terminal.
-
-			In elementscene.cpp an element gets a new uuid when
-			saving the element. In the current state
-			each connection is made by using the local position
-			of the terminal and a dynamic id. In the new
-			case, each terminal should have it's own uuid to
-			identify it uniquely. When changing each time this
-			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.
+	/*!
+	 * \brief m_uuid
+	 * Uuid of the terminal.
+	 *
+	 * In elementscene.cpp an element gets a new uuid when saving the element. In the current state
+	 * each connection is made by using the local position of the terminal and a dynamic id. In the new
+	 * case, each terminal should have it's own uuid to identify it uniquely. When changing each time this
+	 * 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; // default is an invalid uuid.
-		/**
-			@brief m_name
-			Name of the element.
-			It can be used to create wiring harness tables
+	/*!
+	 * \brief m_name
+	 * Name of the element. It can be used to create wiring harness tables
 	 */
 	QString m_name;
 
-		/**
-			@brief m_pos
-			Position of the terminal. The second point is calculated
-			from this position and the orientation
-			@note
-			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.
+	/*!
+	 * \brief m_pos
+	 * Position of the terminal. The second point is calculated from this position and the orientation
+	 * 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{0,0};
 private:

sources/properties/xrefproperties.cpp

@@ -35,7 +35,8 @@ XRefProperties::XRefProperties()
 	@param settings: QSettings to use
 	@param prefix: prefix before properties name
 */
-void XRefProperties::toSettings(QSettings &settings,
+void XRefProperties::toSettings(
+		QSettings &settings,
 		const QString &prefix) const
 {
 	settings.setValue(prefix + "showpowerctc", m_show_power_ctc);
@@ -65,8 +66,7 @@ void XRefProperties::toSettings(QSettings &settings,
 	@param settings: QSettings to use
 	@param prefix: prefix before properties name
 */
-void XRefProperties::fromSettings(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();
@@ -101,7 +101,6 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const
 	xml_element.appendChild(createXmlProperty(xml_document, "displayhas", m_display == Cross? "cross" : "contacts"));
 	xml_element.appendChild(createXmlProperty(xml_document, "snapto", m_snap_to == Bottom? "bottom" : "label"));
 
-
 	QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
 	xml_element.appendChild(createXmlProperty(xml_document, "xrefpos", var.valueToKey(m_xref_pos)));
 	xml_element.appendChild(createXmlProperty(xml_document, "offset", m_offset));
@@ -147,7 +146,7 @@ bool XRefProperties::fromXml(const QDomElement &xml_element) {
 	propertyString(xml_element, "slave_label", &m_slave_label);
 	QString value;
 	foreach (QString key, m_prefix_keys) {
-        if (!propertyString(xml_element, key + "prefix", &value))
+		if (!propertyString(xml_element, key + "prefix", &value));
 			m_prefix.insert(key, value);
 	}
 	return true;

sources/properties/xrefproperties.h

@@ -43,8 +43,7 @@ class XRefProperties : public PropertiesInterface
 	};
 
 	void toSettings	  (QSettings &settings, const QString& = QString()) const override;
-    void fromSettings (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;
 

sources/qet.cpp

@@ -28,12 +28,6 @@
 #include <QActionGroup>
 
 /**
-	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
 	Indique si deux orientations de Borne sont sur le meme axe (Vertical / Horizontal).
 	@param a La premiere orientation de Borne
 	@param b La seconde orientation de Borne

sources/qetgraphicsitem/conductor.cpp

@@ -573,20 +573,12 @@ ConductorTextItem *Conductor::textItem() const
 }
 
 /**
-	Methode de validation d'element XML
-	@param e Un element XML sense represente un Conducteur
-	@return true si l'element XML represente bien un Conducteur ; false sinon
+	@brief Conductor::valideXml
+	@param e
+	@return true
 */
-bool Conductor::valideXml(QDomElement &e){
-
-//	// TODO: seems to short! (see fromXML)
-//	if (propertyDouble(e, "x") ||
-//		propertyDouble(e, "y"))
-//		return false;
-
-//	if (propertyBool(e, "freezeLabel"))
-//		return false;
-
+bool Conductor::valideXml(QDomElement &e)
+{
 	return true;
 }
 
@@ -957,7 +949,7 @@ void Conductor::pointsToSegments(const QList<QPointF>& points_list) {
 /**
 	@brief Conductor::fromXml
 	Load the conductor and her information from xml element
-	@param dom_element
+	@param e
 	@return true is loading success else return false
 */
 bool Conductor::fromXml(const QDomElement &dom_element)
@@ -986,20 +978,12 @@ bool Conductor::fromXml(const QDomElement &dom_element)
 	return return_;
 }
 
-// does not support legacy method
-/*!
-	@brief Conductor::toXml
-	Exporte les caracteristiques du conducteur sous forme d'une element XML.
-	@param dom_document :
-	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 & doc) const {
-	QDomElement dom_element = doc.createElement("conductor");
 
+// does not support legacy method
+// dom_element.setAttribute("terminal1", table_adr_id.value(terminal1));
+QDomElement Conductor::toXml(QDomDocument & doc) const
+{
+	QDomElement dom_element = doc.createElement("conductor");
 
 	dom_element.appendChild(createXmlProperty(doc, "x", pos().x()));
 	dom_element.appendChild(createXmlProperty(doc, "y", pos().y()));
@@ -1062,69 +1046,11 @@ QDomElement Conductor::toXml(QDomDocument & doc) const {
 }
 
 /**
-	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 file
+	@param e
+	@return true if generate path success else return false
 */
 bool Conductor::pathFromXml(const QDomElement &e) {
 	// parcourt les elements XML "segment" et en extrait deux listes de longueurs
@@ -1401,7 +1327,7 @@ void Conductor::calculateTextItemPosition()
 		}
 
 			//Adjust the position of text if his rotation
-			//is 0?? or 270??, to be exactly centered to the conductor
+			//is 0° or 270°, to be exactly centered to the conductor
 		if (m_text_item -> rotation() == 0)
 		{
 			text_pos.rx() -= m_text_item -> boundingRect().width()/2;
@@ -1678,12 +1604,12 @@ void Conductor::displayedTextChanged()
 	new_value.setValue(new_properties);
 
 
-	QUndoCommand *undo = new QUndoCommand(tr("Modifier les propri??t??s d'un conducteur", "undo caption"));
+	QUndoCommand *undo = new QUndoCommand(tr("Modifier les propriétés d'un conducteur", "undo caption"));
 	new QPropertyUndoCommand(this, "properties", old_value, new_value, undo);
 
 	if (!relatedPotentialConductors().isEmpty())
 	{
-		undo->setText(tr("Modifier les propri??t??s de plusieurs conducteurs", "undo caption"));
+		undo->setText(tr("Modifier les propriétés de plusieurs conducteurs", "undo caption"));
 
 		foreach (Conductor *potential_conductor, relatedPotentialConductors())
 		{

sources/qetgraphicsitem/conductor.h

@@ -102,9 +102,8 @@ class Conductor : public QGraphicsObject, public PropertiesInterface
 	public:
 		static bool valideXml (QDomElement &);
 		bool        fromXml   (const QDomElement &) override;
+		//QDomElement toXml     (QDomDocument &, QHash<Terminal *, int> &) const;
 		QDomElement toXml     (QDomDocument &doc) const override;
-        void toSettings(QSettings &, const QString & = QString()) const override {}
-        void fromSettings(QSettings &, const QString & = QString()) override {}
 	private:
 		bool pathFromXml(const QDomElement &);
 

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
@@ -218,12 +220,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;
 }
@@ -243,6 +257,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

@@ -325,6 +325,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;
 
@@ -389,6 +392,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);
@@ -405,6 +411,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")
 	{
@@ -1325,6 +1334,8 @@ void DynamicElementTextItem::updateXref()
 
 void DynamicElementTextItem::setPlainText(const QString &text)
 {
+	if (text == "14")
+		searchedElement = true;
 	if (toPlainText() == text)
 		return;
 

sources/qetgraphicsitem/dynamicelementtextitem.h

@@ -104,6 +104,7 @@ class DynamicElementTextItem : public DiagramTextItem
 		void setTextWidth(qreal width);
 		void setXref_item(Qt::AlignmentFlag m_exHrefPos);
 
+		bool searchedElement{false};
 	protected:
 		void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
 		void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
@@ -140,8 +141,8 @@ class DynamicElementTextItem : public DiagramTextItem
 		m_master_element,
 		m_other_report;
 		QPointer <Conductor> m_watched_conductor;
-		QString
-		m_text,
+		QString m_text,
+				m_text_old,
 				m_info_name,
 				m_composite_text,
 				m_report_formula,
@@ -149,12 +150,10 @@ class DynamicElementTextItem : public DiagramTextItem
 		DynamicElementTextItem::TextFrom m_text_from = UserText;
 		QUuid m_uuid;
 		QMetaObject::Connection m_report_formula_con;
-		QList<QMetaObject::Connection>
-		m_formula_connection,
+		QList<QMetaObject::Connection> m_formula_connection,
 									   m_update_slave_Xref_connection;
 		QColor m_user_color{QColor()};
-		bool
-		m_frame = false,
+		bool m_frame = false,
 			 m_first_scene_change = true;
 		CrossRefItem *m_Xref_item = nullptr;
 		QGraphicsTextItem *m_slave_Xref_item = nullptr;

sources/qetgraphicsitem/element.cpp

@@ -73,16 +73,15 @@ class ElementXmlRetroCompatibility
 
 /**
 	@brief Element::Element
-	@param location : location of this element
-	@param parent : parent graphics item
-	@param state : state of the instanciation
-	@param link_type
+	New element from xml
+	@param location, location of this element
+	@param parent, parent graphics item
+	@param state, state of the instanciation
 */
 Element::Element(
 		const ElementsLocation &location,
 		QGraphicsItem *parent,
-		int *state,
-		kind link_type) :
+		int *state, kind link_type) :
 	QetGraphicsItem(parent),
 	m_link_type (link_type),
 	m_location (location)
@@ -421,9 +420,9 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 		if (conv_ok && QET::version.toDouble() < element_version)
 		{
 			std::cerr << qPrintable(
-				QObject::tr("Avertissement : l'??l??ment "
-				" a ??t?? enregistr?? avec une version"
-				" ult??rieure de QElectroTech.")
+				QObject::tr("Avertissement : l'élément "
+				" a été enregistré avec une version"
+				" ultérieure de QElectroTech.")
 			) << std::endl;
 		}
 	}
@@ -477,7 +476,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") ;
@@ -647,6 +647,12 @@ DynamicElementTextItem *Element::parseDynamicText(
 */
 Terminal *Element::parseTerminal(const QDomElement &dom_element)
 {
+	TerminalData* data = new TerminalData();
+	if (!data->fromXml(dom_element)) {
+		delete data;
+		return nullptr;
+	}
+
 	if (!Terminal::valideXml(dom_element))
 		return nullptr;
 
@@ -665,8 +671,7 @@ Terminal *Element::parseTerminal(const QDomElement &dom_element)
 		else
 			return (a->dockConductor().y() < b->dockConductor().y());
 	});
-
-	return(new_terminal); // TODO: makes no sense
+	return(new_terminal); // TODO: makes not sense
 }
 
 /**
@@ -708,7 +713,8 @@ bool Element::valideXml(QDomElement &e) {
 */
 bool Element::fromXml(
 		QDomElement &e,
-        QHash<int, Terminal *> &table_id_adr)
+		QHash<int,
+		Terminal *> &table_id_adr)
 {
 	m_state = QET::GILoadingFromXml;
 	/*
@@ -716,8 +722,7 @@ bool Element::fromXml(
 		ce recensement servira lors de la mise en place des fils
 	*/
 	QList<QDomElement> liste_terminals; // terminals in the element in the diagram
-	foreach(QDomElement qde,
-			QET::findInDomElement(e, "terminals", "terminal")) {
+	foreach(QDomElement qde, QET::findInDomElement(e, "terminals", "terminal")) {
 		if (Terminal::valideXml(qde)) liste_terminals << qde;
 	}
 
@@ -728,7 +733,8 @@ bool Element::fromXml(
 	for(QGraphicsItem *qgi: childItems()) { // TODO: Where the Terminals are added as childs?
 		if (Terminal *p = qgraphicsitem_cast<Terminal *>(qgi)) {
 			bool terminal_trouvee = false;
-			for(QDomElement qde: liste_terminals) {
+			for(QDomElement qde: liste_terminals)
+			{
 				// 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.
@@ -782,9 +788,9 @@ bool Element::fromXml(
 	}
 
 	//load uuid of connected elements
-	QList <QDomElement> uuid_list = QET::findInDomElement(e, "links_uuids", "link_uuid");
-	foreach (QDomElement qdo, uuid_list) tmp_uuids_link << qdo.attribute("uuid");
-	
+	QList <QDomElement> uuid_list = QET::findInDomElement(e,
+								  "links_uuids",
+								  "link_uuid");
 	foreach (QDomElement qdo, uuid_list)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)	// ### Qt 6: remove
 		tmp_uuids_link << qdo.attribute("uuid");
@@ -803,6 +809,8 @@ bool Element::fromXml(
 	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")
@@ -838,11 +846,10 @@ bool Element::fromXml(
 
 		//************************//
 		//***Dynamic texts item***//
-		//************************// read from the diagram section
-	for (const QDomElement& qde : QET::findInDomElement(
-			 e,
-			 "dynamic_texts",
-			 DynamicElementTextItem::xmlTagName()))
+		//************************//
+		// 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);
 		addDynamicTextItem(deti);
@@ -852,27 +859,27 @@ bool Element::fromXml(
 		//************************//
 		//***Element texts item***//
 		//************************//
-	QList<QDomElement> inputs = QET::findInDomElement(e, "inputs", "input"); // inputs in diagram section
 
+	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;
 
-	for (DynamicElementTextItem *deti : conv_deti_list)
+	// TODO: Legacy (0.7 and prior)
+	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
+
+				//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
-			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()))
+				// 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()))
 			{
 					//Once again this 'if', is only for retrocompatibility with old old old project
 					//when element text with tagg "label" is not null, but the element information "label" is.
@@ -1076,7 +1083,6 @@ bool Element::fromXml(
 						}
 
 						QPointF pos = deti->pos();
-                        // TODO: check
 						if (m_link_type !=PreviousReport
 							|| m_link_type !=NextReport)
 						{
@@ -1180,8 +1186,8 @@ bool Element::fromXml(
 	\~ @return The XML element representing this electrical element
 	\~French L'element XML representant cet element electrique
 */
-QDomElement Element::toXml(
-        QDomDocument &document) const
+
+QDomElement Element::toXml(QDomDocument &document) const
 {
 	QDomElement element = document.createElement("element");
 
@@ -1208,7 +1214,6 @@ QDomElement Element::toXml(
 	element.setAttribute("z", QString::number(this->zValue()));
 	element.setAttribute("orientation", QString::number(orientation()));
 
-	// registration of device terminals
 	// enregistrement des bornes de l'appareil
 	QDomElement xml_terminals = document.createElement("terminals");
 	// for each child of the element

sources/qetgraphicsitem/element.h

@@ -46,11 +46,9 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 	public:
 			/**
 				@brief The kind enum
-				Used to know the kind of this element
-				(master, slave, report ect...)
+				Used to know the kind of this element (master, slave, report ect...)
 			*/
-		enum kind {
-			Simple = 1,
+		enum kind {Simple = 1,
 				   NextReport = 2,
 				   PreviousReport = 4,
 				   AllReport = 6,
@@ -58,9 +56,9 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 				   Slave = 16,
 				   Terminale = 32};
 
-		Element(const ElementsLocation &location,
-			QGraphicsItem * = nullptr,
-			int *state = nullptr,
+		Element(
+				const ElementsLocation &location,
+				QGraphicsItem * parent= nullptr, int *state = nullptr,
 				Element::kind link_type = Element::Simple);
 		~Element() override;
 	private:
@@ -134,7 +132,6 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 		virtual QDomElement toXml(QDomDocument &) const;
 		QUuid uuid() const;
 		int orientation() const;
-
 			//METHODS related to texts
 		void addDynamicTextItem(DynamicElementTextItem *deti = nullptr);
 		void removeDynamicTextItem(DynamicElementTextItem *deti);

sources/qetgraphicsitem/elementtextitemgroup.h

@@ -108,7 +108,8 @@ class ElementTextItemGroup : public QObject, public  QGraphicsItemGroup // TODO:
 	private:
 		Qt::Alignment m_alignment = Qt::AlignJustify;
 		QString m_name;
-		bool m_first_move = true,
+		bool
+		m_first_move = true,
 		m_hold_to_bottom_of_page = false,
 		m_block_alignment_update = false,
 		m_frame = false;

sources/qetgraphicsitem/qetshapeitem.cpp

@@ -662,7 +662,7 @@ void QetShapeItem::insertPoint()
 		if(new_polygon != m_polygon)
 		{
 				//Wrap the undo for avoid to merge the undo commands when user add several points.
-			QUndoCommand *undo = new QUndoCommand(tr("Ajouter un point ?? un polygone"));
+			QUndoCommand *undo = new QUndoCommand(tr("Ajouter un point à un polygone"));
 			new QPropertyUndoCommand(this, "polygon", m_polygon, new_polygon, undo);
 			diagram()->undoStack().push(undo);
 		}
@@ -853,9 +853,9 @@ bool QetShapeItem::fromXml(const QDomElement &e)
 
 	QString type = e.attribute("type");
 #if TODO_LIST
-#pragma message("@TODO Compatibility for version older than N??4075, shape type was stored with an int")
+#pragma message("@TODO Compatibility for version older than N°4075, shape type was stored with an int")
 #endif
-		//@TODO Compatibility for version older than N??4075, shape type was stored with an int
+		//@TODO Compatibility for version older than N°4075, shape type was stored with an int
 	if (type.size() == 1)
 	{
 		switch(e.attribute("type","0").toInt())
@@ -866,7 +866,7 @@ bool QetShapeItem::fromXml(const QDomElement &e)
 			case 3: m_shapeType = Polygon;  break;
 		}
 	}
-		//For version after N??4075, shape is stored with a string
+		//For version after N°4075, shape is stored with a string
 	else
 	{
 		QMetaEnum me = metaObject()->enumerator(metaObject()->indexOfEnumerator("ShapeType"));
@@ -1015,7 +1015,7 @@ QString QetShapeItem::name() const
 	switch (m_shapeType) {
 		case Line:	    return tr("une ligne");
 		case Rectangle:	return tr("un rectangle");
-		case Ellipse:	return tr("une ??llipse");
+		case Ellipse:	return tr("une éllipse");
 		case Polygon:	return tr("une polyligne");
 		default:	    return tr("une shape");
 	}

sources/qetgraphicsitem/slaveelement.cpp

@@ -26,14 +26,13 @@
 	Default constructor
 	@param location location of xml definition
 	@param qgi parent QGraphicItem
+	@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) :
-	Element(location, qgi, state, Element::Slave)
+SlaveElement::SlaveElement(
+		const ElementsLocation &location, QGraphicsItem *parent, int *state) :
+	Element(location, parent, state, Element::Slave)
 {
-	m_xref_item = nullptr;
 }
 
 /**

sources/qetgraphicsitem/slaveelement.h

@@ -27,7 +27,7 @@ class SlaveElement : public Element
 	public:
 	explicit SlaveElement (
 			const ElementsLocation &,
-			QGraphicsItem * = nullptr,
+			QGraphicsItem * parent= nullptr,
 			int * = nullptr);
 		~SlaveElement() override;
 		void linkToElement(Element *elmt) override;

sources/qetgraphicsitem/terminal.cpp

@@ -40,8 +40,7 @@ const qreal Terminal::Z = 1000;
 	@param name of terminal
 	@param hiddenName
 */
-void Terminal::init(
-		QString number, QString name, bool hiddenName)
+void Terminal::init(QString number, QString name, bool hiddenName)
 {
 	// calcul de la position du point d'amarrage a l'element
 	dock_elmt_ = d->m_pos;
@@ -799,8 +798,7 @@ 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(const QDomElement &terminal)
-{
+bool Terminal::valideXml(const QDomElement &terminal) {
 	if (terminal.tagName() != "terminal") return(false);
 
 // affuteuse_250h.qet contains in line 8398 terminals which do not have this
@@ -825,7 +823,8 @@ bool Terminal::valideXml(const QDomElement &terminal)
 	@return true si la borne "se reconnait"
 	(memes coordonnes, meme orientation), false sinon
 */
-bool Terminal::fromXml(const QDomElement &terminal) {
+bool Terminal::fromXml(const QDomElement &terminal)
+{
 	propertyString(terminal, "number", &number_terminal_);
 
 	propertyBool(terminal, "nameHidden", &name_terminal_hidden);
@@ -833,7 +832,6 @@ bool Terminal::fromXml(const QDomElement &terminal) {
 	if(!d->fromXml(terminal))
 		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;
 }

sources/qetgraphicsitem/terminal.h

@@ -79,6 +79,7 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 		Diagram  *diagram             () const;
 		Element  *parentElement       () const;
 		QUuid uuid                    () const;
+
 		int ID() const;
 		QPointF dockPos();
 		QPointF originPos();
@@ -93,6 +94,7 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 		void updateConductor();
 		bool isLinkedTo(Terminal *);
 		bool canBeLinkedTo(Terminal *);
+
 		void setID(int id);
 
 		// methods related to XML import/export
@@ -100,9 +102,6 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 		bool fromXml (const QDomElement &) override;
 		QDomElement toXml (QDomDocument &) const override;
 
-        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
-        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
-
 	protected:
 		// methods related to events management
 		void hoverEnterEvent  (QGraphicsSceneHoverEvent *) override;
@@ -118,7 +117,7 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 
 		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;
@@ -135,7 +134,7 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 		QGraphicsLineItem *m_help_line_a{nullptr};
 
 
-        TerminalData* d{nullptr};
+		TerminalData* d;
 
 		/// Parent electrical element
 		Element *parent_element_{nullptr};
@@ -156,9 +155,10 @@ class Terminal : public QGraphicsObject, public PropertiesInterface
 		/// Whether the mouse pointer is hovering the terminal
 		bool hovered_{false};
 		/// Color used for the hover effect
-        QColor hovered_color_{Terminal::neutralColor};
+		QColor hovered_color_{Terminal::hovered_color_};
 		/// Number of Terminal
 		QString number_terminal_;
+
 		bool name_terminal_hidden{true};
 
 		/// legacy id used by the conductor to find the terminal. From 0.8x on the uuid is used instead.
@@ -187,8 +187,6 @@ inline QString Terminal::number() const
 {
 	return(number_terminal_);
 }
-
-
 QList<Terminal *> relatedPotentialTerminal (const Terminal *terminal,
 						const bool all_diagram = true);
 

sources/titleblock/helpercell.cpp

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

sources/titleblockproperties.cpp

@@ -65,13 +65,12 @@ bool TitleBlockProperties::operator!=(const TitleBlockProperties &ip) {
 	return(!(*this == ip));
 }
 
-
 /**
-	Exporte le cartouche sous formes d'attributs XML ajoutes a l'element e.
-	@param e Element XML auquel seront ajoutes des attributs
+	@brief TitleBlockProperties::toXml
+	@param e
 */
-void TitleBlockProperties::toXml(QDomElement &e) const
-{
+void TitleBlockProperties::toXml(QDomElement &e) const {
+
 	e.setAttribute("author",   author);
 	e.setAttribute("title",    title);
 	e.setAttribute("filename", filename);
@@ -171,7 +170,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

@@ -45,7 +45,7 @@ class TitleBlockProperties: public PropertiesInterface {
     void toXml(QDomElement &e) const;
     bool fromXml(const QDomElement &) override;
     void toSettings(QSettings &, const QString & = QString()) const override;
-    void fromSettings(QSettings &, const QString & = QString()) override;
+    void fromSettings(const QSettings &, const QString & = QString()) override;
 
 	void setAutoPageNum(QString autonum) {auto_page_num = autonum;}
 

sources/ui/conductorpropertieswidget.cpp

@@ -84,8 +84,8 @@ void ConductorPropertiesWidget::setProperties(
 	ui->m_formula_le            -> setText    (m_properties.m_formula);
 	ui->m_text_le               -> setText    (m_properties.text);
 	ui->m_function_le           -> setText    (m_properties.m_function);
-	ui->m_cable_le              -> setText    (m_properties.m_cable);
-	ui->m_bus_le                -> setText    (m_properties.m_bus);
+//	ui->m_cable_le              -> setText    (m_properties.m_cable);
+//	ui->m_bus_le                -> setText    (m_properties.m_bus);
 	ui->m_tension_protocol_le   -> setText    (m_properties.m_tension_protocol);
 	ui->m_wire_color_le         -> setText    (m_properties.m_wire_color);
 	ui->m_wire_section_le       -> setText    (m_properties.m_wire_section);
@@ -130,8 +130,8 @@ ConductorProperties ConductorPropertiesWidget::properties() const
 	properties_.text                    = ui -> m_text_le -> text();
 	properties_.text_color              = ui -> m_text_color_kpb->color();
 	properties_.m_function              = ui -> m_function_le->text();
-	properties_.m_cable                 = ui -> m_cable_le->text();
-	properties_.m_bus                   = ui -> m_bus_le->text();
+//	properties_.m_cable                 = ui -> m_cable_le->text();
+//	properties_.m_bus                   = ui -> m_bus_le->text();
 	properties_.m_tension_protocol      = ui -> m_tension_protocol_le->text();
 	properties_.m_wire_color            = ui -> m_wire_color_le->text();
 	properties_.m_wire_section          = ui -> m_wire_section_le->text();

sources/ui/dynamicelementtextmodel.cpp

@@ -1269,6 +1269,8 @@ void DynamicElementTextModel::enableGroupRotationAndPos(
 void DynamicElementTextModel::itemDataChanged(QStandardItem *qsi)
 {
 	DynamicElementTextItem *deti = textFromItem(qsi);
+    if (deti->searchedElement)
+        int stop = 1;
 	ElementTextItemGroup *etig = groupFromItem(qsi);
 	if (!deti && !etig)
 		return;
@@ -1414,6 +1416,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;