Element editor : Add new tagg for text field (function and tension/protocol).

Report element : text field tagged function or tension/protocol display the function tension/protocol of the potential.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4195 bfdf4180-ca20-0410-9c96-a3a8aa849046

sources/editor/textfieldeditor.cpp

@@ -66,12 +66,14 @@ TextFieldEditor::TextFieldEditor(QETElementEditor *editor, PartTextField *textfi
 	t -> addWidget(qle_text);
 	main_layout -> addLayout(t);
 
-	//add the tagg combobox
+		//add the tagg combobox
 	QHBoxLayout *tagg_layout = new QHBoxLayout();
 	tagg_layout -> addWidget(new QLabel(tr("tagg :")));
 	tagg_layout -> addWidget(m_tagg_cb = new QComboBox());
 	m_tagg_cb -> addItem(tr("Aucun"), QVariant("none"));
 	m_tagg_cb -> addItem(tr("label"), QVariant("label"));
+	m_tagg_cb -> addItem(tr("Fonction"), QVariant("function"));
+	m_tagg_cb -> addItem(tr("Tension/protocole"), QVariant("tension-protocol"));
 	main_layout -> addLayout(tagg_layout);
 	
 	QHBoxLayout *rotation_angle_layout = new QHBoxLayout();
@@ -184,6 +186,12 @@ void TextFieldEditor::updateTextFieldRotationAngle()
 	}
 	m_locked= false;
 }
+
+/**
+ * @brief TextFieldEditor::updateTagg
+ * Change the tagg of the text field.
+ * Change is apply with a QUndoCommand
+ */
 void TextFieldEditor::updateTagg()
 {
 	if(m_locked) return;

sources/qetgraphicsitem/conductor.cpp

@@ -1366,6 +1366,7 @@ void Conductor::setProperties(const ConductorProperties &properties)
 	}
 
 	readProperties();
