Limit resolution of symbol fills during composer previews to improve composer responsiveness

nyalldawson · nyalldawson · commit 375e0d40ed15 · 2014-03-21T12:53:20.000+11:00
diff --git a/src/core/composer/qgscomposershape.cpp b/src/core/composer/qgscomposershape.cpp
@@ -147,7 +147,9 @@ void QgsComposerShape::drawShapeUsingSymbol( QPainter* p )
   context.setScaleFactor( 1.0 );
   if ( mComposition->plotStyle() ==  QgsComposition::Preview )
   {
-    context.setRasterScaleFactor( horizontalViewScaleFactor() );
+    //Limit resolution of symbol fill if composition is not being exported
+    //otherwise zooming into composition slows down renders
+    context.setRasterScaleFactor( qMin( horizontalViewScaleFactor(), 3.0 ) );
   }
   else
   {
diff --git a/src/core/composer/qgspaperitem.cpp b/src/core/composer/qgspaperitem.cpp
@@ -158,7 +158,9 @@ void QgsPaperItem::paint( QPainter* painter, const QStyleOptionGraphicsItem* ite
   context.setScaleFactor( 1.0 );
   if ( mComposition->plotStyle() ==  QgsComposition::Preview )
   {
-    context.setRasterScaleFactor( horizontalViewScaleFactor() );
+    //Limit resolution of symbol fill if composition is not being exported
+    //otherwise zooming into composition slows down renders
+    context.setRasterScaleFactor( qMin( horizontalViewScaleFactor(), 3.0 ) );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,9 @@ void QgsComposerShape::drawShapeUsingSymbol( QPainter* p )`
`147`	`147`	`context.setScaleFactor( 1.0 );`
`148`	`148`	`if ( mComposition->plotStyle() == QgsComposition::Preview )`
`149`	`149`	`{`
`150`		`- context.setRasterScaleFactor( horizontalViewScaleFactor() );`
	`150`	`+ //Limit resolution of symbol fill if composition is not being exported`
	`151`	`+ //otherwise zooming into composition slows down renders`
	`152`	`+ context.setRasterScaleFactor( qMin( horizontalViewScaleFactor(), 3.0 ) );`
`151`	`153`	`}`
`152`	`154`	`else`
`153`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,9 @@ void QgsPaperItem::paint( QPainter* painter, const QStyleOptionGraphicsItem* ite`
`158`	`158`	`context.setScaleFactor( 1.0 );`
`159`	`159`	`if ( mComposition->plotStyle() == QgsComposition::Preview )`
`160`	`160`	`{`
`161`		`- context.setRasterScaleFactor( horizontalViewScaleFactor() );`
	`161`	`+ //Limit resolution of symbol fill if composition is not being exported`
	`162`	`+ //otherwise zooming into composition slows down renders`
	`163`	`+ context.setRasterScaleFactor( qMin( horizontalViewScaleFactor(), 3.0 ) );`
`162`	`164`	`}`
`163`	`165`	`else`
`164`	`166`	`{`