kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-30 14:49:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '77710e1cc5e597d06196d2ee163198176032987a'

Browse Source 
Conflicts:
	sources/conductorproperties.cpp
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/qetshapeitem.cpp
This commit is contained in:
Martin Marmsoler
2021-02-27 07:49:24 +01:00
parent f499507b2d 77710e1cc5
commit 01d6cdb920
17 changed files with 47 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/qetgraphicsitem/element.h
View File

@@ -196,18 +196,6 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
void hoverLeaveEvent(QGraphicsSceneHoverEvent *) override;
protected:
// m_converted_text_from_description,
// when a element is created from his description,
// the old element text item (tagged as 'input' in the xml)
// are converted to dynamic text field,
// the QPointF is the original position of the text item,
// because the origin transformation point of text item
// and dynamic text item are not the same,
// so we must to keep a track of this value,
// to be use in the function element::fromXml
QHash <DynamicElementTextItem *, QPointF>
m_converted_text_from_xml_description;
//ATTRIBUTES related to linked element
QList <Element *> connected_elements;
QList <QUuid> tmp_uuids_link;