fix updating vertex selection

3nids · 3nids · commit 643a763b0501 · 2019-02-25T14:14:29.000-05:00
diff --git a/src/app/vertextool/qgslockedfeature.cpp b/src/app/vertextool/qgslockedfeature.cpp
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "vertextool/qgslockedfeature.h"
-#include "vertextool/qgsvertexentry.h"
+#include "qgslockedfeature.h"
+#include "qgsvertexeditor.h"
 
 #include "qgsfeatureiterator.h"
 #include "qgspoint.h"
@@ -283,7 +283,7 @@ void QgsLockedFeature::selectVertex( int vertexNr )
     return;
 
   QgsVertexEntry *entry = mVertexMap.at( vertexNr );
-  entry->setSelected();
+  entry->setSelected( true );
 
   emit selectionChanged();
 }
diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -396,30 +396,33 @@ void QgsVertexEditor::updateTableSelection()
     }
   }
   disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
+  disconnect( mTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsVertexEditor::updateVertexSelection );
   mTableView->selectionModel()->select( selection, QItemSelectionModel::ClearAndSelect );
   connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
+  connect( mTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsVertexEditor::updateVertexSelection );
 
   if ( firstSelectedRow >= 0 )
     mTableView->scrollTo( mVertexModel->index( firstSelectedRow, 0 ), QAbstractItemView::PositionAtTop );
 
   mUpdatingTableSelection = false;
 }
 
-void QgsVertexEditor::updateVertexSelection( const QItemSelection &selected, const QItemSelection & )
+void QgsVertexEditor::updateVertexSelection( const QItemSelection &, const QItemSelection & )
 {
   if ( !mLockedFeature || mUpdatingTableSelection )
     return;
 
   mUpdatingVertexSelection = true;
+  disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
 
   mLockedFeature->deselectAllVertices();
 
   QgsCoordinateTransform t( mLockedFeature->layer()->crs(), mCanvas->mapSettings().destinationCrs(), QgsProject::instance() );
   std::unique_ptr<QgsRectangle> bbox;
-  QModelIndexList indexList = selected.indexes();
-  for ( int i = 0; i < indexList.length(); ++i )
+  const QModelIndexList indexList = mTableView->selectionModel()->selectedRows();
+  for ( const QModelIndex &index : indexList )
   {
-    int vertexIdx = indexList.at( i ).row();
+    int vertexIdx = index.row();
     mLockedFeature->selectVertex( vertexIdx );
 
     // create a bounding box of selected vertices
@@ -447,6 +450,7 @@ void QgsVertexEditor::updateVertexSelection( const QItemSelection &selected, con
   }
 
   mUpdatingVertexSelection = false;
+  connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
 }
 
 void QgsVertexEditor::keyPressEvent( QKeyEvent *e )
diff --git a/src/app/vertextool/qgsvertexeditor.h b/src/app/vertextool/qgsvertexeditor.h
@@ -81,15 +81,13 @@ class QgsVertexEditor : public QgsDockWidget
     void deleteSelectedRequested();
     void editorClosed();
 
-  public slots:
-    void updateTableSelection();
-
   protected:
     void keyPressEvent( QKeyEvent *event ) override;
     void closeEvent( QCloseEvent *event ) override;
 
   private slots:
-    void updateVertexSelection( const QItemSelection &selected, const QItemSelection &deselected );
+    void updateTableSelection();
+    void updateVertexSelection( const QItemSelection &, const QItemSelection &deselected );
 
   private:
 
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -2328,9 +2328,6 @@ void QgsVertexTool::setHighlightedVertices( const QList<Vertex> &listVertices, H
       mLockedFeature->selectVertex( vertex.vertexId );
     }
 
-//    if ( mVertexEditor )
-//      mVertexEditor->updateTableSelection();
-
     connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -396,30 +396,33 @@ void QgsVertexEditor::updateTableSelection()`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`	`disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
	`399`	`+ disconnect( mTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsVertexEditor::updateVertexSelection );`
`399`	`400`	`mTableView->selectionModel()->select( selection, QItemSelectionModel::ClearAndSelect );`
`400`	`401`	`connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
	`402`	`+ connect( mTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsVertexEditor::updateVertexSelection );`
`401`	`403`
`402`	`404`	`if ( firstSelectedRow >= 0 )`
`403`	`405`	`mTableView->scrollTo( mVertexModel->index( firstSelectedRow, 0 ), QAbstractItemView::PositionAtTop );`
`404`	`406`
`405`	`407`	`mUpdatingTableSelection = false;`
`406`	`408`	`}`
`407`	`409`
`408`		`-void QgsVertexEditor::updateVertexSelection( const QItemSelection &selected, const QItemSelection & )`
	`410`	`+void QgsVertexEditor::updateVertexSelection( const QItemSelection &, const QItemSelection & )`
`409`	`411`	`{`
`410`	`412`	`if ( !mLockedFeature \|\| mUpdatingTableSelection )`
`411`	`413`	`return;`
`412`	`414`
`413`	`415`	`mUpdatingVertexSelection = true;`
	`416`	`+ disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
`414`	`417`
`415`	`418`	`mLockedFeature->deselectAllVertices();`
`416`	`419`
`417`	`420`	`QgsCoordinateTransform t( mLockedFeature->layer()->crs(), mCanvas->mapSettings().destinationCrs(), QgsProject::instance() );`
`418`	`421`	`std::unique_ptr<QgsRectangle> bbox;`
`419`		`- QModelIndexList indexList = selected.indexes();`
`420`		`- for ( int i = 0; i < indexList.length(); ++i )`
	`422`	`+ const QModelIndexList indexList = mTableView->selectionModel()->selectedRows();`
	`423`	`+ for ( const QModelIndex &index : indexList )`
`421`	`424`	`{`
`422`		`- int vertexIdx = indexList.at( i ).row();`
	`425`	`+ int vertexIdx = index.row();`
`423`	`426`	`mLockedFeature->selectVertex( vertexIdx );`
`424`	`427`
`425`	`428`	`// create a bounding box of selected vertices`
`@@ -447,6 +450,7 @@ void QgsVertexEditor::updateVertexSelection( const QItemSelection &selected, con`
`447`	`450`	`}`
`448`	`451`
`449`	`452`	`mUpdatingVertexSelection = false;`
	`453`	`+ connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
`450`	`454`	`}`
`451`	`455`
`452`	`456`	`void QgsVertexEditor::keyPressEvent( QKeyEvent *e )`
Original file line number	Diff line number	Diff line change
`@@ -2328,9 +2328,6 @@ void QgsVertexTool::setHighlightedVertices( const QList<Vertex> &listVertices, H`
`2328`	`2328`	`mLockedFeature->selectVertex( vertex.vertexId );`
`2329`	`2329`	`}`
`2330`	`2330`
`2331`		`-// if ( mVertexEditor )`
`2332`		`-// mVertexEditor->updateTableSelection();`
`2333`		`-`
`2334`	`2331`	`connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );`
`2335`	`2332`	`}`
`2336`	`2333`	`}`