[Server] Reactivate the capability to print selection with Server 2.18

rldhont · nyalldawson · commit 268b9ac6ec98 · 2018-06-06T19:21:39.000+10:00
The capability to print selection has been removed by the commit aaa7003 to prevent accidental selections showing in exports from composer. It is reactivated only for QGIS Server. fixes #13459 QGIS Server WMS GetPrint request don't respect SELECTION parameter
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -59,6 +59,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
     , mUpdatesEnabled( true )
     , mMapCanvas( nullptr )
     , mDrawCanvasItems( true )
+    , mDrawSelection( false )
     , mAtlasDriven( false )
     , mAtlasScalingMode( Auto )
     , mAtlasMargin( 0.10 )
@@ -229,7 +230,7 @@ QgsMapSettings QgsComposerMap::mapSettings( const QgsRectangle& extent, QSizeF s
   jobMapSettings.setDestinationCrs( ms.destinationCrs() );
   jobMapSettings.setCrsTransformEnabled( ms.hasCrsTransformEnabled() );
   jobMapSettings.setFlags( ms.flags() );
-  jobMapSettings.setFlag( QgsMapSettings::DrawSelection, false );
+  jobMapSettings.setFlag( QgsMapSettings::DrawSelection, mDrawSelection );
   jobMapSettings.setFlag( QgsMapSettings::RenderPartialOutput, false );
 
   if ( mComposition->plotStyle() == QgsComposition::Print ||
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -639,6 +639,17 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     void setDrawCanvasItems( bool b ) { mDrawCanvasItems = b; }
     bool drawCanvasItems() const { return mDrawCanvasItems; }
 
+    /** Set the flag to draw selection in map
+     * @note this function was added in version 2.18.21
+     * @note not available in Python bindings
+     */
+    void setDrawSelection( bool b ) { mDrawSelection = b; }
+    /** Get the flag to draw selection in map
+     * @note this function was added in version 2.18.21
+     * @note not available in Python bindings
+     */
+    bool drawSelection() const { return mDrawSelection; }
+
     /** Returns the conversion factor map units -> mm*/
     double mapUnitsToMM() const;
 
@@ -939,6 +950,9 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     /** True if annotation items, rubber band, etc. from the main canvas should be displayed*/
     bool mDrawCanvasItems;
 
+    /** True if selection has to be drawn. For server only! */
+    bool mDrawSelection;
+
     /** Adjusts an extent rectangle to match the provided item width and height, so that extent
      * center of extent remains the same */
     void adjustExtentToItemShape( double itemWidth, double itemHeight, QgsRectangle& extent ) const;
diff --git a/src/server/qgswmsconfigparser.cpp b/src/server/qgswmsconfigparser.cpp
@@ -279,6 +279,9 @@ QgsComposition* QgsWMSConfigParser::createPrintComposition( const QString& compo
       }
     }
 
+    // Draw Selection
+    currentMap->setDrawSelection( true );
+
     //grid space x / y
     currentMap->grid()->setIntervalX( parameterMap.value( mapId + ":GRID_INTERVAL_X" ).toDouble() );
     currentMap->grid()->setIntervalY( parameterMap.value( mapId + ":GRID_INTERVAL_Y" ).toDouble() );

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,9 @@ QgsComposition* QgsWMSConfigParser::createPrintComposition( const QString& compo`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
	`282`	`+ // Draw Selection`
	`283`	`+ currentMap->setDrawSelection( true );`
	`284`	`+`
`282`	`285`	`//grid space x / y`
`283`	`286`	`currentMap->grid()->setIntervalX( parameterMap.value( mapId + ":GRID_INTERVAL_X" ).toDouble() );`
`284`	`287`	`currentMap->grid()->setIntervalY( parameterMap.value( mapId + ":GRID_INTERVAL_Y" ).toDouble() );`