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

Merge branch 'master' into feature/refactor_border_editor

Browse Source
This commit is contained in:
Alexander Arin 2022-11-01 12:48:29 +03:00
commit 9ce8294976
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
limereport/items/lrimageitem.cpp
View File

@ -111,14 +111,14 @@ void ImageItem::processPopUpAction(QAction *action)
ItemDesignIntf::processPopUpAction(action);
}
QImage getFileByResourcePath(QString resourcePath){
QImage getFileByResourcePath(QString resourcePath) {
QFileInfo resourceFile(resourcePath);
if (resourceFile.exists())
return QImage(resourcePath);
return QImage();
}
QImage ImageItem::drawImage()
QImage ImageItem::drawImage() const
{
if (image().isNull())
return getFileByResourcePath(m_resourcePath);
@ -364,7 +364,7 @@ void ImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
}
if (shiftHeight > 0){
point.setY(point.x()+shiftHeight/2);
point.setY(point.y()+shiftHeight/2);
} else {
cutY = fabs(shiftHeight/2);
cutHeigth += shiftHeight;
@ -410,7 +410,7 @@ void ImageItem::setImage(QImage value)
}
}
QImage ImageItem::image(){
QImage ImageItem::image() const{
return m_picture;
}
@ -439,3 +439,8 @@ void ImageItem::setFormat(Format format)
}
}
bool LimeReport::ImageItem::isEmpty() const
{
return drawImage().isNull();
}

8
limereport/items/lrimageitem.h
View File

@ -67,7 +67,7 @@ public:
ImageItem(QObject *owner, QGraphicsItem *parent);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
void setImage(QImage value);
QImage image();
QImage image() const;
void setResourcePath(const QString &value);
QString resourcePath() const;
QString datasource() const;
@ -108,7 +108,7 @@ protected:
void loadPictureFromVariant(QVariant& data);
void preparePopUpMenu(QMenu &menu);
void processPopUpAction(QAction *action);
QImage drawImage();
QImage drawImage() const;
private:
QImage m_picture;
bool m_useExternalPainter;
@ -123,6 +123,10 @@ private:
Format m_format;
QString m_variable;
// BaseDesignIntf interface
public:
bool isEmpty() const override;
};
}

1
limereport/items/lrtextitem.cpp
View File

@ -389,6 +389,7 @@ void TextItem::setTextFont(TextPtr text, const QFont& value) const {
void TextItem::adaptFontSize(TextPtr text) const{
QFont _font = transformToSceneFont(font());
do{
// qApp->processEvents();
setTextFont(text,_font);
if (_font.pixelSize()>2)
_font.setPixelSize(_font.pixelSize()-1);