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

Enable disabled simplification code after merge MTR (1-2)

Browse Source 
Disable simplification of geometries in composer by default
This commit is contained in:
Alvaro Huarte 2014-05-26 17:28:26 +02:00
parent 20015e723a
commit 4ab24a4f40
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/qgsmapsettings.sip
View File

@ -45,7 +45,8 @@ public:
DrawEditingInfo = 0x02, DrawEditingInfo = 0x02,
ForceVectorOutput = 0x04, ForceVectorOutput = 0x04,
UseAdvancedEffects = 0x08, UseAdvancedEffects = 0x08,
DrawLabeling = 0x10 DrawLabeling = 0x10,
UseRenderingOptimization = 0x20
// TODO: ignore scale-based visibiity (overview) // TODO: ignore scale-based visibiity (overview)
}; };
//Q_DECLARE_FLAGS(Flags, Flag) //Q_DECLARE_FLAGS(Flags, Flag)

6
src/core/composer/qgscomposermap.cpp
View File

@ -201,13 +201,13 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
jobMapSettings.setDestinationCrs( ms.destinationCrs() ); jobMapSettings.setDestinationCrs( ms.destinationCrs() );
jobMapSettings.setCrsTransformEnabled( ms.hasCrsTransformEnabled() ); jobMapSettings.setCrsTransformEnabled( ms.hasCrsTransformEnabled() );
jobMapSettings.setFlags( ms.flags() ); jobMapSettings.setFlags( ms.flags() );
/* TODO[MD] fix after merge
if ( mComposition->plotStyle() == QgsComposition::Print || if ( mComposition->plotStyle() == QgsComposition::Print ||
mComposition->plotStyle() == QgsComposition::Postscript ) mComposition->plotStyle() == QgsComposition::Postscript )
{ {
//if outputing composer, disable optimisations like layer simplification //if outputing composer, disable optimisations like layer simplification
theRendererContext->setUseRenderingOptimization( false ); jobMapSettings.setFlag( QgsMapSettings::UseRenderingOptimization, false );
}*/ }
//update $map variable. Use QgsComposerItem's id since that is user-definable //update $map variable. Use QgsComposerItem's id since that is user-definable
QgsExpression::setSpecialColumn( "$map", QgsComposerItem::id() ); QgsExpression::setSpecialColumn( "$map", QgsComposerItem::id() );

3
src/core/qgsmapsettings.h
View File

@ -60,7 +60,8 @@ class CORE_EXPORT QgsMapSettings
DrawEditingInfo = 0x02, DrawEditingInfo = 0x02,
ForceVectorOutput = 0x04, ForceVectorOutput = 0x04,
UseAdvancedEffects = 0x08, UseAdvancedEffects = 0x08,
DrawLabeling = 0x10 DrawLabeling = 0x10,
UseRenderingOptimization = 0x20,
// TODO: ignore scale-based visibility (overview) // TODO: ignore scale-based visibility (overview)
}; };
Q_DECLARE_FLAGS( Flags, Flag ) Q_DECLARE_FLAGS( Flags, Flag )

1
src/core/qgsrendercontext.cpp
View File

@ -48,6 +48,7 @@ QgsRenderContext QgsRenderContext::fromMapSettings( const QgsMapSettings& mapSet
ctx.setDrawEditingInformation( mapSettings.testFlag( QgsMapSettings::DrawEditingInfo ) ); ctx.setDrawEditingInformation( mapSettings.testFlag( QgsMapSettings::DrawEditingInfo ) );
ctx.setForceVectorOutput( mapSettings.testFlag( QgsMapSettings::ForceVectorOutput ) ); ctx.setForceVectorOutput( mapSettings.testFlag( QgsMapSettings::ForceVectorOutput ) );
ctx.setUseAdvancedEffects( mapSettings.testFlag( QgsMapSettings::UseAdvancedEffects ) ); ctx.setUseAdvancedEffects( mapSettings.testFlag( QgsMapSettings::UseAdvancedEffects ) );
ctx.setUseRenderingOptimization( mapSettings.testFlag( QgsMapSettings::UseRenderingOptimization ) );
ctx.setCoordinateTransform( 0 ); ctx.setCoordinateTransform( 0 );
ctx.setSelectionColor( mapSettings.selectionColor() ); ctx.setSelectionColor( mapSettings.selectionColor() );
ctx.setRasterScaleFactor( 1.0 ); ctx.setRasterScaleFactor( 1.0 );

1
src/gui/qgsmapcanvas.cpp
View File

@ -206,6 +206,7 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
this, SLOT( writeProject( QDomDocument & ) ) ); this, SLOT( writeProject( QDomDocument & ) ) );
mSettings.setFlag( QgsMapSettings::DrawEditingInfo ); mSettings.setFlag( QgsMapSettings::DrawEditingInfo );
mSettings.setFlag( QgsMapSettings::UseRenderingOptimization );
// class that will sync most of the changes between canvas and (legacy) map renderer // class that will sync most of the changes between canvas and (legacy) map renderer
// it is parented to map canvas, will be deleted automatically // it is parented to map canvas, will be deleted automatically