sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62699 from qgis/backport-62657-to-release-3_44

Browse Source 
[Backport release-3_44] Fix order of layers in layout elevation profiles
This commit is contained in:
Alexander Bruy 2025-07-29 11:53:24 +01:00 committed by GitHub
commit eb967785ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/layout/qgslayoutelevationprofilewidget.cpp
View File

@ -657,15 +657,16 @@ void QgsLayoutElevationProfileWidget::copySettingsFromProfileCanvas( QgsElevatio
} }
QList<QgsMapLayer *> canvasLayers = canvas->layers(); QList<QgsMapLayer *> canvasLayers = canvas->layers();
// canvas layers are in opposite direction to what the layout item requires
std::reverse( canvasLayers.begin(), canvasLayers.end() );
mProfile->setLayers( canvasLayers ); mProfile->setLayers( canvasLayers );
const QList<QgsLayerTreeLayer *> layers = mLayerTree->findLayers(); const QList<QgsLayerTreeLayer *> layers = mLayerTree->findLayers();
for ( QgsLayerTreeLayer *layer : layers ) for ( QgsLayerTreeLayer *layer : layers )
{ {
layer->setItemVisibilityChecked( mProfile->layers().contains( layer->layer() ) ); layer->setItemVisibilityChecked( mProfile->layers().contains( layer->layer() ) );
} }
mLayerTree->reorderGroupLayers( mProfile->layers() );
// canvas layers are in opposite direction to what the layer tree requires
std::reverse( canvasLayers.begin(), canvasLayers.end() );
mLayerTree->reorderGroupLayers( canvasLayers );
mProfile->invalidateCache(); mProfile->invalidateCache();
mProfile->update(); mProfile->update();
@ -755,12 +756,15 @@ void QgsLayoutElevationProfileWidget::setGuiElementValues()
mSpinTopMargin->setValue( mProfile->plot()->margins().top() ); mSpinTopMargin->setValue( mProfile->plot()->margins().top() );
mSpinBottomMargin->setValue( mProfile->plot()->margins().bottom() ); mSpinBottomMargin->setValue( mProfile->plot()->margins().bottom() );
QList<QgsMapLayer *> profileLayers = mProfile->layers();
const QList<QgsLayerTreeLayer *> layers = mLayerTree->findLayers(); const QList<QgsLayerTreeLayer *> layers = mLayerTree->findLayers();
for ( QgsLayerTreeLayer *layer : layers ) for ( QgsLayerTreeLayer *layer : layers )
{ {
layer->setItemVisibilityChecked( mProfile->layers().contains( layer->layer() ) ); layer->setItemVisibilityChecked( profileLayers.contains( layer->layer() ) );
} }
mLayerTree->reorderGroupLayers( mProfile->layers() ); // elevation profile layers are in opposite direction to what the layer tree requires
std::reverse( profileLayers.begin(), profileLayers.end() );
mLayerTree->reorderGroupLayers( profileLayers );
updateDataDefinedButton( mDDBtnTolerance ); updateDataDefinedButton( mDDBtnTolerance );
updateDataDefinedButton( mDDBtnMinDistance ); updateDataDefinedButton( mDDBtnMinDistance );
@ -795,6 +799,8 @@ void QgsLayoutElevationProfileWidget::updateItemLayers()
layers << layer; layers << layer;
} }
std::reverse( layers.begin(), layers.end() );
mProfile->setLayers( layers ); mProfile->setLayers( layers );
mProfile->update(); mProfile->update();
} }

2
src/gui/layout/qgslayoutelevationprofilewidget.h
View File

@ -80,6 +80,8 @@ class GUI_EXPORT QgsLayoutElevationProfileWidget : public QgsLayoutItemBaseWidge
QgsLayerTreeRegistryBridge *mLayerTreeBridge = nullptr; QgsLayerTreeRegistryBridge *mLayerTreeBridge = nullptr;
QgsElevationProfileLayerTreeView *mLayerTreeView = nullptr; QgsElevationProfileLayerTreeView *mLayerTreeView = nullptr;
QMenu *mCopyFromDockMenu = nullptr; QMenu *mCopyFromDockMenu = nullptr;
friend class TestQgsLayoutGui;
}; };
#endif //QGSLAYOUTELEVATIONPROFILEWIDGET_H #endif //QGSLAYOUTELEVATIONPROFILEWIDGET_H

58
tests/src/gui/testqgslayoutgui.cpp
View File

