Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jul 8, 2020
1 parent ff14c6f commit 48c322e
Show file tree
Hide file tree
Showing 38 changed files with 99 additions and 53 deletions.
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutitemmapgrid.cpp
View file
Expand Up @@ -1091,6 +1091,8 @@ void QgsLayoutItemMapGrid::drawCoordinateAnnotation( QgsRenderContext &context,

QgsLayoutItemMapGrid::BorderSide frameBorder = borderForLineCoord( pos, coordinateType );
double textWidth = QgsTextRenderer::textWidth( context, mAnnotationFormat, QStringList() << annotationString ) / context.convertToPainterUnits( 1, QgsUnitTypes::RenderMillimeters );
if ( extension )
textWidth *= 1.1; // little bit of extra padding when we are calculating the bounding rect, to account for antialiasing
//relevant for annotations is the height of digits
const QFontMetricsF metrics = QgsTextRenderer::fontMetrics( context, mAnnotationFormat, QgsTextRenderer::FONT_WORKAROUND_SCALE );
double textHeight = ( extension ? ( QgsTextRenderer::textHeight( context, mAnnotationFormat, QChar(), true ) )
Expand Down
84 changes: 44 additions & 40 deletions tests/src/core/testqgslayoutmapgrid.cpp
View file

Large diffs are not rendered by default.

66 changes: 53 additions & 13 deletions tests/src/python/test_qgslayoutmapgrid.py
View file
Expand Up @@ -12,7 +12,7 @@

import qgis # NOQA

from qgis.PyQt.QtCore import QRectF
from qgis.PyQt.QtCore import QRectF, QDir
from qgis.PyQt.QtGui import QPainter, QColor

from qgis.core import (QgsLayoutItemMap,
Expand All @@ -22,7 +22,9 @@
QgsProperty,
QgsLayoutObject,
QgsFontUtils,
QgsProject)
QgsTextFormat,
QgsProject,
QgsCoordinateReferenceSystem)
from qgis.testing import start_app, unittest
from utilities import unitTestDataPath, getTestFont
from qgslayoutchecker import QgsLayoutChecker
Expand All @@ -33,10 +35,19 @@

class TestQgsLayoutMapGrid(unittest.TestCase):

def setUp(self):
self.report = "<h1>Python QgsLayoutItemMap Tests</h1>\n"

def tearDown(self):
report_file_path = "%s/qgistest.html" % QDir.tempPath()
with open(report_file_path, 'a') as report_file:
report_file.write(self.report)

def testGrid(self):
layout = QgsLayout(QgsProject.instance())
layout.initializeDefaults()
map = QgsLayoutItemMap(layout)
map.setCrs(QgsCoordinateReferenceSystem('EPSG:32633'))
map.attemptSetSceneRect(QRectF(20, 20, 200, 100))
map.setFrameEnabled(True)
map.setBackgroundColor(QColor(150, 100, 100))
Expand All @@ -55,21 +66,24 @@ def testGrid(self):
map.grid().setAnnotationEnabled(True)
map.grid().setGridLineColor(QColor(0, 255, 0))
map.grid().setGridLineWidth(0.5)
map.grid().setAnnotationFont(getTestFont())
format = QgsTextFormat.fromQFont(getTestFont('Bold'))
format.setColor(QColor(255, 0, 0))
format.setOpacity(150 / 255)
map.grid().setAnnotationTextFormat(format)
map.grid().setAnnotationPrecision(0)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Left)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Top)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationFontColor(QColor(255, 0, 0, 150))
map.grid().setBlendMode(QPainter.CompositionMode_Overlay)
map.updateBoundingRect()

