Skip to content

Commit

Permalink
[FEATURE] Raster fill can have images set to remote URLs
Browse files Browse the repository at this point in the history 
or as embedded files.

Just like the SVG and raster image marker, raster fill can now
be set to use HTTP(s) URLs or have files directly embedded
inside the symbol itself.
  • Loading branch information
@nirvn
nirvn committed Dec 6, 2018
1 parent 901da9d commit 0983f52
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 103 deletions.
103 changes: 16 additions & 87 deletions src/gui/symbology/qgssymbollayerwidget.cpp
View file
Expand Up @@ -3366,8 +3366,10 @@ QgsRasterFillSymbolLayerWidget::QgsRasterFillSymbolLayerWidget( QgsVectorLayer *
{
mLayer = nullptr;
setupUi( this );
connect( mBrowseToolButton, &QToolButton::clicked, this, &QgsRasterFillSymbolLayerWidget::mBrowseToolButton_clicked );
connect( mImageLineEdit, &QLineEdit::editingFinished, this, &QgsRasterFillSymbolLayerWidget::mImageLineEdit_editingFinished );

mImageSourceLineEdit->setLastPathSettingsKey( QStringLiteral( "/UI/lastRasterMarkerImageDir" ) );
connect( mImageSourceLineEdit, &QgsImageSourceLineEdit::sourceChanged, this, &QgsRasterFillSymbolLayerWidget::imageSourceChanged );

connect( mOffsetUnitWidget, &QgsUnitSelectionWidget::changed, this, &QgsRasterFillSymbolLayerWidget::mOffsetUnitWidget_changed );
connect( mRotationSpinBox, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this, &QgsRasterFillSymbolLayerWidget::mRotationSpinBox_valueChanged );
connect( mWidthUnitWidget, &QgsUnitSelectionWidget::changed, this, &QgsRasterFillSymbolLayerWidget::mWidthUnitWidget_changed );
Expand Down Expand Up @@ -3407,9 +3409,7 @@ void QgsRasterFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer *layer )
return;
}

mImageLineEdit->blockSignals( true );
mImageLineEdit->setText( mLayer->imageFilePath() );
mImageLineEdit->blockSignals( false );
whileBlocking( mImageSourceLineEdit )->setSource( mLayer->imageFilePath() );

cboCoordinateMode->blockSignals( true );
switch ( mLayer->coordinateMode() )
Expand All @@ -3423,31 +3423,22 @@ void QgsRasterFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer *layer )
break;
}
cboCoordinateMode->blockSignals( false );
mOpacityWidget->blockSignals( true );
mOpacityWidget->setOpacity( mLayer->opacity() );
mOpacityWidget->blockSignals( false );
mRotationSpinBox->blockSignals( true );
mRotationSpinBox->setValue( mLayer->angle() );
mRotationSpinBox->blockSignals( false );

mSpinOffsetX->blockSignals( true );
mSpinOffsetX->setValue( mLayer->offset().x() );
mSpinOffsetX->blockSignals( false );
mSpinOffsetY->blockSignals( true );
mSpinOffsetY->setValue( mLayer->offset().y() );
mSpinOffsetY->blockSignals( false );
whileBlocking( mOpacityWidget )->setOpacity( mLayer->opacity() );
whileBlocking( mRotationSpinBox )->setValue( mLayer->angle() );

whileBlocking( mSpinOffsetX )->setValue( mLayer->offset().x() );
whileBlocking( mSpinOffsetY )->setValue( mLayer->offset().y() );
mOffsetUnitWidget->blockSignals( true );
mOffsetUnitWidget->setUnit( mLayer->offsetUnit() );
mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );
mOffsetUnitWidget->blockSignals( false );

mWidthSpinBox->blockSignals( true );
mWidthSpinBox->setValue( mLayer->width() );
mWidthSpinBox->blockSignals( false );
whileBlocking( mWidthSpinBox )->setValue( mLayer->width() );
mWidthUnitWidget->blockSignals( true );
mWidthUnitWidget->setUnit( mLayer->widthUnit() );
mWidthUnitWidget->setMapUnitScale( mLayer->widthMapUnitScale() );
mWidthUnitWidget->blockSignals( false );

updatePreviewImage();

registerDataDefinedButton( mFilenameDDBtn, QgsSymbolLayer::PropertyFile );
Expand All @@ -3461,62 +3452,10 @@ QgsSymbolLayer *QgsRasterFillSymbolLayerWidget::symbolLayer()
return mLayer;
}

