Raster resampling: add cubic resampling for zoomed out

qgis · Jun 19, 2020 · 458b825 · 458b825
1 parent c6f3650
commit 458b825
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -716,6 +716,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
   mZoomedInResamplingComboBox->insertItem( 2, tr( "Cubic" ), QStringLiteral( "cubic" ) );
   mZoomedOutResamplingComboBox->insertItem( 0, tr( "Nearest neighbour" ), QStringLiteral( "nearest neighbour" ) );
   mZoomedOutResamplingComboBox->insertItem( 1, tr( "Average" ), QStringLiteral( "bilinear" ) );
+  mZoomedOutResamplingComboBox->insertItem( 2, tr( "Cubic" ), QStringLiteral( "cubic" ) );
   QString zoomedInResampling = mSettings->value( QStringLiteral( "/Raster/defaultZoomedInResampling" ), QStringLiteral( "nearest neighbour" ) ).toString();
   mZoomedInResamplingComboBox->setCurrentIndex( mZoomedInResamplingComboBox->findData( zoomedInResampling ) );
   QString zoomedOutResampling = mSettings->value( QStringLiteral( "/Raster/defaultZoomedOutResampling" ), QStringLiteral( "nearest neighbour" ) ).toString();

diff --git a/src/core/raster/qgsrasterresamplefilter.cpp b/src/core/raster/qgsrasterresamplefilter.cpp
@@ -305,4 +305,8 @@ void QgsRasterResampleFilter::readXml( const QDomElement &filterElem )
   {
     mZoomedOutResampler.reset( new QgsBilinearRasterResampler() );
   }
+  else if ( zoomedOutResamplerType == QLatin1String( "cubic" ) )
+  {
+    mZoomedOutResampler.reset( new QgsCubicRasterResampler() );
+  }
 }
diff --git a/src/gui/raster/qgsresamplingutils.cpp b/src/gui/raster/qgsresamplingutils.cpp
@@ -48,6 +48,7 @@ void QgsResamplingUtils::initWidgets( QgsRasterLayer *rasterLayer,
 
   mZoomedOutResamplingComboBox->addItem( QObject::tr( "Nearest neighbour" ), static_cast<int>( QgsRasterDataProvider::ResamplingMethod::Nearest ) );
   mZoomedOutResamplingComboBox->addItem( QObject::tr( "Average" ), static_cast<int>( QgsRasterDataProvider::ResamplingMethod::Bilinear ) );
+  mZoomedOutResamplingComboBox->addItem( QObject::tr( "Cubic" ), static_cast<int>( QgsRasterDataProvider::ResamplingMethod::Cubic ) );
 }
 
 void QgsResamplingUtils::refreshWidgetsFromLayer()
@@ -94,6 +95,10 @@ void QgsResamplingUtils::refreshWidgetsFromLayer()
         {
           mZoomedOutResamplingComboBox->setCurrentIndex( mZoomedOutResamplingComboBox->findData( static_cast<int>( QgsRasterDataProvider::ResamplingMethod::Bilinear ) ) );
         }
+        else if ( zoomedOutResampler->type() == QLatin1String( "cubic" ) )
+        {
+          mZoomedOutResamplingComboBox->setCurrentIndex( mZoomedOutResamplingComboBox->findData( static_cast<int>( QgsRasterDataProvider::ResamplingMethod::Cubic ) ) );
+        }
       }
       else
       {