wip page rendering

qgis · Jul 25, 2017 · 534f7ab · 534f7ab
1 parent 9df4a67
commit 534f7ab
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/src/core/layout/qgslayout.cpp b/src/core/layout/qgslayout.cpp
@@ -21,7 +21,9 @@ QgsLayout::QgsLayout( QgsProject *project )
   : QGraphicsScene()
   , mProject( project )
   , mPageCollection( new QgsLayoutPageCollection( this ) )
-{}
+{
+  setBackgroundBrush( QColor( 215, 215, 215 ) );
+}
 
 QgsProject *QgsLayout::project() const
 {

diff --git a/src/core/layout/qgslayoutitem.cpp b/src/core/layout/qgslayoutitem.cpp
@@ -78,7 +78,7 @@ void QgsLayoutItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *it
   }
 
   double destinationDpi = itemStyle->matrix.m11() * 25.4;
-  bool useImageCache = true;
+  bool useImageCache = false;
 
   if ( useImageCache )
   {

diff --git a/src/core/layout/qgslayoutitempage.cpp b/src/core/layout/qgslayoutitempage.cpp
@@ -17,37 +17,34 @@
 #include "qgslayoutitempage.h"
 #include "qgslayout.h"
 #include "qgslayoututils.h"
+#include "qgssymbollayerutils.h"
 #include <QPainter>
 
+#define SHADOW_WIDTH_PIXELS 5
 QgsLayoutItemPage::QgsLayoutItemPage( QgsLayout *layout )
   : QgsLayoutItem( layout )
 {
 
 }
 
-void QgsLayoutItemPage::draw( QgsRenderContext &context, const QStyleOptionGraphicsItem *itemStyle )
+void QgsLayoutItemPage::draw( QgsRenderContext &context, const QStyleOptionGraphicsItem * )
 {
-#if 0
-  Q_UNUSED( itemStyle );
-  Q_UNUSED( pWidget );
-  if ( !painter || !mComposition || !mComposition->pagesVisible() )
+  if ( !context.painter() || !mLayout /*|| !mLayout->pagesVisible() */ )
   {
     return;
   }
 
-  //setup painter scaling to dots so that raster symbology is drawn to scale
-  double dotsPerMM = painter->device()->logicalDpiX() / 25.4;
-
-  //setup render context
-  QgsRenderContext context = QgsComposerUtils::createRenderContextForComposition( mComposition, painter );
-  context.setForceVectorOutput( true );
+  double scale = context.convertToPainterUnits( 1, QgsUnitTypes::RenderMillimeters );
 
   QgsExpressionContext expressionContext = createExpressionContext();
   context.setExpressionContext( expressionContext );
 
+  QPainter *painter = context.painter();
   painter->save();
 
+#if 0 //TODO
   if ( mComposition->plotStyle() ==  QgsComposition::Preview )
+#endif
   {
     //if in preview mode, draw page border and shadow so that it's
     //still possible to tell where pages with a transparent style begin and end
@@ -56,28 +53,33 @@ void QgsLayoutItemPage::draw( QgsRenderContext &context, const QStyleOptionGraph
     //shadow
     painter->setBrush( QBrush( QColor( 150, 150, 150 ) ) );
     painter->setPen( Qt::NoPen );
-    painter->drawRect( QRectF( 1, 1, rect().width() + 1, rect().height() + 1 ) );
+    painter->drawRect( QRectF( SHADOW_WIDTH_PIXELS, SHADOW_WIDTH_PIXELS, rect().width() * scale + SHADOW_WIDTH_PIXELS, rect().height() * scale + SHADOW_WIDTH_PIXELS ) );
 
     //page area
     painter->setBrush( QColor( 215, 215, 215 ) );
     QPen pagePen = QPen( QColor( 100, 100, 100 ), 0 );
     pagePen.setCosmetic( true );
     painter->setPen( pagePen );
-    painter->drawRect( QRectF( 0, 0, rect().width(), rect().height() ) );
+    painter->drawRect( QRectF( 0, 0, scale * rect().width(), scale * rect().height() ) );
   }
 
-  painter->scale( 1 / dotsPerMM, 1 / dotsPerMM ); // scale painter from mm to dots
+  std::unique_ptr< QgsFillSymbol > symbol( mLayout->pageCollection()->pageStyleSymbol()->clone() );
+  symbol->startRender( context );
+
+  //get max bleed from symbol
+  double maxBleedPixels = QgsSymbolLayerUtils::estimateMaxSymbolBleed( symbol.get(), context );
 
-  painter->setRenderHint( QPainter::Antialiasing );
-  mComposition->pageStyleSymbol()->startRender( context );
+  //Now subtract 1 pixel to prevent semi-transparent borders at edge of solid page caused by
+  //anti-aliased painting. This may cause a pixel to be cropped from certain edge lines/symbols,
+  //but that can be counteracted by adding a dummy transparent line symbol layer with a wider line width
+  maxBleedPixels--;
 
-  calculatePageMargin();
-  QPolygonF pagePolygon = QPolygonF( QRectF( mPageMargin * dotsPerMM, mPageMargin * dotsPerMM,
-                                     ( rect().width() - 2 * mPageMargin ) * dotsPerMM, ( rect().height() - 2 * mPageMargin ) * dotsPerMM ) );
+  QPolygonF pagePolygon = QPolygonF( QRectF( maxBleedPixels, maxBleedPixels,
+                                     ( rect().width() * scale - 2 * maxBleedPixels ), ( rect().height() * scale - 2 * maxBleedPixels ) ) );
   QList<QPolygonF> rings; //empty list
 
-  mComposition->pageStyleSymbol()->renderPolygon( pagePolygon, &rings, nullptr, context );
-  mComposition->pageStyleSymbol()->stopRender( context );
+  symbol->renderPolygon( pagePolygon, &rings, nullptr, context );
+  symbol->stopRender( context );
+
   painter->restore();
-#endif
 }