Merge pull request #1451 from ahuarte47/Issue_OffsetCurve_API

wonder-sk · wonder-sk · commit 9d8a84247d5c · 2014-06-15T22:43:12.000+07:00
Replace GEOS function calls by QgsGeometry class methods
diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -314,6 +314,9 @@ class QgsGeometry
         of segments used to approximate curves */
     QgsGeometry* buffer( double distance, int segments ) /Factory/;
 
+    /** Returns an offset line at a given distance and side from an input line. */
+    QgsGeometry* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit ) /Factory/;
+
     /** Returns a simplified version of this geometry using a specified tolerance value */
     QgsGeometry* simplify( double tolerance ) /Factory/;
 
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -5594,6 +5594,21 @@ QgsGeometry* QgsGeometry::buffer( double distance, int segments )
   CATCH_GEOS( 0 )
 }
 
+QgsGeometry* QgsGeometry::offsetCurve( double distance, int segments, int joinStyle, double mitreLimit )
+{
+  if ( mDirtyGeos )
+    exportWkbToGeos();
+
+  if ( !mGeos || this->type() != QGis::Line )
+    return 0;
+
+  try
+  {
+    return fromGeosGeom( GEOSOffsetCurve( mGeos, distance, segments, joinStyle, mitreLimit ) );
+  }
+  CATCH_GEOS( 0 )
+}
+
 QgsGeometry* QgsGeometry::simplify( double tolerance )
 {
   if ( mDirtyGeos )
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -355,6 +355,9 @@ class CORE_EXPORT QgsGeometry
         of segments used to approximate curves */
     QgsGeometry* buffer( double distance, int segments );
 
+    /** Returns an offset line at a given distance and side from an input line. */
+    QgsGeometry* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit );
+
     /** Returns a simplified version of this geometry using a specified tolerance value */
     QgsGeometry* simplify( double tolerance );
 
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1927,7 +1927,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   // fix invalid polygons
   if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )
   {
-    geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );
+    QgsGeometry* bufferGeom = geom->buffer( 0, 0 );
+    if ( !bufferGeom )
+    {
+      return;
+    }
+    geom = bufferGeom;
+    clonedGeometry.reset( geom );
   }
 
   // CLIP the geometry if it is bigger than the extent
@@ -1938,11 +1944,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
     do_clip = !extentGeom->contains( geom );
     if ( do_clip )
     {
-      geom = geom->intersection( extentGeom ); // creates new geometry
-      if ( !geom )
+      QgsGeometry* clipGeom = geom->intersection( extentGeom ); // creates new geometry
+      if ( !clipGeom )
       {
         return;
       }
+      geom = clipGeom;
+      clonedGeometry.reset( geom );
     }
   }
 
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -705,15 +705,15 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType
   for ( i = 0; i < pointCount; ++i, tempPtr++ )
     tempPolyline[i] = QgsPoint( tempPtr->rx(), tempPtr->ry() );
 
