migrate setting qgis/simplifyDrawingHints to class (EnumFlag, core)

qgis · Jan 26, 2023 · fde5112 · fde5112
1 parent 4bc4412
commit fde5112
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/core/settings/qgssettingsregistrycore.cpp b/src/core/settings/qgssettingsregistrycore.cpp
@@ -26,7 +26,7 @@
 #include "qgsprocessing.h"
 #include "qgsvectortileconnection.h"
 #include "qgsgpsdetector.h"
-
+#include "qgsvectorlayer.h"
 
 const QgsSettingsEntryEnumFlag<Qgis::SnappingMode> *QgsSettingsRegistryCore::settingsDigitizingDefaultSnapMode = new QgsSettingsEntryEnumFlag<Qgis::SnappingMode>( QStringLiteral( "default_snap_mode" ), QgsSettings::sTreeDigitizing, Qgis::SnappingMode::AllLayers );
 

diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -107,6 +107,10 @@
 #include <limits>
 #include <optional>
 
+#include "qgssettingsentryenumflag.h"
+const QgsSettingsEntryEnumFlag<QgsVectorSimplifyMethod::SimplifyHint> *class QgsVectorLayerJoinInfo;::settingsSimplifyDrawingHints = QgsSettingsEntryEnumFlag<QgsVectorSimplifyMethod::SimplifyHint>( QStringLiteral( "simplifyDrawingHints" ), QgsSettings::sTreeQgis, QgsVectorSimplifyMethod::SimplifyHint::NoSimplification );
+
+
 #ifdef TESTPROVIDERLIB
 #include <dlfcn.h>
 #endif
@@ -225,7 +229,7 @@ QgsVectorLayer::QgsVectorLayer( const QString &vectorLayerPath,
 
   // Default simplify drawing settings
   QgsSettings settings;
-  mSimplifyMethod.setSimplifyHints( settings.flagValue( QStringLiteral( "qgis/simplifyDrawingHints" ), mSimplifyMethod.simplifyHints(), QgsSettings::NoSection ) );
+  mSimplifyMethod.setSimplifyHints( QgsVectorLayer::settingsSimplifyDrawingHints.valueWithDefaultOverride(mSimplifyMethod.simplifyHints()) );
   mSimplifyMethod.setSimplifyAlgorithm( settings.enumValue( QStringLiteral( "qgis/simplifyAlgorithm" ), mSimplifyMethod.simplifyAlgorithm() ) );
   mSimplifyMethod.setThreshold( settings.value( QStringLiteral( "qgis/simplifyDrawingTol" ), mSimplifyMethod.threshold() ).toFloat() );
   mSimplifyMethod.setForceLocalOptimization( settings.value( QStringLiteral( "qgis/simplifyLocal" ), mSimplifyMethod.forceLocalOptimization() ).toBool() );

diff --git a/src/core/vector/qgsvectorlayer.h b/src/core/vector/qgsvectorlayer.h
@@ -44,6 +44,8 @@
 #include "qgsexpressioncontext.h"
 #include "qgsabstractprofilesource.h"
 
+class QgsSettingsEntryEnumFlag;
+
 class QPainter;
 class QImage;
 
@@ -400,6 +402,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
 
   public:
 
+    static const QgsSettingsEntryEnumFlag<QgsVectorSimplifyMethod::SimplifyHint> *settingsSimplifyDrawingHints SIP_SKIP;
+
     /**
      * Setting options for loading vector layers.
      * \since QGIS 3.0