fix updating table selection

3nids · 3nids · commit e8e225804913 · 2019-02-25T14:14:28.000-05:00
diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -368,7 +368,7 @@ void QgsVertexEditor::updateEditor( QgsLockedFeature *lockedFeature )
     mHintLabel->setVisible( false );
     mTableView->setVisible( true );
 
-    //connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
+    connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
   }
   else
   {
@@ -395,9 +395,9 @@ void QgsVertexEditor::updateTableSelection()
       selection.select( mVertexModel->index( i, 0 ), mVertexModel->index( i, mVertexModel->columnCount() - 1 ) );
     }
   }
-  //disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
+  disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
   mTableView->selectionModel()->select( selection, QItemSelectionModel::ClearAndSelect );
-  //connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
+  connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );
 
   if ( firstSelectedRow >= 0 )
     mTableView->scrollTo( mVertexModel->index( firstSelectedRow, 0 ), QAbstractItemView::PositionAtTop );
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -2319,16 +2319,19 @@ void QgsVertexTool::setHighlightedVertices( const QList<Vertex> &listVertices, H
   if ( mLockedFeature )
   {
     disconnect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );
+
+    mLockedFeature->deselectAllVertices();
     for ( const Vertex &vertex : qgis::as_const( mSelectedVertices ) )
     {
       // we should never be able to select vertices that are not from the locked feature
       Q_ASSERT( mLockedFeature->featureId() == vertex.fid && mLockedFeature->layer() == vertex.layer );
       mLockedFeature->selectVertex( vertex.vertexId );
     }
-    connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );
 
-    if ( mVertexEditor )
-      mVertexEditor->updateTableSelection();
+//    if ( mVertexEditor )
+//      mVertexEditor->updateTableSelection();
+
+    connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ void QgsVertexEditor::updateEditor( QgsLockedFeature *lockedFeature )`
`368`	`368`	`mHintLabel->setVisible( false );`
`369`	`369`	`mTableView->setVisible( true );`
`370`	`370`
`371`		`- //connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
	`371`	`+ connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
`372`	`372`	`}`
`373`	`373`	`else`
`374`	`374`	`{`
`@@ -395,9 +395,9 @@ void QgsVertexEditor::updateTableSelection()`
`395`	`395`	`selection.select( mVertexModel->index( i, 0 ), mVertexModel->index( i, mVertexModel->columnCount() - 1 ) );`
`396`	`396`	`}`
`397`	`397`	`}`
`398`		`- //disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
	`398`	`+ disconnect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
`399`	`399`	`mTableView->selectionModel()->select( selection, QItemSelectionModel::ClearAndSelect );`
`400`		`- //connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
	`400`	`+ connect( mLockedFeature, &QgsLockedFeature::selectionChanged, this, &QgsVertexEditor::updateTableSelection );`
`401`	`401`
`402`	`402`	`if ( firstSelectedRow >= 0 )`
`403`	`403`	`mTableView->scrollTo( mVertexModel->index( firstSelectedRow, 0 ), QAbstractItemView::PositionAtTop );`
Original file line number	Diff line number	Diff line change
`@@ -2319,16 +2319,19 @@ void QgsVertexTool::setHighlightedVertices( const QList<Vertex> &listVertices, H`
`2319`	`2319`	`if ( mLockedFeature )`
`2320`	`2320`	`{`
`2321`	`2321`	`disconnect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );`
	`2322`	`+`
	`2323`	`+ mLockedFeature->deselectAllVertices();`
`2322`	`2324`	`for ( const Vertex &vertex : qgis::as_const( mSelectedVertices ) )`
`2323`	`2325`	`{`
`2324`	`2326`	`// we should never be able to select vertices that are not from the locked feature`
`2325`	`2327`	`Q_ASSERT( mLockedFeature->featureId() == vertex.fid && mLockedFeature->layer() == vertex.layer );`
`2326`	`2328`	`mLockedFeature->selectVertex( vertex.vertexId );`
`2327`	`2329`	`}`
`2328`		`- connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );`
`2329`	`2330`
`2330`		`- if ( mVertexEditor )`
`2331`		`- mVertexEditor->updateTableSelection();`
	`2331`	`+// if ( mVertexEditor )`
	`2332`	`+// mVertexEditor->updateTableSelection();`
	`2333`	`+`
	`2334`	`+ connect( mLockedFeature.get(), &QgsLockedFeature::selectionChanged, this, &QgsVertexTool::lockedFeatureSelectionChanged );`
`2332`	`2335`	`}`
`2333`	`2336`	`}`
`2334`	`2337`