Skip to content

Commit

Permalink
Do not bypass edit buffer
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Aug 26, 2018
1 parent 9e387e4 commit 93eef9f
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/core/qgsvectorlayereditutils.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool QgsVectorLayerEditUtils::insertVertex( double x, double y, QgsFeatureId atF


geometry.insertVertex( x, y, beforeVertex ); geometry.insertVertex( x, y, beforeVertex );


mLayer->editBuffer()->changeGeometry( atFeatureId, geometry ); mLayer->changeGeometry( atFeatureId, geometry );
return true; return true;
} }


Expand All @@ -63,7 +63,7 @@ bool QgsVectorLayerEditUtils::insertVertex( const QgsPoint &point, QgsFeatureId


geometry.insertVertex( point, beforeVertex ); geometry.insertVertex( point, beforeVertex );


mLayer->editBuffer()->changeGeometry( atFeatureId, geometry ); mLayer->changeGeometry( atFeatureId, geometry );
return true; return true;
} }


Expand All @@ -86,7 +86,7 @@ bool QgsVectorLayerEditUtils::moveVertex( const QgsPoint &p, QgsFeatureId atFeat


geometry.moveVertex( p, atVertex ); geometry.moveVertex( p, atVertex );


mLayer->editBuffer()->changeGeometry( atFeatureId, geometry ); mLayer->changeGeometry( atFeatureId, geometry );
return true; return true;
} }


Expand All @@ -111,7 +111,7 @@ QgsVectorLayer::EditResult QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId f
geometry.set( nullptr ); geometry.set( nullptr );
} }


mLayer->editBuffer()->changeGeometry( featureId, geometry ); mLayer->changeGeometry( featureId, geometry );
return !geometry.isNull() ? QgsVectorLayer::Success : QgsVectorLayer::EmptyGeometry; return !geometry.isNull() ? QgsVectorLayer::Success : QgsVectorLayer::EmptyGeometry;
} }


Expand Down Expand Up @@ -158,7 +158,7 @@ QgsGeometry::OperationResult QgsVectorLayerEditUtils::addRing( QgsCurve *ring, c
if ( addRingReturnCode == 0 ) if ( addRingReturnCode == 0 )
if ( addRingReturnCode == QgsGeometry::Success ) if ( addRingReturnCode == QgsGeometry::Success )
{ {
mLayer->editBuffer()->changeGeometry( f.id(), g ); mLayer->changeGeometry( f.id(), g );
if ( modifiedFeatureId ) if ( modifiedFeatureId )
*modifiedFeatureId = f.id(); *modifiedFeatureId = f.id();


Expand Down Expand Up @@ -211,7 +211,7 @@ QgsGeometry::OperationResult QgsVectorLayerEditUtils::addPart( const QgsPointSeq
//convert back to single part if required by layer //convert back to single part if required by layer
geometry.convertToSingleType(); geometry.convertToSingleType();
} }
mLayer->editBuffer()->changeGeometry( featureId, geometry ); mLayer->changeGeometry( featureId, geometry );
} }
return errorCode; return errorCode;
} }
Expand Down Expand Up @@ -246,7 +246,7 @@ QgsGeometry::OperationResult QgsVectorLayerEditUtils::addPart( QgsCurve *ring, Q
//convert back to single part if required by layer //convert back to single part if required by layer
geometry.convertToSingleType(); geometry.convertToSingleType();
} }
mLayer->editBuffer()->changeGeometry( featureId, geometry ); mLayer->changeGeometry( featureId, geometry );
} }
return errorCode; return errorCode;
} }
Expand All @@ -266,7 +266,7 @@ int QgsVectorLayerEditUtils::translateFeature( QgsFeatureId featureId, double dx
int errorCode = geometry.translate( dx, dy ); int errorCode = geometry.translate( dx, dy );
if ( errorCode == 0 ) if ( errorCode == 0 )
{ {
mLayer->editBuffer()->changeGeometry( featureId, geometry ); mLayer->changeGeometry( featureId, geometry );
} }
return errorCode; return errorCode;
} }
Expand Down Expand Up @@ -347,13 +347,13 @@ QgsGeometry::OperationResult QgsVectorLayerEditUtils::splitFeatures( const QVect
if ( splitFunctionReturn == QgsGeometry::OperationResult::Success ) if ( splitFunctionReturn == QgsGeometry::OperationResult::Success )
{ {
//change this geometry //change this geometry
mLayer->editBuffer()->changeGeometry( feat.id(), featureGeom ); mLayer->changeGeometry( feat.id(), featureGeom );


//insert new features //insert new features
for ( int i = 0; i < newGeometries.size(); ++i ) for ( int i = 0; i < newGeometries.size(); ++i )
{ {
QgsFeature f = QgsVectorLayerUtils::createFeature( mLayer, newGeometries.at( i ), feat.attributes().toMap() ); QgsFeature f = QgsVectorLayerUtils::createFeature( mLayer, newGeometries.at( i ), feat.attributes().toMap() );
mLayer->editBuffer()->addFeature( f ); mLayer->addFeature( f );
} }


if ( topologicalEditing ) if ( topologicalEditing )
Expand Down Expand Up @@ -469,7 +469,7 @@ QgsGeometry::OperationResult QgsVectorLayerEditUtils::splitParts( const QVector<


if ( !addPartRet ) if ( !addPartRet )
{ {
mLayer->editBuffer()->changeGeometry( feat.id(), featureGeom ); mLayer->changeGeometry( feat.id(), featureGeom );
} }


if ( topologicalEditing ) if ( topologicalEditing )
Expand Down

0 comments on commit 93eef9f

Please sign in to comment.