Element editor : dynamic text item can be added directly from the element editor (WIP)

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

sources/qetgraphicsitem/customelement.cpp

@@ -24,6 +24,7 @@
 #include "terminal.h"
 #include "diagramposition.h"
 #include "diagramcontent.h"
+#include "dynamicelementtextitem.h"
 
 /**
 	Constructeur de la classe CustomElement. Permet d'instancier un element
@@ -95,11 +96,13 @@ bool CustomElement::buildFromXml(const QDomElement &xml_def_elmt, int *state) {
 		return(false);
 	}
 
-	// verifie basiquement que la version actuelle est capable de lire ce fichier
-	if (xml_def_elmt.hasAttribute("version")) {
+		//Check if the curent version can read the xml description
+	if (xml_def_elmt.hasAttribute("version"))
+	{
 		bool conv_ok;
 		qreal element_version = xml_def_elmt.attribute("version").toDouble(&conv_ok);
-		if (conv_ok && QET::version.toDouble() < element_version) {
+		if (conv_ok && QET::version.toDouble() < element_version)
+		{
 			std::cerr << qPrintable(
 				QObject::tr("Avertissement : l'élément "
 				" a été enregistré avec une version"
@@ -108,7 +111,7 @@ bool CustomElement::buildFromXml(const QDomElement &xml_def_elmt, int *state) {
 		}
 	}
 
-	// ces attributs doivent etre presents et valides
+		//This attribute must be present and valid
 	int w, h, hot_x, hot_y;
 	if (
 		!QET::attributeIsAnInteger(xml_def_elmt, QString("width"), &w) ||\
@@ -131,61 +134,81 @@ bool CustomElement::buildFromXml(const QDomElement &xml_def_elmt, int *state) {
 		return(false);
 	}
 
-	// initialisation du QPainter (pour dessiner l'element)
+		//Init the QPainter for draw the elemennt
 	QPainter qp;
 	qp.begin(&drawing);
 
 	QPainter low_zoom_qp;
 	low_zoom_qp.begin(&low_zoom_drawing);
 	QPen tmp;
-	tmp.setWidthF(1.0); // ligne vaudou pour prise en compte du setCosmetic - ne pas enlever
+	tmp.setWidthF(1.0); //Vaudoo line to take into account the setCosmetic - don't remove
 	tmp.setCosmetic(true);
 	low_zoom_qp.setPen(tmp);
 
-	// extrait les noms de la definition XML
+		//Extract the names
 	names.fromXml(xml_def_elmt);
 	setToolTip(name());
 
-	//load kind informations
+		//load kind informations
 	kind_informations_.fromXml(xml_def_elmt.firstChildElement("kindInformations"), "kindInformation");
 
-	// parcours des enfants de la definition : parties du dessin
+		//scroll of the Children of the Definition: Parts of the Drawing
 	int parsed_elements_count = 0;
-	for (QDomNode node = xml_def_elmt.firstChild() ; !node.isNull() ; node = node.nextSibling()) {
+	for (QDomNode node = xml_def_elmt.firstChild() ; !node.isNull() ; node = node.nextSibling())
+	{
 		QDomElement elmts = node.toElement();
-		if (elmts.isNull()) continue;
-		if (elmts.tagName() == "description") {
-			// gestion de la description graphique de l'element
-			//  = parcours des differentes parties du dessin
-			for (QDomNode n = node.firstChild() ; !n.isNull() ; n = n.nextSibling()) {
+		if (elmts.isNull())
+			continue;
+		
+		if (elmts.tagName() == "description")
+		{
+				//Manage the graphic description = part of drawing
+			for (QDomNode n = node.firstChild() ; !n.isNull() ; n = n.nextSibling())
+			{
 				QDomElement qde = n.toElement();
-				if (qde.isNull()) continue;
-				if (parseElement(qde, qp)) {
+				if (qde.isNull())
+					continue;
+				
+				if (parseElement(qde, qp))
+				{
 					++ parsed_elements_count;
 					QString current_tag = qde.tagName();
-					if (current_tag != "terminal" && current_tag != "input") {
+					if (current_tag != "terminal" && current_tag != "input" && current_tag != "dynamic_text")
+					{
 						forbid_antialiasing = true;
 						parseElement(qde, low_zoom_qp);
 						forbid_antialiasing = false;
 					}
-				} else {
-					if (state) *state = 7;
+				}
+				else
+				{
+					if (state)
+						*state = 7;
+					
 					return(false);
 				}
 			}
 		}
 	}
 
-	// fin du dessin
+		//End of the drawing
 	qp.end();
 	low_zoom_qp.end();
 
-	// il doit y avoir au moins un element charge
-	if (!parsed_elements_count) {
-		if (state) *state = 8;
+
+		//They must be at least one parsed graphics part
+	if (!parsed_elements_count)
+	{
+		if (state)
+			*state = 8;
+		
 		return(false);
-	} else {
-		if (state) *state = 0;
+	}
+	else
+	{
+		if (state)
+			*state = 0;
+		
 		return(true);
 	}
 }
@@ -277,17 +300,19 @@ void CustomElement::paint(QPainter *qp, const QStyleOptionGraphicsItem *options)
 	@param qp Le QPainter a utiliser pour dessiner l'element perso
 	@return true si l'analyse reussit, false sinon
 */
