[settings] migrate raster settings (#51600)

qgis · Jan 27, 2023 · b3e4295 · b3e4295
1 parent da29df8
commit b3e4295
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/python/core/auto_generated/raster/qgsrasterlayer.sip.in b/python/core/auto_generated/raster/qgsrasterlayer.sip.in
@@ -36,6 +36,7 @@ Sample usage of the :py:class:`QgsRasterLayer` class:
 %End
   public:
 
+
     static const double SAMPLE_SIZE;
 
     static const QgsContrastEnhancement::ContrastEnhancementAlgorithm SINGLE_BAND_ENHANCEMENT_ALGORITHM;

diff --git a/src/app/options/qgsrasterrenderingoptions.cpp b/src/app/options/qgsrasterrenderingoptions.cpp
@@ -51,9 +51,9 @@ QgsRasterRenderingOptionsWidget::QgsRasterRenderingOptionsWidget( QWidget *paren
   QString zoomedOutResampling = settings.value( QStringLiteral( "/Raster/defaultZoomedOutResampling" ), QStringLiteral( "nearest neighbour" ) ).toString();
   mZoomedOutResamplingComboBox->setCurrentIndex( mZoomedOutResamplingComboBox->findData( zoomedOutResampling ) );
 
-  spnOversampling->setValue( settings.value( QStringLiteral( "/Raster/defaultOversampling" ), 2.0 ).toDouble() );
+  spnOversampling->setValue( QgsRasterLayer::settingsRasterDefaultOversampling->value() );
   spnOversampling->setClearValue( 2.0 );
-  mCbEarlyResampling->setChecked( settings.value( QStringLiteral( "/Raster/defaultEarlyResampling" ), false ).toBool() );
+  mCbEarlyResampling->setChecked( QgsRasterLayer::settingsRasterDefaultEarlyResampling->value() );
 
   initContrastEnhancement( cboxContrastEnhancementAlgorithmSingleBand, QStringLiteral( "singleBand" ),
                            QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsRasterLayer::SINGLE_BAND_ENHANCEMENT_ALGORITHM ) );
@@ -89,8 +89,8 @@ void QgsRasterRenderingOptionsWidget::apply()
   settings.setValue( QStringLiteral( "/Raster/defaultZoomedInResampling" ), mZoomedInResamplingComboBox->currentData().toString() );
   settings.setValue( QStringLiteral( "/Raster/defaultZoomedOutResampling" ), mZoomedOutResamplingComboBox->currentData().toString() );
 
-  settings.setValue( QStringLiteral( "/Raster/defaultOversampling" ), spnOversampling->value() );
-  settings.setValue( QStringLiteral( "/Raster/defaultEarlyResampling" ), mCbEarlyResampling->isChecked() );
+  QgsRasterLayer::settingsRasterDefaultOversampling->setValue( spnOversampling->value() );
+  QgsRasterLayer::settingsRasterDefaultEarlyResampling->setValue( mCbEarlyResampling->isChecked() );
 
   saveContrastEnhancement( cboxContrastEnhancementAlgorithmSingleBand, QStringLiteral( "singleBand" ) );
   saveContrastEnhancement( cboxContrastEnhancementAlgorithmMultiBandSingleByte, QStringLiteral( "multiBandSingleByte" ) );

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -58,6 +58,7 @@ email                : tim at linfiniti.com
 #include "qgsrasterlayerelevationproperties.h"
 #include "qgsrasterlayerprofilegenerator.h"
 #include "qgsthreadingutils.h"
+#include "qgssettingsentryimpl.h"
 
 #include <cmath>
 #include <cstdio>
@@ -83,6 +84,9 @@ email                : tim at linfiniti.com
 #include <QSlider>
 #include <QUrl>
 
+const QgsSettingsEntryDouble *QgsRasterLayer::settingsRasterDefaultOversampling = new QgsSettingsEntryDouble( QStringLiteral( "default-oversampling" ), QgsSettings::sTreeRaster, 2.0 );
+const QgsSettingsEntryBool *QgsRasterLayer::settingsRasterDefaultEarlyResampling = new QgsSettingsEntryBool( QStringLiteral( "default-early-resampling" ), QgsSettings::sTreeRaster, false );
+
 #define ERR(message) QGS_ERROR_MESSAGE(message,"Raster layer")
 
 const double QgsRasterLayer::SAMPLE_SIZE = 250000;
@@ -939,12 +943,12 @@ void QgsRasterLayer::setDataProvider( QString const &provider, const QgsDataProv
       mDataProvider->setZoomedOutResamplingMethod( QgsRasterDataProvider::ResamplingMethod::Bilinear );
     }
 
-    const double maxOversampling = settings.value( QStringLiteral( "/Raster/defaultOversampling" ), 2.0 ).toDouble();
+    const double maxOversampling = QgsRasterLayer::settingsRasterDefaultOversampling->value();
     resampleFilter->setMaxOversampling( maxOversampling );
     mDataProvider->setMaxOversampling( maxOversampling );
 
     if ( ( mDataProvider->providerCapabilities() & QgsRasterDataProvider::ProviderHintCanPerformProviderResampling ) &&
-         settings.value( QStringLiteral( "/Raster/defaultEarlyResampling" ), false ).toBool() )
+         QgsRasterLayer::settingsRasterDefaultEarlyResampling->value() )
     {
       setResamplingStage( Qgis::RasterResamplingStage::Provider );
     }

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -48,6 +48,8 @@ class QgsRasterResampleFilter;
 class QgsBrightnessContrastFilter;
 class QgsHueSaturationFilter;
 class QgsRasterLayerElevationProperties;