+	emit propertiesChange();
 }
 
 /**

sources/qetgraphicsitem/conductor.h

@@ -42,6 +42,9 @@ class Conductor : public QObject, public QGraphicsPathItem
 	Q_PROPERTY(QPointF pos READ pos WRITE setPos)
 	Q_PROPERTY(int animPath READ fakePath WRITE updatePathAnimate)
 	Q_PROPERTY(ConductorProperties properties READ properties WRITE setProperties)
+
+	signals:
+		void propertiesChange();
 	
 		// constructors, destructor
 	public:

sources/qetgraphicsitem/reportelement.cpp

@@ -20,10 +20,13 @@
 #include "diagramposition.h"
 #include "qetproject.h"
 #include "diagram.h"
+#include "terminal.h"
+#include "conductor.h"
 
 ReportElement::ReportElement(const ElementsLocation &location, QString link_type,QGraphicsItem *qgi, int *state) :
 	CustomElement(location, qgi, state),
-	m_text_field (nullptr)
+	m_text_field (nullptr),
+	m_watched_conductor(nullptr)
 {	
 		/*
 		 * Get text tagged label. This is work for report
@@ -39,10 +42,22 @@ ReportElement::ReportElement(const ElementsLocation &location, QString link_type
 
 	link_type == "next_report"? link_type_=NextReport : link_type_=PreviousReport;
 	link_type == "next_report"? inverse_report=PreviousReport : inverse_report=NextReport;
+
+		//We make these connections, to be always aware about the conductor properties
+	connect (terminals().first(), &Terminal::conductorWasAdded, this, &ReportElement::conductorWasAdded);
+	connect (terminals().first(), &Terminal::conductorWasRemoved, this, &ReportElement::conductorWasRemoved);
 }
 
-ReportElement::~ReportElement() {
+/**
+ * @brief ReportElement::~ReportElement
+ * Destructor
+ */
+ReportElement::~ReportElement()
+{
 	unlinkAllElements();
+	disconnect(terminals().first(), 0, 0, 0);
+	if (m_watched_conductor)
+		disconnect(m_watched_conductor, &Conductor::propertiesChange, this, &ReportElement::updateLabel);
 }
 
 /**
@@ -61,10 +76,8 @@ void ReportElement::linkToElement(Element * elmt)
 
 		//ensure elmt isn't already linked
 	bool i = true;
-	if (!this -> isFree())
+	if (!this -> isFree() && (connected_elements.first() == elmt))
-	{
+		i = false;
-		if (connected_elements.first() == elmt) i = false;
-	}
 
 		//ensure elmt is an inverse report of this element
 	if ((elmt->linkType() == inverse_report) && i)
@@ -76,11 +89,18 @@ void ReportElement::linkToElement(Element * elmt)
 		connect(elmt,                   SIGNAL( yChanged() ),                                       this, SLOT( updateLabel()     ));
 		connect(diagram(),              SIGNAL( reportPropertiesChanged(QString) ),                 this, SLOT( setLabel(QString) ));
 		connect(diagram() -> project(), SIGNAL( projectDiagramsOrderChanged(QETProject*,int,int) ), this, SLOT( updateLabel()     ));
+		connect(elmt->terminals().first(), &Terminal::conductorWasAdded, this, &ReportElement::conductorWasAdded);
+		connect(elmt->terminals().first(), &Terminal::conductorWasRemoved, this, &ReportElement::conductorWasRemoved);
 
 		label_ = diagram() -> defaultReportProperties();
-		updateLabel();
+
+		if (!m_watched_conductor && elmt->conductors().size())
+			conductorWasAdded(elmt->conductors().first());
+		else
+			updateLabel();
 
 		elmt -> linkToElement(this);
+
 		emit linkedElementChanged();
 	}
 }
@@ -91,26 +111,30 @@ void ReportElement::linkToElement(Element * elmt)
  */
 void ReportElement::unlinkAllElements()
 {
-	if (!isFree())
+	if (isFree()) return;
+
+	QList <Element *> tmp_elmt = connected_elements;
+
+	foreach(Element *elmt, connected_elements)
 	{
-		QList <Element *> tmp_elmt = connected_elements;
+		disconnect(elmt, SIGNAL(xChanged()), this, SLOT(updateLabel()));
-
+		disconnect(elmt, SIGNAL(yChanged()), this, SLOT(updateLabel()));
-		foreach(Element *elmt, connected_elements)
+		disconnect(diagram()->project(), SIGNAL(projectDiagramsOrderChanged(QETProject*,int,int)), this, SLOT(updateLabel()));
-		{
+		disconnect(elmt->terminals().first(), &Terminal::conductorWasAdded, this, &ReportElement::conductorWasAdded);
-			disconnect(elmt, SIGNAL(xChanged()), this, SLOT(updateLabel()));
+		disconnect(elmt->terminals().first(), &Terminal::conductorWasRemoved, this, &ReportElement::conductorWasRemoved);
-			disconnect(elmt, SIGNAL(yChanged()), this, SLOT(updateLabel()));
+		connected_elements.removeAll(elmt);
-			disconnect(diagram()->project(), SIGNAL(projectDiagramsOrderChanged(QETProject*,int,int)), this, SLOT(updateLabel()));
+			//if elmt is the owner of m_watched_conductor, we remove it
-		}
+		if (elmt->conductors().contains(m_watched_conductor))
-		connected_elements.clear();
+			conductorWasRemoved(m_watched_conductor);
-		updateLabel();
-
-		foreach(Element *elmt, tmp_elmt)
-		{
-			elmt -> setHighlighted(false);
-			elmt -> unlinkAllElements();
-		}
-		emit linkedElementChanged();
 	}
+	updateLabel();
+
+	foreach(Element *elmt, tmp_elmt)
+	{
+		elmt -> setHighlighted(false);
+		elmt -> unlinkAllElements();
+	}
+	emit linkedElementChanged();
 }
 /**
  * @brief ReportElement::unlinkElement
@@ -124,6 +148,44 @@ void ReportElement::unlinkElement(Element *elmt) {
 	unlinkAllElements();
 }
 
+/**
+ * @brief ReportElement::conductorWasAdded
+ * This method is called when a conduxtor is added to the potential
+ * @param conductor : added conductor
+ */
+void ReportElement::conductorWasAdded(Conductor *conductor)
+{
+	if (m_watched_conductor) return;
+
+	m_watched_conductor = conductor;
+	connect(m_watched_conductor, &Conductor::propertiesChange, this, &ReportElement::updateLabel);
+	updateLabel();
+}
+
+/**
+ * @brief ReportElement::conductorWasRemoved
+ * This method is called when a conductor is removed to the potential
+ * @param conductor : removed conductor
+ */
+void ReportElement::conductorWasRemoved(Conductor *conductor)
+{
+	if (m_watched_conductor != conductor) return;
+
+	disconnect(m_watched_conductor, &Conductor::propertiesChange, this, &ReportElement::updateLabel);
+	m_watched_conductor = nullptr;
+
+		//Get another conductor to be always up to date about the properties of the potential.
+
+		//Get a conducteur docked to this report
+	if (conductors().size())
+		conductorWasAdded(conductors().first());
+		//Else we get a conductor of the linked report (if any)
+	else if (linkedElements().size() && linkedElements().first()->conductors().size())
+		conductorWasAdded(linkedElements().first()->conductors().first());
+	else
+		updateLabel();
+}
+
 /**
  * @brief ReportElement::setLabel
  * Set new label and call updatelabel
@@ -153,7 +215,8 @@ void ReportElement::updateLabel()
 		m_text_field -> setPlainText(label);
 	}
 	else
-	{
 		m_text_field -> setPlainText("/");
-	}
+
+	setTaggedText("function", (m_watched_conductor? m_watched_conductor->properties().m_function : ""));
+	setTaggedText("tension-protocol", (m_watched_conductor? m_watched_conductor->properties().m_tension_protocol : ""));
 }

sources/qetgraphicsitem/reportelement.h

@@ -27,27 +27,30 @@ class ElementTextItem;
  *this class represent an element that can be linked to an other ReportElement
  * a folio report in a diagram is a element that show a wire go on an other folio
  */
