mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

SvgItem has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2021-02-20 15:40:13 +03:00
parent f8bdd97679
commit e4f1c62f4c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -133,7 +133,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 80 LIMEREPORT_VERSION_RELEASE = 81
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

6
limereport/items/lrsvgitem.cpp
View File

@ -110,8 +110,8 @@ void SVGItem::updateItemSize(DataSourceManager *dataManager, RenderPass pass, in
QVariant data = dataManager->variable(m_variable); QVariant data = dataManager->variable(m_variable);
if (data.type() == QVariant::String){ if (data.type() == QVariant::String){
m_image = imageFromResource(data.toString()); m_image = imageFromResource(data.toString());
} else if (data.type() == QVariant::Image){ } else if (data.type() == QVariant::ByteArray) {
m_image = data.value<QByteArray>(); m_image = data.value<QByteArray>() ;
} }
} }
} }
@ -142,6 +142,8 @@ void SVGItem::setVariable(const QString &variable)
m_variable = variable; m_variable = variable;
} }
bool SVGItem::isNeedUpdateSize(RenderPass) const { return m_image.isNull() ; }
QString SVGItem::resourcePath() const QString SVGItem::resourcePath() const
{ {
return m_resourcePath; return m_resourcePath;

2
limereport/items/lrsvgitem.h
View File

@ -37,7 +37,7 @@ public:
void setField(const QString &field); void setField(const QString &field);
QString variable() const; QString variable() const;
void setVariable(const QString &variable); void setVariable(const QString &variable);
bool isNeedUpdateSize(RenderPass) const;
protected: protected:
BaseDesignIntf *createSameTypeItem(QObject *owner, QGraphicsItem *parent); BaseDesignIntf *createSameTypeItem(QObject *owner, QGraphicsItem *parent);
void updateItemSize(DataSourceManager *dataManager, RenderPass pass, int maxHeight); void updateItemSize(DataSourceManager *dataManager, RenderPass pass, int maxHeight);