+class QgsSettingsEntryBool;
+class QgsSettingsEntryDouble;
 
 class QImage;
 class QPixmap;
@@ -78,6 +80,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer, public QgsAbstractProfile
 
   public:
 
+    static const QgsSettingsEntryBool *settingsRasterDefaultEarlyResampling SIP_SKIP;
+    static const QgsSettingsEntryDouble *settingsRasterDefaultOversampling SIP_SKIP;
+
     //! \brief Default sample size (number of pixels) for estimated statistics/histogram calculation
     static const double SAMPLE_SIZE;
 

diff --git a/src/core/settings/qgssettings.h b/src/core/settings/qgssettings.h
@@ -105,6 +105,7 @@ class CORE_EXPORT QgsSettings : public QObject
     static inline QgsSettingsTreeNode *sTreeQgis = treeRoot()->createChildElement( QStringLiteral( "qgis" ) );
     static inline QgsSettingsTreeNode *sTreePlugins = treeRoot()->createChildElement( QStringLiteral( "plugins" ) );
     static inline QgsSettingsTreeNode *sTreeProcessing = treeRoot()->createChildElement( QStringLiteral( "processing" ) );
+    static inline QgsSettingsTreeNode *sTreeRaster = treeRoot()->createChildElement( QStringLiteral( "raster" ) );
     static inline QgsSettingsTreeNode *sTreeSvg = treeRoot()->createChildElement( QStringLiteral( "svg" ) );
     static inline QgsSettingsTreeNode *sTreeWms = treeRoot()->createChildElement( QStringLiteral( "wms" ) );
 

diff --git a/src/core/settings/qgssettingsregistrycore.cpp b/src/core/settings/qgssettingsregistrycore.cpp
@@ -26,6 +26,7 @@
 #include "qgsprocessing.h"
 #include "qgsvectortileconnection.h"
 #include "qgsgpsdetector.h"
+#include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
 
 const QgsSettingsEntryEnumFlag<Qgis::SnappingMode> *QgsSettingsRegistryCore::settingsDigitizingDefaultSnapMode = new QgsSettingsEntryEnumFlag<Qgis::SnappingMode>( QStringLiteral( "default_snap_mode" ), QgsSettings::sTreeDigitizing, Qgis::SnappingMode::AllLayers );
@@ -137,6 +138,9 @@ void QgsSettingsRegistryCore::migrateOldSettings()
   QgsGpsDetector::settingsGpsParity->copyValueFromKey( QStringLiteral( "core/gps/parity" ) );
 #endif
 
+  QgsRasterLayer::settingsRasterDefaultOversampling->copyValueFromKey( QStringLiteral( "Raster/defaultOversampling" ), true );
+  QgsRasterLayer::settingsRasterDefaultEarlyResampling->copyValueFromKey( QStringLiteral( "Raster/defaultEarlyResampling" ), true );
+
   // locator filters - added in 3.30
   {
     QgsSettings settings;
@@ -280,6 +284,10 @@ void QgsSettingsRegistryCore::backwardCompatibility()
   QgsGpsDetector::settingsGpsParity->copyValueToKey( QStringLiteral( "core/gps/parity" ) );
 #endif
 
+  QgsRasterLayer::settingsRasterDefaultOversampling->copyValueToKey( QStringLiteral( "Raster/defaultOversampling" ) );
+  QgsRasterLayer::settingsRasterDefaultEarlyResampling->copyValueToKey( QStringLiteral( "Raster/defaultEarlyResampling" ) );
+
+
   // locator filters - added in 3.30
   {
     const QStringList filters = QgsLocator::sTreeLocatorFilters->items();