Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Look for image files from substitution fields relative to project file.

Browse Source
This commit is contained in:
Jim Evins
2019-08-04 23:32:50 -04:00
parent f41461ef26
commit 3fedb16c2c
5 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/ModelImageObject.cpp
+14 -2
View File
@@ -20,9 +20,11 @@
#include "ModelImageObject.h"
#include "Model.h"
#include "Size.h"
#include <QBrush>
#include <QDir>
#include <QFileInfo>
#include <QImage>
#include <QPen>
@@ -431,7 +433,12 @@ namespace glabels
}
else
{
auto* image = new QImage( mFilenameNode.text( record, variables ) );
// Look for image file relative to project file 1st then CWD 2nd
auto* model = dynamic_cast<Model*>( parent() );
QDir::setSearchPaths( "images", {model->dir(), QDir::currentPath()} );
QString filename = QString("images:") + mFilenameNode.text( record, variables );
auto* image = new QImage( filename );
if ( !image->isNull() && image->hasAlphaChannel() && (image->depth() == 32) )
{
QImage* shadowImage = createShadowImage( *image, shadowColor );
@@ -528,7 +535,12 @@ namespace glabels
}
else if ( mFilenameNode.isField() )
{
auto* image = new QImage( mFilenameNode.text( record, variables ) );
// Look for image file relative to project file 1st then CWD 2nd
auto* model = dynamic_cast<Model*>( parent() );
QDir::setSearchPaths( "images", {model->dir(), QDir::currentPath()} );
QString filename = QString("images:") + mFilenameNode.text( record, variables );
auto* image = new QImage( filename );
if ( !image->isNull() )
{
painter->drawImage( destRect, *image );