Set correct field to display

qgis · Aug 17, 2019 · 541fc23 · 541fc23
1 parent 6fd3366
commit 541fc23
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/core/layout/qgslayoutgeopdfexporter.cpp b/src/core/layout/qgslayoutgeopdfexporter.cpp
@@ -20,6 +20,7 @@
 #include "qgslayout.h"
 #include "qgslogger.h"
 #include "qgsgeometry.h"
+#include "qgsvectorlayer.h"
 #include "qgsvectorfilewriter.h"
 
 #include <gdal.h>
@@ -199,6 +200,10 @@ bool QgsLayoutGeoPdfExporter::saveTemporaryLayers()
     detail.name = layer ? layer->name() : it.key();
     detail.mapLayerId = it.key();
     detail.sourceVectorPath = filePath;
+    if ( const QgsVectorLayer *vl = qobject_cast< const QgsVectorLayer * >( layer ) )
+    {
+      detail.displayAttribute = vl->displayField();
+    }
 
     // write out features to disk
     const QgsFeatureList features = it.value();
@@ -375,7 +380,8 @@ QString QgsLayoutGeoPdfExporter::createCompositionXml( const QList<ComponentLaye
     vectorDataset.setAttribute( QStringLiteral( "visible" ), QStringLiteral( "false" ) );
     QDomElement logicalStructure = doc.createElement( QStringLiteral( "LogicalStructure" ) );
     logicalStructure.setAttribute( QStringLiteral( "displayLayerName" ), component.name );
-    //logicalStructure.setAttribute( QStringLiteral( "fieldToDisplay" ), it.key() ); // TODO
+    if ( !component.displayAttribute.isEmpty() )
+      logicalStructure.setAttribute( QStringLiteral( "fieldToDisplay" ), component.displayAttribute );
     vectorDataset.appendChild( logicalStructure );
     ifLayerOn.appendChild( vectorDataset );
     content.appendChild( ifLayerOn );

diff --git a/src/core/layout/qgslayoutgeopdfexporter.h b/src/core/layout/qgslayoutgeopdfexporter.h
@@ -139,6 +139,9 @@ class CORE_EXPORT QgsLayoutGeoPdfExporter
       //! Associated map layer ID
       QString mapLayerId;
 
+      //! Field name for display
+      QString displayAttribute;
+
       //! File path to the (already created) vector dataset to use as the source for this component layer
       QString sourceVectorPath;
 

diff --git a/tests/src/core/testqgslayoutgeopdfexport.cpp b/tests/src/core/testqgslayoutgeopdfexport.cpp
@@ -83,6 +83,7 @@ void TestQgsLayoutGeoPdfExport::testCollectingFeatures()
   QgsVectorLayer *pointsLayer = new QgsVectorLayer( TEST_DATA_DIR + QStringLiteral( "/points.shp" ),
       QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
   QVERIFY( pointsLayer->isValid() );
+  pointsLayer->setDisplayExpression( QStringLiteral( "Staff" ) );
 
   QgsProject p;
   p.addMapLayer( linesLayer );