Expose QgsSnappingConfig to QML

Sponsored by QField
qgis · Dec 20, 2016 · 95fedd0 · 95fedd0
1 parent a332ff9
commit 95fedd0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/python/core/qgssnappingconfig.sip b/python/core/qgssnappingconfig.sip
@@ -87,7 +87,7 @@ class QgsSnappingConfig
     /**
      * Constructor with default parameters defined in global settings
      */
-    explicit QgsSnappingConfig( QgsProject* project );
+    explicit QgsSnappingConfig( QgsProject* project = nullptr );
 
     ~QgsSnappingConfig();
 
@@ -221,5 +221,7 @@ class QgsSnappingConfig
      * @note Added in QGIS 3.0
      */
     bool removeLayers( const QList<QgsMapLayer*>& layers );
+    QgsProject* project() const;
+    void setProject(QgsProject* project);
 
 };
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -505,6 +505,7 @@ SET(QGIS_CORE_MOC_HDRS
   qgsproject.h
   qgsrelationmanager.h
   qgsrunprocess.h
+  qgssnappingconfig.h
   qgssnappingutils.h
   qgstaskmanager.h
   qgstracer.h
@@ -707,7 +708,6 @@ SET(QGIS_CORE_HDRS
   qgsprojectbadlayerhandler.h
   qgsprojectfiletransform.h
   qgsprojectproperty.h
-  qgssnappingconfig.h
   qgsprojectversion.h
   qgsprovidermetadata.h
   qgsproviderregistry.h
@@ -722,7 +722,6 @@ SET(QGIS_CORE_HDRS
   qgsscaleutils.h
   qgssimplifymethod.h
   qgssnapper.h
-  qgssnappingconfig.h
   qgssnappingutils.h
   qgsspatialindex.h
   qgssqlexpressioncompiler.h

diff --git a/src/core/qgssnappingconfig.cpp b/src/core/qgssnappingconfig.cpp
@@ -107,7 +107,8 @@ bool QgsSnappingConfig::IndividualLayerSettings::operator ==( const QgsSnappingC
 QgsSnappingConfig::QgsSnappingConfig( QgsProject* project )
     : mProject( project )
 {
-  reset();
+  if ( project )
+    reset();
 }
 
 QgsSnappingConfig::~QgsSnappingConfig()
@@ -475,3 +476,16 @@ void QgsSnappingConfig::readLegacySettings()
     mIndividualLayerSettings.insert( vlayer, IndividualLayerSettings( *enabledIt == QLatin1String( "enabled" ), t, tolIt->toDouble(), static_cast<QgsTolerance::UnitType>( tolUnitIt->toInt() ) ) );
   }
 }
+
+QgsProject* QgsSnappingConfig::project() const
+{
+  return mProject;
+}
+
+void QgsSnappingConfig::setProject( QgsProject* project )
+{
+  if ( mProject != project )
+    mProject = project;
+
+  reset();
+}
diff --git a/src/core/qgssnappingconfig.h b/src/core/qgssnappingconfig.h
@@ -29,6 +29,10 @@ class QgsVectorLayer;
  */
 class CORE_EXPORT QgsSnappingConfig
 {
+    Q_GADGET
+
+    Q_PROPERTY( QgsProject* project READ project WRITE setProject )
+
   public:
 
     /**
@@ -118,7 +122,7 @@ class CORE_EXPORT QgsSnappingConfig
     /**
      * Constructor with default parameters defined in global settings
      */
-    explicit QgsSnappingConfig( QgsProject* project );
+    explicit QgsSnappingConfig( QgsProject* project = nullptr );
 
     ~QgsSnappingConfig();
 
@@ -177,8 +181,6 @@ class CORE_EXPORT QgsSnappingConfig
      */
     bool operator!= ( const QgsSnappingConfig& other ) const;
 
-  public:
-
     /**
      * Reads the configuration from the specified QGIS project document.
      *
@@ -217,6 +219,20 @@ class CORE_EXPORT QgsSnappingConfig
      */
     bool removeLayers( const QList<QgsMapLayer*>& layers );
 
+    /**
+     * The project from which the snapped layers should be retrieved
+     *
+     * \note Added in QGIS 3.0
+     */
+    QgsProject* project() const;
+
+    /**
+     * \copydoc project()
+     *
+     * \note Added in QGIS 3.0
+     */
+    void setProject( QgsProject* project );
+
   private:
     void readLegacySettings();