Skip to content

Commit

Permalink
Conversion of composer to use map renderer job
Browse files Browse the repository at this point in the history
  • Loading branch information
@wonder-sk
wonder-sk committed Nov 13, 2013
1 parent 35894f1 commit 630272d
Show file tree
Hide file tree
Showing 20 changed files with 176 additions and 174 deletions.
7 changes: 3 additions & 4 deletions src/app/composer/qgscomposer.cpp
View file
Expand Up @@ -50,7 +50,6 @@
#include "qgslogger.h"
#include "qgsproject.h"
#include "qgsmapcanvas.h"
#include "qgsmaprenderer.h"
#include "qgsmessageviewer.h"
#include "qgscontexthelp.h"
#include "qgscursors.h"
Expand Down Expand Up @@ -359,7 +358,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
mViewFrame->setLayout( mViewLayout );

//init undo/redo buttons
mComposition = new QgsComposition( mQgis->mapCanvas()->mapRenderer() );
mComposition = new QgsComposition( mQgis->mapCanvas()->mapSettings() );

mActionUndo->setEnabled( false );
mActionRedo->setEnabled( false );
Expand Down Expand Up @@ -2179,7 +2178,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
createComposerView();

//read composition settings
mComposition = new QgsComposition( mQgis->mapCanvas()->mapRenderer() );
mComposition = new QgsComposition( mQgis->mapCanvas()->mapSettings() );
QDomNodeList compositionNodeList = composerElem.elementsByTagName( "Composition" );
if ( compositionNodeList.size() > 0 )
{
Expand Down Expand Up @@ -2550,7 +2549,7 @@ void QgsComposer::cleanupAfterTemplateRead()
double currentHeight = mapItem->rect().height();
if ( currentWidth - 0 > 0.0 ) //don't divide through zero
{
QgsRectangle canvasExtent = mapItem->mapRenderer()->extent();
QgsRectangle canvasExtent = mComposition->mapSettings().visibleExtent();
//adapt min y of extent such that the size of the map item stays the same
double newCanvasExtentHeight = currentHeight / currentWidth * canvasExtent.width();
canvasExtent.setYMinimum( canvasExtent.yMaximum() - newCanvasExtentHeight );
Expand Down
6 changes: 1 addition & 5 deletions src/app/composer/qgscomposermapwidget.cpp
View file
Expand Up @@ -166,10 +166,7 @@ void QgsComposerMapWidget::on_mSetToMapCanvasExtentButton_clicked()
{
if ( mComposerMap )
{
const QgsMapRenderer* renderer = mComposerMap->mapRenderer();
if ( renderer )
{
QgsRectangle newExtent = renderer->extent();
QgsRectangle newExtent = mComposerMap->composition()->mapSettings().visibleExtent();

//Make sure the width/height ratio is the same as in current composer map extent.
//This is to keep the map item frame and the page layout fixed
Expand Down Expand Up @@ -204,7 +201,6 @@ void QgsComposerMapWidget::on_mSetToMapCanvasExtentButton_clicked()
mComposerMap->setNewExtent( newExtent );
mComposerMap->endCommand();
}
}
}

void QgsComposerMapWidget::on_mXMinLineEdit_editingFinished()
Expand Down
8 changes: 5 additions & 3 deletions src/core/composer/qgsatlascomposition.cpp
View file
Expand Up @@ -94,7 +94,7 @@ void QgsAtlasComposition::beginRender()
}

const QgsCoordinateReferenceSystem& coverage_crs = mCoverageLayer->crs();
const QgsCoordinateReferenceSystem& destination_crs = mComposerMap->mapRenderer()->destinationCrs();
const QgsCoordinateReferenceSystem& destination_crs = mComposition->mapSettings().destinationCrs();
// transformation needed for feature geometries
mTransform.setSourceCrs( coverage_crs );
mTransform.setDestCRS( destination_crs );
Expand Down Expand Up @@ -167,6 +167,7 @@ void QgsAtlasComposition::beginRender()
mOrigExtent = mComposerMap->extent();

mRestoreLayer = false;
/* TODO: make working again. btw. Atlas must not change layers of map canvas at any time!
QStringList& layerSet = mComposition->mapRenderer()->layerSet();
if ( mHideCoverage )
{
Expand All @@ -177,7 +178,7 @@ void QgsAtlasComposition::beginRender()
mRestoreLayer = true;
layerSet.removeAt( removeAt );
}
}
}*/

// special columns for expressions
QgsExpression::setSpecialColumn( "$numpages", QVariant( mComposition->numPages() ) );
Expand All @@ -200,14 +201,15 @@ void QgsAtlasComposition::endRender()
}

