kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dynamic text item : load the good font from xml.

Browse Source 
Laurent, you can now sleep well :) 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5603 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-11-24 21:12:27 +00:00
parent bc3f02a6e9
commit 2f585840c6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/qetgraphicsitem/diagramtextitem.cpp
View File

@@ -153,7 +153,9 @@ QPointF DiagramTextItem::mapMovementFromParent(const QPointF &movement) const {
void DiagramTextItem::setFontSize(int s) void DiagramTextItem::setFontSize(int s)
{ {
prepareAlignment(); prepareAlignment();
setFont(QETApp::diagramTextsFont(s)); QFont font_ = font();
font_.setPointSize(s);
setFont(font_);
finishAlignment(); finishAlignment();
emit fontSizeChanged(s); emit fontSizeChanged(s);
} }

4
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -161,7 +161,9 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt)
} }
QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble()); QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble());
setFont(QETApp::diagramTextsFont(dom_elmt.attribute("font_size", QString::number(9)).toInt())); QFont font_(dom_elmt.attribute("dynamicitemfont", font().family()),
dom_elmt.attribute("font_size", QString::number(9)).toInt());
setFont(font_);
m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString())); m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString()));
setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false); setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false);
setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble()); setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());