Add new tests for meshlayer node renderer (Scalar and Vector datasets)

qgis · Feb 10, 2024 · 567d13d · 567d13d
1 parent b6ad0b5
commit 567d13d
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 4 deletions.
diff --git a/tests/src/core/testqgslayertree.cpp b/tests/src/core/testqgslayertree.cpp
@@ -973,18 +973,19 @@ void TestQgsLayerTree::testRasterSymbolNode()
   const std::unique_ptr< QgsLayerTreeLayer > n = std::make_unique< QgsLayerTreeLayer >( rl.get() );
 
   // not checkable
-  QgsRasterSymbolLegendNode rasterNode( n.get(), QColor( 255, 0, 0 ), QStringLiteral( "my node" ), nullptr, false, QStringLiteral( "key" ) );
+  QgsRasterSymbolLegendNode rasterNode( n.get(), QColor( 255, 0, 0 ), QStringLiteral( "my node" ), nullptr, false, QStringLiteral( "key" ), QStringLiteral("parentKey") );
   QVERIFY( !rasterNode.isCheckable() );
   QCOMPARE( rasterNode.ruleKey(), QStringLiteral( "key" ) );
   QCOMPARE( static_cast< int >( rasterNode.flags() ), static_cast< int >( Qt::ItemIsEnabled | Qt::ItemIsSelectable ) );
   QCOMPARE( rasterNode.data( Qt::DisplayRole ).toString(), QStringLiteral( "my node" ) );
   QCOMPARE( rasterNode.data( static_cast< int >( QgsLayerTreeModelLegendNode::CustomRole::NodeType ) ).toInt(), static_cast< int >( QgsLayerTreeModelLegendNode::RasterSymbolLegend ) );
   QCOMPARE( rasterNode.data( static_cast< int >( QgsLayerTreeModelLegendNode::CustomRole::RuleKey ) ).toString(), QStringLiteral( "key" ) );
+  QCOMPARE( rasterNode.data( static_cast< int >( QgsLayerTreeModelLegendNode::CustomRole::ParentRuleKey ) ).toString(), QStringLiteral( "parentKey" ) );
   QCOMPARE( rasterNode.data( Qt::CheckStateRole ), QVariant() );
   QVERIFY( !rasterNode.setData( true, Qt::CheckStateRole ) );
 
   // checkable
-  const QgsRasterSymbolLegendNode rasterNode2( n.get(), QColor( 255, 0, 0 ), QStringLiteral( "my node" ), nullptr, true, QStringLiteral( "key" ) );
+  const QgsRasterSymbolLegendNode rasterNode2( n.get(), QColor( 255, 0, 0 ), QStringLiteral( "my node" ), nullptr, true, QStringLiteral( "key" ), QStringLiteral("parentKey") );
   QVERIFY( rasterNode2.isCheckable() );
   QCOMPARE( static_cast< int >( rasterNode2.flags() ), static_cast< int >( Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable ) );
 }

diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
@@ -48,6 +48,7 @@
 #include "qgslinesymbol.h"
 #include "qgsmarkersymbol.h"
 #include "qgsfillsymbol.h"
+#include "qgsmeshlayer.h"
 
 static void _setStandardTestFont( QgsLegendSettings &settings, const QString &style = QStringLiteral( "Roman" ) )
 {
@@ -196,6 +197,7 @@ class TestQgsLegendRenderer : public QgsTest
     void testFilterByExpression();
     void testFilterByExpressionWithContext();
     void testDiagramAttributeLegend();
+    void testDiagramMeshLegend();
     void testDiagramSizeLegend();
     void testDataDefinedSizeCollapsed();
     void testTextOnSymbol();
@@ -1435,6 +1437,76 @@ void TestQgsLegendRenderer::testDiagramAttributeLegend()
   QgsProject::instance()->removeMapLayer( vl4 );
 }
 
+void TestQgsLegendRenderer::testDiagramMeshLegend()
+{
+  const QString uri_1( QString( TEST_DATA_DIR ) + QStringLiteral( "/mesh/mesh_z_ws_d_vel.nc" ) ); //mesh with dataset group "Bed Elevation", "Water Level", "Depth" and "Velocity"
+
+  QTemporaryDir tempDir;
+  const QString uri( tempDir.filePath( QStringLiteral( "mesh.nc" ) ) );
+
+  QFile::copy( uri_1, uri );
+  QgsMeshLayer* layer = new QgsMeshLayer( uri, QStringLiteral( "mesh" ), QStringLiteral( "mdal" ) );
+  QVERIFY( layer->isValid() );
+  QCOMPARE( layer->datasetGroupCount(), 4 );
+
+  QgsProject::instance()->addMapLayer( layer );
+
+  int scalarIndex = 0;
+  int vectorIndex = -1;
+
+  QgsMeshRendererSettings rendererSettings = layer->rendererSettings();
+  rendererSettings.setActiveScalarDatasetGroup(scalarIndex);
+  rendererSettings.setActiveVectorDatasetGroup(vectorIndex);
+  layer->setRendererSettings(rendererSettings);
+
+  std::unique_ptr< QgsLayerTree > root( std::make_unique<QgsLayerTree>() );
+  root->addLayer( layer );
+  std::unique_ptr<QgsLayerTreeModel> legendModel(  std::make_unique<QgsLayerTreeModel>(root.get()) );
+
+  QgsLegendSettings settings;
+
+  QImage res = _renderLegend( legendModel.get(), settings );
+  QVERIFY( _verifyImage( res, QStringLiteral( "legend_mesh_diagram_no_vector" ) ) );
+
+  //red vector
+  QgsMeshLayer* layer2 = layer->clone();
+  QgsProject::instance()->removeMapLayer( layer );
+  QgsProject::instance()->addMapLayer( layer2 );
+
+  vectorIndex = 2;
+  rendererSettings.setActiveVectorDatasetGroup(vectorIndex);
+  QgsMeshRendererVectorSettings vectorSettings = rendererSettings.vectorSettings(vectorIndex);
+  vectorSettings.setColor( Qt::red );
+  rendererSettings.setVectorSettings(vectorIndex, vectorSettings);
+  layer2->setRendererSettings(rendererSettings);
+
+  root = std::make_unique<QgsLayerTree>();
+  root->addLayer( layer2 );
+  legendModel = std::make_unique<QgsLayerTreeModel>( root.get() );
+
+  res = _renderLegend( legendModel.get(), settings );
+  QVERIFY( _verifyImage( res, QStringLiteral( "legend_mesh_diagram_red_vector" ) ) );
+
+  //color ramp vector
+  QgsMeshLayer* layer3 = layer2->clone();
+  QgsProject::instance()->removeMapLayer( layer2 );
+  QgsProject::instance()->addMapLayer( layer3 );
+
+  const QgsColorRampShader fcn = rendererSettings.scalarSettings(vectorIndex).colorRampShader();
+  vectorSettings.setColorRampShader(fcn);
+  vectorSettings.setColoringMethod(QgsInterpolatedLineColor::ColorRamp);
+  rendererSettings.setVectorSettings(vectorIndex, vectorSettings);
+  layer3->setRendererSettings(rendererSettings);
+
+  root = std::make_unique<QgsLayerTree>();
+  root->addLayer( layer3 );
+  legendModel = std::make_unique<QgsLayerTreeModel>( root.get() );
+
+  res = _renderLegend( legendModel.get(), settings );
+  QVERIFY( _verifyImage( res, QStringLiteral( "legend_mesh_diagram_color_ramp_vector" ) ) );
+  QgsProject::instance()->removeMapLayer( layer3 );
+}
+
 void TestQgsLegendRenderer::testDiagramSizeLegend()
 {
   QgsVectorLayer *vl4 = new QgsVectorLayer( QStringLiteral( "Point" ), QStringLiteral( "Point Layer" ), QStringLiteral( "memory" ) );

diff --git a/tests/src/python/test_qgscolorramplegendnode.py b/tests/src/python/test_qgscolorramplegendnode.py
@@ -129,11 +129,13 @@ def test_basic(self):
         layer = QgsVectorLayer('dummy', 'test', 'memory')
         layer_tree_layer = QgsLayerTreeLayer(layer)
 
-        node = QgsColorRampLegendNode(layer_tree_layer, r, 'min_label', 'max_label')
+        node = QgsColorRampLegendNode(layer_tree_layer, r, 'min_label', 'max_label', 'key', 'parentKey')
 
         self.assertEqual(node.ramp().color1().name(), '#c80000')
         self.assertEqual(node.ramp().color2().name(), '#00c800')
-
+        self.assertEqual(node.data(QgsLayerTreeModelLegendNode.LegendNodeRoles.RuleKeyRole), 'key')
+        self.assertEqual(node.data(QgsLayerTreeModelLegendNode.LegendNodeRoles.ParentRuleKeyRole), 'parentKey')
+
         node.setIconSize(QSize(11, 12))
         self.assertEqual(node.iconSize(), QSize(11, 12))
 

diff --git a/...sh_diagram_color_ramp_vector/expected_legend_mesh_diagram_color_ramp_vector.png b/...sh_diagram_color_ramp_vector/expected_legend_mesh_diagram_color_ramp_vector.png
diff --git a/...pected_legend_mesh_diagram_no_vector/expected_legend_mesh_diagram_no_vector.png b/...pected_legend_mesh_diagram_no_vector/expected_legend_mesh_diagram_no_vector.png
diff --git a/...cted_legend_mesh_diagram_red_vector/expected_legend_mesh_diagram_red_vector.png b/...cted_legend_mesh_diagram_red_vector/expected_legend_mesh_diagram_red_vector.png