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

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

sources/bordertitleblock.h

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

sources/conductorautonumerotation.cpp

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

sources/conductorautonumerotation.h

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

sources/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
+	
+//#######################################################################################################################
+//####    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