Skip to content

Commit 9af405c

Browse files
committed
[layout] Set default legend item title to an empty string
1 parent 9a400d7 commit 9af405c

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/core/qgslegendsettings.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#include <QPainter>
1919

2020
QgsLegendSettings::QgsLegendSettings()
21-
: mTitle( QObject::tr( "Legend" ) )
22-
, mFontColor( QColor( 0, 0, 0 ) )
21+
: mFontColor( QColor( 0, 0, 0 ) )
2322
, mSymbolSize( 7, 4 )
2423
, mWmsLegendSize( 50, 25 )
2524
, mRasterStrokeColor( Qt::black )

tests/src/core/testqgslegendrenderer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ static void _setStandardTestFont( QgsLegendSettings &settings, const QString &st
5656
}
5757
}
5858

59-
static void _renderLegend( const QString &testName, QgsLayerTreeModel *legendModel, const QgsLegendSettings &settings )
59+
static void _renderLegend( const QString &testName, QgsLayerTreeModel *legendModel, QgsLegendSettings &settings )
6060
{
61+
settings.setTitle( QStringLiteral( "Legend" ) );
6162
QgsLegendRenderer legendRenderer( legendModel, settings );
6263
QSizeF size = legendRenderer.minimumSize();
6364

tests/src/python/test_qgslayoutatlas.py

+1
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ def legend_test(self):
554554

555555
# add a legend
556556
legend = QgsLayoutItemLegend(self.layout)
557+
legend.setTitle("Legend")
557558
legend.attemptMove(QgsLayoutPoint(200, 100))
558559
# sets the legend filter parameter
559560
legend.setLinkedMap(self.atlas_map)

tests/src/python/test_qgslayoutlegend.py

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def testInitialSizeSymbolMapUnits(self):
7373
map.setExtent(point_layer.extent())
7474

7575
legend = QgsLayoutItemLegend(layout)
76+
legend.setTitle("Legend")
7677
legend.attemptSetSceneRect(QRectF(120, 20, 80, 80))
7778
legend.setFrameEnabled(True)
7879
legend.setFrameStrokeWidth(QgsLayoutMeasurement(2))
@@ -127,6 +128,7 @@ def testResizeWithMapContent(self):
127128
map.setExtent(point_layer.extent())
128129

129130
legend = QgsLayoutItemLegend(layout)
131+
legend.setTitle("Legend")
130132
legend.attemptSetSceneRect(QRectF(120, 20, 80, 80))
131133
legend.setFrameEnabled(True)
132134
legend.setFrameStrokeWidth(QgsLayoutMeasurement(2))
@@ -166,6 +168,7 @@ def testResizeDisabled(self):
166168
map.setExtent(point_layer.extent())
167169

168170
legend = QgsLayoutItemLegend(layout)
171+
legend.setTitle("Legend")
169172
legend.attemptSetSceneRect(QRectF(120, 20, 80, 80))
170173
legend.setFrameEnabled(True)
171174
legend.setFrameStrokeWidth(QgsLayoutMeasurement(2))
@@ -209,6 +212,7 @@ def testResizeDisabledCrop(self):
209212
map.setExtent(point_layer.extent())
210213

211214
legend = QgsLayoutItemLegend(layout)
215+
legend.setTitle("Legend")
212216
legend.attemptSetSceneRect(QRectF(120, 20, 20, 20))
213217
legend.setFrameEnabled(True)
214218
legend.setFrameStrokeWidth(QgsLayoutMeasurement(2))
@@ -253,6 +257,7 @@ def testDataDefinedColumnCount(self):
253257
layout.initializeDefaults()
254258

255259
legend = QgsLayoutItemLegend(layout)
260+
legend.setTitle("Legend")
256261
layout.addLayoutItem(legend)
257262

258263
legend.setColumnCount(2)

0 commit comments

Comments
 (0)