-bool CustomElement::parseElement(QDomElement &e, QPainter &qp) {
-	if (e.tagName() == "terminal") return(parseTerminal(e));
-	else if (e.tagName() == "line") return(parseLine(e, qp));
-	else if (e.tagName() == "rect") return(parseRect(e, qp));
-	else if (e.tagName() == "ellipse") return(parseEllipse(e, qp));
-	else if (e.tagName() == "circle") return(parseCircle(e, qp));
-	else if (e.tagName() == "arc") return(parseArc(e, qp));
-	else if (e.tagName() == "polygon") return(parsePolygon(e, qp));
-	else if (e.tagName() == "text") return(parseText(e, qp));
-	else if (e.tagName() == "input") return(parseInput(e));
-	else return(true);	// on n'est pas chiant, on ignore l'element inconnu
+bool CustomElement::parseElement(QDomElement &e, QPainter &qp)
+{
+	if      (e.tagName() == "terminal")     return(parseTerminal(e));
+	else if (e.tagName() == "line")         return(parseLine(e, qp));
+	else if (e.tagName() == "rect")         return(parseRect(e, qp));
+	else if (e.tagName() == "ellipse")      return(parseEllipse(e, qp));
+	else if (e.tagName() == "circle")       return(parseCircle(e, qp));
+	else if (e.tagName() == "arc")          return(parseArc(e, qp));
+	else if (e.tagName() == "polygon")      return(parsePolygon(e, qp));
+	else if (e.tagName() == "text")         return(parseText(e, qp));
+	else if (e.tagName() == "input")        return(parseInput(e));
+	else if (e.tagName() == "dynamic_text") return(parseDynamicText(e));
+	else return(true);
 }
 
 /**
@@ -719,6 +744,27 @@ ElementTextItem *CustomElement::parseInput(QDomElement &e) {
 	return(eti);
 }
 
+/**
+ * @brief CustomElement::parseDynamicText
+ * Create the dynamic text field describ in @dom_element
+ * @param dom_element
+ * @return 
+ */
+DynamicElementTextItem *CustomElement::parseDynamicText(QDomElement &dom_element)
+{
+	DynamicElementTextItem *deti = new DynamicElementTextItem(this);
+		//Because the xml description of a .elmt file is the same as how a dynamic text field is save to xml in a .qet file
+		//wa call fromXml, we just change the tagg name (.elmt = dynamic_text, .qet = dynamic_elmt_text)
+		//and the uuid (because the uuid, is the uuid of the descritpion and not the uuid of instantiated dynamic text field)
+	
+	QDomElement dom(dom_element.cloneNode(true).toElement());
+	dom.setTagName(DynamicElementTextItem::xmlTaggName());
+	deti->fromXml(dom);
+	deti->m_uuid = QUuid::createUuid();
+	this->addDynamicTextItem(deti);
+	return deti;
+}
+
 /**
 	Analyse un element XML suppose representer une borne. Si l'analyse
 	reussit, la borne est ajoutee a l'element.

sources/qetgraphicsitem/customelement.h

@@ -54,45 +54,47 @@ class CustomElement : public FixedElement
 		bool forbid_antialiasing;
 
 
-	QList<QLineF *> list_lines_;
-	QList<QRectF *> list_rectangles_;
-	QList<QRectF *> list_circles_;
-	QList<QVector<QPointF> *> list_polygons_;
-	QList<QVector<qreal> *> list_arcs_;
+		QList<QLineF *> list_lines_;
+		QList<QRectF *> list_rectangles_;
+		QList<QRectF *> list_circles_;
+		QList<QVector<QPointF> *> list_polygons_;
+		QList<QVector<qreal> *> list_arcs_;
 	
 	// methods
 	public:
-	QList<Terminal *> terminals() const override;
-	QList<Conductor *> conductors() const override;
-	QList<ElementTextItem *> texts() const override;
-	QList<QLineF *> lines() const override;
-	QList<QRectF *> rectangles() const override;
-	QList<QRectF *> circles() const override;
-	QList<QVector<QPointF> *> polygons() const override;
-	QList<QVector<qreal> *> arcs() const override;
-	int terminalsCount() const override;
-	void paint(QPainter *, const QStyleOptionGraphicsItem *) override;
-	QString typeId() const override;
-	ElementsLocation location() const;
-	QString name() const override;
-	ElementTextItem* taggedText(const QString &tagg) const override;
+		QList<Terminal *> terminals() const override;
+		QList<Conductor *> conductors() const override;
+		QList<ElementTextItem *> texts() const override;
+		QList<QLineF *> lines() const override;
+		QList<QRectF *> rectangles() const override;
+		QList<QRectF *> circles() const override;
+		QList<QVector<QPointF> *> polygons() const override;
+		QList<QVector<qreal> *> arcs() const override;
+		int terminalsCount() const override;
+		void paint(QPainter *, const QStyleOptionGraphicsItem *) override;
+		QString typeId() const override;
+		ElementsLocation location() const;
+		QString name() const override;
+		ElementTextItem* taggedText(const QString &tagg) const override;
 	
 	protected:
-	virtual bool buildFromXml(const QDomElement &, int * = nullptr);
-	virtual bool parseElement(QDomElement &, QPainter &);
-	virtual bool parseLine(QDomElement &, QPainter &);
-	virtual bool parseRect(QDomElement &, QPainter &);
-	virtual bool parseEllipse(QDomElement &, QPainter &);
-	virtual bool parseCircle(QDomElement &, QPainter &);
-	virtual bool parseArc(QDomElement &, QPainter &);
-	virtual bool parsePolygon(QDomElement &, QPainter &);
-	virtual bool parseText(QDomElement &, QPainter &);
-	virtual ElementTextItem *parseInput(QDomElement &);
-	virtual Terminal *parseTerminal(QDomElement &);
-	virtual void setQPainterAntiAliasing(QPainter &, bool);
-	virtual bool validOrientationAttribute(const QDomElement &);
-	virtual void setPainterStyle(QDomElement &, QPainter &);
-	ElementTextItem* setTaggedText(const QString &tagg, const QString &newstr, const bool noeditable=false);
+		virtual bool buildFromXml(const QDomElement &, int * = nullptr);
+		virtual bool parseElement(QDomElement &, QPainter &);
+		virtual bool parseLine(QDomElement &, QPainter &);
+		virtual bool parseRect(QDomElement &, QPainter &);
+		virtual bool parseEllipse(QDomElement &, QPainter &);
+		virtual bool parseCircle(QDomElement &, QPainter &);
+		virtual bool parseArc(QDomElement &, QPainter &);
+		virtual bool parsePolygon(QDomElement &, QPainter &);
+		virtual bool parseText(QDomElement &, QPainter &);
+		virtual ElementTextItem *parseInput(QDomElement &);
+		virtual DynamicElementTextItem *parseDynamicText(QDomElement &);
+		virtual Terminal *parseTerminal(QDomElement &);
+		
+		virtual void setQPainterAntiAliasing(QPainter &, bool);
+		virtual bool validOrientationAttribute(const QDomElement &);
+		virtual void setPainterStyle(QDomElement &, QPainter &);
+		ElementTextItem* setTaggedText(const QString &tagg, const QString &newstr, const bool noeditable=false);
 
 };
 

sources/qetgraphicsitem/dynamicelementtextitem.cpp

@@ -86,6 +86,19 @@ DynamicElementTextItem::DynamicElementTextItem(Element *parent_element) :
 DynamicElementTextItem::~DynamicElementTextItem()
 {}
 
+/**
+ * @brief DynamicElementTextItem::textFromMetaEnum
+ * @return The QMetaEnum of the enum TextFrom 
+ */
+QMetaEnum DynamicElementTextItem::textFromMetaEnum()
+{
+	DynamicElementTextItem deti;
+	return deti.metaObject()->enumerator(deti.metaObject()->indexOfEnumerator("TextFrom"));
+}
+
+DynamicElementTextItem::DynamicElementTextItem()
+{}
+
 /**
  * @brief DynamicElementTextItem::toXml
  * Export this text to xml
@@ -102,7 +115,7 @@ QDomElement DynamicElementTextItem::toXml(QDomDocument &dom_doc) const
 	root_element.setAttribute("font_size", font().pointSize());
 	root_element.setAttribute("uuid", m_uuid.toString());
 	
-	QMetaEnum me = metaObject()->enumerator(metaObject()->indexOfEnumerator("TextFrom"));
+	QMetaEnum me = textFromMetaEnum();
 	root_element.setAttribute("text_from", me.valueToKey(m_text_from));
 	
     QDomElement dom_text = dom_doc.createElement("text");
@@ -162,7 +175,7 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt)
 	setFont(QETApp::diagramTextsFont(dom_elmt.attribute("font_size", QString::number(9)).toInt()));
 	m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString()));
 	
-	QMetaEnum me = metaObject()->enumerator(metaObject()->indexOfEnumerator("TextFrom"));
+	QMetaEnum me = textFromMetaEnum();
 	m_text_from = DynamicElementTextItem::TextFrom(me.keyToValue(dom_elmt.attribute("text_from").toStdString().data()));
 	if(m_text_from == ElementInfo || m_text_from == CompositeText)
 	{
@@ -178,7 +191,10 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt)
 		//Text
     QDomElement dom_text = dom_elmt.firstChildElement("text");
 	if (!dom_text.isNull())
-        setPlainText(dom_text.text());
+	{
+		m_text = dom_text.text();
+		setPlainText(m_text);
+	}
 	
 		//Info name
 	QDomElement dom_info_name = dom_elmt.firstChildElement("info_name");

sources/qetgraphicsitem/dynamicelementtextitem.h

@@ -35,6 +35,7 @@ class DynamicElementTextItem : public DiagramTextItem
 {
 	friend class DynamicTextItemDelegate;
 	friend class CompositeTextEditDialog;
+	friend class CustomElement;
 	
     Q_OBJECT
     
@@ -64,7 +65,9 @@ class DynamicElementTextItem : public DiagramTextItem
 	public:
 		DynamicElementTextItem(Element *parent_element);
 		~DynamicElementTextItem() override;
+		static QMetaEnum textFromMetaEnum();
 	private:
+		DynamicElementTextItem ();
 		DynamicElementTextItem(const DynamicElementTextItem &);
 		
 	public:

sources/qetgraphicsitem/element.cpp

@@ -532,6 +532,12 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
 	} else {
 		applyRotation(90*read_ori);
 	}
+	
+		//Befor 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
     for (QDomElement qde : QET::findInDomElement(e, "dynamic_texts", DynamicElementTextItem::xmlTaggName()))
@@ -626,7 +632,7 @@ QDomElement Element::toXml(QDomDocument &document, QHash<Terminal *, int> &table
 		m_element_informations.toXml(infos, "elementInformation");
 		element.appendChild(infos);
 	}
-    
+    	
         //Dynamic texts
     QDomElement dyn_text = document.createElement("dynamic_texts");
     for (DynamicElementTextItem *deti : m_dynamic_text_list)