// restore the coverage visibility
/* TODO: make working again. btw. Atlas must not change layers of map canvas at any time!
if ( mRestoreLayer )
{
QStringList& layerSet = mComposition->mapRenderer()->layerSet();
layerSet.push_back( mCoverageLayer->id() );
mComposerMap->cache();
mComposerMap->update();
}
}*/
mComposerMap->setNewExtent( mOrigExtent );
}

Expand Down
5 changes: 2 additions & 3 deletions src/core/composer/qgscomposerattributetable.cpp
View file
Expand Up @@ -132,11 +132,10 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
if ( mComposerMap && mShowOnlyVisibleFeatures )
{
selectionRect = mComposerMap->extent();
if ( mVectorLayer && mComposerMap->mapRenderer()
&& mComposerMap->mapRenderer()->hasCrsTransformEnabled() )
if ( mVectorLayer && mComposition->mapSettings().hasCrsTransformEnabled() )
{
//transform back to layer CRS
QgsCoordinateTransform coordTransform( mVectorLayer->crs(), mComposerMap->mapRenderer()->destinationCrs() );
QgsCoordinateTransform coordTransform( mVectorLayer->crs(), mComposition->mapSettings().destinationCrs() );
try
{
selectionRect = coordTransform.transformBoundingBox( selectionRect, QgsCoordinateTransform::ReverseTransform );
Expand Down
6 changes: 1 addition & 5 deletions src/core/composer/qgscomposerlegend.cpp
View file
Expand Up @@ -526,11 +526,7 @@ QStringList QgsComposerLegend::layerIdList() const
//take layer list from map renderer (to have legend order)
if ( mComposition )
{
QgsMapRenderer* r = mComposition->mapRenderer();
if ( r )
{
return r->layerSet();
}
return mComposition->mapSettings().layers();
}
return QStringList();
}
Expand Down
128 changes: 44 additions & 84 deletions src/core/composer/qgscomposermap.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgscoordinatetransform.h"
#include "qgslogger.h"
#include "qgsmaprenderer.h"
#include "qgsmaprendererjob.h"
#include "qgsmaplayerregistry.h"
#include "qgsmaptopixel.h"
#include "qgsproject.h"
Expand Down Expand Up @@ -60,7 +61,6 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
mId = 0;
assignFreeId();

mMapRenderer = mComposition->mapRenderer();
mPreviewMode = QgsComposerMap::Rectangle;
mCurrentRectangle = rect();

Expand All @@ -75,10 +75,8 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
connectUpdateSlot();

//calculate mExtent based on width/height ratio and map canvas extent
if ( mMapRenderer )
{
mExtent = mMapRenderer->extent();
}
mExtent = mComposition->mapSettings().visibleExtent();

setSceneRect( QRectF( x, y, width, height ) );
setToolTip( tr( "Map %1" ).arg( mId ) );

Expand Down Expand Up @@ -108,7 +106,6 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )
connectUpdateSlot();

mComposition = composition;
mMapRenderer = mComposition->mapRenderer();
mId = mComposition->composerMapItems().size();
mPreviewMode = QgsComposerMap::Rectangle;
mCurrentRectangle = rect();
Expand Down Expand Up @@ -155,70 +152,47 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
return;
}

if ( !mMapRenderer )
{
return;
}
const QgsMapSettings& ms = mComposition->mapSettings();

QgsMapRenderer theMapRenderer;
theMapRenderer.setExtent( extent );
theMapRenderer.setOutputSize( size, dpi );
if ( mMapRenderer->labelingEngine() )
theMapRenderer.setLabelingEngine( mMapRenderer->labelingEngine()->clone() );
QgsMapSettings jobMapSettings;
jobMapSettings.setExtent( extent );
jobMapSettings.setOutputSize( size.toSize() ); // TODO: sizeF
jobMapSettings.setOutputDpi( dpi );
/* TODO: if ( mMapRenderer->labelingEngine() )
theMapRenderer.setLabelingEngine( mMapRenderer->labelingEngine()->clone() );*/

//use stored layer set or read current set from main canvas
if ( mKeepLayerSet )
{
theMapRenderer.setLayerSet( mLayerSet );
}
else
{
theMapRenderer.setLayerSet( mMapRenderer->layerSet() );
}
theMapRenderer.setDestinationCrs( mMapRenderer->destinationCrs() );
theMapRenderer.setProjectionsEnabled( mMapRenderer->hasCrsTransformEnabled() );

//set antialiasing if enabled in options
QSettings settings;
// Changed to enable anti aliased rendering by default as of QGIS 1.7
if ( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() )
{
painter->setRenderHint( QPainter::Antialiasing );
}

QgsRenderContext* theRendererContext = theMapRenderer.rendererContext();
if ( theRendererContext )
{
theRendererContext->setDrawEditingInformation( false );
theRendererContext->setRenderingStopped( false );
}
jobMapSettings.setLayers( mKeepLayerSet ? mLayerSet : ms.layers() );
jobMapSettings.setDestinationCrs( ms.destinationCrs() );
jobMapSettings.setProjectionsEnabled( ms.hasCrsTransformEnabled() );
jobMapSettings.setAntiAliasingEnabled( ms.isAntiAliasingEnabled() );
jobMapSettings.setDrawEditingInformation( false );

// force vector output (no caching of marker images etc.)
theRendererContext->setForceVectorOutput( true );
jobMapSettings.setForceVectorOutput( true );

// make the renderer respect the composition's useAdvancedEffects flag
theRendererContext->setUseAdvancedEffects( mComposition->useAdvancedEffects() );
jobMapSettings.setUseAdvancedEffects( mComposition->useAdvancedEffects() );

//force composer map scale for scale dependent visibility
double bk_scale = theMapRenderer.scale();
theMapRenderer.setScale( scale() );

//layer caching (as QImages) cannot be done for composer prints
QSettings s;
bool bkLayerCaching = s.value( "/qgis/enable_render_caching", false ).toBool();
s.setValue( "/qgis/enable_render_caching", false );
// force composer map scale for scale dependent visibility
// TODO: custom scale jobMapSettings.setScale( scale() );

Q_UNUSED(forceWidthScale);
/*
if ( forceWidthScale ) //force wysiwyg line widths / marker sizes
{
theMapRenderer.render( painter, forceWidthScale );
}
else
{
theMapRenderer.render( painter );
}
s.setValue( "/qgis/enable_render_caching", bkLayerCaching );
}*/

// render
QgsMapRendererCustomPainterJob job( jobMapSettings, painter );
job.start();
job.waitForFinished();

theMapRenderer.setScale( bk_scale );
}

void QgsComposerMap::cache( void )
Expand Down Expand Up @@ -450,10 +424,15 @@ void QgsComposerMap::setCacheUpdated( bool u )
mCacheUpdated = u;
}

const QgsMapRenderer *QgsComposerMap::mapRenderer() const
{
return mComposition->mapRenderer();
}

double QgsComposerMap::scale() const
{
QgsScaleCalculator calculator;
calculator.setMapUnits( mMapRenderer->mapUnits() );
calculator.setMapUnits( mComposition->mapSettings().mapUnits() );
calculator.setDpi( 25.4 ); //QGraphicsView units are mm
return calculator.calculate( mExtent, rect().width() );
}
Expand Down Expand Up @@ -635,12 +614,7 @@ void QgsComposerMap::updateItem()

