Element editor :

The font of the dynamic text field can be edited.
The font of the static text field can be edited.
The color of the static text field can be edited. 


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

sources/editor/graphicspart/partdynamictextfield.cpp

@@ -33,8 +33,8 @@ PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsIt
 	setDefaultTextColor(Qt::black);
 	setFont(QETApp::dynamicTextsItemFont());
 	QSettings settings;
-	setRotation(settings.value("dynamic_rotation", 0).toInt());
-	setTextWidth(settings.value("dynamic_with", -1).toInt());
+	setRotation(settings.value("diagrameditor/dynamic_text_rotation", 0).toInt());
+	setTextWidth(settings.value("diagrameditor/dynamic_text_width", -1).toInt());
 	setText("_");
 	setTextFrom(DynamicElementTextItem::UserText);
 	setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges | QGraphicsItem::ItemIsMovable);
@@ -94,8 +94,7 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 	root_element.setAttribute("y", QString::number(pos().y()));
 	root_element.setAttribute("z", QString::number(zValue()));
 	root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation())));
-	root_element.setAttribute("font_size", font().pointSize());
-	root_element.setAttribute("font_family", (QETApp::dynamicTextsItemFont().family()));
+	root_element.setAttribute("font", font().toString());
 	root_element.setAttribute("uuid", m_uuid.toString());
 	root_element.setAttribute("frame", m_frame? "true" : "false");
 	root_element.setAttribute("text_width", QString::number(m_text_width));
@@ -165,7 +164,16 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt)
 							  dom_elmt.attribute("y", QString::number(0)).toDouble());
 	setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble());
 	QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble());
-	setFont(QETApp::diagramTextsFont(dom_elmt.attribute("font_size", QString::number(9)).toInt()));
+
+	if (dom_elmt.hasAttribute("font"))
+	{
+		QFont font_;
+		font_.fromString(dom_elmt.attribute("font"));
+		setFont(font_);
+	} else {	//Keep compatibility TODO remove in futur
+		setFont(QETApp::dynamicTextsItemFont(9));
+	}
+
 	m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString()));
 	setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false);
 	setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());
@@ -352,22 +360,6 @@ QColor PartDynamicTextField::color() const {
 	return defaultTextColor();
 }
 
