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

Make absolute image filename more Windows friendly

Browse Source
This commit is contained in:
gitlost
2019-08-23 00:56:31 +01:00
parent 010879fa71
commit 98038e34e7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/ModelImageObject.cpp
+8 -3
View File
@@ -538,10 +538,15 @@ namespace glabels
} }
else if ( mFilenameNode.isField() ) else if ( mFilenameNode.isField() )
{ {
// Look for image file relative to project file 1st then CWD 2nd then absolute 3rd QString filename = mFilenameNode.text( record, variables );
QFileInfo fileInfo( filename );
if ( fileInfo.isRelative() )
{
// Look for image file relative to project file 1st then CWD 2nd
auto* model = dynamic_cast<Model*>( parent() ); auto* model = dynamic_cast<Model*>( parent() );
QDir::setSearchPaths( "images", {model->dirPath(), QDir::currentPath(), QDir::rootPath()} ); QDir::setSearchPaths( "images", {model->dirPath(), QDir::currentPath()} );
QString filename = QString("images:") + mFilenameNode.text( record, variables ); filename = QString("images:") + filename;
}
QImage* image; QImage* image;
QSvgRenderer* svgRenderer; QSvgRenderer* svgRenderer;