address @wonder-wonder-sk 's comments on node editor improvements

nirvn · nirvn · commit b5cb74fee4ca · 2019-01-23T18:34:03.000+07:00
diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -337,6 +337,7 @@ void QgsVertexEditor::updateEditor( QgsVectorLayer *layer, QgsSelectedFeature *s
   if ( mSelectedFeature )
   {
     delete mVertexModel;
+    mVertexModel = nullptr;
   }
 
   mLayer = layer;
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -1068,7 +1068,7 @@ void QgsVertexTool::onCachedGeometryDeleted( QgsFeatureId fid )
 void QgsVertexTool::showVertexEditor()  //#spellok
 {
   QgsPointLocator::Match m = mLastMouseMoveMatch;
-  if ( m.isValid() || m.layer() )
+  if ( m.isValid() && m.layer() )
   {
     if ( mSelectedFeature && mSelectedFeature->featureId() == m.featureId() && mSelectedFeature->layer() == m.layer() )
     {
@@ -1099,7 +1099,8 @@ void QgsVertexTool::showVertexEditor()  //#spellok
     connect( mVertexEditor.get(), &QgsVertexEditor::deleteSelectedRequested, this, &QgsVertexTool::deleteVertexEditorSelection );
     connect( mVertexEditor.get(), &QgsVertexEditor::editorClosed, this, &QgsVertexTool::cleanupVertexEditor );
 
-    QTimer::singleShot( 100, this, [ = ] { mVertexEditor->show(); mVertexEditor->raise(); } );
+    // timer required as showing/raising the vertex editor in the same function following restoreDockWidget fails
+    QTimer::singleShot( 200, this, [ = ] { mVertexEditor->show(); mVertexEditor->raise(); } );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,7 @@ void QgsVertexEditor::updateEditor( QgsVectorLayer layer, QgsSelectedFeature s`
`337`	`337`	`if ( mSelectedFeature )`
`338`	`338`	`{`
`339`	`339`	`delete mVertexModel;`
	`340`	`+ mVertexModel = nullptr;`
`340`	`341`	`}`
`341`	`342`
`342`	`343`	`mLayer = layer;`
Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ void QgsVertexTool::onCachedGeometryDeleted( QgsFeatureId fid )`
`1068`	`1068`	`void QgsVertexTool::showVertexEditor() //#spellok`
`1069`	`1069`	`{`
`1070`	`1070`	`QgsPointLocator::Match m = mLastMouseMoveMatch;`
`1071`		`- if ( m.isValid() \|\| m.layer() )`
	`1071`	`+ if ( m.isValid() && m.layer() )`
`1072`	`1072`	`{`
`1073`	`1073`	`if ( mSelectedFeature && mSelectedFeature->featureId() == m.featureId() && mSelectedFeature->layer() == m.layer() )`
`1074`	`1074`	`{`
`@@ -1099,7 +1099,8 @@ void QgsVertexTool::showVertexEditor() //#spellok`
`1099`	`1099`	`connect( mVertexEditor.get(), &QgsVertexEditor::deleteSelectedRequested, this, &QgsVertexTool::deleteVertexEditorSelection );`
`1100`	`1100`	`connect( mVertexEditor.get(), &QgsVertexEditor::editorClosed, this, &QgsVertexTool::cleanupVertexEditor );`
`1101`	`1101`
`1102`		`- QTimer::singleShot( 100, this, [ = ] { mVertexEditor->show(); mVertexEditor->raise(); } );`
	`1102`	`+ // timer required as showing/raising the vertex editor in the same function following restoreDockWidget fails`
	`1103`	`+ QTimer::singleShot( 200, this, [ = ] { mVertexEditor->show(); mVertexEditor->raise(); } );`
`1103`	`1104`	`}`
`1104`	`1105`	`else`
`1105`	`1106`	`{`