kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-10 22:24:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1429 from bhangart/fix/image-missing-size

Browse Source 
Load a picture without a usable size at size 1, not 0
This commit is contained in:
ispyisail
2026-10-10 07:52:03 +13:00
committed by GitHub
parent 4b99c73c03 e1cb6006c6
commit 4c7ea90c51
4 changed files with 172 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetgraphicsitem/diagramimageitem.cpp
+6 -1
View File
@@ -1686,7 +1686,12 @@ bool DiagramImageItem::fromXml(const QDomElement &e)
// pivot), the same two-tier fallback QetShapeItem's own fromXml()
// already uses for its identical <transform> element.
m_transform.rotation = e.attribute("rotation").toDouble();
m_transform.scaleX = e.attribute("size").toDouble();
//A missing, unreadable, non-finite or zero size would scale the
//picture to nothing (and a resave wrote size="0" back): use 1,
//the size a picture is added with, as the <transform> branch does
bool size_ok = false;
const qreal size = e.attribute("size").toDouble(&size_ok);
m_transform.scaleX = (size_ok && qIsFinite(size) && size != 0) ? size : 1;
m_transform.scaleY = m_transform.scaleX;
m_transform.pivot = imageRect().center();
m_pivotIsCustom = false;