From 8a2c0a2d36015d888e473cdbee8d87c219a2d23e Mon Sep 17 00:00:00 2001
From: blacksun
 <blacksun@r5936  blacksun  2019-06-24 19:44:37 +0200 (lun. 24 juin 2019)>
Date: Sun, 19 Oct 2014 10:08:55 +0000
Subject: [PATCH] Conductor : reset conductor path also reset conductor text
 item position

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3381 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/diagramcommands.cpp           | 22 +++++++++++++++-------
 sources/qetgraphicsitem/conductor.cpp |  7 ++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sources/diagramcommands.cpp b/sources/diagramcommands.cpp
index 6b626ce33..94def03a8 100644
--- a/sources/diagramcommands.cpp
+++ b/sources/diagramcommands.cpp
@@ -720,10 +720,10 @@ void ChangeConductorCommand::setConductorTextItemMove(const QPointF &pos_before,
 }
 
 /**
-	Constructeur
-	@param cp Conducteurs reinitialises, associes a leur ancien profil
-	@param parent QUndoCommand parent
-*/
+ * @brief ResetConductorCommand::ResetConductorCommand
+ * @param cp
+ * @param parent
+ */
 ResetConductorCommand::ResetConductorCommand(
 	const QHash<Conductor *, ConductorProfilesGroup> &cp,
 	QUndoCommand *parent
@@ -740,11 +740,15 @@ ResetConductorCommand::ResetConductorCommand(
 	);
 }
 
-/// Destructeur
+/**
+ * @brief ResetConductorCommand::~ResetConductorCommand
+ */
 ResetConductorCommand::~ResetConductorCommand() {
 }
 
-/// Annule la reinitialisation des conducteurs
+/**
+ * @brief ResetConductorCommand::undo
+ */
 void ResetConductorCommand::undo() {
 	diagram -> showMe();
 	foreach(Conductor *c, conductors_profiles.keys()) {
@@ -752,10 +756,14 @@ void ResetConductorCommand::undo() {
 	}
 }
 
-/// Refait la reinitialisation des conducteurs
+/**
+ * @brief ResetConductorCommand::redo
+ */
 void ResetConductorCommand::redo() {
 	diagram -> showMe();
 	foreach(Conductor *c, conductors_profiles.keys()) {
+		c -> textItem() -> forceMovedByUser  (false);
+		c -> textItem() -> forceRotateByUser (false);
 		c -> setProfiles(ConductorProfilesGroup());
 	}
 }
diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp
index 7b14324b5..fe5fe7326 100644
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -1633,8 +1633,9 @@ ConductorProfilesGroup Conductor::profiles() const {
 }
 
 /**
-	@param cpg Les nouveaux profils de ce conducteur
-*/
+ * @brief Conductor::setProfiles
+ * @param cpg : the new profils of conductor
+ */
 void Conductor::setProfiles(const ConductorProfilesGroup &cpg) {
 	conductor_profiles = cpg;
 	if (conductor_profiles[currentPathType()].isNull()) {
@@ -1644,7 +1645,7 @@ void Conductor::setProfiles(const ConductorProfilesGroup &cpg) {
 		updateConductorPath(terminal1 -> dockConductor(), terminal1 -> orientation(), terminal2 -> dockConductor(), terminal2 -> orientation());
 		modified_path = true;
 	}
-	if (type() == ConductorProperties::Multi) {
+	if (properties().type == ConductorProperties::Multi) {
 		calculateTextItemPosition();
 	}
 }