Merge commit 'b021ac3e1fb98a56810773c7c701e3329efb3148'

Conflicts:
	sources/qetgraphicsitem/element.h
This commit is contained in:
Martin Marmsoler
2021-03-04 21:31:55 +01:00
113 changed files with 6245 additions and 1179 deletions

View File

@@ -1325,6 +1325,15 @@ void Element::setElementInformations(DiagramContext dc)
emit elementInfoChange(old_info, m_data.m_informations);
}
/**
* @brief Element::elementData
* @return the element data used by this element
*/
ElementData Element::elementData() const
{
return m_data;
}
/**
@brief comparPos
Compare position of the two elements. Compare 3 points: