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

dxf export: consider layer styles (fixes #15946)

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-02-12 20:20:12 +01:00
parent bb2a6c8033
commit 92091c536b
6 changed files with 108 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,12 @@ class QgsDxfExport
QgsDxfExport();
~QgsDxfExport();
/**
* Set map settings and assign layer name attributes
* @param settings map settings to apply
*/
void setMapSettings( const QgsMapSettings &settings );
/**
* Add layers to export
* @param layers list of layers and corresponding attribute indexes that determine the layer name (-1 for original layer name or title)

4
src/app/qgisapp.cpp
View File

@ -5212,6 +5212,10 @@ void QgisApp::dxfExport()
if ( d.exec() == QDialog::Accepted )
{
QgsDxfExport dxfExport;
QgsMapSettings settings( mapCanvas()->mapSettings() );
settings.setLayerStyleOverrides( QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverrides( d.mapTheme() ) );
dxfExport.setMapSettings( settings );
dxfExport.addLayers( d.layers() );
dxfExport.setSymbologyScaleDenominator( d.symbologyScale() );
dxfExport.setSymbologyExport( d.symbologyMode() );

5
src/app/qgsdxfexportdialog.cpp
View File

@ -638,3 +638,8 @@ QgsCoordinateReferenceSystem QgsDxfExportDialog::crs() const
{
return mCRS;
}
QString QgsDxfExportDialog::mapTheme() const
{
return mVisibilityPresets->currentText();
}

1
src/app/qgsdxfexportdialog.h
View File

@ -87,6 +87,7 @@ class QgsDxfExportDialog : public QDialog, private Ui::QgsDxfExportDialogBase
QString saveFile() const;
bool exportMapExtent() const;
bool layerTitleAsName() const;
QString mapTheme() const;
QString encoding() const;
QgsCoordinateReferenceSystem crs() const;

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

@ -41,6 +41,7 @@
#include "qgstextlabelfeature.h"
#include "qgscrscache.h"
#include "qgslogger.h"
#include "qgsmaplayerstylemanager.h"
#include "qgswkbtypes.h"
#include "qgspointv2.h"
@ -382,9 +383,10 @@ QgsDxfExport::QgsDxfExport( const QgsDxfExport& dxfExport )
*this = dxfExport;
}
QgsDxfExport& QgsDxfExport::operator=( const QgsDxfExport & dxfExport )
QgsDxfExport &QgsDxfExport::operator=( const QgsDxfExport & dxfExport )
{
mLayers = dxfExport.mLayers;
mMapSettings = dxfExport.mMapSettings;
mLayerNameAttribute = dxfExport.mLayerNameAttribute;
mSymbologyScaleDenominator = dxfExport.mSymbologyScaleDenominator;
mSymbologyExport = dxfExport.mSymbologyExport;
mMapUnits = dxfExport.mMapUnits;
@ -397,9 +399,26 @@ QgsDxfExport& QgsDxfExport::operator=( const QgsDxfExport & dxfExport )
return *this;
}
void QgsDxfExport::setMapSettings( const QgsMapSettings &settings )
{
mMapSettings = settings;
}
void QgsDxfExport::addLayers( const QList< QPair< QgsVectorLayer *, int > > &layers )
{
mLayers = layers;
QList<QgsMapLayer*> layerList;
mLayerNameAttribute.clear();
QList< QPair< QgsVectorLayer*, int > >::const_iterator layerIt = layers.constBegin();
for ( ; layerIt != layers.constEnd(); ++layerIt )
{
layerList << layerIt->first;
if ( layerIt->second >= 0 )
mLayerNameAttribute.insert( layerIt->first->id(), layerIt->second );
}
mMapSettings.setLayers( layerList );
}
void QgsDxfExport::writeGroup( int code, int i )
@ -497,22 +516,22 @@ int QgsDxfExport::writeToFile( QIODevice* d, const QString& encoding )
if ( mExtent.isEmpty() )
{
QList< QPair<QgsVectorLayer*, int> >::const_iterator layerIt = mLayers.constBegin();
for ( ; layerIt != mLayers.constEnd(); ++layerIt )
Q_FOREACH ( QgsMapLayer *ml, mMapSettings.layers() )
{
if ( layerIt->first )
{
QgsRectangle layerExtent = layerIt->first->extent();
layerExtent = mMapSettings.layerToMapCoordinates( layerIt->first, layerExtent );
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
if ( !vl )
continue;
if ( mExtent.isEmpty() )
{
mExtent = layerExtent;
}
else
{
mExtent.combineExtentWith( layerExtent );
}
QgsRectangle layerExtent = vl->extent();
layerExtent = mMapSettings.layerToMapCoordinates( vl, layerExtent );
if ( mExtent.isEmpty() )
{
mExtent = layerExtent;
}
else
{
mExtent.combineExtentWith( layerExtent );
}
}
}
@ -747,27 +766,28 @@ void QgsDxfExport::writeTables()
writeGroup( 70, 0 );
writeGroup( 0, QStringLiteral( "ENDTAB" ) );
QList< QPair<QgsVectorLayer*, int> >::const_iterator layerIt = mLayers.constBegin();
QSet<QString> layerNames;
for ( ; layerIt != mLayers.constEnd(); ++layerIt )
Q_FOREACH ( QgsMapLayer *ml, mMapSettings.layers() )
{
if ( !layerIsScaleBasedVisible( layerIt->first ) )
if ( !layerIsScaleBasedVisible( ml ) )
continue;
if ( layerIt->first )
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
if ( !vl )
continue;
int attrIdx = mLayerNameAttribute.value( vl->id(), -1 );
if ( attrIdx < 0 )
{
if ( layerIt->second < 0 )
layerNames << dxfLayerName( layerName( vl ) );
}
else
{
QList<QVariant> values;
vl->uniqueValues( attrIdx, values );
Q_FOREACH ( const QVariant& v, values )
{
layerNames << dxfLayerName( layerName( layerIt->first ) );
}
else
{
QList<QVariant> values;
layerIt->first->uniqueValues( layerIt->second, values );
Q_FOREACH ( const QVariant& v, values )
{
layerNames << dxfLayerName( v.toString() );
}
layerNames << dxfLayerName( v.toString() );
}
}
}
@ -946,27 +966,40 @@ void QgsDxfExport::writeEntities()
engine.setMapSettings( mMapSettings );
// iterate through the maplayers
QList< QPair< QgsVectorLayer*, int > >::const_iterator layerIt = mLayers.constBegin();
for ( ; layerIt != mLayers.constEnd(); ++layerIt )
Q_FOREACH ( QgsMapLayer *ml, mMapSettings.layers() )
{
QgsVectorLayer* vl = layerIt->first;
QgsVectorLayer* vl = qobject_cast<QgsVectorLayer *>( ml );
if ( !vl || !layerIsScaleBasedVisible( vl ) )
{
continue;
}
bool hasStyleOverride = mMapSettings.layerStyleOverrides().contains( vl->id() );
if ( hasStyleOverride )
{
QgsDebugMsg( QString( "%1: apply override style" ).arg( vl->id() ) );
vl->styleManager()->setOverrideStyle( mMapSettings.layerStyleOverrides().value( vl->id() ) );
}
else
{
QgsDebugMsg( QString( "%1: not override style" ).arg( vl->id() ) );
}
QgsSymbolRenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, 0, nullptr );
QgsFeatureRenderer* renderer = vl->renderer();
if ( !renderer )
{
if ( hasStyleOverride )
vl->styleManager()->restoreOverrideStyle();
continue;
}
renderer->startRender( ctx, vl->fields() );
QSet<QString> attributes = renderer->usedAttributes( ctx );
if ( vl->fields().exists( layerIt->second ) )
int attrIdx = mLayerNameAttribute.value( vl->id(), 1 );
if ( vl->fields().exists( attrIdx ) )
{
QString layerAttr = vl->fields().at( layerIt->second ).name();
QString layerAttr = vl->fields().at( attrIdx ).name();
attributes << layerAttr;
}
@ -1003,6 +1036,10 @@ void QgsDxfExport::writeEntities()
{
writeEntitiesSymbolLevels( vl );
renderer->stopRender( ctx );
if ( hasStyleOverride )
vl->styleManager()->restoreOverrideStyle();
continue;
}
@ -1017,7 +1054,7 @@ void QgsDxfExport::writeEntities()
while ( featureIt.nextFeature( fet ) )
{
ctx.expressionContext().setFeature( fet );
QString lName( dxfLayerName( layerIt->second == -1 ? layerName( vl ) : fet.attribute( layerIt->second ).toString() ) );
QString lName( dxfLayerName( attrIdx < 0 ? layerName( vl ) : fet.attribute( attrIdx ).toString() ) );
sctx.setFeature( &fet );
if ( mSymbologyExport == NoSymbology )
@ -1067,6 +1104,9 @@ void QgsDxfExport::writeEntities()
}
renderer->stopRender( ctx );
if ( hasStyleOverride )
vl->styleManager()->restoreOverrideStyle();
}
engine.run( ctx );
@ -3936,11 +3976,9 @@ QList< QPair< QgsSymbolLayer*, QgsSymbol* > > QgsDxfExport::symbolLayers( QgsRen
{
QList< QPair< QgsSymbolLayer*, QgsSymbol* > > symbolLayers;
QList< QPair< QgsVectorLayer*, int> >::const_iterator lIt = mLayers.constBegin();
for ( ; lIt != mLayers.constEnd(); ++lIt )
Q_FOREACH ( QgsMapLayer *ml, mMapSettings.layers() )
{
// cast to vector layer
QgsVectorLayer* vl = lIt->first;
QgsVectorLayer* vl = qobject_cast<QgsVectorLayer *>( ml );
if ( !vl )
{
continue;
@ -4192,12 +4230,13 @@ bool QgsDxfExport::layerIsScaleBasedVisible( const QgsMapLayer* layer ) const
QString QgsDxfExport::layerName( const QString &id, const QgsFeature &f ) const
{
QList< QPair<QgsVectorLayer*, int> >::const_iterator layerIt = mLayers.constBegin();
for ( ; layerIt != mLayers.constEnd(); ++layerIt )
Q_FOREACH ( QgsMapLayer *ml, mMapSettings.layers() )
{
if ( layerIt->first && layerIt->first->id() == id )
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
if ( vl && vl->id() == id )
{
return dxfLayerName( layerIt->second < 0 ? layerName( layerIt->first ) : f.attribute( layerIt->second ).toString() );
int attrIdx = mLayerNameAttribute.value( vl->id(), -1 );
return dxfLayerName( attrIdx < 0 ? layerName( vl ) : f.attribute( attrIdx ).toString() );
}
}

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

@ -55,6 +55,12 @@ class CORE_EXPORT QgsDxfExport
QgsDxfExport( const QgsDxfExport &dxfExport );
QgsDxfExport &operator=( const QgsDxfExport &dxfExport );
/**
* Set map settings and assign layer name attributes
* @param settings map settings to apply
*/
void setMapSettings( const QgsMapSettings &settings );
/**
* Add layers to export
* @param layers list of layers and corresponding attribute indexes that determine the layer name (-1 for original layer name or title)
@ -328,8 +334,6 @@ class CORE_EXPORT QgsDxfExport
void registerDxfLayer( const QString &layerId, QgsFeatureId fid, const QString &layer );
private:
QList< QPair<QgsVectorLayer*, int> > mLayers;
//! Extent for export, only intersecting features are exported. If the extent is an empty rectangle, all features are exported
QgsRectangle mExtent;
//! Scale for symbology export (used if symbols units are mm)
@ -396,6 +400,7 @@ class CORE_EXPORT QgsDxfExport
QMap< QString, QMap<QgsFeatureId, QString> > mDxfLayerNames;
QgsCoordinateReferenceSystem mCrs;
QgsMapSettings mMapSettings;
QHash<QString, int> mLayerNameAttribute;
double mFactor;
};