-/**
- * @brief PartDynamicTextField::setFontSize
- * @param s
- */
-void PartDynamicTextField::setFontSize(int s)
-{
-	prepareAlignment();
-	setFont(QETApp::dynamicTextsItemFont(s));
-	finishAlignment();
-	emit fontSizeChanged(s);
-}
-
-int PartDynamicTextField::fontSize() const {
-	return font().pointSize();
-}
-
 void PartDynamicTextField::setFrame(bool frame)
 {
 	m_frame = frame;
@@ -425,6 +417,17 @@ Qt::Alignment PartDynamicTextField::alignment() const {
 	return m_alignment;
 }
 
+void PartDynamicTextField::setFont(const QFont &font)
+{
+	if (font == this->font()) {
+		return;
+	}
+	prepareAlignment();
+	QGraphicsTextItem::setFont(font);
+	finishAlignment();
+	emit fontChanged(font);
+}
+
 /**
  * @brief PartDynamicTextField::mouseMoveEvent
  * @param event
@@ -501,13 +504,13 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt
 	if (m_frame)
 	{
 		painter->save();
-		painter->setFont(QETApp::dynamicTextsItemFont(fontSize()));
+		painter->setFont(this->font());
 		
 			//Adjust the thickness according to the font size, 
 		qreal w=0.3;
-		if(fontSize() >= 5)
+		if(this->font().pointSize() >= 5)
 		{
-			w = (qreal)fontSize()*0.1;
+			w = this->font().pointSizeF()*0.1;
 			if(w > 2.5)
 				w = 2.5;
 		}
@@ -534,7 +537,7 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt
 		pos.ry() -= size.height()/2;
 		
 			//Adjust the rounding of the rectangle according to the size of the font
-		qreal ro = (qreal)fontSize()/3;
+		qreal ro = this->font().pointSizeF()/3;
 		painter->drawRoundedRect(QRectF(pos, size), ro, ro);
 		
 		painter->restore();

sources/editor/graphicspart/partdynamictextfield.h

@@ -38,10 +38,10 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 	Q_PROPERTY(QString infoName READ infoName WRITE setInfoName NOTIFY infoNameChanged)
 	Q_PROPERTY(QString compositeText READ compositeText WRITE setCompositeText NOTIFY compositeTextChanged)
 	Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-	Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
 	Q_PROPERTY(bool frame READ frame WRITE setFrame NOTIFY frameChanged)
 	Q_PROPERTY(qreal textWidth READ textWidth WRITE setTextWidth NOTIFY textWidthChanged)
 	Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+	Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
 	
 	public:
 			///PROPERTY
@@ -55,10 +55,10 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 		void infoNameChanged(QString info);
 		void compositeTextChanged(QString text);
 		void colorChanged(QColor color);
-		void fontSizeChanged(int size);
 		void frameChanged(bool frame);
 		void textWidthChanged(qreal width);
 		void alignmentChanged(Qt::Alignment alignment);
+		void fontChanged(QFont font);
 	
 	public:
 		PartDynamicTextField(QETElementEditor *editor, QGraphicsItem *parent = nullptr);
@@ -88,14 +88,13 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 		QString compositeText() const;
 		void setColor(const QColor& color);
         QColor color() const;
-		void setFontSize(int s);
-        int fontSize()const;
 		void setFrame(bool frame);
 		bool frame() const;
 		void setTextWidth(qreal width);
 		void setPlainText(const QString &text);
 		void setAlignment(Qt::Alignment alignment);
 		Qt::Alignment alignment() const;
+		void setFont(const QFont &font);
 		
 	protected:
 		void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;

sources/editor/graphicspart/parttext.cpp

@@ -55,24 +55,32 @@ PartText::~PartText() {
 	Importe les proprietes d'un texte statique depuis un element XML
 	@param xml_element Element XML a lire
 */
-void PartText::fromXml(const QDomElement &xml_element) {
+void PartText::fromXml(const QDomElement &xml_element)
+{
 	bool ok;
-	int font_size = xml_element.attribute("size").toInt(&ok);
-	if (!ok || font_size < 1) font_size = 20;
-	
-	setBlack(xml_element.attribute("color") != "white");
-	setProperty("size" , font_size);
-	setPlainText(xml_element.attribute("text"));
-	
-	qreal default_rotation_angle = 0.0;
-	if (QET::attributeIsAReal(xml_element, "rotation", &default_rotation_angle)) {
-		setRotation(default_rotation_angle);
+
+	if (xml_element.hasAttribute("size"))
+	{
+		int font_size = xml_element.attribute("size").toInt(&ok);
+		if (!ok || font_size < 1) {
+			font_size = 20;
+		}
+		QFont font_ = this->font();
+		font_.setPointSize(font_size);
+		setFont(font_);
+	}
+	else if (xml_element.hasAttribute("font"))
+	{
+		QFont font_;
+		font_.fromString(xml_element.attribute("font"));
+		setFont(font_);
 	}
 	
-	setPos(
-		xml_element.attribute("x").toDouble(),
-		xml_element.attribute("y").toDouble()
-	);
+	setDefaultTextColor(QColor(xml_element.attribute("color", "#000000")));
+	setPlainText(xml_element.attribute("text"));
+	setPos(xml_element.attribute("x").toDouble(),
+		   xml_element.attribute("y").toDouble());
+	setRotation(xml_element.attribute("rotation", QString::number(0)).toDouble());
 }
 
 /**
@@ -80,19 +88,17 @@ void PartText::fromXml(const QDomElement &xml_element) {
 	@param xml_document Document XML a utiliser pour creer l'element XML
 	@return un element XML decrivant le texte statique
 */
-const QDomElement PartText::toXml(QDomDocument &xml_document) const {
-	QDomElement xml_element = xml_document.createElement("text");
-	xml_element.setAttribute("x", QString("%1").arg(pos().x()));
-	xml_element.setAttribute("y", QString("%1").arg(pos().y()));
+const QDomElement PartText::toXml(QDomDocument &xml_document) const
+{
+	QDomElement xml_element = xml_document.createElement(xmlName());
+
+	xml_element.setAttribute("x", QString::number(pos().x()));
+	xml_element.setAttribute("y", QString::number(pos().y()));
 	xml_element.setAttribute("text", toPlainText());
-	xml_element.setAttribute("size", font().pointSize());
-	// angle de rotation du champ de texte
-	if (rotation()) {
-		xml_element.setAttribute("rotation", QString("%1").arg(rotation()));
-	}
-	if (!isBlack()) {
-		xml_element.setAttribute("color", "white");
-	}
+	xml_element.setAttribute("font", font().toString());
+	xml_element.setAttribute("rotation", QString::number(rotation()));
+	xml_element.setAttribute("color", defaultTextColor().name());
+
 	return(xml_element);
 }
 
@@ -228,6 +234,33 @@ void PartText::handleUserTransformation(const QRectF &initial_selection_rect, co
 	setProperty("real_size", qMax(1, qRound(new_font_size)));
 }
 
+void PartText::setDefaultTextColor(const QColor &color)
+{
+	if (color != this->defaultTextColor())
+	{
+		QGraphicsTextItem::setDefaultTextColor(color);
+		emit colorChanged(color);
+	}
+}
+
+void PartText::setPlainText(const QString &text)
+{
+	if (text != this->toPlainText())
+	{
+		QGraphicsTextItem::setPlainText(text);
+		emit plainTextChanged(text);
+	}
+}
+
+void PartText::setFont(const QFont &font)
+{
+	if (font != this->font())
+	{
+		QGraphicsTextItem::setFont(font);
+		emit fontChanged(font);
+	}
+}
+
 
 void PartText::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {

sources/editor/graphicspart/parttext.h

@@ -26,53 +26,55 @@ class ElementPrimitiveDecorator;
 	This class represents an static text primitive which may be used to compose
 	the drawing of an electrical element within the element editor.
 */
-class PartText : public QGraphicsTextItem, public CustomElementPart {
+class PartText : public QGraphicsTextItem, public CustomElementPart
+{
 	Q_OBJECT
+
+	Q_PROPERTY(qreal real_size READ realSize WRITE setRealSize)
+	Q_PROPERTY(QColor color READ defaultTextColor WRITE setDefaultTextColor NOTIFY colorChanged)
+	Q_PROPERTY(QString text READ toPlainText WRITE setPlainText NOTIFY plainTextChanged)
+	Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
+
+	signals:
+		void fontChanged(const QFont &font);
+		void colorChanged(const QColor &color);
+		void plainTextChanged(const QString &text);
 	
-	// constructors, destructor
+		// constructors, destructor
 	public:
-    PartText(QETElementEditor *, QGraphicsItem * = nullptr);
-	~PartText() override;
+		PartText(QETElementEditor *, QGraphicsItem * = nullptr);
+		~PartText() override;
 	
 	private:
-	PartText(const PartText &);
+		PartText(const PartText &);
 	
-	// methods
+		// methods
 	public:
-	enum { Type = UserType + 1107 };
-	/**
-		Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a
-		PartText.
-		@return the QGraphicsItem type
-	*/
-	int type() const override { return Type; }
-	QString name() const override { return(QObject::tr("texte", "element part name")); }
-	QString xmlName() const override { return(QString("text")); }
-	void fromXml(const QDomElement &) override;
-	const QDomElement toXml(QDomDocument &) const override;
-	void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
-	bool isUseless() const override;
-	QRectF sceneGeometricRect() const override;
-	void startUserTransformation(const QRectF &) override;
-	void handleUserTransformation(const QRectF &, const QRectF &) override;
+		enum { Type = UserType + 1107 };
+		/**
+			Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a
+			PartText.
+			@return the QGraphicsItem type
+		*/
+		int type() const override { return Type; }
+		QString name() const override { return(QObject::tr("texte", "element part name")); }
+		QString xmlName() const override { return(QString("text")); }
+		void fromXml(const QDomElement &) override;
+		const QDomElement toXml(QDomDocument &) const override;
+		void setRotation(qreal angle) {(QGraphicsObject::setRotation(QET::correctAngle(angle)));}
+		bool isUseless() const override;
+		QRectF sceneGeometricRect() const override;
+		void startUserTransformation(const QRectF &) override;
+		void handleUserTransformation(const QRectF &, const QRectF &) override;
+
+		void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);}
+		QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);}
 
-	///PROPERTY
-	void setProperty(const char *name, const QVariant &value) override {QGraphicsTextItem::setProperty(name, value);}
-	QVariant property(const char *name) const override {return QGraphicsTextItem::property(name);}
-	// Size value
-	Q_PROPERTY(qreal size READ size WRITE setSize)
-		qreal size () const {return font().pointSize();}
-		void setSize (qreal s) {setFont(QETApp::dynamicTextsItemFont(s));}
-	// Real size value
-	Q_PROPERTY(qreal real_size READ realSize WRITE setRealSize)
 		qreal realSize() const {return real_font_size_;}
 		void setRealSize(qreal rs) {real_font_size_ = rs;}
-	// Color value (true = black , false = white)
-	Q_PROPERTY(bool color READ isBlack WRITE setBlack)
-		bool isBlack() const {return defaultTextColor() == Qt::black;}
-		void setBlack(bool b) {setDefaultTextColor(b ? Qt::black : Qt::white);}
-	// displayed string
-	Q_PROPERTY(QString text READ toPlainText WRITE setPlainText)
+		void setDefaultTextColor(const QColor &color);
+		void setPlainText(const QString &text);
+		void setFont(const QFont &font);
 	
 	public slots:
         void adjustItemPosition(int = 0);