Update QGIS snapping dialog if settings changed via QgsProject

qgis · Jun 20, 2012 · 1e60028 · 1e60028
1 parent 1db0422
commit 1e60028
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp
@@ -73,7 +73,7 @@ QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas ): Q
   connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( layersWillBeRemoved( QStringList ) ) );
   connect( cbxEnableTopologicalEditingCheckBox, SIGNAL( stateChanged( int ) ), this, SLOT( on_cbxEnableTopologicalEditingCheckBox_stateChanged( int ) ) );
 
-  mLayerTreeWidget->clear();
+  reloadLayers();
 
   QMap< QString, QgsMapLayer *> mapLayers = QgsMapLayerRegistry::instance()->mapLayers();
   QMap< QString, QgsMapLayer *>::iterator it;
@@ -91,6 +91,7 @@ QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas ): Q
   mLayerTreeWidget->setSortingEnabled( true );
 
   setTopologicalEditingState();
+  connect( QgsProject::instance(), SIGNAL( snapSettingsChanged() ), this, SLOT( reloadLayers() ) );
 }
 
 QgsSnappingDialog::QgsSnappingDialog()
@@ -101,6 +102,19 @@ QgsSnappingDialog::~QgsSnappingDialog()
 {
 }
 
+void QgsSnappingDialog::reloadLayers()
+{
+  mLayerTreeWidget->clear();
+
+  QMap< QString, QgsMapLayer *> mapLayers = QgsMapLayerRegistry::instance()->mapLayers();
+  QMap< QString, QgsMapLayer *>::iterator it;
+  for ( it = mapLayers.begin(); it != mapLayers.end() ; ++it )
+  {
+    addLayer( it.value() );
+  }
+
+}
+
 void QgsSnappingDialog::on_cbxEnableTopologicalEditingCheckBox_stateChanged( int state )
 {
   int topologicalEditingEnabled = ( state == Qt::Checked ) ? 1 : 0;

diff --git a/src/app/qgssnappingdialog.h b/src/app/qgssnappingdialog.h
@@ -67,6 +67,9 @@ class QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialogBase
      */
     void closeEvent( QCloseEvent* event );
 
+  private slots:
+    void reloadLayers();
+
 
   private:
     /**Default constructor forbidden*/

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1675,6 +1675,7 @@ void QgsProject::setSnapSettingsForLayer( const QString& layerId, bool enabled,
   writeEntry( "Digitizing", "/LayerSnappingToleranceUnitList", toleranceUnitList );
   writeEntry( "Digitizing", "/LayerSnapToList", snapTypeList );
   writeEntry( "Digitizing", "/AvoidIntersectionsList", avoidIntersectionList );
+  emit snapSettingsChanged();
 }
 
 bool QgsProject::snapSettingsForLayer( const QString& layerId, bool& enabled, QgsSnapper::SnappingType &type, QgsTolerance::UnitType& units, double& tolerance,

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -326,6 +326,8 @@ class CORE_EXPORT QgsProject : public QObject
     // @param n number of layers
     void layerLoaded( int i, int n );
 
+    void snapSettingsChanged();
+
   private:
 
     QgsProject(); // private 'cause it's a singleton