Expose map theme info to export layer details

qgis · Aug 20, 2019 · 5a252a3 · 5a252a3
1 parent f49389d
commit 5a252a3
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/python/core/auto_generated/layout/qgslayoutitem.sip.in b/python/core/auto_generated/layout/qgslayoutitem.sip.in
@@ -459,6 +459,8 @@ Moves to the next export part for a multi-layered export item, during a multi-la
       QString name;
 
       QString mapLayerId;
+
+      QString mapTheme;
     };
 
     virtual QgsLayoutItem::ExportLayerDetail exportLayerDetails() const;

diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h
@@ -488,6 +488,9 @@ class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectIt
 
       //! Associated map layer ID, or an empty string if this export layer is not associated with a map layer
       QString mapLayerId;
+
+      //! Associated map theme, or an empty string if this export layer does not need to be associated with a map theme
+      QString mapTheme;
     };
 
     /**

diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -1121,6 +1121,9 @@ QgsLayoutItem::ExportLayerDetail QgsLayoutItemMap::exportLayerDetails() const
       return detail;
 
     case Layer:
+      if ( !mExportThemes.empty() && mExportThemeIt != mExportThemes.end() )
+        detail.mapTheme = *mExportThemeIt;
+
       if ( mStagedRendererJob )
       {
         switch ( mStagedRendererJob->currentStage() )