Skip to content

Commit f470dfb

Browse files
committedJul 2, 2016
dxf export: don't use 3D coordinates for filled circles (followup b3bf4a1; refs #14995)
1 parent c277e6e commit f470dfb

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed
 

‎src/core/dxf/qgsdxfexport.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3551,11 +3551,11 @@ void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color,
35513551

35523552
void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius )
35533553
{
3554-
writeGroup( 0, "HATCH" ); // Entity type
3554+
writeGroup( 0, "HATCH" ); // Entity type
35553555
writeHandle();
35563556
writeGroup( 330, mBlockHandle );
35573557
writeGroup( 100, "AcDbEntity" );
3558-
writeGroup( 8, layer ); // Layer name
3558+
writeGroup( 8, layer ); // Layer name
35593559
writeGroup( color ); // Color (0 by block, 256 by layer)
35603560
writeGroup( 100, "AcDbHatch" );
35613561

@@ -3566,26 +3566,23 @@ void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color,
35663566
writeGroup( 70, 1 ); // Solid fill flag (solid fill = 1; pattern fill = 0)
35673567
writeGroup( 71, 0 ); // Associativity flag (associative = 1; non-associative = 0)
35683568

3569-
35703569
writeGroup( 91, 1 ); // Number of boundary paths (loops)
35713570

3572-
writeGroup( 92, 7 ); // Boundary path type flag (bit coded): 0 = Default; 1 = External; 2 = Polyline 4 = Derived; 8 = Textbox; 16 = Outermost
3573-
writeGroup( 72, 2 );
3571+
writeGroup( 92, 3 ); // Boundary path type flag (bit coded): 0 = Default; 1 = External; 2 = Polyline 4 = Derived; 8 = Textbox; 16 = Outermost
3572+
writeGroup( 72, 1 );
35743573
writeGroup( 73, 1 ); // Is closed flag
35753574
writeGroup( 93, 2 ); // Number of polyline vertices
35763575

3577-
writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, pt.x() - radius, pt.y() ) );
3576+
writeGroup( 0, QgsPointV2( QgsWKBTypes::Point, pt.x() - radius, pt.y() ) );
35783577
writeGroup( 42, 1.0 );
35793578

3580-
writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, pt.x() + radius, pt.y() ) );
3579+
writeGroup( 0, QgsPointV2( QgsWKBTypes::Point, pt.x() + radius, pt.y() ) );
35813580
writeGroup( 42, 1.0 );
35823581

35833582
writeGroup( 97, 0 ); // Number of source boundary objects
35843583

3585-
writeGroup( 75, 1 ); // Hatch style: 0 = Hatch "odd parity" area (Normal style), 1 = Hatch outermost area only (Outer style), 2 = Hatch through entire area (Ignore style)
3584+
writeGroup( 75, 0 ); // Hatch style: 0 = Hatch "odd parity" area (Normal style), 1 = Hatch outermost area only (Outer style), 2 = Hatch through entire area (Ignore style)
35863585
writeGroup( 76, 1 ); // Hatch pattern type: 0 = User-defined; 1 = Predefined; 2 = Custom
3587-
writeGroup( 47, 0.0059696789328105 ); // Pixel size
3588-
35893586
writeGroup( 98, 0 ); // Number of seed points
35903587
}
35913588

0 commit comments

Comments
 (0)
Please sign in to comment.