Fix snapping model

qgis · Nov 9, 2020 · f48cd39 · f48cd39
1 parent bc18ec9
commit f48cd39
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/app/qgssnappinglayertreemodel.cpp b/src/app/qgssnappinglayertreemodel.cpp
@@ -328,6 +328,11 @@ Qt::ItemFlags QgsSnappingLayerTreeModel::flags( const QModelIndex &idx ) const
 
 QModelIndex QgsSnappingLayerTreeModel::index( int row, int column, const QModelIndex &parent ) const
 {
+  if ( row < 0 || column < 0 || row >= rowCount( parent ) || column >= columnCount( parent ) )
+  {
+    return QModelIndex();
+  }
+
   QModelIndex newIndex = QSortFilterProxyModel::index( row, LayerColumn, parent );
   if ( column == LayerColumn )
     return newIndex;

diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -43,6 +43,9 @@
 #include "qgssettings.h"
 #include "qgsscalewidget.h"
 
+#ifdef ENABLE_MODELTEST
+#include "modeltest.h"
+#endif
 
 class SnapTypeMenu: public QMenu
 {
@@ -88,6 +91,12 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
   mLayerTreeView = new QTreeView();
   QgsSnappingLayerTreeModel *model = new QgsSnappingLayerTreeModel( mProject, mCanvas, this );
   model->setLayerTreeModel( new QgsLayerTreeModel( mProject->layerTreeRoot(), model ) );
+
+#ifdef ENABLE_MODELTEST
+  new ModelTest( model, this );
+  new ModelTest( model->layerTreeModel(), this );
+#endif
+
   // connections
   connect( model, &QgsSnappingLayerTreeModel::rowsInserted, this, &QgsSnappingWidget::onSnappingTreeLayersChanged );
   connect( model, &QgsSnappingLayerTreeModel::modelReset, this, &QgsSnappingWidget::onSnappingTreeLayersChanged );