mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-23 20:22:58 +03:00
SvgItem has been fixed
This commit is contained in:
parent
f8bdd97679
commit
e4f1c62f4c
@ -133,7 +133,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 5
|
||||
LIMEREPORT_VERSION_RELEASE = 80
|
||||
LIMEREPORT_VERSION_RELEASE = 81
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -110,8 +110,8 @@ void SVGItem::updateItemSize(DataSourceManager *dataManager, RenderPass pass, in
|
||||
QVariant data = dataManager->variable(m_variable);
|
||||
if (data.type() == QVariant::String){
|
||||
m_image = imageFromResource(data.toString());
|
||||
} else if (data.type() == QVariant::Image){
|
||||
m_image = data.value<QByteArray>();
|
||||
} else if (data.type() == QVariant::ByteArray) {
|
||||
m_image = data.value<QByteArray>() ;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -142,6 +142,8 @@ void SVGItem::setVariable(const QString &variable)
|
||||
m_variable = variable;
|
||||
}
|
||||
|
||||
bool SVGItem::isNeedUpdateSize(RenderPass) const { return m_image.isNull() ; }
|
||||
|
||||
QString SVGItem::resourcePath() const
|
||||
{
|
||||
return m_resourcePath;
|
||||
|
@ -37,7 +37,7 @@ public:
|
||||
void setField(const QString &field);
|
||||
QString variable() const;
|
||||
void setVariable(const QString &variable);
|
||||
|
||||
bool isNeedUpdateSize(RenderPass) const;
|
||||
protected:
|
||||
BaseDesignIntf *createSameTypeItem(QObject *owner, QGraphicsItem *parent);
|
||||
void updateItemSize(DataSourceManager *dataManager, RenderPass pass, int maxHeight);
|
||||
|
Loading…
Reference in New Issue
Block a user