dxf export: fix detection of close polylines

jef-n · jef-n · commit 74f10b9b0302 · 2015-05-11T16:50:37.000+02:00
diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip
@@ -66,8 +66,7 @@ class QgsDxfExport
     int writeHandle( int code = 5, int handle = 0 );
 
     //draw dxf primitives
-    void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, QColor color,
-                        double width = -1, bool polygon = false );
+    void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, QColor color, double width = -1 );
 
     void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, QColor color );
 
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -3338,8 +3338,7 @@ void QgsDxfExport::writePoint( const QgsPoint& pt, const QString& layer, QColor
   }
 }
 
-void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer, const QString& lineStyleName, QColor color,
-                                  double width, bool polygon )
+void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer, const QString& lineStyleName, QColor color, double width )
 {
   writeGroup( 0, "LWPOLYLINE" );
   writeHandle();
@@ -3349,16 +3348,17 @@ void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer,
   writeGroup( 6, lineStyleName );
   writeGroup( color );
 
-  writeGroup( 90, line.size() );
+  bool polygon = line[0] == line[ line.size() - 1 ];
+  int n = line.size();
+  if ( polygon )
+    --n;
 
+  writeGroup( 90, n );
   writeGroup( 70, polygon ? 1 : 0 );
   writeGroup( 43, width );
 
-  QgsPolyline::const_iterator lineIt = line.constBegin();
-  for ( ; lineIt != line.constEnd(); ++lineIt )
-  {
-    writeGroup( 0, *lineIt );
-  }
+  for ( int i = 0; i < n; i++ )
+    writeGroup( 0, line[i] );
 }
 
 void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer, const QString& hatchPattern, QColor color )
@@ -3405,7 +3405,7 @@ void QgsDxfExport::writeLine( const QgsPoint& pt1, const QgsPoint& pt2, const QS
   QgsPolyline line( 2 );
   line[0] = pt1;
   line[1] = pt2;
-  writePolyline( line, layer, lineStyleName, color, width, false );
+  writePolyline( line, layer, lineStyleName, color, width );
 }
 
 void QgsDxfExport::writePoint( const QString& layer, QColor color, const QgsPoint& pt )
@@ -3652,7 +3652,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin
       if ( !offsetLine )
         offsetLine = nonConstGeom;
 
-      writePolyline( offsetLine->asPolyline(), layer, lineStyleName, penColor, width, false );
+      writePolyline( offsetLine->asPolyline(), layer, lineStyleName, penColor, width );
 
       if ( offsetLine != nonConstGeom )
         delete offsetLine;
@@ -3671,7 +3671,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin
       QgsMultiPolyline::const_iterator lIt = multiLine.constBegin();
       for ( ; lIt != multiLine.constEnd(); ++lIt )
       {
-        writePolyline( *lIt, layer, lineStyleName, penColor, width, false );
+        writePolyline( *lIt, layer, lineStyleName, penColor, width );
       }
 
       if ( offsetLine != nonConstGeom )
@@ -3691,7 +3691,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin
       QgsPolygon::const_iterator polyIt = polygon.constBegin();
       for ( ; polyIt != polygon.constEnd(); ++polyIt ) // iterate over rings
       {
-        writePolyline( *polyIt, layer, lineStyleName, penColor, width, false );
+        writePolyline( *polyIt, layer, lineStyleName, penColor, width );
       }
 
       if ( offsetPolygon != nonConstGeom )
@@ -3714,7 +3714,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin
         QgsPolygon::const_iterator polyIt = mpIt->constBegin();
         for ( ; polyIt != mpIt->constEnd(); ++polyIt )
         {
-          writePolyline( *polyIt, layer, lineStyleName, penColor, width, true );
+          writePolyline( *polyIt, layer, lineStyleName, penColor, width );
         }
       }
 
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -79,8 +79,7 @@ class CORE_EXPORT QgsDxfExport
     int writeHandle( int code = 5, int handle = 0 );
 
     //! draw dxf primitives
-    void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, QColor color,
-                        double width = -1, bool polygon = false );
+    void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, QColor color, double width = -1 );
 
     void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, QColor color );
 
