python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-09-23 08:39:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Processing of resourcePath property in the ImageItem has been changed

Browse Source
This commit is contained in:
Arin Alexander
2019-04-29 10:44:59 +03:00
parent 5c5050ad4f
commit a1af26eab3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/items/lrimageitem.cpp
View File

@@ -67,7 +67,6 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
m_picture = data.value<QImage>();
} else {
switch (m_format) {
default:
case Binary:
m_picture.loadFromData(data.toByteArray());
break;
@@ -76,13 +75,16 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
break;
case Base64:
m_picture.loadFromData(QByteArray::fromBase64(data.toByteArray()));
break;
break;
}
}
}
}
} else if (!m_resourcePath.isEmpty()){
m_resourcePath = expandUserVariables(m_resourcePath, pass, NoEscapeSymbols, dataManager);
m_resourcePath = expandDataFields(m_resourcePath, NoEscapeSymbols, dataManager);
m_picture = QImage(m_resourcePath);
}
}