WIP2

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/borderproperties.cpp

@@ -27,7 +27,7 @@
 	- 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
@@ -53,11 +53,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 +75,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,12 +88,11 @@ 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 {
 	e.setAttribute("cols",        columns_count);
@@ -106,12 +105,11 @@ void BorderProperties::toXml(QDomElement &e) const {
 
 /**
 	@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) {
 	if (e.hasAttribute("cols"))        columns_count   = e.attribute("cols").toInt();
@@ -124,15 +122,14 @@ void BorderProperties::fromXml(QDomElement &e) {
 
 /**
 	@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,12 +142,14 @@ 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) {
 	columns_count   = settings.value(prefix + "cols",            columns_count).toInt();

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.
 */
@@ -51,43 +50,30 @@ class BorderTitleBlock : public QObject
 	
 		//METHODS TO GET DIMENSION
 		//COLUMNS
-		/// @return the number of columns
+			/// @return the number of columns
 		int   columnsCount() const { return(columns_count_); }
-		/// @return the columns width, in pixels
+			/// @return the columns width, in pixels
 		qreal columnsWidth() const { return(columns_width_); }
-		/// @return the total width of all columns, headers excluded
+			/// @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
-		/// @return the column headers height, in pixels
+		qreal columnsHeaderHeight() const { return(columns_header_height_); }
-		qreal columnsHeaderHeight() const {
-			return(columns_header_height_); }
 	
 		//ROWS
-		/// @return the number of rows
+			/// @return the number of rows
 		int rowsCount() const { return(rows_count_); }
-		/// @return the rows height, in pixels
+			/// @return the rows height, in pixels
 		qreal rowsHeight() const { return(rows_height_); }
-		/// @return the total height of all rows, headers excluded
+			/// @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
-		/// @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;
 
@@ -102,49 +88,45 @@ class BorderTitleBlock : public QObject
 		QRectF outsideBorderRect() const;
 		QRectF insideBorderRect() const;
 	
-		// methods to get title block basic data
+			// methods to get title block basic data
-		/// @return the value of the title block "Author" field
+			/// @return the value of the title block "Author" field
 		QString author() const { return(btb_author_); }
-		/// @return the value of the title block "Date" field
+			/// @return the value of the title block "Date" field
 		QDate date() const { return(btb_date_); }
-		/// @return the value of the title block "Title" field
+			/// @return the value of the title block "Title" field
 		QString title() const { return(btb_title_); }
-		/// @return the value of the title block "Folio" field
+			/// @return the value of the title block "Folio" field
 		QString folio() const { return(btb_folio_); }
-		/// @return the value of the title block "Folio" field as displayed
+			/// @return the value of the title block "Folio" field as displayed
 		QString finalfolio() const { return(btb_final_folio_); }
-		/// @return the value of the title block "Plant" field
+			/// @return the value of the title block "Plant" field
 		QString plant() const { return(btb_plant_); }
-		/// @return the value of the title block "Locmach" field
+			/// @return the value of the title block "Locmach" field
 		QString locmach() const { return(btb_locmach_); }
-		/// @return the value of the revision index block "Folio" field
+			/// @return the value of the revision index block "Folio" field
 		QString indexrev() const { return(btb_indexrev_); }
-		/// @return the value of the title block "File" field
+			/// @return the value of the title block "File" field
 		QString fileName() const { return(btb_filename_); }
-		/// @return the value of the title block Additional Fields
+			/// @return the value of the title block Additional Fields
 		QString version() const { return(btb_version_); }
-		/// @return the value of the title block Additional Fields
+			/// @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
-		/// @return the value of the title block
 		QString autoPageNum() const { return(btb_auto_page_num_); }
-		/// @return the value of the total number of folios
+			/// @return the value of the total number of folios
 		int folioTotal() const { return(folio_total_);}
 	
-		// methods to get display options
+			// methods to get display options
-		/// @return true si le cartouche est affiche, false sinon
+			/// @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
+			/// @return true si la bordure est affichee, false sinon
 		bool borderIsDisplayed() const { return(display_border_); }
 		
-		// methods to set dimensions
+			// methods to set dimensions
 		void setColumnsCount(int);
 		void setRowsCount(int);
 		void setColumnsWidth(const qreal &);
@@ -155,13 +137,12 @@ class BorderTitleBlock : public QObject
 		
 		DiagramPosition convertPosition(const QPointF &);
 		
-		// methods to set title block basic data
+			// methods to set title block basic data
 		void setAuthor(const QString &author);
 		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);
@@ -187,11 +168,9 @@ 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
+			// methods to set display options
 		void displayTitleBlock(bool);
 		void displayColumns(bool);
 		void displayRows(bool);
@@ -200,86 +179,77 @@ 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
-			Signal emitted after the border has changed
+				@param old_border Former border
-			@param old_border Former border
+				@param new_border New border
-			@param new_border New border
+			*/
-		*/
 		void borderChanged(QRectF old_border, QRectF new_border);
-		/**
+			/**
-			@brief displayChanged
+				Signal emitted after display options have changed
-			Signal emitted after display options have changed
+			*/
-		*/
 		void displayChanged();
-		/**
+			/**
-			@brief diagramTitleChanged
+				Signal emitted after the title has changed
-			Signal emitted after the title has changed
+			*/
-		*/
 		void diagramTitleChanged(const QString &);
-		/**
+			/**
-			@brief titleBlockFolioChanged
+			 @brief titleBlockFolioChanged
-			Signal emitted after Folio has changed
+				Signal emitted after Folio has changed
-		*/
+			*/
 		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
+		// attributes
 	private:
-		// titleblock basic data
+			// 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)
+			// border dimensions (rows and columns)
-		// columns: number and dimensions
+			// 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
+			// 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
+			// title block dimensions
 		qreal titleblock_height_;
 	
-		// rectangles used for drawing operations
+			// rectangles used for drawing operations
 		QRectF diagram_rect_;
 	
 			// display options

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
+ConductorAutoNumerotation::ConductorAutoNumerotation(Conductor *conductor, Diagram *diagram, QUndoCommand *parent_undo) :
-	@param diagram     : the diagram of conductor
-	@param parent_undo : parent undo command
-*/
-ConductorAutoNumerotation::ConductorAutoNumerotation(
-		Conductor *conductor,
-		Diagram *diagram,
-		QUndoCommand *parent_undo) :
 	m_diagram      (diagram),
 	m_conductor     (conductor),
 	conductor_list (conductor -> relatedPotentialConductors().values()),
@@ -50,22 +43,19 @@ 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)
 {
 	if (!m_conductor) return;
@@ -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,9 +124,9 @@ 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()
 {
 	ConductorProperties cp = conductor_list.first()->properties();
@@ -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,26 +26,19 @@ 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
+			//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
+			//methods
 		void numeratePotential ();
 		void numerateNewConductor ();
 

sources/diagram.cpp

@@ -928,6 +928,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: " << root.attribute("title");
+	
 	// Read attributes of this diagram
 	if (consider_informations) {
 		// Version of diagram
@@ -1023,6 +1025,7 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
 		}
 		
 		int state = 0;
+        qDebug() << "Element from collection: " << element_location;
 		Element *nvel_elmt = ElementFactory::Instance() -> createElement(element_location, nullptr, &state);
 		if (state)
 		{

sources/diagramcontext.cpp

@@ -118,7 +118,7 @@ int DiagramContext::count() {
 
 /**
  * @brief DiagramContext::keyMustShow
- * @return the value pairs with key, if key no found, return false
+ * @return the value pairs with key, if key not found, return false
  */
 bool DiagramContext::keyMustShow(const QString &key) const {
 	if (m_content_show.contains(key))

sources/qetdiagrameditor.cpp

@@ -2220,19 +2220,19 @@ void QETDiagramEditor::generateTerminalBlock()
 		success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached("qet_tb_generator", {("")});
+		success = process->startDetached("qet_tb_generator");
 	}
 	if (openedProjects().count()){
 		success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe", {("")});
+		success = process->startDetached(QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe");
 	}
 	if (openedProjects().count()){
 		success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe", {("")});
+		success = process->startDetached(QDir::homePath() + "/qet_tb_generator.exe");
 	}
 
 #elif  defined(Q_OS_MAC)
@@ -2240,13 +2240,13 @@ void QETDiagramEditor::generateTerminalBlock()
 		success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.8/bin/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.8/bin/qet_tb_generator", {("")});
+		success = process->startDetached("/Library/Frameworks/Python.framework/Versions/3.8/bin/qet_tb_generator");
 	}
 		if (openedProjects().count()){
 		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app", {("")});
+		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator.app");
 	}
 	
 #else
@@ -2254,13 +2254,13 @@ void QETDiagramEditor::generateTerminalBlock()
 		success = process->startDetached("qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached("qet_tb_generator", {("")});
+		success = process->startDetached("qet_tb_generator");
 	}
 	if (openedProjects().count()){
 		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator", {(QETDiagramEditor::currentProjectView()->project()->filePath())});
 	}
 	else  {
-		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator", {("")});
+		success = process->startDetached(QDir::homePath() + "/.qet/qet_tb_generator");
 	}
 	
 #endif

sources/qetgraphicsitem/element.cpp

@@ -418,6 +418,7 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 		{
 				//Minor workaround to find if there is a "input" tagg as label.
 				//If not, we set the tagg "label" to the first "input.
+            // TODO: Remove in later version begin
 			QList <QDomElement> input_field;
 			bool have_label = false;
 			for (QDomElement input_node = node.firstChildElement("input") ; !input_node.isNull() ; input_node = input_node.nextSiblingElement("input"))
@@ -429,8 +430,11 @@ bool Element::buildFromXml(const QDomElement &xml_def_elmt, int *state)
 						have_label = true;
 				}
 			}
-			if(!have_label && !input_field.isEmpty())
+            if(!have_label && !input_field.isEmpty()) {
+                qDebug() << input_field.first().attribute("text");
 				input_field.first().setAttribute("tagg", "label");
+            }
+            // TODO: Remove in later version end
 			
 				//Parse the definition
 			for (QDomNode n = node.firstChild() ; !n.isNull() ; n = n.nextSibling())
@@ -717,15 +721,20 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 		setRotation(90*read_ori);
 	}
 
-		//Befor load the dynamic text field,
+    // TODO: elementInformations are not read from the diagram section or? Yes see below
-		//we remove the dynamic text field created from the description of this element, to avoid doublons.
+	
+//#######################################################################################################################
+//####    START   #######################################################################################################
+//#######################################################################################################################
+        //Before load the dynamic text field,
+        //we remove the dynamic text field created from the description of this element, to avoid doublons.
 	for(DynamicElementTextItem *deti : m_dynamic_text_list)
 		delete deti;
 	m_dynamic_text_list.clear();
-    
 		//************************//
 		//***Dynamic texts item***//
 		//************************//
+        // Texts in diagram section
 	for (const QDomElement& qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTagName()))
     {
         DynamicElementTextItem *deti = new DynamicElementTextItem(this);
@@ -733,20 +742,24 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
         deti->fromXml(qde);
     }
 	
+    // TODO: remove in later version begin
 
 		//************************//
 		//***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();
+    const QList <DynamicElementTextItem *> conv_deti_list = m_converted_text_from_xml_description.keys(); // Texts in element definition (elements collection)
 	QList <DynamicElementTextItem *> successfully_converted; 
 	const QList <QDomElement> dom_inputs = inputs;
 	
-	for (DynamicElementTextItem *deti : conv_deti_list)
+
+
+    for (DynamicElementTextItem *deti : conv_deti_list) // Texts from element definition (elements collection)
 	{
-		for(const QDomElement& dom_input : dom_inputs)
+        for(const QDomElement& dom_input : dom_inputs) // Inputs in 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
@@ -817,7 +830,7 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 		group->fromXml(qde);
 	}
 	
-		//load informations
+        //load elementInformations from diagram section
 	DiagramContext dc;
 	dc.fromXml(e.firstChildElement("elementInformations"), "elementInformation");
 		/**
@@ -991,6 +1004,12 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 			}
 		}
 	}
+
+    // TODO: remove in later version end
+
+//#######################################################################################################################
+//####    END     #######################################################################################################
+//#######################################################################################################################
     m_state = QET::GIOK;
 	return(true);
 }

sources/ui/dynamicelementtextitemeditor.cpp

@@ -186,6 +186,10 @@ QUndoCommand *DynamicElementTextItemEditor::associatedUndo() const
 		return nullptr;
 }
 
+/*!
+ * \brief DynamicElementTextItemEditor::dataEdited
+ * Apply changes to the text item. It is called when dataChanged() signal is called
+ */
 void DynamicElementTextItemEditor::dataEdited()
 {
 	if (m_live_edit)

sources/ui/dynamicelementtextitemeditor.h

@@ -29,6 +29,10 @@ namespace Ui {
 	class DynamicElementTextItemEditor;
 }
 
+/*!
+ * \brief The DynamicElementTextItemEditor class
+ * Widget used to modify the properties of DynamicElementTextItem.
+ */
 class DynamicElementTextItemEditor : public AbstractElementPropertiesEditorWidget
 {
     Q_OBJECT

sources/ui/dynamicelementtextmodel.cpp

@@ -57,6 +57,10 @@ static int adjust_grp_row         = 4;
 static int frame_grp_row          = 5;
 static int hold_to_bottom_grp_row = 6;
 
+const char* user_text = "Texte utilisateur";
+const char* element_information = "Information de l'élément";
+const char* composite_text = "Texte composé";
+
 DynamicElementTextModel::DynamicElementTextModel(Element *element, QObject *parent) :
 	QStandardItemModel(parent),
 	m_element(element)
@@ -136,9 +140,9 @@ QList<QStandardItem *> DynamicElementTextModel::itemsForText(DynamicElementTextI
     src->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
     
 	QString title;
-	if (deti->textFrom() == DynamicElementTextItem::UserText) title = tr("Texte utilisateur");
+    if (deti->textFrom() == DynamicElementTextItem::UserText) title = tr(user_text);
-	else if (deti->textFrom() == DynamicElementTextItem::ElementInfo) title = tr("Information de l'élément");
+    else if (deti->textFrom() == DynamicElementTextItem::ElementInfo) title = tr(element_information);
-	else title =  tr("Texte composé");
+    else title =  tr(composite_text);
     QStandardItem *srca = new QStandardItem(title);
     srca->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     srca->setData(textFrom, Qt::UserRole+1);
@@ -172,7 +176,7 @@ QList<QStandardItem *> DynamicElementTextModel::itemsForText(DynamicElementTextI
     qsi->appendRow(qsi_list);
 	
 		//Composite text
-	QStandardItem *composite = new QStandardItem(tr("Texte composé"));
+    QStandardItem *composite = new QStandardItem(tr(composite_text));
 	composite->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 	
 	DiagramContext dc;
@@ -397,7 +401,7 @@ DynamicElementTextItem *DynamicElementTextModel::textFromItem(QStandardItem *ite
 	
 	
 	QStandardItem *text_item = item;
-	while (text_item->parent())
+    while (text_item->parent()) // recursive search for the highest parent
 		text_item = text_item->parent();
 	
 	if (m_texts_list.values().contains(text_item)) //The item is a text
@@ -458,26 +462,26 @@ QUndoCommand *DynamicElementTextModel::undoForEditedText(DynamicElementTextItem
 	QStandardItem *text_qsi = m_texts_list.value(deti);
 	
 	QString from = text_qsi->child(src_txt_row,1)->data(Qt::DisplayRole).toString();
-	if ((from == tr("Texte utilisateur")) && (deti->textFrom() != DynamicElementTextItem::UserText))
+    if ((from == tr(user_text)) && (deti->textFrom() != DynamicElementTextItem::UserText))
 		new QPropertyUndoCommand(deti, "textFrom", QVariant(deti->textFrom()), QVariant(DynamicElementTextItem::UserText), undo);
-	else if ((from == tr("Information de l'élément")) && (deti->textFrom() != DynamicElementTextItem::ElementInfo))
+    else if ((from == tr(element_information)) && (deti->textFrom() != DynamicElementTextItem::ElementInfo))
 		new QPropertyUndoCommand(deti, "textFrom", QVariant(deti->textFrom()), QVariant(DynamicElementTextItem::ElementInfo), undo);
-	else if ((from == tr("Texte composé")) && (deti->textFrom() != DynamicElementTextItem::CompositeText))
+    else if ((from == tr(composite_text)) && (deti->textFrom() != DynamicElementTextItem::CompositeText))
 		new QPropertyUndoCommand(deti, "textFrom", QVariant(deti->textFrom()), QVariant(DynamicElementTextItem::CompositeText), undo);
 	
-	if(from == tr("Texte utilisateur"))
+    if(from == tr(user_text))
 	{
 		QString text = text_qsi->child(usr_txt_row,1)->data(Qt::DisplayRole).toString();
 		if (text != deti->text())
 			new QPropertyUndoCommand(deti, "text", QVariant(deti->text()), QVariant(text), undo);
 	}
-	else if (from == tr("Information de l'élément"))
+    else if (from == tr(element_information))
 	{
 		QString info_name = text_qsi->child(info_txt_row,1)->data(Qt::UserRole+2).toString();
 		if(info_name != deti->infoName())
 			new QPropertyUndoCommand(deti, "infoName", QVariant(deti->infoName()), QVariant(info_name), undo);
 	}
-	else if (from == tr("Texte composé"))
+    else if (from == tr(composite_text))
 	{
 		QString composite_text = text_qsi->child(compo_txt_row,1)->data(Qt::UserRole+2).toString();
 		if(composite_text != deti->compositeText())
@@ -1112,6 +1116,7 @@ void DynamicElementTextModel::enableSourceText(DynamicElementTextItem *deti, Dyn
 		case DynamicElementTextItem::CompositeText: compo = true;break;
 	}
 
+    m_ignore_item_change = true;
 		//User text
 	qsi->child(usr_txt_row,0)->setEnabled(usr);
 	qsi->child(usr_txt_row,1)->setEnabled(usr);
@@ -1120,6 +1125,7 @@ void DynamicElementTextModel::enableSourceText(DynamicElementTextItem *deti, Dyn
 	qsi->child(info_txt_row,1)->setEnabled(info);
 		//Composite text
 	qsi->child(compo_txt_row,0)->setEnabled(compo);
+    m_ignore_item_change = false;
 	qsi->child(compo_txt_row,1)->setEnabled(compo);
 }
 
@@ -1157,6 +1163,10 @@ void DynamicElementTextModel::enableGroupRotationAndPos(ElementTextItemGroup *gr
 
 void DynamicElementTextModel::itemDataChanged(QStandardItem *qsi)
 {
+
+    if (m_ignore_item_change)
+        return;
+
 	DynamicElementTextItem *deti = textFromItem(qsi);
 	ElementTextItemGroup *etig = groupFromItem(qsi);
 	if (!deti && !etig)
@@ -1170,15 +1180,15 @@ void DynamicElementTextModel::itemDataChanged(QStandardItem *qsi)
 			dc = deti->elementUseForInfo()->elementInformations();
 		
 		if (qsi->data().toInt() == textFrom)
-		{
+        { // change textFrom
 			QString from = qsi->data(Qt::DisplayRole).toString();
 			
-			if (from == tr("Texte utilisateur"))
+            if (from == tr(user_text))
 			{
 				enableSourceText(deti, DynamicElementTextItem::UserText);
 				text_qsi->setData(text_qsi->child(usr_txt_row,1)->data(Qt::DisplayRole).toString());
 			}
-			else if (from == tr("Information de l'élément"))
+            else if (from == tr(element_information))
 			{
 				enableSourceText(deti, DynamicElementTextItem::ElementInfo);
 				QString info = text_qsi->child(info_txt_row,1)->data(Qt::UserRole+2).toString();
@@ -1213,7 +1223,7 @@ void DynamicElementTextModel::itemDataChanged(QStandardItem *qsi)
 		//We emit the signal only if @qsi is in the second column, because the data are stored on this column
 		//the first column is use only for display the title of the property, except for the name of texts group
 	if((m_groups_list.values().contains(qsi) || qsi->column() == 1) && !m_block_dataChanged)
-		emit dataChanged();
+        emit dataChanged(); // TODO: where it goes?
     if(deti) deti->updateXref();
 }
 
@@ -1309,9 +1319,9 @@ void DynamicElementTextModel::updateDataFromText(DynamicElementTextItem *deti, V
 		{
 			switch (deti->textFrom())
 			{
-				case DynamicElementTextItem::UserText: qsi->child(0,1)->setData(tr("Texte utilisateur"), Qt::DisplayRole); break;
+                case DynamicElementTextItem::UserText: qsi->child(0,1)->setData(tr(user_text), Qt::DisplayRole); break;
-				case DynamicElementTextItem::ElementInfo : qsi->child(0,1)->setData(tr("Information de l'élément"), Qt::DisplayRole); break;
+                case DynamicElementTextItem::ElementInfo : qsi->child(0,1)->setData(tr(element_information), Qt::DisplayRole); break;
-				case DynamicElementTextItem::CompositeText : qsi->child(0,1)->setData(tr("Texte composé"), Qt::DisplayRole); break;
+                case DynamicElementTextItem::CompositeText : qsi->child(0,1)->setData(tr(composite_text), Qt::DisplayRole); break;
 			}
 			enableSourceText(deti, deti->textFrom());
 			qsi->setData(deti->toPlainText(), Qt::DisplayRole);
@@ -1448,6 +1458,15 @@ DynamicTextItemDelegate::DynamicTextItemDelegate(QObject *parent) :
     QStyledItemDelegate(parent)
 {}
 
+/*!
+ * \brief DynamicTextItemDelegate::createEditor
+ * Different widgets are used depending of the data which should be shown in the view.
+ * For example for choosing color, a color chooser is used.
+ * \param parent
+ * \param option
+ * \param index
+ * \return
+ */
 QWidget *DynamicTextItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
 	switch (index.data(Qt::UserRole+1).toInt())
@@ -1456,9 +1475,9 @@ QWidget *DynamicTextItemDelegate::createEditor(QWidget *parent, const QStyleOpti
 		{
 			QComboBox *qcb = new QComboBox(parent);
 			qcb->setObjectName("text_from");
-			qcb->addItem(tr("Texte utilisateur"));
+            qcb->addItem(tr(user_text));
-			qcb->addItem(tr("Information de l'élément"));
+            qcb->addItem(tr(element_information));
-			qcb->addItem(tr("Texte composé"));
+            qcb->addItem(tr(composite_text));
 			return qcb;
 		}
 		case DynamicElementTextModel::infoText:

sources/ui/dynamicelementtextmodel.h

@@ -106,6 +106,7 @@ class DynamicElementTextModel : public QStandardItemModel
 	QHash <DynamicElementTextItem *, QList<QMetaObject::Connection>> m_hash_text_connect;
 	QHash <ElementTextItemGroup *, QList<QMetaObject::Connection>> m_hash_group_connect;
 	bool m_block_dataChanged = false;
+    bool m_ignore_item_change{false};
 };
 
 class DynamicTextItemDelegate : public QStyledItemDelegate