diff --git a/src/core/dxf/qgsdxfpaintengine.cpp b/src/core/dxf/qgsdxfpaintengine.cpp
@@ -86,7 +86,7 @@ void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, Poly
 
   if ( mode == QPaintEngine::PolylineMode )
   {
-    mDxf->writePolyline( polyline, mLayer, "CONTINUOUS", mPen.color(), currentWidth(), true );
+    mDxf->writePolyline( polyline, mLayer, "CONTINUOUS", mPen.color(), currentWidth() );
   }
   else
   {
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -670,7 +670,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
       }
       //close ellipse with first point
       line.push_back( line.at( 0 ) );
-      e.writePolyline( line, layerName, "SOLID", oc, outlineWidth, true );
+      e.writePolyline( line, layerName, "SOLID", oc, outlineWidth );
     }
   }
   else if ( symbolName == "rectangle" )
@@ -689,13 +689,13 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
     QPointF pt2( t.map( QPointF( halfWidth, 0 ) ) );
     line1[0] = pt1;
     line1[1] = pt2;
-    e.writePolyline( line1, layerName, "CONTINUOUS", oc, outlineWidth, false );
+    e.writePolyline( line1, layerName, "CONTINUOUS", oc, outlineWidth );
     QgsPolyline line2( 2 );
     QPointF pt3( t.map( QPointF( 0, halfHeight ) ) );
     QPointF pt4( t.map( QPointF( 0, -halfHeight ) ) );
     line2[0] = pt3;
     line2[1] = pt4;
-    e.writePolyline( line2, layerName, "CONTINUOUS", oc, outlineWidth, false );
+    e.writePolyline( line2, layerName, "CONTINUOUS", oc, outlineWidth );
     return true;
   }
   else if ( symbolName == "triangle" )

Original file line number	Diff line number	Diff line change
`@@ -3338,8 +3338,7 @@ void QgsDxfExport::writePoint( const QgsPoint& pt, const QString& layer, QColor`
`3338`	`3338`	`}`
`3339`	`3339`	`}`
`3340`	`3340`
`3341`		`-void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer, const QString& lineStyleName, QColor color,`
`3342`		`- double width, bool polygon )`
	`3341`	`+void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer, const QString& lineStyleName, QColor color, double width )`
`3343`	`3342`	`{`
`3344`	`3343`	`writeGroup( 0, "LWPOLYLINE" );`
`3345`	`3344`	`writeHandle();`
`@@ -3349,16 +3348,17 @@ void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer,`
`3349`	`3348`	`writeGroup( 6, lineStyleName );`
`3350`	`3349`	`writeGroup( color );`
`3351`	`3350`
`3352`		`- writeGroup( 90, line.size() );`
	`3351`	`+ bool polygon = line[0] == line[ line.size() - 1 ];`
	`3352`	`+ int n = line.size();`
	`3353`	`+ if ( polygon )`
	`3354`	`+ --n;`
`3353`	`3355`
	`3356`	`+ writeGroup( 90, n );`
`3354`	`3357`	`writeGroup( 70, polygon ? 1 : 0 );`
`3355`	`3358`	`writeGroup( 43, width );`
`3356`	`3359`
`3357`		`- QgsPolyline::const_iterator lineIt = line.constBegin();`
`3358`		`- for ( ; lineIt != line.constEnd(); ++lineIt )`
`3359`		`- {`
`3360`		`- writeGroup( 0, *lineIt );`
`3361`		`- }`
	`3360`	`+ for ( int i = 0; i < n; i++ )`
	`3361`	`+ writeGroup( 0, line[i] );`
`3362`	`3362`	`}`
`3363`	`3363`
`3364`	`3364`	`void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer, const QString& hatchPattern, QColor color )`
`@@ -3405,7 +3405,7 @@ void QgsDxfExport::writeLine( const QgsPoint& pt1, const QgsPoint& pt2, const QS`
`3405`	`3405`	`QgsPolyline line( 2 );`
`3406`	`3406`	`line[0] = pt1;`
`3407`	`3407`	`line[1] = pt2;`
`3408`		`- writePolyline( line, layer, lineStyleName, color, width, false );`
	`3408`	`+ writePolyline( line, layer, lineStyleName, color, width );`
`3409`	`3409`	`}`
`3410`	`3410`
`3411`	`3411`	`void QgsDxfExport::writePoint( const QString& layer, QColor color, const QgsPoint& pt )`
`@@ -3652,7 +3652,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin`
`3652`	`3652`	`if ( !offsetLine )`
`3653`	`3653`	`offsetLine = nonConstGeom;`
`3654`	`3654`
`3655`		`- writePolyline( offsetLine->asPolyline(), layer, lineStyleName, penColor, width, false );`
	`3655`	`+ writePolyline( offsetLine->asPolyline(), layer, lineStyleName, penColor, width );`
