sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

dxf export:

Browse Source 
* output 3D geometries
* more adaptions to labeling changes
This commit is contained in:
Juergen E. Fischer 2016-04-25 01:19:35 +02:00
parent 2bd20de9c3
commit b3bf4a11ac
10 changed files with 542 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
python/core/dxf/qgsdxfexport.sip
View File

@ -165,9 +165,19 @@ class QgsDxfExport
* @param z z value of the point (defaults to 0.0) * @param z z value of the point (defaults to 0.0)
* @param skipz write point in 2d (defaults to false) * @param skipz write point in 2d (defaults to false)
* @note available in python bindings as writeGroupPoint * @note available in python bindings as writeGroupPoint
* @deprecated use QgsPointV2 version instead
*/ */
void writeGroup( int code, const QgsPoint &p, double z = 0.0, bool skipz = false ) /PyName=writeGroupPoint/; void writeGroup( int code, const QgsPoint &p, double z = 0.0, bool skipz = false ) /PyName=writeGroupPoint/;
/**
* Write a group code with a point
* @param code group code
* @param p point value
* @note available in python bindings as writeGroupPointV2
* @note added in 2.15
*/
void writeGroup( int code, const QgsPointV2 &p ) /PyName=writeGroupPointV2/;
/** /**
* Write a group code with color value * Write a group code with color value
* @param color color * @param color color
@ -215,19 +225,43 @@ class QgsDxfExport
* @param line polyline * @param line polyline
* @param layer layer name to use * @param layer layer name to use
* @param lineStyleName line type to use * @param lineStyleName line type to use
* @param color coolor to use * @param color color to use
* @param width line width to use * @param width line width to use
*/ */
void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 ); void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
/**
* Draw dxf primitives (LWPOLYLINE)
* @param line polyline
* @param layer layer name to use
* @param lineStyleName line type to use
* @param color color to use
* @param width line width to use
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolyline( const QgsPointSequenceV2 &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
/** /**
* Draw dxf filled polygon (HATCH) * Draw dxf filled polygon (HATCH)
* @param polygon polygon * @param polygon polygon
* @param layer layer name to use * @param layer layer name to use
* @param hatchPattern hatchPattern to use * @param hatchPattern hatchPattern to use
* @param color coolor to use * @param color color to use
* @deprecated use version with QgsRingSequenceV2
*/ */
void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ); void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ) /Deprecated/;
/**
* Draw dxf filled polygon (HATCH)
* @param polygon polygon
* @param layer layer name to use
* @param hatchPattern hatchPattern to use
* @param color color to use
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolygon( const QgsRingSequenceV2 &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
/** /**
* Draw dxf filled polygon (SOLID) * Draw dxf filled polygon (SOLID)
@ -244,20 +278,54 @@ class QgsDxfExport
//! Write line (as a polyline) //! Write line (as a polyline)
void writeLine( const QgsPoint &pt1, const QgsPoint &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 ); void writeLine( const QgsPoint &pt1, const QgsPoint &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
//! Write line (as a polyline)
//! @note added in 2.15
void writeLine( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
//! Write point //! Write point
void writePoint( const QString &layer, const QColor& color, const QgsPoint &pt ); //! @deprecated use QgsPointV2 version
void writePoint( const QString &layer, const QColor& color, const QgsPoint &pt ) /Deprecated/;
//! Write point
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writePoint( const QString &layer, const QColor& color, const QgsPointV2 &pt ) /PyName=writePointV2/;
//! Write filled circle (as hatch) //! Write filled circle (as hatch)
void writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius ); //! @deprecated use QgsPointV2 version
void writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius ) /Deprecated/;
//! Write filled circle (as hatch)
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writeFilledCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius ) /PyName=writeFillCircleV2/;
//! Write circle (as polyline) //! Write circle (as polyline)
void writeCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width ); //! @deprecated use QgsPointV2 version
void writeCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width ) /Deprecated/;
//! Write circle (as polyline)
//! @note available in Python bindings as writeCircleV2
//! @note added in 2.15
void writeCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width ) /PyName=writeCircleV2/;
//! Write text (TEXT) //! Write text (TEXT)
void writeText( const QString &layer, const QString &text, const QgsPoint &pt, double size, double angle, const QColor& color ); //! @deprecated use QgsPointV2 version
void writeText( const QString &layer, const QString &text, const QgsPoint &pt, double size, double angle, const QColor& color ) /Deprecated/;
//! Write text (TEXT)
//! @note available in Python bindings as writeTextV2
//! @note added in 2.15
void writeText( const QString &layer, const QString &text, const QgsPointV2 &pt, double size, double angle, const QColor& color ) /PyName=writeTextV2/;
//! Write mtext (MTEXT) //! Write mtext (MTEXT)
void writeMText( const QString &layer, const QString &text, const QgsPoint &pt, double width, double angle, const QColor& color ); //! @deprecated use QgsPointV2 version
void writeMText( const QString &layer, const QString &text, const QgsPoint &pt, double width, double angle, const QColor& color ) /Deprecated/;
//! Write mtext (MTEXT)
//! @note available in Python bindings as writeMTextV2
//! @note added in 2.15
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits ); static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );

2
src/app/qgsdxfexportdialog.cpp
View File

@ -438,6 +438,8 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f )
connect( mSelectAllButton, SIGNAL( clicked() ), this, SLOT( selectAll() ) ); connect( mSelectAllButton, SIGNAL( clicked() ), this, SLOT( selectAll() ) );
connect( mUnSelectAllButton, SIGNAL( clicked() ), this, SLOT( unSelectAll() ) ); connect( mUnSelectAllButton, SIGNAL( clicked() ), this, SLOT( unSelectAll() ) );
mFileLineEdit->setFocus();
//last dxf symbology mode //last dxf symbology mode
QSettings s; QSettings s;
mSymbologyModeComboBox->setCurrentIndex( QgsProject::instance()->readEntry( "dxf", "/lastDxfSymbologyMode", s.value( "qgis/lastDxfSymbologyMode", "2" ).toString() ).toInt() ); mSymbologyModeComboBox->setCurrentIndex( QgsProject::instance()->readEntry( "dxf", "/lastDxfSymbologyMode", s.value( "qgis/lastDxfSymbologyMode", "2" ).toString() ).toInt() );

510
src/core/dxf/qgsdxfexport.cpp
View File

@ -39,6 +39,10 @@
#include "qgsunittypes.h" #include "qgsunittypes.h"
#include "qgstextlabelfeature.h" #include "qgstextlabelfeature.h"
#include "qgswkbtypes.h"
#include "qgspointv2.h"
#include "qgsgeos.h"
#include "pal/feature.h" #include "pal/feature.h"
#include "pal/pointset.h" #include "pal/pointset.h"
#include "pal/labelposition.h" #include "pal/labelposition.h"
@ -422,6 +426,14 @@ void QgsDxfExport::writeGroup( int code, const QgsPoint &p, double z, bool skipz
writeGroup( code + 30, z ); writeGroup( code + 30, z );
} }
void QgsDxfExport::writeGroup( int code, const QgsPointV2 &p )
{
writeGroup( code + 10, p.x() );
writeGroup( code + 20, p.y() );
if ( p.is3D() )
writeGroup( code + 30, p.z() );
}
void QgsDxfExport::writeGroup( const QColor& color, int exactMatchCode, int rgbCode, int transparencyCode ) void QgsDxfExport::writeGroup( const QColor& color, int exactMatchCode, int rgbCode, int transparencyCode )
{ {
int minDistAt = -1; int minDistAt = -1;
@ -513,11 +525,11 @@ void QgsDxfExport::writeHeader( const QString& codepage )
{ {
// EXTMIN // EXTMIN
writeGroup( 9, "$EXTMIN" ); writeGroup( 9, "$EXTMIN" );
writeGroup( 0, QgsPoint( ext.xMinimum(), ext.yMinimum() ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, ext.xMinimum(), ext.yMinimum() ) );
// EXTMAX // EXTMAX
writeGroup( 9, "$EXTMAX" ); writeGroup( 9, "$EXTMAX" );
writeGroup( 0, QgsPoint( ext.xMaximum(), ext.yMaximum() ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, ext.xMaximum(), ext.yMaximum() ) );
} }
// Global linetype scale // Global linetype scale
@ -670,36 +682,36 @@ void QgsDxfExport::writeTables()
writeGroup( 100, "AcDbViewportTableRecord" ); writeGroup( 100, "AcDbViewportTableRecord" );
writeGroup( 2, "*ACTIVE" ); writeGroup( 2, "*ACTIVE" );
writeGroup( 70, 0 ); // flags writeGroup( 70, 0 ); // flags
writeGroup( 0, QgsPoint( 0.0, 0.0 ), 0.0, true ); // lower left writeGroup( 0, QgsPointV2( 0.0, 0.0 ) ); // lower left
writeGroup( 1, QgsPoint( 1.0, 1.0 ), 0.0, true ); // upper right writeGroup( 1, QgsPointV2( 1.0, 1.0 ) ); // upper right
writeGroup( 2, QgsPoint( 0.0, 0.0 ), 0.0, true ); // view center point writeGroup( 2, QgsPointV2( 0.0, 0.0 ) ); // view center point
writeGroup( 3, QgsPoint( 0.0, 0.0 ), 0.0, true ); // snap base point writeGroup( 3, QgsPointV2( 0.0, 0.0 ) ); // snap base point
writeGroup( 4, QgsPoint( 1.0, 1.0 ), 0.0, true ); // snap spacing writeGroup( 4, QgsPointV2( 1.0, 1.0 ) ); // snap spacing
writeGroup( 5, QgsPoint( 1.0, 1.0 ), 0.0, true ); // grid spacing writeGroup( 5, QgsPointV2( 1.0, 1.0 ) ); // grid spacing
writeGroup( 6, QgsPoint( 0.0, 0.0 ), 1.0 ); // view direction from target point writeGroup( 6, QgsPointV2( QgsWKBTypes::PointZ, 0.0, 0.0, 1.0 ) ); // view direction from target point
writeGroup( 7, ext.center(), 0.0, true ); // view target point writeGroup( 7, QgsPointV2( ext.center() ) ); // view target point
writeGroup( 40, ext.height() ); // view height writeGroup( 40, ext.height() ); // view height
writeGroup( 41, ext.width() / ext.height() ); // view aspect ratio writeGroup( 41, ext.width() / ext.height() ); // view aspect ratio
writeGroup( 42, 50.0 ); // lens length writeGroup( 42, 50.0 ); // lens length
writeGroup( 43, 0.0 ); // front clipping plane writeGroup( 43, 0.0 ); // front clipping plane
writeGroup( 44, 0.0 ); // back clipping plane writeGroup( 44, 0.0 ); // back clipping plane
writeGroup( 50, 0.0 ); // snap rotation writeGroup( 50, 0.0 ); // snap rotation
writeGroup( 51, 0.0 ); // view twist angle writeGroup( 51, 0.0 ); // view twist angle
writeGroup( 71, 0 ); // view mode (0 = deactivates) writeGroup( 71, 0 ); // view mode (0 = deactivates)
writeGroup( 72, 100 ); // circle zoom percent writeGroup( 72, 100 ); // circle zoom percent
writeGroup( 73, 1 ); // fast zoom setting writeGroup( 73, 1 ); // fast zoom setting
writeGroup( 74, 1 ); // UCSICON setting writeGroup( 74, 1 ); // UCSICON setting
writeGroup( 75, 0 ); // snapping off writeGroup( 75, 0 ); // snapping off
writeGroup( 76, 0 ); // grid off writeGroup( 76, 0 ); // grid off
writeGroup( 77, 0 ); // snap style writeGroup( 77, 0 ); // snap style
writeGroup( 78, 0 ); // snap isopair writeGroup( 78, 0 ); // snap isopair
writeGroup( 281, 0 ); // render mode (0 = 2D optimized) writeGroup( 281, 0 ); // render mode (0 = 2D optimized)
writeGroup( 65, 1 ); // value of UCSVP for this viewport writeGroup( 65, 1 ); // value of UCSVP for this viewport
writeGroup( 100, QgsPoint( 0.0, 0.0 ) ); // UCS origin writeGroup( 100, QgsPointV2( QgsWKBTypes::PointZ ) ); // UCS origin
writeGroup( 101, QgsPoint( 1.0, 0.0 ) ); // UCS x axis writeGroup( 101, QgsPointV2( QgsWKBTypes::PointZ, 1.0 ) ); // UCS x axis
writeGroup( 102, QgsPoint( 0.0, 1.0 ) ); // UCS y axis writeGroup( 102, QgsPointV2( QgsWKBTypes::PointZ, 0.0, 1.0 ) ); // UCS y axis
writeGroup( 79, 0 ); // Orthographic type of UCS (0 = UCS is not orthographic) writeGroup( 79, 0 ); // Orthographic type of UCS (0 = UCS is not orthographic)
writeGroup( 146, 0.0 ); // Elevation writeGroup( 146, 0.0 ); // Elevation
writeGroup( 70, 0 ); writeGroup( 70, 0 );
writeGroup( 0, "ENDTAB" ); writeGroup( 0, "ENDTAB" );
@ -812,7 +824,7 @@ void QgsDxfExport::writeBlocks()
writeGroup( 100, "AcDbBlockBegin" ); writeGroup( 100, "AcDbBlockBegin" );
writeGroup( 2, block ); writeGroup( 2, block );
writeGroup( 70, 0 ); writeGroup( 70, 0 );
writeGroup( 0, QgsPoint( 0.0, 0.0 ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ ) );
writeGroup( 3, block ); writeGroup( 3, block );
writeGroup( 1, "" ); writeGroup( 1, "" );
writeGroup( 0, "ENDBLK" ); writeGroup( 0, "ENDBLK" );
@ -865,7 +877,7 @@ void QgsDxfExport::writeBlocks()
// todo: consider anchor point // todo: consider anchor point
// double size = ml->size(); // double size = ml->size();
// size *= mapUnitScaleFactor( mSymbologyScaleDenominator, ml->sizeUnit(), mMapUnits ); // size *= mapUnitScaleFactor( mSymbologyScaleDenominator, ml->sizeUnit(), mMapUnits );
writeGroup( 0, QgsPoint( 0.0, 0.0 ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ ) );
writeGroup( 3, block ); writeGroup( 3, block );
writeGroup( 1, "" ); writeGroup( 1, "" );
@ -919,6 +931,7 @@ void QgsDxfExport::writeEntities()
// label engine // label engine
QgsLabelingEngineV2 engine; QgsLabelingEngineV2 engine;
engine.readSettingsFromProject();
engine.setMapSettings( mapSettings ); engine.setMapSettings( mapSettings );
// iterate through the maplayers // iterate through the maplayers
@ -3329,7 +3342,7 @@ void QgsDxfExport::endSection()
writeGroup( 0, "ENDSEC" ); writeGroup( 0, "ENDSEC" );
} }
void QgsDxfExport::writePoint( const QgsPoint& pt, const QString& layer, const QColor& color, QgsSymbolV2RenderContext &ctx, const QgsSymbolLayerV2* symbolLayer, const QgsSymbolV2* symbol, double angle ) void QgsDxfExport::writePoint( const QgsPointV2 &pt, const QString& layer, const QColor& color, QgsSymbolV2RenderContext &ctx, const QgsSymbolLayerV2* symbolLayer, const QgsSymbolV2* symbol, double angle )
{ {
#if 0 #if 0
// debug: draw rectangle for debugging // debug: draw rectangle for debugging
@ -3341,10 +3354,10 @@ void QgsDxfExport::writePoint( const QgsPoint& pt, const QString& layer, const Q
writeGroup( 0, "SOLID" ); writeGroup( 0, "SOLID" );
writeGroup( 8, layer ); writeGroup( 8, layer );
writeGroup( 62, 1 ); writeGroup( 62, 1 );
writeGroup( 0, pt + QgsVector( -halfSize, -halfSize ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, pt.x() - halfSize, pt.y() - halfSize ) );
writeGroup( 1, pt + QgsVector( halfSize, -halfSize ) ); writeGroup( 1, QgsPointV2( QgsWKBTypes::PointZ, pt.x() + halfSize, pt.y() - halfSize ) );
writeGroup( 2, pt + QgsVector( -halfSize, halfSize ) ); writeGroup( 2, QgsPointV2( QgsWKBTypes::PointZ, pt.x() - halfSize, pt.y() + halfSize ) );
writeGroup( 3, pt + QgsVector( halfSize, halfSize ) ); writeGroup( 3, QgsPointV2( QgsWKBTypes::PointZ, pt.x() + halfSize, pt.y() + halfSize ) );
} }
#endif // 0 #endif // 0
@ -3377,7 +3390,15 @@ void QgsDxfExport::writePoint( const QgsPoint& pt, const QString& layer, const Q
} }
} }
void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) void QgsDxfExport::writePolyline( const QgsPolyline &line, const QString& layer, const QString& lineStyleName, const QColor& color, double width )
{
QgsPointSequenceV2 s;
Q_FOREACH ( const QgsPoint p, line )
s << QgsPointV2( p );
writePolyline( s, layer, lineStyleName, color, width );
}
void QgsDxfExport::writePolyline( const QgsPointSequenceV2 &line, const QString& layer, const QString& lineStyleName, const QColor& color, double width )
{ {
int n = line.size(); int n = line.size();
if ( n == 0 ) if ( n == 0 )
@ -3395,23 +3416,71 @@ void QgsDxfExport::writePolyline( const QgsPolyline& line, const QString& layer,
return; return;
} }
writeGroup( 0, "LWPOLYLINE" ); if ( !line.at( 0 ).is3D() )
writeHandle(); {
writeGroup( 8, layer ); writeGroup( 0, "LWPOLYLINE" );
writeGroup( 100, "AcDbEntity" ); writeHandle();
writeGroup( 100, "AcDbPolyline" ); writeGroup( 8, layer );
writeGroup( 6, lineStyleName ); writeGroup( 100, "AcDbEntity" );
writeGroup( color ); writeGroup( 100, "AcDbPolyline" );
writeGroup( 6, lineStyleName );
writeGroup( color );
writeGroup( 90, n ); writeGroup( 90, n );
writeGroup( 70, polygon ? 1 : 0 ); writeGroup( 70, polygon ? 1 : 0 );
writeGroup( 43, width ); writeGroup( 43, width );
for ( int i = 0; i < n; i++ ) for ( int i = 0; i < n; i++ )
writeGroup( 0, line[i] ); writeGroup( 0, line[i] );
}
else
{
writeGroup( 0, "POLYLINE" );
writeHandle();
writeGroup( 8, layer );
writeGroup( 100, "AcDbEntity" );
writeGroup( 100, "AcDb3dPolyline" );
writeGroup( 6, lineStyleName );
writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ ) );
writeGroup( color );
writeGroup( 70, 8 );
for ( int i = 0; i < n; i++ )
{
writeGroup( 0, "VERTEX" );
writeHandle();
writeGroup( 8, layer );
writeGroup( 100, "AcDbEntity" );
writeGroup( 100, "AcDbVertex" );
writeGroup( 100, "AcDb3dPolylineVertex" );
writeGroup( 0, line[i] );
writeGroup( 70, 32 );
}
writeGroup( 0, "SEQEND" );
writeHandle();
writeGroup( 8, layer );
writeGroup( 100, "AcDbEntity" );
}
} }
void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer, const QString& hatchPattern, const QColor& color ) void QgsDxfExport::writePolygon( const QgsPolygon &polygon, const QString& layer, const QString& hatchPattern, const QColor& color )
{
QgsRingSequenceV2 r;
Q_FOREACH ( const QgsPolyline l, polygon )
{
QgsPointSequenceV2 s;
Q_FOREACH ( const QgsPoint p, l )
s << QgsPointV2( p );
r << s;
}
writePolygon( r, layer, hatchPattern, color );
}
void QgsDxfExport::writePolygon( const QgsRingSequenceV2 &polygon, const QString& layer, const QString& hatchPattern, const QColor& color )
{ {
writeGroup( 0, "HATCH" ); // Entity type writeGroup( 0, "HATCH" ); // Entity type
writeHandle(); writeHandle();
@ -3421,8 +3490,8 @@ void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer
writeGroup( color ); // Color writeGroup( color ); // Color
writeGroup( 100, "AcDbHatch" ); writeGroup( 100, "AcDbHatch" );
writeGroup( 0, QgsPoint( 0, 0 ) ); // Elevation point (in OCS) writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ ) ); // Elevation point (in OCS)
writeGroup( 200, QgsPoint( 0, 0 ), 1.0 ); writeGroup( 200, QgsPointV2( QgsWKBTypes::PointZ, 0.0, 0.0, 1.0 ) );
writeGroup( 2, hatchPattern ); // Hatch pattern name writeGroup( 2, hatchPattern ); // Hatch pattern name
writeGroup( 70, hatchPattern == "SOLID" ); // Solid fill flag (solid fill = 1; pattern fill = 0) writeGroup( 70, hatchPattern == "SOLID" ); // Solid fill flag (solid fill = 1; pattern fill = 0)
@ -3438,7 +3507,7 @@ void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer
for ( int j = 0; j < polygon[i].size(); ++j ) for ( int j = 0; j < polygon[i].size(); ++j )
{ {
writeGroup( 0, polygon[i][j], 0.0, true ); // Vertex location (in OCS) writeGroup( 0, polygon[i][j] ); // Vertex location (in OCS)
} }
writeGroup( 97, 0 ); // Number of source boundary objects writeGroup( 97, 0 ); // Number of source boundary objects
@ -3452,13 +3521,20 @@ void QgsDxfExport::writePolygon( const QgsPolygon& polygon, const QString& layer
void QgsDxfExport::writeLine( const QgsPoint& pt1, const QgsPoint& pt2, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) void QgsDxfExport::writeLine( const QgsPoint& pt1, const QgsPoint& pt2, const QString& layer, const QString& lineStyleName, const QColor& color, double width )
{ {
QgsPolyline line( 2 ); writeLine( QgsPointV2( pt1 ), QgsPointV2( pt2 ), layer, lineStyleName, color, width );
line[0] = pt1;
line[1] = pt2;
writePolyline( line, layer, lineStyleName, color, width );
} }
void QgsDxfExport::writePoint( const QString& layer, const QColor& color, const QgsPoint& pt ) void QgsDxfExport::writeLine( const QgsPointV2& pt1, const QgsPointV2& pt2, const QString& layer, const QString& lineStyleName, const QColor& color, double width )
{
writePolyline( QgsPointSequenceV2() << pt1 << pt2, layer, lineStyleName, color, width );
}
void QgsDxfExport::writePoint( const QString &layer, const QColor &color, const QgsPoint &pt )
{
writePoint( layer, color, QgsPointV2( pt ) );
}
void QgsDxfExport::writePoint( const QString& layer, const QColor& color, const QgsPointV2 &pt )
{ {
writeGroup( 0, "POINT" ); writeGroup( 0, "POINT" );
writeHandle(); writeHandle();
@ -3470,6 +3546,11 @@ void QgsDxfExport::writePoint( const QString& layer, const QColor& color, const
} }
void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius ) void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius )
{
writeFilledCircle( layer, color, QgsPointV2( pt ), radius );
}
void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius )
{ {
writeGroup( 0, "HATCH" ); // Entity type writeGroup( 0, "HATCH" ); // Entity type
writeHandle(); writeHandle();
@ -3479,8 +3560,8 @@ void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color,
writeGroup( color ); // Color (0 by block, 256 by layer) writeGroup( color ); // Color (0 by block, 256 by layer)
writeGroup( 100, "AcDbHatch" ); writeGroup( 100, "AcDbHatch" );
writeGroup( 0, QgsPoint( 0, 0 ) ); // Elevation point (in OCS) writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ ) ); // Elevation point (in OCS)
writeGroup( 200, QgsPoint( 0, 0 ), 1.0 ); writeGroup( 200, QgsPointV2( QgsWKBTypes::PointZ, 0.0, 0.0, 1.0 ) );
writeGroup( 2, "SOLID" ); // Hatch pattern name writeGroup( 2, "SOLID" ); // Hatch pattern name
writeGroup( 70, 1 ); // Solid fill flag (solid fill = 1; pattern fill = 0) writeGroup( 70, 1 ); // Solid fill flag (solid fill = 1; pattern fill = 0)
@ -3494,10 +3575,10 @@ void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color,
writeGroup( 73, 1 ); // Is closed flag writeGroup( 73, 1 ); // Is closed flag
writeGroup( 93, 2 ); // Number of polyline vertices writeGroup( 93, 2 ); // Number of polyline vertices
writeGroup( 0, QgsPoint( pt.x() - radius, pt.y() ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, pt.x() - radius, pt.y() ) );
writeGroup( 42, 1.0 ); writeGroup( 42, 1.0 );
writeGroup( 0, QgsPoint( pt.x() + radius, pt.y() ) ); writeGroup( 0, QgsPointV2( QgsWKBTypes::PointZ, pt.x() + radius, pt.y() ) );
writeGroup( 42, 1.0 ); writeGroup( 42, 1.0 );
writeGroup( 97, 0 ); // Number of source boundary objects writeGroup( 97, 0 ); // Number of source boundary objects
@ -3509,7 +3590,12 @@ void QgsDxfExport::writeFilledCircle( const QString &layer, const QColor& color,
writeGroup( 98, 0 ); // Number of seed points writeGroup( 98, 0 ); // Number of seed points
} }
void QgsDxfExport::writeCircle( const QString& layer, const QColor& color, const QgsPoint& pt, double radius, const QString &lineStyleName, double width ) void QgsDxfExport::writeCircle( const QString& layer, const QColor& color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width )
{
writeCircle( layer, color, QgsPointV2( pt ), radius, lineStyleName, width );
}
void QgsDxfExport::writeCircle( const QString& layer, const QColor& color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width )
{ {
writeGroup( 0, "LWPOLYLINE" ); writeGroup( 0, "LWPOLYLINE" );
writeHandle(); writeHandle();
@ -3525,13 +3611,18 @@ void QgsDxfExport::writeCircle( const QString& layer, const QColor& color, const
writeGroup( 70, 1 ); writeGroup( 70, 1 );
writeGroup( 43, width ); writeGroup( 43, width );
writeGroup( 0, QgsPoint( pt.x() - radius, pt.y() ) ); writeGroup( 0, QgsPointV2( pt.x() - radius, pt.y() ) );
writeGroup( 42, 1.0 ); writeGroup( 42, 1.0 );
writeGroup( 0, QgsPoint( pt.x() + radius, pt.y() ) ); writeGroup( 0, QgsPointV2( pt.x() + radius, pt.y() ) );
writeGroup( 42, 1.0 ); writeGroup( 42, 1.0 );
} }
void QgsDxfExport::writeText( const QString& layer, const QString& text, const QgsPoint& pt, double size, double angle, const QColor& color ) void QgsDxfExport::writeText( const QString& layer, const QString& text, const QgsPoint &pt, double size, double angle, const QColor& color )
{
writeText( layer, text, QgsPointV2( pt ), size, angle, color );
}
void QgsDxfExport::writeText( const QString& layer, const QString& text, const QgsPointV2 &pt, double size, double angle, const QColor& color )
{ {
writeGroup( 0, "TEXT" ); writeGroup( 0, "TEXT" );
writeHandle(); writeHandle();
@ -3546,7 +3637,12 @@ void QgsDxfExport::writeText( const QString& layer, const QString& text, const Q
writeGroup( 7, "STANDARD" ); // so far only support for standard font writeGroup( 7, "STANDARD" ); // so far only support for standard font
} }
void QgsDxfExport::writeMText( const QString& layer, const QString& text, const QgsPoint& pt, double width, double angle, const QColor& color ) void QgsDxfExport::writeMText( const QString& layer, const QString& text, const QgsPoint &pt, double width, double angle, const QColor& color )
{
writeMText( layer, text, QgsPointV2( pt ), width, angle, color );
}
void QgsDxfExport::writeMText( const QString& layer, const QString& text, const QgsPointV2 &pt, double width, double angle, const QColor& color )
{ {
if ( !mTextStream.codec()->canEncode( text ) ) if ( !mTextStream.codec()->canEncode( text ) )
{ {
@ -3571,7 +3667,7 @@ void QgsDxfExport::writeMText( const QString& layer, const QString& text, const
} }
writeGroup( 1, text ); writeGroup( 1, text );
writeGroup( 50, angle ); // Rotation angle in radians writeGroup( 50, angle ); // Rotation angle in radians
writeGroup( 41, width * 1.1 ); // Reference rectangle width writeGroup( 41, width * 1.1 ); // Reference rectangle width
// Attachment point: // Attachment point:
@ -3580,35 +3676,19 @@ void QgsDxfExport::writeMText( const QString& layer, const QString& text, const
// 7 8 9 // 7 8 9
writeGroup( 71, 7 ); writeGroup( 71, 7 );
writeGroup( 7, "STANDARD" ); // so far only support for standard font writeGroup( 7, "STANDARD" ); // so far only support for standard font
} }
void QgsDxfExport::writeSolid( const QString& layer, const QColor& color, const QgsPoint& pt1, const QgsPoint& pt2, const QgsPoint& pt3, const QgsPoint& pt4 ) void QgsDxfExport::writeSolid( const QString& layer, const QColor& color, const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3, const QgsPoint &pt4 )
{ {
// pt1 pt2 // pt1 pt2
// pt3 pt4 // pt3 pt4
int i = 0; QgsPointSequenceV2 p;
QgsPolygon p( 1 ); p << QgsPointV2( pt1 ) << QgsPointV2( pt2 ) << QgsPointV2( pt4 );
p[0].resize( pt3 != pt4 ? 5 : 4 ); if ( pt3 != pt4 )
p[0][i++] = pt1; p << QgsPointV2( pt3 );
p[0][i++] = pt2; p << QgsPointV2( pt1 );
p[0][i++] = pt4; writePolygon( QgsRingSequenceV2() << p, layer, "SOLID", color );
if ( p[0].size() == 5 )
p[0][i++] = pt3;
p[0][i] = pt1;
writePolygon( p, layer, "SOLID", color );
}
void QgsDxfExport::writeVertex( const QgsPoint& pt, const QString& layer )
{
writeGroup( 0, "VERTEX" );
writeHandle();
writeGroup( 100, "AcDbEntity" );
writeGroup( 100, "AcDbVertex" );
writeGroup( 100, "AcDb2dVertex" );
writeGroup( 8, layer );
writeGroup( 0, pt, 0.0, false );
} }
QgsRectangle QgsDxfExport::dxfExtent() const QgsRectangle QgsDxfExport::dxfExtent() const
@ -3642,9 +3722,9 @@ void QgsDxfExport::addFeature( QgsSymbolV2RenderContext& ctx, const QString& lay
if ( !fet->constGeometry() ) if ( !fet->constGeometry() )
return; return;
const QgsGeometry *geom = fet->constGeometry(); const QgsAbstractGeometryV2 *geom = fet->constGeometry()->geometry();
QGis::WkbType geometryType = geom->wkbType(); QgsWKBTypes::Type geometryType = geom->wkbType();
QColor penColor; QColor penColor;
QColor brushColor; QColor brushColor;
@ -3678,124 +3758,126 @@ void QgsDxfExport::addFeature( QgsSymbolV2RenderContext& ctx, const QString& lay
} }
// single point // single point
if ( geometryType == QGis::WKBPoint || geometryType == QGis::WKBPoint25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::Point )
{ {
writePoint( geom->asPoint(), layer, penColor, ctx, symbolLayer, symbol, angle ); writePoint( geom->coordinateSequence().at( 0 ).at( 0 ).at( 0 ), layer, penColor, ctx, symbolLayer, symbol, angle );
return; return;
} }
// multipoint if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::MultiPoint )
if ( geometryType == QGis::WKBMultiPoint || geometryType == QGis::WKBMultiPoint25D )
{ {
QgsMultiPoint multiPoint = geom->asMultiPoint(); const QgsCoordinateSequenceV2 &cs = geom->coordinateSequence();
QgsMultiPoint::const_iterator it = multiPoint.constBegin(); for ( int i = 0; i < cs.size(); i++ )
for ( ; it != multiPoint.constEnd(); ++it )
{ {
writePoint( *it, layer, penColor, ctx, symbolLayer, symbol, angle ); writePoint( cs.at( i ).at( 0 ).at( 0 ), layer, penColor, ctx, symbolLayer, symbol, angle );
} }
return; return;
} }
if ( penStyle != Qt::NoPen ) if ( penStyle != Qt::NoPen )
{ {
// single line // single line
if ( geometryType == QGis::WKBLineString || geometryType == QGis::WKBLineString25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::LineString )
{ {
QgsGeometry* nonConstGeom = new QgsGeometry( *geom ); const QgsAbstractGeometryV2 *offsetGeom = geom;
QgsGeometry* offsetLine = offset == 0.0 ? nonConstGeom : nonConstGeom->offsetCurve( offset, 0, GEOSBUF_JOIN_MITRE, 2.0 ); if ( !qgsDoubleNear( offset, 0.0 ) )
if ( !offsetLine ) {
offsetLine = nonConstGeom; QgsGeos geos( geom );
offsetGeom = geos.offsetCurve( offset, 0, GEOSBUF_JOIN_MITRE, 2.0 );
if ( offsetGeom )
offsetGeom = geom;
}
writePolyline( offsetLine->asPolyline(), layer, lineStyleName, penColor, width ); writePolyline( offsetGeom->coordinateSequence().at( 0 ).at( 0 ), layer, lineStyleName, penColor, width );
if ( offsetLine != nonConstGeom ) if ( offsetGeom != geom )
delete offsetLine; delete offsetGeom;
delete nonConstGeom;
} }
// multiline // multiline
if ( geometryType == QGis::WKBMultiLineString || geometryType == QGis::WKBMultiLineString25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::MultiLineString )
{ {
QgsGeometry* nonConstGeom = new QgsGeometry( *geom ); const QgsAbstractGeometryV2 *offsetGeom = geom;
QgsGeometry *offsetLine = offset == 0.0 ? nonConstGeom : nonConstGeom->offsetCurve( offset, 0, GEOSBUF_JOIN_MITRE, 2.0 );
if ( !offsetLine )
offsetLine = nonConstGeom;
QgsMultiPolyline multiLine = offsetLine->asMultiPolyline(); if ( !qgsDoubleNear( offset, 0.0 ) )
QgsMultiPolyline::const_iterator lIt = multiLine.constBegin();
for ( ; lIt != multiLine.constEnd(); ++lIt )
{ {
writePolyline( *lIt, layer, lineStyleName, penColor, width ); QgsGeos geos( geom );
offsetGeom = geos.offsetCurve( offset, 0, GEOSBUF_JOIN_MITRE, 2.0 );
if ( !offsetGeom )
offsetGeom = geom;
} }
if ( offsetLine != nonConstGeom ) const QgsCoordinateSequenceV2 &cs = offsetGeom->coordinateSequence();
delete offsetLine; for ( int i = 0; i < cs.size(); i++ )
delete nonConstGeom; {
writePolyline( cs.at( i ).at( 0 ), layer, lineStyleName, penColor, width );
}
if ( offsetGeom != geom )
delete offsetGeom;
} }
// polygon // polygon
if ( geometryType == QGis::WKBPolygon || geometryType == QGis::WKBPolygon25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::Polygon )
{ {
QgsGeometry* nonConstGeom = new QgsGeometry( *geom ); const QgsAbstractGeometryV2 *bufferGeom = geom;
QgsGeometry *offsetPolygon = offset == 0.0 ? nonConstGeom : nonConstGeom->buffer( -offset, 0, GEOSBUF_CAP_FLAT, GEOSBUF_JOIN_MITRE, 2.0 );
if ( !offsetPolygon )
offsetPolygon = nonConstGeom;
QgsPolygon polygon = offsetPolygon->asPolygon(); if ( !qgsDoubleNear( offset, 0.0 ) )
QgsPolygon::const_iterator polyIt = polygon.constBegin();
for ( ; polyIt != polygon.constEnd(); ++polyIt ) // iterate over rings
{ {
writePolyline( *polyIt, layer, lineStyleName, penColor, width ); QgsGeos geos( geom );
bufferGeom = geos.buffer( offset, 0, GEOSBUF_CAP_FLAT, GEOSBUF_JOIN_MITRE, 2.0 );
if ( !bufferGeom )
bufferGeom = geom;
} }
if ( offsetPolygon != nonConstGeom ) const QgsCoordinateSequenceV2 &cs = bufferGeom->coordinateSequence();
delete offsetPolygon; for ( int i = 0; i < cs.at( 0 ).size(); i++ )
delete nonConstGeom; {
writePolyline( cs.at( 0 ).at( i ), layer, lineStyleName, penColor, width );
}
if ( bufferGeom != geom )
delete bufferGeom;
} }
// multipolygon or polygon // multipolygon or polygon
if ( geometryType == QGis::WKBMultiPolygon || geometryType == QGis::WKBMultiPolygon25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::MultiPolygon )
{ {
QgsGeometry* nonConstGeom = new QgsGeometry( *geom ); const QgsAbstractGeometryV2 *bufferGeom = geom;
QgsGeometry *offsetPolygon = offset == 0.0 ? nonConstGeom : nonConstGeom->buffer( -offset, 0, GEOSBUF_CAP_FLAT, GEOSBUF_JOIN_MITRE, 2.0 );
if ( !offsetPolygon )
offsetPolygon = nonConstGeom;
QgsMultiPolygon mp = offsetPolygon->asMultiPolygon(); if ( !qgsDoubleNear( offset, 0.0 ) )
QgsMultiPolygon::const_iterator mpIt = mp.constBegin();
for ( ; mpIt != mp.constEnd(); ++mpIt )
{ {
QgsPolygon::const_iterator polyIt = mpIt->constBegin(); QgsGeos geos( geom );
for ( ; polyIt != mpIt->constEnd(); ++polyIt ) bufferGeom = geos.buffer( offset, 0, GEOSBUF_CAP_FLAT, GEOSBUF_JOIN_MITRE, 2.0 );
{ if ( !bufferGeom )
writePolyline( *polyIt, layer, lineStyleName, penColor, width ); bufferGeom = geom;
}
} }
if ( offsetPolygon != nonConstGeom ) const QgsCoordinateSequenceV2 &cs = bufferGeom->coordinateSequence();
delete offsetPolygon; for ( int i = 0; i < cs.size(); i++ )
delete nonConstGeom; for ( int j = 0; j < cs.at( i ).size(); j++ )
writePolyline( cs.at( i ).at( j ), layer, lineStyleName, penColor, width );
if ( bufferGeom != geom )
delete bufferGeom;
} }
} }
if ( brushStyle != Qt::NoBrush ) if ( brushStyle != Qt::NoBrush )
{ {
// polygon // polygon
if ( geometryType == QGis::WKBPolygon || geometryType == QGis::WKBPolygon25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::Polygon )
{ {
QgsPolygon polygon = geom->asPolygon(); writePolygon( geom->coordinateSequence().at( 0 ), layer, "SOLID", brushColor );
writePolygon( polygon, layer, "SOLID", brushColor );
} }
// multipolygon or polygon // multipolygon or polygon
if ( geometryType == QGis::WKBMultiPolygon || geometryType == QGis::WKBMultiPolygon25D ) if ( QgsWKBTypes::flatType( geometryType ) == QgsWKBTypes::MultiPolygon )
{ {
QgsMultiPolygon mp = geom->asMultiPolygon(); const QgsCoordinateSequenceV2 &cs = geom->coordinateSequence();
QgsMultiPolygon::const_iterator mpIt = mp.constBegin(); for ( int i = 0; i < cs.size(); i++ )
for ( ; mpIt != mp.constEnd(); ++mpIt )
{ {
writePolygon( *mpIt, layer, "SOLID", brushColor ); writePolygon( cs.at( i ), layer, "SOLID", brushColor );
} }
} }
} }
@ -4203,63 +4285,98 @@ QString QgsDxfExport::layerName( QgsVectorLayer *vl ) const
void QgsDxfExport::drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings ) void QgsDxfExport::drawLabel( QString layerId, QgsRenderContext& context, pal::LabelPosition* label, const QgsPalLayerSettings &settings )
{ {
Q_UNUSED( context ); Q_UNUSED( context );
QgsTextLabelFeature* lf = dynamic_cast<QgsTextLabelFeature*>( label->getFeaturePart()->feature() );
if ( !lf ) if ( !settings.drawLabels )
return; return;
//label text QgsTextLabelFeature* lf = dynamic_cast<QgsTextLabelFeature*>( label->getFeaturePart()->feature() );
QString txt = lf->text( label->getPartId() );
//angle // Copy to temp, editable layer settings
double angle = label->getAlpha() * 180 / M_PI; // these settings will be changed by any data defined values, then used for rendering label components
// settings may be adjusted during rendering of components
QgsPalLayerSettings tmpLyr( settings );
// apply any previously applied data defined settings for the label
const QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant >& ddValues = lf->dataDefinedValues();
//font
QFont dFont = lf->definedFont();
QgsDebugMsgLevel( QString( "PAL font tmpLyr: %1, Style: %2" ).arg( tmpLyr.textFont.toString(), tmpLyr.textFont.styleName() ), 4 );
QgsDebugMsgLevel( QString( "PAL font definedFont: %1, Style: %2" ).arg( dFont.toString(), dFont.styleName() ), 4 );
tmpLyr.textFont = dFont;
if ( tmpLyr.multilineAlign == QgsPalLayerSettings::MultiFollowPlacement )
{
//calculate font alignment based on label quadrant
switch ( label->getQuadrant() )
{
case pal::LabelPosition::QuadrantAboveLeft:
case pal::LabelPosition::QuadrantLeft:
case pal::LabelPosition::QuadrantBelowLeft:
tmpLyr.multilineAlign = QgsPalLayerSettings::MultiRight;
break;
case pal::LabelPosition::QuadrantAbove:
case pal::LabelPosition::QuadrantOver:
case pal::LabelPosition::QuadrantBelow:
tmpLyr.multilineAlign = QgsPalLayerSettings::MultiCenter;
break;
case pal::LabelPosition::QuadrantAboveRight:
case pal::LabelPosition::QuadrantRight:
case pal::LabelPosition::QuadrantBelowRight:
tmpLyr.multilineAlign = QgsPalLayerSettings::MultiLeft;
break;
}
}
// update tmpLyr with any data defined text style values
QgsPalLabeling::dataDefinedTextStyle( tmpLyr, ddValues );
// update tmpLyr with any data defined text buffer values
QgsPalLabeling::dataDefinedTextBuffer( tmpLyr, ddValues );
// update tmpLyr with any data defined text formatting values
QgsPalLabeling::dataDefinedTextFormatting( tmpLyr, ddValues );
// add to the results
QString txt = label->getFeaturePart()->feature()->labelText();
QgsFeatureId fid = label->getFeaturePart()->featureId(); QgsFeatureId fid = label->getFeaturePart()->featureId();
QString dxfLayer = mDxfLayerNames[layerId][fid]; QString dxfLayer = mDxfLayerNames[layerId][fid];
//debug: show label rectangle QString wrapchr = tmpLyr.wrapChar.isEmpty() ? "\n" : tmpLyr.wrapChar;
#if 0
QgsPolyline line;
for ( int i = 0; i < 4; ++i )
{
line.append( QgsPoint( label->getX( i ), label->getY( i ) ) );
}
writePolyline( line, dxfLayer, "CONTINUOUS", 1, 0.01, true );
#endif
QString wrapchr = settings.wrapChar.isEmpty() ? "\n" : settings.wrapChar;
//add the direction symbol if needed //add the direction symbol if needed
if ( !txt.isEmpty() && settings.placement == QgsPalLayerSettings::Line && settings.addDirectionSymbol ) if ( !txt.isEmpty() && tmpLyr.placement == QgsPalLayerSettings::Line && tmpLyr.addDirectionSymbol )
{ {
bool prependSymb = false; bool prependSymb = false;
QString symb = settings.rightDirectionSymbol; QString symb = tmpLyr.rightDirectionSymbol;
if ( label->getReversed() ) if ( label->getReversed() )
{ {
prependSymb = true; prependSymb = true;
symb = settings.leftDirectionSymbol; symb = tmpLyr.leftDirectionSymbol;
} }
if ( settings.reverseDirectionSymbol ) if ( tmpLyr.reverseDirectionSymbol )
{ {
if ( symb == settings.rightDirectionSymbol ) if ( symb == tmpLyr.rightDirectionSymbol )
{ {
prependSymb = true; prependSymb = true;
symb = settings.leftDirectionSymbol; symb = tmpLyr.leftDirectionSymbol;
} }
else else
{ {
prependSymb = false; prependSymb = false;
symb = settings.rightDirectionSymbol; symb = tmpLyr.rightDirectionSymbol;
} }
} }
if ( settings.placeDirectionSymbol == QgsPalLayerSettings::SymbolAbove ) if ( tmpLyr.placeDirectionSymbol == QgsPalLayerSettings::SymbolAbove )
{ {
prependSymb = true; prependSymb = true;
symb = symb + wrapchr; symb = symb + wrapchr;
} }
else if ( settings.placeDirectionSymbol == QgsPalLayerSettings::SymbolBelow ) else if ( tmpLyr.placeDirectionSymbol == QgsPalLayerSettings::SymbolBelow )
{ {
prependSymb = false; prependSymb = false;
symb = wrapchr + symb; symb = wrapchr + symb;
@ -4277,30 +4394,31 @@ void QgsDxfExport::drawLabel( QString layerId, QgsRenderContext& context, pal::L
txt = txt.replace( wrapchr, "\\P" ); txt = txt.replace( wrapchr, "\\P" );
if ( settings.textFont.underline() ) if ( tmpLyr.textFont.underline() )
{ {
txt.prepend( "\\L" ).append( "\\l" ); txt.prepend( "\\L" ).append( "\\l" );
} }
if ( settings.textFont.overline() ) if ( tmpLyr.textFont.overline() )
{ {
txt.prepend( "\\O" ).append( "\\o" ); txt.prepend( "\\O" ).append( "\\o" );
} }
if ( settings.textFont.strikeOut() ) if ( tmpLyr.textFont.strikeOut() )
{ {
txt.prepend( "\\K" ).append( "\\k" ); txt.prepend( "\\K" ).append( "\\k" );
} }
txt.prepend( QString( "\\f%1|i%2|b%3;\\H%4;\\W0.75;" ) txt.prepend( QString( "\\f%1|i%2|b%3;\\H%4;\\W0.75;" )
.arg( settings.textFont.family() ) .arg( tmpLyr.textFont.family() )
.arg( settings.textFont.italic() ? 1 : 0 ) .arg( tmpLyr.textFont.italic() ? 1 : 0 )
.arg( settings.textFont.bold() ? 1 : 0 ) .arg( tmpLyr.textFont.bold() ? 1 : 0 )
.arg( label->getHeight() / ( 1 + txt.count( "\\P" ) ) * 0.75 ) ); .arg( label->getHeight() / ( 1 + txt.count( "\\P" ) ) * 0.75 ) );
writeMText( dxfLayer, txt, QgsPoint( label->getX(), label->getY() ), label->getWidth() * 1.1, angle, settings.textColor ); writeMText( dxfLayer, txt, QgsPointV2( label->getX(), label->getY() ), label->getWidth(), label->getAlpha() * 180.0 / M_PI, tmpLyr.textColor );
} }
void QgsDxfExport::registerDxfLayer( QString layerId, QgsFeatureId fid, QString layerName ) void QgsDxfExport::registerDxfLayer( QString layerId, QgsFeatureId fid, QString layerName )
{ {
if ( !mDxfLayerNames.contains( layerId ) ) if ( !mDxfLayerNames.contains( layerId ) )

95
src/core/dxf/qgsdxfexport.h
View File

@ -185,8 +185,18 @@ class CORE_EXPORT QgsDxfExport
* @param z z value of the point (defaults to 0.0) * @param z z value of the point (defaults to 0.0)
* @param skipz write point in 2d (defaults to false) * @param skipz write point in 2d (defaults to false)
* @note available in python bindings as writeGroupPoint * @note available in python bindings as writeGroupPoint
* @deprecated use QgsPointV2 version instead
*/ */
void writeGroup( int code, const QgsPoint &p, double z = 0.0, bool skipz = false ); Q_DECL_DEPRECATED void writeGroup( int code, const QgsPoint &p, double z = 0.0, bool skipz = false );
/**
* Write a group code with a point
* @param code group code
* @param p point value
* @note available in python bindings as writeGroupPointV2
* @note added in 2.15
*/
void writeGroup( int code, const QgsPointV2 &p );
/** /**
* Write a group code with color value * Write a group code with color value
@ -235,19 +245,44 @@ class CORE_EXPORT QgsDxfExport
* @param line polyline * @param line polyline
* @param layer layer name to use * @param layer layer name to use
* @param lineStyleName line type to use * @param lineStyleName line type to use
* @param color coolor to use * @param color color to use
* @param width line width to use * @param width line width to use
* @deprecated use QgsPointSequenceV2 variant
*/ */
void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 ); Q_DECL_DEPRECATED void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
/**
* Draw dxf primitives (LWPOLYLINE)
* @param line polyline
* @param layer layer name to use
* @param lineStyleName line type to use
* @param color color to use
* @param width line width to use
* @note not available in Python bindings
* @note added in 2.15
*/
void writePolyline( const QgsPointSequenceV2 &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
/** /**
* Draw dxf filled polygon (HATCH) * Draw dxf filled polygon (HATCH)
* @param polygon polygon * @param polygon polygon
* @param layer layer name to use * @param layer layer name to use
* @param hatchPattern hatchPattern to use * @param hatchPattern hatchPattern to use
* @param color coolor to use * @param color color to use
* @deprecated use version with QgsRingSequenceV2
*/ */
void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ); Q_DECL_DEPRECATED void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
/**
* Draw dxf filled polygon (HATCH)
* @param polygon polygon
* @param layer layer name to use
* @param hatchPattern hatchPattern to use
* @param color color to use
* @note not available in Python bindings
* @note added in 2.15
*/
void writePolygon( const QgsRingSequenceV2 &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
/** /**
* Draw dxf filled polygon (SOLID) * Draw dxf filled polygon (SOLID)
@ -262,22 +297,57 @@ class CORE_EXPORT QgsDxfExport
Q_DECL_DEPRECATED void writeSolid( const QString &layer, const QColor& color, const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3, const QgsPoint &pt4 ); Q_DECL_DEPRECATED void writeSolid( const QString &layer, const QColor& color, const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3, const QgsPoint &pt4 );
//! Write line (as a polyline) //! Write line (as a polyline)
void writeLine( const QgsPoint &pt1, const QgsPoint &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writeLine( const QgsPoint &pt1, const QgsPoint &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
//! Write line (as a polyline)
//! @note added in 2.15
void writeLine( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
//! Write point //! Write point
void writePoint( const QString &layer, const QColor& color, const QgsPoint &pt ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writePoint( const QString &layer, const QColor& color, const QgsPoint &pt );
//! Write point
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writePoint( const QString &layer, const QColor& color, const QgsPointV2 &pt );
//! Write filled circle (as hatch) //! Write filled circle (as hatch)
void writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writeFilledCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius );
//! Write filled circle (as hatch)
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writeFilledCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius );
//! Write circle (as polyline) //! Write circle (as polyline)
void writeCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writeCircle( const QString &layer, const QColor& color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width );
//! Write circle (as polyline)
//! @note available in Python bindings as writeCircleV2
//! @note added in 2.15
void writeCircle( const QString &layer, const QColor& color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width );
//! Write text (TEXT) //! Write text (TEXT)
void writeText( const QString &layer, const QString &text, const QgsPoint &pt, double size, double angle, const QColor& color ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writeText( const QString &layer, const QString &text, const QgsPoint &pt, double size, double angle, const QColor& color );
//! Write text (TEXT)
//! @note available in Python bindings as writeTextV2
//! @note added in 2.15
void writeText( const QString &layer, const QString &text, const QgsPointV2 &pt, double size, double angle, const QColor& color );
//! Write mtext (MTEXT) //! Write mtext (MTEXT)
void writeMText( const QString &layer, const QString &text, const QgsPoint &pt, double width, double angle, const QColor& color ); //! @deprecated use QgsPointV2 version
Q_DECL_DEPRECATED void writeMText( const QString &layer, const QString &text, const QgsPoint &pt, double width, double angle, const QColor& color );
//! Write mtext (MTEXT)
//! @note available in Python bindings as writeMTextV2
//! @note added in 2.15
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor& color );
static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits ); static double mapUnitScaleFactor( double scaleDenominator, QgsSymbolV2::OutputUnit symbolUnits, QGis::UnitType mapUnits );
@ -340,8 +410,7 @@ class CORE_EXPORT QgsDxfExport
void startSection(); void startSection();
void endSection(); void endSection();
void writePoint( const QgsPoint &pt, const QString &layer, const QColor& color, QgsSymbolV2RenderContext &ctx, const QgsSymbolLayerV2 *symbolLayer, const QgsSymbolV2 *symbol, double angle ); void writePoint( const QgsPointV2 &pt, const QString &layer, const QColor& color, QgsSymbolV2RenderContext &ctx, const QgsSymbolLayerV2 *symbolLayer, const QgsSymbolV2 *symbol, double angle );
void writeVertex( const QgsPoint &pt, const QString &layer );
void writeDefaultLinetypes(); void writeDefaultLinetypes();
void writeSymbolLayerLinetype( const QgsSymbolLayerV2 *symbolLayer ); void writeSymbolLayerLinetype( const QgsSymbolLayerV2 *symbolLayer );
void writeLinetype( const QString &styleName, const QVector<qreal> &pattern, QgsSymbolV2::OutputUnit u ); void writeLinetype( const QString &styleName, const QVector<qreal> &pattern, QgsSymbolV2::OutputUnit u );

29
src/core/dxf/qgsdxfpaintengine.cpp
View File

@ -66,11 +66,11 @@ void QgsDxfPaintEngine::updateState( const QPaintEngineState& state )
mBrush = state.brush(); mBrush = state.brush();
} }
void QgsDxfPaintEngine::setRing( QgsPolyline &polyline, const QPointF *points, int pointCount ) void QgsDxfPaintEngine::setRing( QgsPointSequenceV2 &polyline, const QPointF *points, int pointCount )
{ {
polyline.resize( pointCount ); polyline.clear();
for ( int i = 0; i < pointCount; ++i ) for ( int i = 0; i < pointCount; ++i )
polyline[i] = toDxfCoordinates( points[i] ); polyline.append( toDxfCoordinates( points[i] ) );
} }
void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, PolygonDrawMode mode ) void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, PolygonDrawMode mode )
@ -79,13 +79,14 @@ void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, Poly
if ( !mDxf || !mPaintDevice ) if ( !mDxf || !mPaintDevice )
return; return;
QgsPolygon polygon( 1 ); QgsRingSequenceV2 polygon;
setRing( polygon[0], points, pointCount ); polygon << QgsPointSequenceV2();
setRing( polygon.last(), points, pointCount );
if ( mode == QPaintEngine::PolylineMode ) if ( mode == QPaintEngine::PolylineMode )
{ {
if ( mPen.style() != Qt::NoPen && mPen.brush().style() != Qt::NoBrush ) if ( mPen.style() != Qt::NoPen && mPen.brush().style() != Qt::NoBrush )
mDxf->writePolyline( polygon[0], mLayer, "CONTINUOUS", mPen.color(), currentWidth() ); mDxf->writePolyline( polygon.at( 0 ), mLayer, "CONTINUOUS", mPen.color(), currentWidth() );
} }
else else
{ {
@ -155,8 +156,8 @@ void QgsDxfPaintEngine::endPolygon()
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
drawPolygon( mCurrentPolygon.constData(), mCurrentPolygon.size(), QPaintEngine::PolylineMode ); drawPolygon( mCurrentPolygon.constData(), mCurrentPolygon.size(), QPaintEngine::PolylineMode );
mPolygon.resize( mPolygon.size() + 1 ); mPolygon << QgsPointSequenceV2();
setRing( mPolygon[ mPolygon.size() - 1 ], mCurrentPolygon.constData(), mCurrentPolygon.size() ); setRing( mPolygon.last(), mCurrentPolygon.constData(), mCurrentPolygon.size() );
} }
mCurrentPolygon.clear(); mCurrentPolygon.clear();
} }
@ -195,19 +196,19 @@ void QgsDxfPaintEngine::drawLines( const QLineF* lines, int lineCount )
for ( int i = 0; i < lineCount; ++i ) for ( int i = 0; i < lineCount; ++i )
{ {
QgsPoint pt1 = toDxfCoordinates( lines[i].p1() ); mDxf->writeLine( toDxfCoordinates( lines[i].p1() ),
QgsPoint pt2 = toDxfCoordinates( lines[i].p2() ); toDxfCoordinates( lines[i].p2() ),
mDxf->writeLine( pt1, pt2, mLayer, "CONTINUOUS", mPen.color(), currentWidth() ); mLayer, "CONTINUOUS", mPen.color(), currentWidth() );
} }
} }
QgsPoint QgsDxfPaintEngine::toDxfCoordinates( QPointF pt ) const QgsPointV2 QgsDxfPaintEngine::toDxfCoordinates( QPointF pt ) const
{ {
if ( !mPaintDevice || !mDxf ) if ( !mPaintDevice || !mDxf )
return QgsPoint( pt.x(), pt.y() ); return QgsPointV2( pt.x(), pt.y() );
QPointF dxfPt = mPaintDevice->dxfCoordinates( mTransform.map( pt ) ) + mShift; QPointF dxfPt = mPaintDevice->dxfCoordinates( mTransform.map( pt ) ) + mShift;
return QgsPoint( dxfPt.x(), dxfPt.y() ); return QgsPointV2( dxfPt.x(), dxfPt.y() );
} }

9
src/core/dxf/qgsdxfpaintengine.h
View File

@ -20,10 +20,11 @@
#include <QPaintEngine> #include <QPaintEngine>
#include "qgsgeometryfactory.h" #include "qgsgeometryfactory.h"
#include "qgsabstractgeometryv2.h"
class QgsDxfExport; class QgsDxfExport;
class QgsDxfPaintDevice; class QgsDxfPaintDevice;
class QgsPoint;
/** \class QgsDxfPaintEngine /** \class QgsDxfPaintEngine
* \note not available in Python bindings * \note not available in Python bindings
@ -61,11 +62,11 @@ class CORE_EXPORT QgsDxfPaintEngine: public QPaintEngine
QBrush mBrush; QBrush mBrush;
QString mLayer; QString mLayer;
QPointF mShift; QPointF mShift;
QgsPolygon mPolygon; QgsRingSequenceV2 mPolygon;
QPolygonF mCurrentPolygon; QPolygonF mCurrentPolygon;
QList<QPointF> mCurrentCurve; QList<QPointF> mCurrentCurve;
QgsPoint toDxfCoordinates( QPointF pt ) const; QgsPointV2 toDxfCoordinates( QPointF pt ) const;
double currentWidth() const; double currentWidth() const;
void moveTo( double dx, double dy ); void moveTo( double dx, double dy );
@ -74,7 +75,7 @@ class CORE_EXPORT QgsDxfPaintEngine: public QPaintEngine
void endPolygon(); void endPolygon();
void endCurve(); void endCurve();
void setRing( QgsPolyline &polyline, const QPointF * points, int pointCount ); void setRing( QgsPointSequenceV2 &polyline, const QPointF * points, int pointCount );
//utils for bezier curve calculation //utils for bezier curve calculation
static QPointF bezierPoint( const QList<QPointF>& controlPolygon, double t ); static QPointF bezierPoint( const QList<QPointF>& controlPolygon, double t );

1
src/core/qgspallabeling.cpp
View File

@ -2209,7 +2209,6 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
} }
} }
// NOTE: this should come AFTER any option that affects font metrics // NOTE: this should come AFTER any option that affects font metrics
QScopedPointer<QFontMetricsF> labelFontMetrics( new QFontMetricsF( labelFont ) ); QScopedPointer<QFontMetricsF> labelFontMetrics( new QFontMetricsF( labelFont ) );
double labelX, labelY; // will receive label size double labelX, labelY; // will receive label size

2
src/core/qgspallabeling.h
View File

@ -58,6 +58,7 @@ class QgsMapSettings;
class QgsLabelFeature; class QgsLabelFeature;
class QgsLabelingEngineV2; class QgsLabelingEngineV2;
class QgsVectorLayerLabelProvider; class QgsVectorLayerLabelProvider;
class QgsDxfExport;
class QgsVectorLayerDiagramProvider; class QgsVectorLayerDiagramProvider;
class CORE_EXPORT QgsPalLayerSettings class CORE_EXPORT QgsPalLayerSettings
@ -1055,6 +1056,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
const QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant >& ddValues ); const QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant >& ddValues );
friend class QgsVectorLayerLabelProvider; // to allow calling the static methods above friend class QgsVectorLayerLabelProvider; // to allow calling the static methods above
friend class QgsDxfExport; // to allow calling the static methods above
void deleteTemporaryData(); void deleteTemporaryData();

64
src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
View File

@ -840,70 +840,68 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa
{ {
if ( qgsDoubleNear( halfWidth, halfHeight ) ) if ( qgsDoubleNear( halfWidth, halfHeight ) )
{ {
QPointF pt( t.map( QPointF( 0, 0 ) ) ); QgsPointV2 pt( t.map( QPointF( 0, 0 ) ) );
e.writeFilledCircle( layerName, oc, pt, halfWidth ); e.writeFilledCircle( layerName, oc, pt, halfWidth );
} }
else else
{ {
QgsPolyline line; QgsPointSequenceV2 line;
line.reserve( 40 );
double stepsize = 2 * M_PI / 40; double stepsize = 2 * M_PI / 40;
for ( int i = 0; i < 39; ++i ) for ( int i = 0; i < 39; ++i )
{ {
double angle = stepsize * i; double angle = stepsize * i;
double x = halfWidth * cos( angle ); double x = halfWidth * cos( angle );
double y = halfHeight * sin( angle ); double y = halfHeight * sin( angle );
QPointF pt( t.map( QPointF( x, y ) ) ); line << QgsPointV2( t.map( QPointF( x, y ) ) );
line.push_back( pt );
} }
//close ellipse with first point //close ellipse with first point
line.push_back( line.at( 0 ) ); line << line.at( 0 );
if ( mBrush.style() != Qt::NoBrush ) if ( mBrush.style() != Qt::NoBrush )
e.writePolygon( QgsPolygon() << line, layerName, "SOLID", fc ); e.writePolygon( QgsRingSequenceV2() << line, layerName, "SOLID", fc );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writePolyline( line, layerName, "CONTINUOUS", oc, outlineWidth ); e.writePolyline( line, layerName, "CONTINUOUS", oc, outlineWidth );
} }
} }
else if ( symbolName == "rectangle" ) else if ( symbolName == "rectangle" )
{ {
QgsPolygon p( 1 ); QgsPointSequenceV2 p;
p[0].resize( 5 ); p << QgsPointV2( t.map( QPointF( -halfWidth, -halfHeight ) ) )
p[0][0] = t.map( QPointF( -halfWidth, -halfHeight ) ); << QgsPointV2( t.map( QPointF( halfWidth, -halfHeight ) ) )
p[0][1] = t.map( QPointF( halfWidth, -halfHeight ) ); << QgsPointV2( t.map( QPointF( halfWidth, halfHeight ) ) )
p[0][2] = t.map( QPointF( halfWidth, halfHeight ) ); << QgsPointV2( t.map( QPointF( -halfWidth, halfHeight ) ) );
p[0][3] = t.map( QPointF( -halfWidth, halfHeight ) ); p << p[0];
p[0][4] = p[0][0];
if ( mBrush.style() != Qt::NoBrush ) if ( mBrush.style() != Qt::NoBrush )
e.writePolygon( p, layerName, "SOLID", fc ); e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", fc );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writePolyline( p[0], layerName, "CONTINUOUS", oc, outlineWidth ); e.writePolyline( p, layerName, "CONTINUOUS", oc, outlineWidth );
return true; return true;
} }
else if ( symbolName == "cross" && mPen.style() != Qt::NoPen ) else if ( symbolName == "cross" && mPen.style() != Qt::NoPen )
{ {
QgsPolyline line( 2 ); e.writePolyline( QgsPointSequenceV2()
line[0] = t.map( QPointF( -halfWidth, 0 ) ); << QgsPointV2( t.map( QPointF( -halfWidth, 0 ) ) )
line[1] = t.map( QPointF( halfWidth, 0 ) ); << QgsPointV2( t.map( QPointF( halfWidth, 0 ) ) ),
e.writePolyline( line, layerName, "CONTINUOUS", oc, outlineWidth ); layerName, "CONTINUOUS", oc, outlineWidth );
e.writePolyline( QgsPointSequenceV2()
line[0] = t.map( QPointF( 0, halfHeight ) ); << QgsPointV2( t.map( QPointF( 0, halfHeight ) ) )
line[1] = t.map( QPointF( 0, -halfHeight ) ); << QgsPointV2( t.map( QPointF( 0, -halfHeight ) ) ),
e.writePolyline( line, layerName, "CONTINUOUS", oc, outlineWidth ); layerName, "CONTINUOUS", oc, outlineWidth );
return true; return true;
} }
else if ( symbolName == "triangle" ) else if ( symbolName == "triangle" )
{ {
QgsPolygon p( 1 ); QgsPointSequenceV2 p;
p[0].resize( 4 ); p << QgsPointV2( t.map( QPointF( -halfWidth, -halfHeight ) ) )
p[0][0] = QPointF( t.map( QPointF( -halfWidth, -halfHeight ) ) ); << QgsPointV2( t.map( QPointF( halfWidth, -halfHeight ) ) )
p[0][1] = QPointF( t.map( QPointF( halfWidth, -halfHeight ) ) ); << QgsPointV2( t.map( QPointF( 0, halfHeight ) ) );
p[0][2] = QPointF( t.map( QPointF( 0, halfHeight ) ) ); p << p[0];
p[0][3] = p[0][0];
if ( mBrush.style() != Qt::NoBrush ) if ( mBrush.style() != Qt::NoBrush )
e.writePolygon( p, layerName, "SOLID", fc ); e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", fc );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writePolyline( p[0], layerName, "CONTINUOUS", oc, outlineWidth ); e.writePolyline( p, layerName, "CONTINUOUS", oc, outlineWidth );
return true; return true;
} }

33
src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
View File

@ -1049,25 +1049,22 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
polygon = t.map( polygon ); polygon = t.map( polygon );
QgsPolygon p( 1 ); QgsPointSequenceV2 p;
p.resize( 1 ); for ( int i = 0; i < polygon.size(); i++ )
p[0].resize( polygon.size() + 1 ); p << QgsPointV2( polygon[i] );
int i = 0; p << p[0];
for ( i = 0; i < polygon.size(); i++ )
p[0][i] = polygon[i];
p[0][i] = p[0][0];
if ( mBrush.style() != Qt::NoBrush ) if ( mBrush.style() != Qt::NoBrush )
e.writePolygon( p, layerName, "SOLID", bc ); e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", bc );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writePolyline( p[0], layerName, "CONTINUOUS", pc, outlineWidth ); e.writePolyline( p, layerName, "CONTINUOUS", pc, outlineWidth );
} }
else if ( name == "circle" ) else if ( name == "circle" )
{ {
if ( mBrush.style() != Qt::NoBrush ) if ( mBrush.style() != Qt::NoBrush )
e.writeFilledCircle( layerName, bc, shift, halfSize ); e.writeFilledCircle( layerName, bc, QgsPointV2( shift ), halfSize );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writeCircle( layerName, pc, shift, halfSize, "CONTINUOUS", outlineWidth ); e.writeCircle( layerName, pc, QgsPointV2( shift ), halfSize, "CONTINUOUS", outlineWidth );
} }
else if ( name == "line" ) else if ( name == "line" )
{ {
@ -1075,7 +1072,7 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
QPointF pt2 = t.map( QPointF( 0, halfSize ) ); QPointF pt2 = t.map( QPointF( 0, halfSize ) );
if ( mPen.style() != Qt::NoPen ) if ( mPen.style() != Qt::NoPen )
e.writeLine( pt1, pt2, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt1 ), QgsPointV2( pt2 ), layerName, "CONTINUOUS", pc, outlineWidth );
} }
else if ( name == "cross" ) else if ( name == "cross" )
{ {
@ -1086,8 +1083,8 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
QPointF pt3 = t.map( QPointF( 0, -halfSize ) ); QPointF pt3 = t.map( QPointF( 0, -halfSize ) );
QPointF pt4 = t.map( QPointF( 0, halfSize ) ); QPointF pt4 = t.map( QPointF( 0, halfSize ) );
e.writeLine( pt1, pt2, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt1 ), QgsPointV2( pt2 ), layerName, "CONTINUOUS", pc, outlineWidth );
e.writeLine( pt3, pt4, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt3 ), QgsPointV2( pt4 ), layerName, "CONTINUOUS", pc, outlineWidth );
} }
} }
else if ( name == "x" || name == "cross2" ) else if ( name == "x" || name == "cross2" )
@ -1099,8 +1096,8 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
QPointF pt3 = t.map( QPointF( halfSize, -halfSize ) ); QPointF pt3 = t.map( QPointF( halfSize, -halfSize ) );
QPointF pt4 = t.map( QPointF( -halfSize, halfSize ) ); QPointF pt4 = t.map( QPointF( -halfSize, halfSize ) );
e.writeLine( pt1, pt2, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt1 ), QgsPointV2( pt2 ), layerName, "CONTINUOUS", pc, outlineWidth );
e.writeLine( pt3, pt4, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt3 ), QgsPointV2( pt4 ), layerName, "CONTINUOUS", pc, outlineWidth );
} }
} }
else if ( name == "arrowhead" ) else if ( name == "arrowhead" )
@ -1111,8 +1108,8 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
QPointF pt2 = t.map( QPointF( 0, 0 ) ); QPointF pt2 = t.map( QPointF( 0, 0 ) );
QPointF pt3 = t.map( QPointF( -halfSize, -halfSize ) ); QPointF pt3 = t.map( QPointF( -halfSize, -halfSize ) );
e.writeLine( pt1, pt2, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt1 ), QgsPointV2( pt2 ), layerName, "CONTINUOUS", pc, outlineWidth );
e.writeLine( pt3, pt2, layerName, "CONTINUOUS", pc, outlineWidth ); e.writeLine( QgsPointV2( pt3 ), QgsPointV2( pt2 ), layerName, "CONTINUOUS", pc, outlineWidth );
} }
} }
else else