kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-26 13:20:52 +01: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

22
sources/qetgraphicsitem/qetshapeitem.cpp
View File

@@ -853,26 +853,8 @@ bool QetShapeItem::fromXml(const QDomElement &e)
m_brush = QETXML::brushFromXml(e.firstChildElement("brush"));
QString type = e.attribute("type");
#if TODO_LIST
#pragma message("@TODO Compatibility for version older than N??4075, shape type was stored with an int")
#endif
//@TODO Compatibility for version older than N??4075, shape type was stored with an int
if (type.size() == 1)
{
switch(e.attribute("type","0").toInt())
{
case 0: m_shapeType = Line; break;
case 1: m_shapeType = Rectangle; break;
case 2: m_shapeType = Ellipse; break;
case 3: m_shapeType = Polygon; break;
}
}
//For version after N??4075, shape is stored with a string
else
{
QMetaEnum me = metaObject()->enumerator(metaObject()->indexOfEnumerator("ShapeType"));
m_shapeType = QetShapeItem::ShapeType(me.keysToValue(type.toStdString().data()));
}
QMetaEnum me = metaObject()->enumerator(metaObject()->indexOfEnumerator("ShapeType"));
m_shapeType = QetShapeItem::ShapeType(me.keysToValue(type.toStdString().data()));
if (m_shapeType != Polygon)
{