-class ReportElement : public CustomElement {
+class ReportElement : public CustomElement
-
+{
 	Q_OBJECT
 
-	public  :
+	public :
-	explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = 0, int * = 0);
+		explicit ReportElement(const ElementsLocation &,QString link_type, QGraphicsItem * = 0, int * = 0);
-	~ReportElement();
+		~ReportElement();
-	virtual void linkToElement(Element *);
+		virtual void linkToElement(Element *);
-	virtual void unlinkAllElements();
+		virtual void unlinkAllElements();
-	virtual void unlinkElement(Element *elmt);
+		virtual void unlinkElement(Element *elmt);
 
 	private:
-	int              inverse_report;
+		int              inverse_report;
-	QString          label_;
+		QString          label_;
-	ElementTextItem *m_text_field;
+		ElementTextItem *m_text_field;
+		Conductor *m_watched_conductor;
 
-	signals:
+	private:
+		void conductorWasAdded(Conductor *conductor);
+		void conductorWasRemoved(Conductor *conductor);
 
 	private slots:
-	void setLabel (QString label);
+		void setLabel (QString label);
-	void updateLabel();
+		void updateLabel();
 };
 
 #endif // REPORTELEMENT_H

sources/qetgraphicsitem/terminal.cpp

@@ -78,7 +78,7 @@ void Terminal::init(QPointF pf, Qet::Orientation o, QString number, QString name
 	@param s   Scene sur laquelle figure cette borne
 */
 Terminal::Terminal(QPointF pf, Qet::Orientation o, Element *e) :
-	QGraphicsItem(e),
+	QGraphicsObject(e),
 	m_draw_help_line(false),
 	m_help_line     (nullptr),
 	m_help_line_a   (nullptr),
@@ -97,7 +97,7 @@ Terminal::Terminal(QPointF pf, Qet::Orientation o, Element *e) :
 	@param s    Scene sur laquelle figure cette borne
 */
 Terminal::Terminal(qreal pf_x, qreal pf_y, Qet::Orientation o, Element *e) :
-	QGraphicsItem(e),
+	QGraphicsObject(e),
 	m_draw_help_line (false),
 	m_help_line      (nullptr),
 	m_help_line_a    (nullptr),
@@ -118,7 +118,7 @@ Terminal::Terminal(qreal pf_x, qreal pf_y, Qet::Orientation o, Element *e) :
 	@param s   Scene sur laquelle figure cette borne
 */
 Terminal::Terminal(QPointF pf, Qet::Orientation o, QString num, QString name, bool hiddenName, Element *e) :
-	QGraphicsItem    (e),
+	QGraphicsObject    (e),
 	m_draw_help_line (false),
 	m_help_line      (nullptr),
 	m_help_line_a    (nullptr),
@@ -179,41 +179,41 @@ void Terminal::setName(QString name, bool hiddenName) {
 }
 
 /**
-	Attribue un conductor a la borne
+ * @brief Terminal::addConductor
-	@param f Le conducteur a rattacher a cette borne
+ * Add a conductor to this terminal
-*/
+ * @param conductor : the conductor to add.
-bool Terminal::addConductor(Conductor *f) {
+ * @return true if the conductor was successfully added
-	// pointeur 0 refuse
+ */
-	if (!f) return(false);
+bool Terminal::addConductor(Conductor *conductor)
+{
+	if (!conductor) return(false);
 	
-	// une seule des deux bornes du conducteur doit etre this
+	Q_ASSERT_X(((conductor -> terminal1 == this) ^ (conductor -> terminal2 == this)), "Terminal::addConductor", "The conductor must be linked exactly once to this terminal");
-	Q_ASSERT_X(((f -> terminal1 == this) ^ (f -> terminal2 == this)), "Terminal::addConductor", "Le conductor devrait etre relie exactement une fois a la terminal en cours");
 	
-	// determine l'autre borne a laquelle cette borne va etre relie grace au conducteur
+		//Get the other terminal where the conductor must be linked
-	Terminal *autre_terminal = (f -> terminal1 == this) ? f -> terminal2 : f -> terminal1;
+	Terminal *other_terminal = (conductor -> terminal1 == this) ? conductor->terminal2 : conductor->terminal1;
 	
-	// verifie que la borne n'est pas deja reliee avec l'autre borne
+		//Check if this terminal isn't already linked with other_terminal
-	bool deja_liees = false;
+	foreach (Conductor* cond, conductors_)
-	foreach (Conductor* conductor, conductors_) {
+		if (cond -> terminal1 == other_terminal || cond -> terminal2 == other_terminal)
-		if (conductor -> terminal1 == autre_terminal || conductor -> terminal2 == autre_terminal) deja_liees = true;
+			return false; //They already a conductor linked to this and other_terminal
-	}
+
-	
+	conductors_.append(conductor);
-	// si les deux bornes sont deja reliees, on refuse d'ajouter le conducteur
+	emit conductorWasAdded(conductor);
-	if (deja_liees) return(false);
-	
-	// sinon on ajoute le conducteur
-	conductors_.append(f);
 	return(true);
 }
 
 /**
-	Enleve un conducteur donne a la borne
+ * @brief Terminal::removeConductor
-	@param f Conducteur a enlever
+ * Remove a conductor from this terminal
-*/
+ * @param conductor : conductor to remove
-void Terminal::removeConductor(Conductor *f) {
+ */
-	int index = conductors_.indexOf(f);
+void Terminal::removeConductor(Conductor *conductor)
+{
+	int index = conductors_.indexOf(conductor);
 	if (index == -1) return;
 	conductors_.removeAt(index);
+	emit conductorWasRemoved(conductor);
 }
 
 /**

sources/qetgraphicsitem/terminal.h

@@ -27,9 +27,15 @@ class Element;
 	This class represents a terminal of an electrical element, i.e. a possible
 	plug point for conductors.
 */
-class Terminal : public QGraphicsItem {
+class Terminal : public QGraphicsObject
+{
+		Q_OBJECT
+
+	signals:
+		void conductorWasAdded(Conductor *conductor);
+		void conductorWasRemoved(Conductor *conductor);
 	
-	// constructors, destructor
+		// constructors, destructor
 	public:
 		Terminal(QPointF,      Qet::Orientation, Element * = 0);
 		Terminal(qreal, qreal, Qet::Orientation, Element * = 0);
@@ -39,7 +45,7 @@ class Terminal : public QGraphicsItem {
 	private:
 		Terminal(const Terminal &);
 	
-	// methods
+		// methods
 	public:
 			//Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a Terminal
 			//@return the QGraphicsItem type
@@ -52,8 +58,8 @@ class Terminal : public QGraphicsItem {
 	
 			// methods to manage conductors attached to the terminal
 		Terminal* alignedWithTerminal () const;
-		bool      addConductor        (Conductor *);
+		bool      addConductor        (Conductor *conductor);
-		void      removeConductor     (Conductor *);
+		void      removeConductor     (Conductor *conductor);
 		int       conductorsCount     () const;
 		Diagram  *diagram             () const;
 		Element  *parentElement       () const;