@ -22,6 +22,11 @@
#include "qgslayoutitemmap.h" #include "qgslayoutitemmap.h"
#include "qgslayoutmodel.h" #include "qgslayoutmodel.h"
#include "qgslayoutitemcombobox.h" #include "qgslayoutitemcombobox.h"
#include "qgslayoutelevationprofilewidget.h"
#include "qgsvectorlayer.h"
#include "qgsvectorlayerelevationproperties.h"
#include "qgselevationprofilecanvas.h"
#include "qgslayertree.h"
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
@ -39,6 +44,7 @@ class TestQgsLayoutGui : public QObject
void itemTypeComboBox(); void itemTypeComboBox();
void testProxyCrash(); void testProxyCrash();
void testElevationProfileWidget();
private: private:
}; };
@ -235,6 +241,58 @@ void TestQgsLayoutGui::testProxyCrash()
delete layout; delete layout;
} }
void TestQgsLayoutGui::testElevationProfileWidget()
{
QgsProject project;
QgsLayout layout( &project );
QgsVectorLayer *vl1 = new QgsVectorLayer( QStringLiteral( "Point?field=intarray:int[]&field=strarray:string[]&field=intf:int" ), QStringLiteral( "vl1" ), QStringLiteral( "memory" ) );
qobject_cast< QgsVectorLayerElevationProperties * >( vl1->elevationProperties() )->setZOffset( 5 );
QgsVectorLayer *vl2 = new QgsVectorLayer( QStringLiteral( "Point?field=intarray:int[]&field=strarray:string[]&field=intf:int" ), QStringLiteral( "vl2" ), QStringLiteral( "memory" ) );
qobject_cast< QgsVectorLayerElevationProperties * >( vl2->elevationProperties() )->setZOffset( 5 );
QgsVectorLayer *vl3 = new QgsVectorLayer( QStringLiteral( "Point?field=intarray:int[]&field=strarray:string[]&field=intf:int" ), QStringLiteral( "vl3" ), QStringLiteral( "memory" ) );
qobject_cast< QgsVectorLayerElevationProperties * >( vl3->elevationProperties() )->setZOffset( 5 );
project.addMapLayers( { vl1, vl2, vl3 } );
QgsLayoutItemElevationProfile profile( &layout );
// layers will be rendered from v1->vl3 from bottom to top
profile.setLayers( { vl1, vl2, vl3 } );
QgsLayoutElevationProfileWidget widget( &profile );
QCOMPARE( widget.mLayerTree->children().size(), 3 );
// in widget's layer tree the layers should be in order v1->vl3 from bottom to top
QCOMPARE( qobject_cast< QgsLayerTreeLayer * >( widget.mLayerTree->children().at( 0 ) )->layer()->name(), QStringLiteral( "vl3" ) );
QVERIFY( widget.mLayerTree->children().at( 0 )->isItemVisibilityCheckedRecursive() );
QCOMPARE( qobject_cast< QgsLayerTreeLayer * >( widget.mLayerTree->children().at( 1 ) )->layer()->name(), QStringLiteral( "vl2" ) );
QVERIFY( widget.mLayerTree->children().at( 1 )->isItemVisibilityCheckedRecursive() );
QCOMPARE( qobject_cast< QgsLayerTreeLayer * >( widget.mLayerTree->children().at( 2 ) )->layer()->name(), QStringLiteral( "vl1" ) );
QVERIFY( widget.mLayerTree->children().at( 2 )->isItemVisibilityCheckedRecursive() );
// uncheck a layer
widget.mLayerTree->children().at( 1 )->setItemVisibilityChecked( false );
QCOMPARE( profile.layers().size(), 2 );
// layers should be in order of rendering, ie vl1 before vl3 as vl3 is rendered on top
QCOMPARE( profile.layers().at( 0 )->name(), QStringLiteral( "vl1" ) );
QCOMPARE( profile.layers().at( 1 )->name(), QStringLiteral( "vl3" ) );
QgsElevationProfileCanvas canvas;
// layers will be rendered from v1->vl3 from bottom to top
canvas.setLayers( { vl1, vl2, vl3 } );
widget.copySettingsFromProfileCanvas( &canvas );
QCOMPARE( profile.layers().size(), 3 );
// layers should be in order of rendering, ie vl1 before vl3 as vl3 is rendered on top
QCOMPARE( profile.layers().at( 0 )->name(), QStringLiteral( "vl1" ) );
QCOMPARE( profile.layers().at( 1 )->name(), QStringLiteral( "vl2" ) );
QCOMPARE( profile.layers().at( 2 )->name(), QStringLiteral( "vl3" ) );
canvas.setLayers( { vl3, vl2, vl1 } );
widget.copySettingsFromProfileCanvas( &canvas );
QCOMPARE( profile.layers().size(), 3 );
QCOMPARE( profile.layers().at( 0 )->name(), QStringLiteral( "vl3" ) );
QCOMPARE( profile.layers().at( 1 )->name(), QStringLiteral( "vl2" ) );
QCOMPARE( profile.layers().at( 2 )->name(), QStringLiteral( "vl1" ) );
}
QTEST_MAIN( TestQgsLayoutGui ) QTEST_MAIN( TestQgsLayoutGui )
#include "testqgslayoutgui.moc" #include "testqgslayoutgui.moc"