void QgsRasterFillSymbolLayerWidget::mBrowseToolButton_clicked()
{
QgsSettings s;
QString openDir;
QString lineEditText = mImageLineEdit->text();
if ( !lineEditText.isEmpty() )
{
QFileInfo openDirFileInfo( lineEditText );
openDir = openDirFileInfo.path();
}

if ( openDir.isEmpty() )
{
openDir = s.value( QStringLiteral( "/UI/lastRasterFillImageDir" ), QDir::homePath() ).toString();
}

//show file dialog
QString filePath = QFileDialog::getOpenFileName( nullptr, tr( "Select Image File" ), openDir );
if ( !filePath.isNull() )
{
//check if file exists
QFileInfo fileInfo( filePath );
if ( !fileInfo.exists() || !fileInfo.isReadable() )
{
QMessageBox::critical( nullptr, QStringLiteral( "Select Image File" ), QStringLiteral( "Error, file does not exist or is not readable." ) );
return;
}

s.setValue( QStringLiteral( "/UI/lastRasterFillImageDir" ), fileInfo.absolutePath() );
mImageLineEdit->setText( filePath );
mImageLineEdit_editingFinished();
}
}

void QgsRasterFillSymbolLayerWidget::mImageLineEdit_editingFinished()
void QgsRasterFillSymbolLayerWidget::imageSourceChanged( const QString &text )
{
if ( !mLayer )
{
return;
}

QFileInfo fi( mImageLineEdit->text() );
if ( !fi.exists() )
{
QUrl url( mImageLineEdit->text() );
if ( !url.isValid() )
{
return;
}
}

QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
mLayer->setImageFilePath( mImageLineEdit->text() );
mLayer->setImageFilePath( text );
updatePreviewImage();
QApplication::restoreOverrideCursor();

emit changed();
}

Expand Down Expand Up @@ -3596,26 +3535,16 @@ void QgsRasterFillSymbolLayerWidget::mWidthSpinBox_valueChanged( double d )
emit changed();
}


void QgsRasterFillSymbolLayerWidget::updatePreviewImage()
{
if ( !mLayer )
{
return;
}

QImage image( mLayer->imageFilePath() );
bool fitsInCache = false;
QImage image = QgsApplication::imageCache()->pathAsImage( mLayer->imageFilePath(), QSize( 150, 150 ), true, 1.0, fitsInCache );
if ( image.isNull() )
{
mLabelImagePreview->setPixmap( QPixmap() );
return;
}

if ( image.height() > 150 || image.width() > 150 )
{
image = image.scaled( 150, 150, Qt::KeepAspectRatio, Qt::SmoothTransformation );
}

QImage previewImage( 150, 150, QImage::Format_ARGB32 );
previewImage.fill( Qt::transparent );
QRect imageRect( ( 150 - image.width() ) / 2.0, ( 150 - image.height() ) / 2.0, image.width(), image.height() );
Expand Down
3 changes: 1 addition & 2 deletions src/gui/symbology/qgssymbollayerwidget.h
View file
Expand Up @@ -664,8 +664,7 @@ class GUI_EXPORT QgsRasterFillSymbolLayerWidget : public QgsSymbolLayerWidget, p
QgsRasterFillSymbolLayer *mLayer = nullptr;

private slots:
void mBrowseToolButton_clicked();
void mImageLineEdit_editingFinished();
void imageSourceChanged( const QString &text );
void setCoordinateMode( int index );
void opacityChanged( double value );
void offsetChanged();
Expand Down
26 changes: 12 additions & 14 deletions src/ui/symbollayer/widget_rasterfill.ui
View file
Expand Up @@ -22,18 +22,11 @@
</widget>
</item>
<item row="1" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="mImageLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="mBrowseToolButton">
<property name="text">
<string>…</string>
</property>
</widget>
</item>
</layout>
<widget class="QgsImageSourceLineEdit" name="mImageSourceLineEdit" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
Expand Down Expand Up @@ -352,10 +345,15 @@
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsImageSourceLineEdit</class>
<extends>QWidget</extends>
<header>qgsfilecontentsourcelineedit.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mImageLineEdit</tabstop>
<tabstop>mBrowseToolButton</tabstop>
<tabstop>mImageSourceLineEdit</tabstop>
<tabstop>mFilenameDDBtn</tabstop>
<tabstop>mWidthSpinBox</tabstop>
<tabstop>mWidthUnitWidget</tabstop>
Expand Down

0 comments on commit 0983f52

Please sign in to comment.