checker = QgsLayoutChecker('composermap_grid', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
map.grid().setEnabled(False)
map.grid().setAnnotationEnabled(False)

Expand Down Expand Up @@ -100,6 +114,7 @@ def testCrossGrid(self):
checker = QgsLayoutChecker('composermap_crossgrid', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()

map.grid().setStyle(QgsLayoutItemMapGrid.Solid)
map.grid().setEnabled(False)
Expand Down Expand Up @@ -131,6 +146,7 @@ def testMarkerGrid(self):
checker = QgsLayoutChecker('composermap_markergrid', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()

map.grid().setStyle(QgsLayoutItemMapGrid.Solid)
map.grid().setEnabled(False)
Expand Down Expand Up @@ -162,6 +178,7 @@ def testFrameOnly(self):
checker = QgsLayoutChecker('composermap_gridframeonly', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()

map.grid().setStyle(QgsLayoutItemMapGrid.Solid)
map.grid().setEnabled(False)
Expand All @@ -186,7 +203,6 @@ def testZebraStyle(self):
map.grid().setIntervalX(2000)
map.grid().setIntervalY(2000)
map.grid().setGridLineColor(QColor(0, 0, 0))
map.grid().setAnnotationFontColor(QColor(0, 0, 0))
map.grid().setBlendMode(QPainter.CompositionMode_SourceOver)
map.grid().setFrameStyle(QgsLayoutItemMapGrid.Zebra)
map.grid().setFrameWidth(10)
Expand All @@ -201,6 +217,7 @@ def testZebraStyle(self):
checker = QgsLayoutChecker('composermap_zebrastyle', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout(0, 100)
self.report += checker.report()
assert myTestResult, myMessage

def testZebraStyleSides(self):
Expand All @@ -218,7 +235,6 @@ def testZebraStyleSides(self):
map.grid().setIntervalX(2000)
map.grid().setIntervalY(2000)
map.grid().setGridLineColor(QColor(0, 0, 0))
map.grid().setAnnotationFontColor(QColor(0, 0, 0))
map.grid().setBlendMode(QPainter.CompositionMode_SourceOver)
map.grid().setFrameStyle(QgsLayoutItemMapGrid.Zebra)
map.grid().setFrameWidth(10)
Expand All @@ -238,20 +254,23 @@ def testZebraStyleSides(self):
checker = QgsLayoutChecker('composermap_zebrastyle_left', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout(0, 100)
self.report += checker.report()
assert myTestResult, myMessage

map.grid().setFrameSideFlag(QgsLayoutItemMapGrid.FrameTop, True)
map.updateBoundingRect()
checker = QgsLayoutChecker('composermap_zebrastyle_lefttop', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout(0, 100)
self.report += checker.report()
assert myTestResult, myMessage

map.grid().setFrameSideFlag(QgsLayoutItemMapGrid.FrameRight, True)
map.updateBoundingRect()
checker = QgsLayoutChecker('composermap_zebrastyle_lefttopright', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout(0, 100)
self.report += checker.report()
assert myTestResult, myMessage

map.grid().setFrameSideFlag(QgsLayoutItemMapGrid.FrameBottom, True)
Expand All @@ -271,7 +290,6 @@ def testInteriorTicks(self):
map.setExtent(myRectangle)
map.grid().setIntervalX(2000)
map.grid().setIntervalY(2000)
map.grid().setAnnotationFontColor(QColor(0, 0, 0))
map.grid().setBlendMode(QPainter.CompositionMode_SourceOver)
map.grid().setFrameStyle(QgsLayoutItemMapGrid.InteriorTicks)
map.grid().setFrameWidth(10)
Expand All @@ -284,6 +302,7 @@ def testInteriorTicks(self):
checker = QgsLayoutChecker('composermap_interiorticks', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout(0, 100)
self.report += checker.report()
assert myTestResult, myMessage

def testExpressionContext(self):
Expand Down Expand Up @@ -321,15 +340,17 @@ def testDataDefinedEnabled(self):
map.grid().setAnnotationEnabled(True)
map.grid().setGridLineColor(QColor(0, 255, 0))
map.grid().setGridLineWidth(0.5)
map.grid().setAnnotationFont(getTestFont())
format = QgsTextFormat.fromQFont(getTestFont('Bold'))
format.setColor(QColor(255, 0, 0))
format.setOpacity(150 / 255)
map.grid().setAnnotationTextFormat(format)
map.grid().setAnnotationPrecision(0)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Left)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Top)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationFontColor(QColor(255, 0, 0, 150))
map.grid().setBlendMode(QPainter.CompositionMode_Overlay)
map.updateBoundingRect()

Expand All @@ -339,6 +360,7 @@ def testDataDefinedEnabled(self):
checker = QgsLayoutChecker('composermap_grid', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

map.grid().dataDefinedProperties().setProperty(QgsLayoutObject.MapGridEnabled, QgsProperty.fromValue(False))
Expand All @@ -347,6 +369,7 @@ def testDataDefinedEnabled(self):
checker = QgsLayoutChecker('composermap_datadefined_disabled', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

def testDataDefinedIntervalOffset(self):
Expand Down Expand Up @@ -377,6 +400,7 @@ def testDataDefinedIntervalOffset(self):

checker = QgsLayoutChecker('composermap_datadefined_intervaloffset', layout)
checker.setControlPathPrefix("composer_mapgrid")
self.report += checker.report()
myTestResult, myMessage = checker.testLayout()
self.assertTrue(myTestResult, myMessage)

Expand Down Expand Up @@ -415,6 +439,7 @@ def testDataDefinedFrameSize(self):
'composermap_datadefined_framesizemargin', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

def testDataDefinedCrossSize(self):
Expand Down Expand Up @@ -446,6 +471,7 @@ def testDataDefinedCrossSize(self):

checker = QgsLayoutChecker('composermap_datadefined_crosssize', layout)
checker.setControlPathPrefix("composer_mapgrid")
self.report += checker.report()
myTestResult, myMessage = checker.testLayout()
self.assertTrue(myTestResult, myMessage)

Expand Down Expand Up @@ -482,6 +508,7 @@ def testDataDefinedFrameThickness(self):
checker = QgsLayoutChecker('composermap_datadefined_framethickness', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

def testDataDefinedAnnotationDistance(self):
Expand All @@ -501,15 +528,19 @@ def testDataDefinedAnnotationDistance(self):
map.grid().setAnnotationEnabled(True)
map.grid().setGridLineColor(QColor(0, 255, 0))
map.grid().setGridLineWidth(0.5)
map.grid().setAnnotationFont(getTestFont('Bold', 20))

format = QgsTextFormat.fromQFont(getTestFont('Bold', 20))
format.setColor(QColor(255, 0, 0))
format.setOpacity(150 / 255)
map.grid().setAnnotationTextFormat(format)

map.grid().setAnnotationPrecision(0)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Left)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Top)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationFontColor(QColor(255, 0, 0, 150))
map.grid().setBlendMode(QPainter.CompositionMode_Overlay)
map.updateBoundingRect()

Expand All @@ -519,6 +550,7 @@ def testDataDefinedAnnotationDistance(self):
checker = QgsLayoutChecker('composermap_datadefined_annotationdistance', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

def testDynamicInterval(self):
Expand All @@ -539,15 +571,19 @@ def testDynamicInterval(self):
map.grid().setAnnotationEnabled(True)
map.grid().setGridLineColor(QColor(0, 255, 0))
map.grid().setGridLineWidth(0.5)
map.grid().setAnnotationFont(getTestFont('Bold', 20))

format = QgsTextFormat.fromQFont(getTestFont('Bold', 20))
format.setColor(QColor(255, 0, 0))
format.setOpacity(150 / 255)
map.grid().setAnnotationTextFormat(format)

map.grid().setAnnotationPrecision(0)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Left)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDisplay(QgsLayoutItemMapGrid.HideAll, QgsLayoutItemMapGrid.Top)
map.grid().setAnnotationPosition(QgsLayoutItemMapGrid.OutsideMapFrame, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Right)
map.grid().setAnnotationDirection(QgsLayoutItemMapGrid.Horizontal, QgsLayoutItemMapGrid.Bottom)
map.grid().setAnnotationFontColor(QColor(255, 0, 0, 150))
map.grid().setBlendMode(QPainter.CompositionMode_Overlay)
map.updateBoundingRect()

Expand All @@ -556,20 +592,23 @@ def testDynamicInterval(self):
checker = QgsLayoutChecker('composermap_dynamic_5_10', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

map.setScale(map.scale() * 1.1)

checker = QgsLayoutChecker('composermap_dynamic_5_10_2', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

map.setScale(map.scale() * 1.8)

checker = QgsLayoutChecker('composermap_dynamic_5_10_3', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)

map.grid().setMinimumIntervalWidth(10)
Expand All @@ -579,6 +618,7 @@ def testDynamicInterval(self):
checker = QgsLayoutChecker('composermap_dynamic_5_10_4', layout)
checker.setControlPathPrefix("composer_mapgrid")
myTestResult, myMessage = checker.testLayout()
self.report += checker.report()
self.assertTrue(myTestResult, myMessage)


Expand Down
Binary file modified ...ined_annotationdistance/expected_composermap_datadefined_annotationdistance.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...id/expected_composermap_dynamic_5_10/expected_composermap_dynamic_5_10_mask.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...xpected_composermap_dynamic_5_10_2/expected_composermap_dynamic_5_10_2_mask.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...xpected_composermap_dynamic_5_10_3/expected_composermap_dynamic_5_10_3_mask.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...xpected_composermap_dynamic_5_10_4/expected_composermap_dynamic_5_10_4_mask.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...sermap_exteriorticks_annotated/expected_composermap_exteriorticks_annotated.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...p_exteriorticks_annotated/expected_composermap_exteriorticks_annotated_mask.png
View file
Binary file not shown.
Binary file modified ...rmap_exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2_mask.png
View file
Binary file not shown.
Binary file modified ...ed_composermap_filteredannotations/expected_composermap_filteredannotations.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...mposermap_filteredannotations/expected_composermap_filteredannotations_mask.png
View file
Binary file not shown.
Binary file removed ...omposer_mapgrid/expected_composermap_grid/default/expected_composermap_grid.png
View file
Binary file not shown.
Binary file removed ...er_mapgrid/expected_composermap_grid/default/expected_composermap_grid_mask.png
View file
Binary file not shown.
Binary file added ...images/composer_mapgrid/expected_composermap_grid/expected_composermap_grid.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/composer_mapgrid/expected_composermap_grid/expected_composermap_grid_mask.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...composer_mapgrid/expected_composermap_grid/fedora/expected_composermap_grid.png
View file
Binary file not shown.
Binary file removed ...ser_mapgrid/expected_composermap_grid/fedora/expected_composermap_grid_mask.png
View file
Binary file not shown.
Binary file modified ...xteriorticks_annotated/expected_composermap_interiorexteriorticks_annotated.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...orticks_annotated/expected_composermap_interiorexteriorticks_annotated_mask.png
View file
Binary file not shown.
Binary file modified ...eriorticks_annotated2/expected_composermap_interiorexteriorticks_annotated2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...ticks_annotated2/expected_composermap_interiorexteriorticks_annotated2_mask.png
View file
Binary file not shown.
Binary file modified ...sermap_interiorticks_annotated/expected_composermap_interiorticks_annotated.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...p_interiorticks_annotated/expected_composermap_interiorticks_annotated_mask.png
View file
Binary file not shown.
Binary file modified ...rmap_interiorticks_annotated2/expected_composermap_interiorticks_annotated2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...interiorticks_annotated2/expected_composermap_interiorticks_annotated2_mask.png
View file
Binary file not shown.
Binary file modified ..._composermap_lineborder_annotated/expected_composermap_lineborder_annotated.png
View file
Binary file removed ...osermap_lineborder_annotated/expected_composermap_lineborder_annotated_mask.png
View file
Diff not rendered.
Binary file modified ...omposermap_lineborder_annotated2/expected_composermap_lineborder_annotated2.png
View file
Binary file removed ...ermap_lineborder_annotated2/expected_composermap_lineborder_annotated2_mask.png
View file
Diff not rendered.
Binary file modified ...cted_composermap_rotatedannotations/expected_composermap_rotatedannotations.png
View file
Binary file removed ...composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png
View file
Diff not rendered.
Binary file modified ...ap_verticaldescending_inside/expected_composermap_verticaldescending_inside.png
View file
Binary file removed ...rticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png
View file
Diff not rendered.
Binary file modified ..._verticaldescending_outside/expected_composermap_verticaldescending_outside.png
View file
Binary file removed ...icaldescending_outside/expected_composermap_verticaldescending_outside_mask.png
View file
Diff not rendered.

0 comments on commit 48c322e

Please sign in to comment.