bool QgsComposerMap::containsWMSLayer() const
{
if ( !mMapRenderer )
{
return false;
}

QStringList layers = mMapRenderer->layerSet();
QStringList layers = mComposition->mapSettings().layers();

QStringList::const_iterator layer_it = layers.constBegin();
QgsMapLayer* currentLayer = 0;
Expand Down Expand Up @@ -670,15 +644,11 @@ bool QgsComposerMap::containsWMSLayer() const
bool QgsComposerMap::containsAdvancedEffects() const
{
// check if map contains advanced effects like blend modes, or flattened layers for transparency
if ( !mMapRenderer )
{
return false;
}

QStringList layers = mMapRenderer->layerSet();
QStringList layers = mComposition->mapSettings().layers();

//Also need to check PAL labeling for blend modes
QgsPalLabeling* lbl = dynamic_cast<QgsPalLabeling*>( mMapRenderer->labelingEngine() );
QgsPalLabeling* lbl = 0; // TODO: dynamic_cast<QgsPalLabeling*>( mMapRenderer->labelingEngine() );

QStringList::const_iterator layer_it = layers.constBegin();
QgsMapLayer* currentLayer = 0;
Expand All @@ -705,7 +675,7 @@ bool QgsComposerMap::containsAdvancedEffects() const
return true;
}
// check label blend modes
if ( lbl->willUseLayer( currentVectorLayer ) )
if ( lbl && lbl->willUseLayer( currentVectorLayer ) )
{
// Check all label blending properties
QgsPalLayerSettings& layerSettings = lbl->layer( currentVectorLayer->id() );
Expand Down Expand Up @@ -1062,15 +1032,12 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d

void QgsComposerMap::storeCurrentLayerSet()
{
if ( mMapRenderer )
{
mLayerSet = mMapRenderer->layerSet();
}
mLayerSet = mComposition->mapSettings().layers();
}

void QgsComposerMap::syncLayerSet()
{
if ( mLayerSet.size() < 1 && !mMapRenderer )
if ( mLayerSet.size() < 1 )
{
return;
}
Expand All @@ -1083,7 +1050,7 @@ void QgsComposerMap::syncLayerSet()
}
else //only consider layers visible in the map
{
currentLayerSet = mMapRenderer->layerSet();
currentLayerSet = mComposition->mapSettings().layers();
}

for ( int i = mLayerSet.size() - 1; i >= 0; --i )
Expand Down Expand Up @@ -2017,16 +1984,13 @@ void QgsComposerMap::drawCanvasItems( QPainter* painter, const QStyleOptionGraph

void QgsComposerMap::drawCanvasItem( QGraphicsItem* item, QPainter* painter, const QStyleOptionGraphicsItem* itemStyle )
{
if ( !item || !mMapCanvas || !mMapRenderer || !item->isVisible() )
if ( !item || !mMapCanvas || !item->isVisible() )
{
return;
}

painter->save();

QgsRectangle rendererExtent = mMapRenderer->extent();
QgsRectangle composerMapExtent = mExtent;

//determine scale factor according to graphics view dpi
double scaleFactor = 1.0 / mMapCanvas->logicalDpiX() * 25.4;

Expand Down Expand Up @@ -2062,7 +2026,7 @@ void QgsComposerMap::drawCanvasItem( QGraphicsItem* item, QPainter* painter, con

QPointF QgsComposerMap::composerMapPosForItem( const QGraphicsItem* item ) const
{
if ( !item || !mMapCanvas || !mMapRenderer )
if ( !item || !mMapCanvas )
{
return QPointF( 0, 0 );
}
Expand All @@ -2074,7 +2038,7 @@ QPointF QgsComposerMap::composerMapPosForItem( const QGraphicsItem* item ) const

QRectF graphicsSceneRect = mMapCanvas->sceneRect();
QPointF itemScenePos = item->scenePos();
QgsRectangle mapRendererExtent = mMapRenderer->extent();
QgsRectangle mapRendererExtent = mComposition->mapSettings().visibleExtent();

double mapX = itemScenePos.x() / graphicsSceneRect.width() * mapRendererExtent.width() + mapRendererExtent.xMinimum();
double mapY = mapRendererExtent.yMaximum() - itemScenePos.y() / graphicsSceneRect.height() * mapRendererExtent.height();
Expand Down Expand Up @@ -2297,11 +2261,7 @@ void QgsComposerMap::initGridAnnotationFormatFromProject()
{
QString format = QgsProject::instance()->readEntry( "PositionPrecision", "/DegreeFormat", "D" );

bool degreeUnits = true;
if ( mMapRenderer )
{
degreeUnits = ( mMapRenderer->mapUnits() == QGis::Degrees );
}
bool degreeUnits = ( mComposition->mapSettings().mapUnits() == QGis::Degrees );

if ( format == "DM" && degreeUnits )
{
Expand Down

0 comments on commit 630272d

Please sign in to comment.