-  QgsGeometry * tempGeometry = ( geometryType == QGis::Polygon ) ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );
+  QgsGeometry* tempGeometry = ( geometryType == QGis::Polygon ) ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );
   if ( tempGeometry )
   {
-    const GEOSGeometry* geosGeom = tempGeometry->asGeos();
-    GEOSGeometry* offsetGeom = ( geometryType == QGis::Polygon ) ? GEOSBuffer( geosGeom, -dist, 8 /*quadSegments*/ ) : GEOSOffsetCurve( geosGeom, dist, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ );
+    QgsGeometry* offsetGeom = ( geometryType == QGis::Polygon ) ? tempGeometry->buffer( -dist, 8 /*quadSegments*/ ) : tempGeometry->offsetCurve( dist, 8 /*quadSegments*/, 0 /*joinStyle*/, 5.0 /*mitreLimit*/ );
 
     if ( offsetGeom )
     {
-      tempGeometry->fromGeos( offsetGeom );
+      delete tempGeometry;
+      tempGeometry = offsetGeom;
 
       if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBLineString )
       {

Original file line number	Diff line number	Diff line change
`@@ -1927,7 +1927,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1927`	`1927`	`// fix invalid polygons`
`1928`	`1928`	`if ( geom->type() == QGis::Polygon && !geom->isGeosValid() )`
`1929`	`1929`	`{`
`1930`		`- geom->fromGeos( GEOSBuffer( geom->asGeos(), 0, 0 ) );`
	`1930`	`+ QgsGeometry* bufferGeom = geom->buffer( 0, 0 );`
	`1931`	`+ if ( !bufferGeom )`
	`1932`	`+ {`
	`1933`	`+ return;`
	`1934`	`+ }`
	`1935`	`+ geom = bufferGeom;`
	`1936`	`+ clonedGeometry.reset( geom );`
`1931`	`1937`	`}`
`1932`	`1938`
`1933`	`1939`	`// CLIP the geometry if it is bigger than the extent`
`@@ -1938,11 +1944,13 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1938`	`1944`	`do_clip = !extentGeom->contains( geom );`
`1939`	`1945`	`if ( do_clip )`
`1940`	`1946`	`{`
`1941`		`- geom = geom->intersection( extentGeom ); // creates new geometry`
`1942`		`- if ( !geom )`
	`1947`	`+ QgsGeometry* clipGeom = geom->intersection( extentGeom ); // creates new geometry`
	`1948`	`+ if ( !clipGeom )`
`1943`	`1949`	`{`
`1944`	`1950`	`return;`
`1945`	`1951`	`}`
	`1952`	`+ geom = clipGeom;`
	`1953`	`+ clonedGeometry.reset( geom );`
`1946`	`1954`	`}`
`1947`	`1955`	`}`
`1948`	`1956`
Original file line number	Diff line number	Diff line change
`@@ -705,15 +705,15 @@ QList<QPolygonF> offsetLine( QPolygonF polyline, double dist, QGis::GeometryType`
`705`	`705`	`for ( i = 0; i < pointCount; ++i, tempPtr++ )`
`706`	`706`	`tempPolyline[i] = QgsPoint( tempPtr->rx(), tempPtr->ry() );`
`707`	`707`
`708`		`- QgsGeometry * tempGeometry = ( geometryType == QGis::Polygon ) ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );`
	`708`	`+ QgsGeometry* tempGeometry = ( geometryType == QGis::Polygon ) ? QgsGeometry::fromPolygon( QgsPolygon() << tempPolyline ) : QgsGeometry::fromPolyline( tempPolyline );`
`709`	`709`	`if ( tempGeometry )`
`710`	`710`	`{`
`711`		`- const GEOSGeometry* geosGeom = tempGeometry->asGeos();`
`712`		`- GEOSGeometry* offsetGeom = ( geometryType == QGis::Polygon ) ? GEOSBuffer( geosGeom, -dist, 8 /quadSegments/ ) : GEOSOffsetCurve( geosGeom, dist, 8 /quadSegments/, 0 /joinStyle/, 5.0 /mitreLimit/ );`
	`711`	`+ QgsGeometry* offsetGeom = ( geometryType == QGis::Polygon ) ? tempGeometry->buffer( -dist, 8 /quadSegments/ ) : tempGeometry->offsetCurve( dist, 8 /quadSegments/, 0 /joinStyle/, 5.0 /mitreLimit/ );`
`713`	`712`
`714`	`713`	`if ( offsetGeom )`
`715`	`714`	`{`
`716`		`- tempGeometry->fromGeos( offsetGeom );`
	`715`	`+ delete tempGeometry;`
	`716`	`+ tempGeometry = offsetGeom;`
`717`	`717`
`718`	`718`	`if ( QGis::flatType( tempGeometry->wkbType() ) == QGis::WKBLineString )`
`719`	`719`	`{`