Merge pull request #6174 from elpaso/bugfix-17958

elpaso · web-flow · commit e2fcf704a760 · 2018-01-29T09:04:16.000+01:00
[bugfix] Fix crash in node editor
diff --git a/src/app/nodetool/qgsnodeeditor.cpp b/src/app/nodetool/qgsnodeeditor.cpp
@@ -68,7 +68,6 @@ QgsNodeEditorModel::QgsNodeEditorModel( QgsVectorLayer *layer, QgsSelectedFeatur
     mWidgetFont = parentWidget->font();
   }
 
-  connect( mSelectedFeature, &QgsSelectedFeature::vertexMapChanged, this, &QgsNodeEditorModel::featureChanged );
 }
 
 int QgsNodeEditorModel::rowCount( const QModelIndex &parent ) const
@@ -273,11 +272,6 @@ bool QgsNodeEditorModel::calcR( int row, double &r, double &minRadius ) const
   return true;
 }
 
-void QgsNodeEditorModel::featureChanged()
-{
-  //TODO - avoid reset
-  reset();
-}
 
 QgsNodeEditor::QgsNodeEditor(
   QgsVectorLayer *layer,
diff --git a/src/app/nodetool/qgsnodeeditor.h b/src/app/nodetool/qgsnodeeditor.h
@@ -64,9 +64,6 @@ class QgsNodeEditorModel : public QAbstractTableModel
 
     bool calcR( int row, double &r, double &minRadius ) const;
 
-  private slots:
-
-    void featureChanged();
 };
 
 class QgsNodeEditor : public QgsDockWidget

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ QgsNodeEditorModel::QgsNodeEditorModel( QgsVectorLayer *layer, QgsSelectedFeatur`
`68`	`68`	`mWidgetFont = parentWidget->font();`
`69`	`69`	`}`
`70`	`70`
`71`		`- connect( mSelectedFeature, &QgsSelectedFeature::vertexMapChanged, this, &QgsNodeEditorModel::featureChanged );`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`int QgsNodeEditorModel::rowCount( const QModelIndex &parent ) const`
`@@ -273,11 +272,6 @@ bool QgsNodeEditorModel::calcR( int row, double &r, double &minRadius ) const`
`273`	`272`	`return true;`
`274`	`273`	`}`
`275`	`274`
`276`		`-void QgsNodeEditorModel::featureChanged()`
`277`		`-{`
`278`		`- //TODO - avoid reset`
`279`		`- reset();`
`280`		`-}`
`281`	`275`
`282`	`276`	`QgsNodeEditor::QgsNodeEditor(`
`283`	`277`	`QgsVectorLayer *layer,`