Update tests

qgis · Nov 19, 2020 · 83aa68f · 83aa68f
1 parent 4d3978b
commit 83aa68f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 5 deletions.
diff --git a/tests/src/python/test_qgspointcloudrgbrenderer.py b/tests/src/python/test_qgspointcloudrgbrenderer.py
@@ -23,7 +23,9 @@
     QgsMultiRenderChecker,
     QgsMapSettings,
     QgsRectangle,
-    QgsContrastEnhancement
+    QgsContrastEnhancement,
+    QgsUnitTypes,
+    QgsMapUnitScale
 )
 
 from qgis.PyQt.QtCore import QDir, QSize
@@ -83,7 +85,20 @@ def testBasic(self):
         bluece.setContrastEnhancementAlgorithm(QgsContrastEnhancement.ClipToMinimumMaximum)
         renderer.setBlueContrastEnhancement(bluece)
 
+        renderer.setMaximumScreenError(18)
+        renderer.setMaximumScreenErrorUnit(QgsUnitTypes.RenderInches)
+        renderer.setPointSize(13)
+        renderer.setPointSizeUnit(QgsUnitTypes.RenderPoints)
+        renderer.setPointSizeMapUnitScale(QgsMapUnitScale(1000, 2000))
+
         rr = renderer.clone()
+        self.assertEqual(rr.maximumScreenError(), 18)
+        self.assertEqual(rr.maximumScreenErrorUnit(), QgsUnitTypes.RenderInches)
+        self.assertEqual(rr.pointSize(), 13)
+        self.assertEqual(rr.pointSizeUnit(), QgsUnitTypes.RenderPoints)
+        self.assertEqual(rr.pointSizeMapUnitScale().minScale, 1000)
+        self.assertEqual(rr.pointSizeMapUnitScale().maxScale, 2000)
+
         self.assertEqual(rr.blueAttribute(), 'b')
         self.assertEqual(rr.greenAttribute(), 'g')
         self.assertEqual(rr.redAttribute(), 'r')
@@ -101,6 +116,13 @@ def testBasic(self):
         elem = renderer.save(doc, QgsReadWriteContext())
 
         r2 = QgsPointCloudRgbRenderer.create(elem, QgsReadWriteContext())
+        self.assertEqual(r2.maximumScreenError(), 18)
+        self.assertEqual(r2.maximumScreenErrorUnit(), QgsUnitTypes.RenderInches)
+        self.assertEqual(r2.pointSize(), 13)
+        self.assertEqual(r2.pointSizeUnit(), QgsUnitTypes.RenderPoints)
+        self.assertEqual(r2.pointSizeMapUnitScale().minScale, 1000)
+        self.assertEqual(r2.pointSizeMapUnitScale().maxScale, 2000)
+
         self.assertEqual(r2.blueAttribute(), 'b')
         self.assertEqual(r2.greenAttribute(), 'g')
         self.assertEqual(r2.redAttribute(), 'r')
@@ -130,7 +152,8 @@ def testRender(self):
         layer = QgsPointCloudLayer(unitTestDataPath() + '/point_clouds/ept/rgb/ept.json', 'test', 'ept')
         self.assertTrue(layer.isValid())
 
-        layer.renderer().setPenWidth(2)
+        layer.renderer().setPointSize(2)
+        layer.renderer().setPointSizeUnit(QgsUnitTypes.RenderMillimeters)
 
         mapsettings = QgsMapSettings()
         mapsettings.setOutputSize(QSize(400, 400))
@@ -152,7 +175,8 @@ def testRenderWithContrast(self):
         layer = QgsPointCloudLayer(unitTestDataPath() + '/point_clouds/ept/rgb/ept.json', 'test', 'ept')
         self.assertTrue(layer.isValid())
 
-        layer.renderer().setPenWidth(2)
+        layer.renderer().setPointSize(2)
+        layer.renderer().setPointSizeUnit(QgsUnitTypes.RenderMillimeters)
 
         redce = QgsContrastEnhancement()
         redce.setMinimumValue(100)
@@ -192,7 +216,8 @@ def testRenderOpacity(self):
         layer = QgsPointCloudLayer(unitTestDataPath() + '/point_clouds/ept/rgb/ept.json', 'test', 'ept')
         self.assertTrue(layer.isValid())
 
-        layer.renderer().setPenWidth(2)
+        layer.renderer().setPointSize(2)
+        layer.renderer().setPointSizeUnit(QgsUnitTypes.RenderMillimeters)
 
         layer.setOpacity(0.5)
 
@@ -216,7 +241,8 @@ def testRenderBlendMode(self):
         layer = QgsPointCloudLayer(unitTestDataPath() + '/point_clouds/ept/rgb/ept.json', 'test', 'ept')
         self.assertTrue(layer.isValid())
 
-        layer.renderer().setPenWidth(2)
+        layer.renderer().setPointSize(2)
+        layer.renderer().setPointSizeUnit(QgsUnitTypes.RenderMillimeters)
 
         layer.setBlendMode(QPainter.CompositionMode_ColorBurn)
 
@@ -235,6 +261,29 @@ def testRenderBlendMode(self):
         TestQgsPointCloudRgbRenderer.report += renderchecker.report()
         self.assertTrue(result)
 
+    @unittest.skipIf('ept' not in QgsProviderRegistry.instance().providerList(), 'EPT provider not available')
+    def testRenderPointSize(self):
+        layer = QgsPointCloudLayer(unitTestDataPath() + '/point_clouds/ept/rgb/ept.json', 'test', 'ept')
+        self.assertTrue(layer.isValid())
+
+        layer.renderer().setPointSize(0.05)
+        layer.renderer().setPointSizeUnit(QgsUnitTypes.RenderMapUnits)
+
+        mapsettings = QgsMapSettings()
+        mapsettings.setOutputSize(QSize(400, 400))
+        mapsettings.setOutputDpi(96)
+        mapsettings.setDestinationCrs(layer.crs())
+        mapsettings.setExtent(QgsRectangle(497753.5, 7050887.5, 497754.6, 7050888.6))
+        mapsettings.setLayers([layer])
+
+        renderchecker = QgsMultiRenderChecker()
+        renderchecker.setMapSettings(mapsettings)
+        renderchecker.setControlPathPrefix('pointcloudrenderer')
+        renderchecker.setControlName('expected_pointsize')
+        result = renderchecker.runTest('expected_pointsize')
+        TestQgsPointCloudRgbRenderer.report += renderchecker.report()
+        self.assertTrue(result)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/...ata/control_images/pointcloudrenderer/expected_pointsize/expected_pointsize.png b/...ata/control_images/pointcloudrenderer/expected_pointsize/expected_pointsize.png