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

Element text item with are now converted to dynamic element text item.

Browse Source 
From now, the class ElementTextItem is not anymore use in qet. Every texts in a diagram are DynamicElementTextItem.
the Xref item was adapted to dynamic text.
Previously, the comment and location, displayed as a "static text" below the "old text" tagged "label" are now automaticaly converted to DynamicElementTextItem, so visually, these texts stay unchanged 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5216 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-01-19 12:17:20 +00:00
parent 649f8519c6
commit d85e395b46
17 changed files with 856 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
sources/qetgraphicsitem/customelement.cpp
View File

@@ -737,33 +737,33 @@ bool CustomElement::parseInput(QDomElement &dom_element) {
!QET::attributeIsAnInteger(dom_element, "size", &size)
) return(false);
//The text have a tagg, we create an element text item
if (dom_element.attribute("tagg", "none") != "none")
{
ElementTextItem *eti = new ElementTextItem(dom_element.attribute("text"), this);
eti -> setFont(QETApp::diagramTextsFont(size));
eti -> setTagg(dom_element.attribute("tagg", "other"));
m_element_informations.addValue(dom_element.attribute("tagg", "other"), dom_element.attribute("text"));
// //The text have a tagg, we create an element text item
// if (dom_element.attribute("tagg", "none") != "none")
// {
// ElementTextItem *eti = new ElementTextItem(dom_element.attribute("text"), this);
// eti -> setFont(QETApp::diagramTextsFont(size));
// eti -> setTagg(dom_element.attribute("tagg", "other"));
// m_element_informations.addValue(dom_element.attribute("tagg", "other"), dom_element.attribute("text"));
// position the text field
eti -> setOriginalPos(QPointF(pos_x, pos_y));
eti -> setPos(pos_x, pos_y);
// // position the text field
// eti -> setOriginalPos(QPointF(pos_x, pos_y));
// eti -> setPos(pos_x, pos_y);
// rotation of the text field
qreal original_rotation_angle = 0.0;
QET::attributeIsAReal(dom_element, "rotation", &original_rotation_angle);
eti -> setOriginalRotationAngle(original_rotation_angle);
eti -> setRotationAngle(original_rotation_angle);
// // rotation of the text field
// qreal original_rotation_angle = 0.0;
// QET::attributeIsAReal(dom_element, "rotation", &original_rotation_angle);
// eti -> setOriginalRotationAngle(original_rotation_angle);
// eti -> setRotationAngle(original_rotation_angle);
// behavior when the parent element is rotated
eti -> setFollowParentRotations(dom_element.attribute("rotate") == "true");
// // behavior when the parent element is rotated
// eti -> setFollowParentRotations(dom_element.attribute("rotate") == "true");
m_texts << eti;
// m_texts << eti;
connect(eti, &ElementTextItem::diagramTextChanged, this, &Element::textItemChanged);
// connect(eti, &ElementTextItem::diagramTextChanged, this, &Element::textItemChanged);
return(eti);
}
// return(eti);
// }
//The text haven't got a tagg, so we convert it to a dynamic text item
//and store it to m_converted_text_from_xml_description, instead of m_dynamic_text_list
//because these dynamic text need post treatement
@@ -773,7 +773,12 @@ bool CustomElement::parseInput(QDomElement &dom_element) {
deti->setText(dom_element.attribute("text", "_"));
deti->setFontSize(dom_element.attribute("size", QString::number(9)).toInt());
deti->setRotation(dom_element.attribute("rotation", QString::number(0)).toDouble());
if(dom_element.attribute("tagg", "none") != "none")
{
deti->setTextFrom(DynamicElementTextItem::ElementInfo);
deti->setInfoName(dom_element.attribute("tagg"));
}
//the origin transformation point of PartDynamicTextField is the top left corner, no matter the font size
//The origin transformation point of ElementTextItem is the middle of left edge, and so by definition, change with the size of the font