Skip to content

Commit

Permalink
apply formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
nstrahl committed Feb 10, 2024
1 parent 567d13d commit 3705bc1
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions tests/src/core/testqgslayertree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ 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" ), QStringLiteral("parentKey") );
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 ) );
Expand All @@ -985,7 +985,7 @@ void TestQgsLayerTree::testRasterSymbolNode()
QVERIFY( !rasterNode.setData( true, Qt::CheckStateRole ) );

// checkable
const QgsRasterSymbolLegendNode rasterNode2( n.get(), QColor( 255, 0, 0 ), QStringLiteral( "my node" ), nullptr, true, QStringLiteral( "key" ), QStringLiteral("parentKey") );
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 ) );
}
Expand Down
36 changes: 18 additions & 18 deletions tests/src/core/testqgslegendrenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1445,40 +1445,40 @@ void TestQgsLegendRenderer::testDiagramMeshLegend()
const QString uri( tempDir.filePath( QStringLiteral( "mesh.nc" ) ) );

QFile::copy( uri_1, uri );
QgsMeshLayer* layer = new QgsMeshLayer( uri, QStringLiteral( "mesh" ), QStringLiteral( "mdal" ) );
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);
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()) );
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();
QgsMeshLayer *layer2 = layer->clone();
QgsProject::instance()->removeMapLayer( layer );
QgsProject::instance()->addMapLayer( layer2 );

vectorIndex = 2;
rendererSettings.setActiveVectorDatasetGroup(vectorIndex);
QgsMeshRendererVectorSettings vectorSettings = rendererSettings.vectorSettings(vectorIndex);
rendererSettings.setActiveVectorDatasetGroup( vectorIndex );
QgsMeshRendererVectorSettings vectorSettings = rendererSettings.vectorSettings( vectorIndex );
vectorSettings.setColor( Qt::red );
rendererSettings.setVectorSettings(vectorIndex, vectorSettings);
layer2->setRendererSettings(rendererSettings);
rendererSettings.setVectorSettings( vectorIndex, vectorSettings );
layer2->setRendererSettings( rendererSettings );

root = std::make_unique<QgsLayerTree>();
root->addLayer( layer2 );
Expand All @@ -1488,15 +1488,15 @@ void TestQgsLegendRenderer::testDiagramMeshLegend()
QVERIFY( _verifyImage( res, QStringLiteral( "legend_mesh_diagram_red_vector" ) ) );

//color ramp vector
QgsMeshLayer* layer3 = layer2->clone();
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);
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 );
Expand Down
2 changes: 1 addition & 1 deletion tests/src/python/test_qgscolorramplegendnode.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def test_basic(self):
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))

Expand Down

0 comments on commit 3705bc1

Please sign in to comment.