sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[offset tool] fix #18115 improved offset calculation

Browse Source 
* use QgsGeometry::contains for polygons (contains => negative offset)
* use the geometry part and not the whole geometry to find closest segment
This commit is contained in:
Denis Rouzaud 2018-02-17 13:28:10 -04:00
parent cad45c0b80
commit 45bfa50cba
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/qgsmaptooloffsetcurve.cpp
View File

@ -367,8 +367,15 @@ double QgsMapToolOffsetCurve::calculateOffset( QgsPointXY mapPoint )
int beforeVertex;
int leftOf = 0;
offset = std::sqrt( mOriginalGeometry.closestSegmentWithContext( layerCoords, minDistPoint, beforeVertex, &leftOf ) );
offset = leftOf < 0 ? offset : -offset;
offset = std::sqrt( mManipulatedGeometry.closestSegmentWithContext( layerCoords, minDistPoint, beforeVertex, &leftOf ) );
if ( QgsWkbTypes::geometryType( mManipulatedGeometry.wkbType() ) == QgsWkbTypes::LineGeometry )
{
offset = leftOf < 0 ? offset : -offset;
}
else
{
offset = mManipulatedGeometry.contains( &layerCoords ) ? -offset : offset;
}
}
return offset;
}
@ -573,7 +580,7 @@ void QgsMapToolOffsetCurve::updateGeometryAndRubberBand( double offset )
}
else
{
offsetGeom = mManipulatedGeometry.buffer( -offset, quadSegments, capStyle, joinStyle, miterLimit );
offsetGeom = mManipulatedGeometry.buffer( offset, quadSegments, capStyle, joinStyle, miterLimit );
}
if ( !offsetGeom )