`3656`	`3656`
`3657`	`3657`	`if ( offsetLine != nonConstGeom )`
`3658`	`3658`	`delete offsetLine;`
`@@ -3671,7 +3671,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin`
`3671`	`3671`	`QgsMultiPolyline::const_iterator lIt = multiLine.constBegin();`
`3672`	`3672`	`for ( ; lIt != multiLine.constEnd(); ++lIt )`
`3673`	`3673`	`{`
`3674`		`- writePolyline( *lIt, layer, lineStyleName, penColor, width, false );`
	`3674`	`+ writePolyline( *lIt, layer, lineStyleName, penColor, width );`
`3675`	`3675`	`}`
`3676`	`3676`
`3677`	`3677`	`if ( offsetLine != nonConstGeom )`
`@@ -3691,7 +3691,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin`
`3691`	`3691`	`QgsPolygon::const_iterator polyIt = polygon.constBegin();`
`3692`	`3692`	`for ( ; polyIt != polygon.constEnd(); ++polyIt ) // iterate over rings`
`3693`	`3693`	`{`
`3694`		`- writePolyline( *polyIt, layer, lineStyleName, penColor, width, false );`
	`3694`	`+ writePolyline( *polyIt, layer, lineStyleName, penColor, width );`
`3695`	`3695`	`}`
`3696`	`3696`
`3697`	`3697`	`if ( offsetPolygon != nonConstGeom )`
`@@ -3714,7 +3714,7 @@ void QgsDxfExport::addFeature( const QgsSymbolV2RenderContext& ctx, const QStrin`
`3714`	`3714`	`QgsPolygon::const_iterator polyIt = mpIt->constBegin();`
`3715`	`3715`	`for ( ; polyIt != mpIt->constEnd(); ++polyIt )`
`3716`	`3716`	`{`
`3717`		`- writePolyline( *polyIt, layer, lineStyleName, penColor, width, true );`
	`3717`	`+ writePolyline( *polyIt, layer, lineStyleName, penColor, width );`
`3718`	`3718`	`}`
`3719`	`3719`	`}`
`3720`	`3720`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, Poly`
`86`	`86`
`87`	`87`	`if ( mode == QPaintEngine::PolylineMode )`
`88`	`88`	`{`
`89`		`- mDxf->writePolyline( polyline, mLayer, "CONTINUOUS", mPen.color(), currentWidth(), true );`
	`89`	`+ mDxf->writePolyline( polyline, mLayer, "CONTINUOUS", mPen.color(), currentWidth() );`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa`
`670`	`670`	`}`
`671`	`671`	`//close ellipse with first point`
`672`	`672`	`line.push_back( line.at( 0 ) );`
`673`		`- e.writePolyline( line, layerName, "SOLID", oc, outlineWidth, true );`
	`673`	`+ e.writePolyline( line, layerName, "SOLID", oc, outlineWidth );`
`674`	`674`	`}`
`675`	`675`	`}`
`676`	`676`	`else if ( symbolName == "rectangle" )`
`@@ -689,13 +689,13 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa`
`689`	`689`	`QPointF pt2( t.map( QPointF( halfWidth, 0 ) ) );`
`690`	`690`	`line1[0] = pt1;`
`691`	`691`	`line1[1] = pt2;`
`692`		`- e.writePolyline( line1, layerName, "CONTINUOUS", oc, outlineWidth, false );`
	`692`	`+ e.writePolyline( line1, layerName, "CONTINUOUS", oc, outlineWidth );`
`693`	`693`	`QgsPolyline line2( 2 );`
`694`	`694`	`QPointF pt3( t.map( QPointF( 0, halfHeight ) ) );`
`695`	`695`	`QPointF pt4( t.map( QPointF( 0, -halfHeight ) ) );`
`696`	`696`	`line2[0] = pt3;`
`697`	`697`	`line2[1] = pt4;`
`698`		`- e.writePolyline( line2, layerName, "CONTINUOUS", oc, outlineWidth, false );`
	`698`	`+ e.writePolyline( line2, layerName, "CONTINUOUS", oc, outlineWidth );`
`699`	`699`	`return true;`
`700`	`700`	`}`
`701`	`701`	`else if ( symbolName == "triangle" )`