Display name of layers in need of rasterization when saving as PDF (#…

…4539)
qgis · May 12, 2017 · 4180846 · 4180846
1 parent ad5054b
commit 4180846
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/python/core/qgsmapsettingsutils.sip b/python/core/qgsmapsettingsutils.sip
@@ -22,11 +22,11 @@ class QgsMapSettingsUtils
 %End
   public:
 
-    static bool containsAdvancedEffects( const QgsMapSettings &mapSettings );
+    static const QStringList containsAdvancedEffects( const QgsMapSettings &mapSettings );
 %Docstring
  Checks whether any of the layers attached to a map settings object contain advanced effects
  \param mapSettings map settings
- :rtype: bool
+ :rtype: list of str
 %End
 
     static QString worldFileContent( const QgsMapSettings &mapSettings );

diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -66,7 +66,23 @@ QgsMapSaveDialog::QgsMapSaveDialog( QWidget *parent, QgsMapCanvas *mapCanvas, co
   {
     mSaveWorldFile->setVisible( false );
 
-    mSaveAsRaster->setChecked( QgsMapSettingsUtils::containsAdvancedEffects( mapCanvas->mapSettings() ) );
+    QStringList layers = QgsMapSettingsUtils::containsAdvancedEffects( mapCanvas->mapSettings() );
+    if ( !layers.isEmpty() )
+    {
+      // Limit number of items to avoid extreme dialog height
+      if ( layers.count() >= 10 )
+      {
+        layers = layers.mid( 0, 9 );
+        layers << QChar( 0x2026 );
+      }
+      mInfo->setText( tr( "The following layer(s) use advanced effects:\n%1\nRasterizing map is recommended for proper rendering." ).arg(
+                        QChar( 0x2022 ) + QString( " " ) + layers.join( QString( "\n" ) + QChar( 0x2022 ) + QString( " " ) ) ) );
+      mSaveAsRaster->setChecked( true );
+    }
+    else
+    {
+      mSaveAsRaster->setChecked( false );
+    }
     mSaveAsRaster->setVisible( true );
 
     this->setWindowTitle( tr( "Save map as PDF" ) );

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1082,7 +1082,7 @@ bool QgsComposerMap::containsAdvancedEffects() const
 
   QgsMapSettings ms;
   ms.setLayers( layersToRender() );
-  return QgsMapSettingsUtils::containsAdvancedEffects( ms );
+  return ( !QgsMapSettingsUtils::containsAdvancedEffects( ms ).isEmpty() );
 }
 
 void QgsComposerMap::connectUpdateSlot()

diff --git a/src/core/qgsmapsettingsutils.cpp b/src/core/qgsmapsettingsutils.cpp
@@ -23,41 +23,46 @@
 
 #include <QString>
 
-bool QgsMapSettingsUtils::containsAdvancedEffects( const QgsMapSettings &mapSettings )
+const QStringList QgsMapSettingsUtils::containsAdvancedEffects( const QgsMapSettings &mapSettings )
 {
+  QSet< QString > layers;
+
   QgsTextFormat layerFormat;
   Q_FOREACH ( QgsMapLayer *layer, mapSettings.layers() )
   {
     if ( layer )
     {
       if ( layer->blendMode() != QPainter::CompositionMode_SourceOver )
       {
-        return true;
+        layers << layer->name();
       }
       // if vector layer, check labels and feature blend mode
       QgsVectorLayer *currentVectorLayer = qobject_cast<QgsVectorLayer *>( layer );
       if ( currentVectorLayer )
       {
         if ( currentVectorLayer->layerTransparency() != 0 )
         {
-          return true;
+          layers << layer->name();
         }
         if ( currentVectorLayer->featureBlendMode() != QPainter::CompositionMode_SourceOver )
         {
-          return true;
+          layers << layer->name();
         }
         // check label blend modes
         if ( QgsPalLabeling::staticWillUseLayer( currentVectorLayer ) )
         {
           // Check all label blending properties
           layerFormat.readFromLayer( currentVectorLayer );
           if ( layerFormat.containsAdvancedEffects() )
-            return true;
+          {
+            layers << layer->name();
+          }
         }
       }
     }
   }
-  return false;
+
+  return layers.toList();
 }
 
 QString QgsMapSettingsUtils::worldFileContent( const QgsMapSettings &mapSettings )

diff --git a/src/core/qgsmapsettingsutils.h b/src/core/qgsmapsettingsutils.h
@@ -35,7 +35,7 @@ class CORE_EXPORT QgsMapSettingsUtils
     /** Checks whether any of the layers attached to a map settings object contain advanced effects
      * \param mapSettings map settings
      */
-    static bool containsAdvancedEffects( const QgsMapSettings &mapSettings );
+    static const QStringList containsAdvancedEffects( const QgsMapSettings &mapSettings );
 
     /** Creates the content of a world file.
      * \param mapSettings map settings

diff --git a/src/ui/qgsmapsavedialog.ui b/src/ui/qgsmapsavedialog.ui
@@ -16,6 +16,13 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <item row="9" column="0" colspan="2">
+      <widget class="QLabel" name="mInfo">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
      <item row="8" column="0" colspan="2">
       <widget class="QCheckBox" name="mSaveAsRaster">
        <property name="text">