[FEATURE] Rendering of scalar and vector datasets of mesh layers #6

PeterPetrik · 2018-05-16T11:05:20Z

Rudimentary support for rendering of scalar and vector datasets for mesh layers.
The goal of this PR is to allow to have at least something usable for QGIS 3.2 regarding mesh layers.
No GUI support added, the datasets must be added and styled via Python API. For example

base = '~/mesh/MDAL/tests/data/'
layer = QgsMeshLayer(base+'2dm/quad_and_triangle.2dm', 'q_and_t', 'mdal')
layer.dataProvider().addDataset(base+'ascii_dat/quad_and_triangle_els_vector.dat')
QgsProject.instance().addMapLayer(layer)

rs = layer.rendererTriangularMeshSettings()
rs.setEnabled(True)
rs.setColor(QColor(255, 0, 255))
layer.setRendererTriangularMeshSettings(rs)

rs.setEnabled(False)
layer.setRendererTriangularMeshSettings(rs)

layer.setActiveScalarDataset(0)
layer.triggerRepaint()

layer.setActiveScalarDataset(-1)
layer.triggerRepaint()

layer.setActiveVectorDataset(0)
layer.triggerRepaint()

rs = layer.rendererVectorSettings()
rs.setShaftLengthMethod(QgsMeshRendererVectorSettings.Scaled)
rs.setScaleFactor(100)
layer.setRendererVectorSettings(rs)

Reading and processing scalar (e.g. water depth) and vector (e.g. velocity) data from mesh data providers (e.g. MDAL)

Rudimentary support for rendering of scalar data (e.g. water depth) on mesh map layers.

Rudimentary support of rendering of vector data (e.g. velocity) on mesh map layers. Rendering can be adjusted by QgsMeshRenderer*Settings. Only in Python API, no GUI widgets for styling present.

wonder-sk · 2018-05-16T11:13:52Z

src/core/mesh/qgsmeshlayer.h

+    void setRendererNativeMeshSettings( const QgsMeshRendererMeshSettings &settings );
+
+    //! Returns rendrer settings
+    QgsMeshRendererMeshSettings rendererTriangularMeshSettings() const SIP_FACTORY;


No need to mark these methods as SIP_FACTORY - we are returning by value, not a new pointer

wonder-sk · 2018-05-16T11:14:18Z

src/core/mesh/qgsmeshlayer.cpp

+  Q_ASSERT( dataProvider()->datasetCount() > index );
+  // for vector datasets, we render magnitude
+  mActiveScalarDataset = index;
+}


triggerRepaint() here as well?

wonder-sk · 2018-05-16T11:14:25Z

src/core/mesh/qgsmeshlayer.cpp

+
+  Q_ASSERT( dataProvider()->datasetCount() > index );
+  if ( !dataProvider()->datasetHasScalarData( index ) )
+    mActiveVectorDataset = index;
 }


triggerRepaint() here as well?

wonder-sk · 2018-05-16T11:17:27Z

src/core/mesh/qgsmeshdataprovider.h

+    /**
+     * \brief Returns whether dataset is valid
+     */
+    virtual bool datasetIsValid( int index ) const = 0;


Can we merge datasetHasScalarData(), datasetIsOnVertices(), datasetMetadata(), datasetIsValid() into one function?

I would suggest to have one method datasetMetadata() that returns QgsMeshDatasetMetadata which would be a class with methods hasScalarData(), isOnVertices(), isValid() and extraOptions().

wonder-sk · 2018-05-16T11:17:47Z

src/core/mesh/qgsmeshdataprovider.h

-class CORE_EXPORT QgsMeshDataProvider: public QgsDataProvider, public QgsMeshSource
+ * Dataset is a  collection of vector or scalar values on vertices or faces of the mesh
+ *
+ * Base on the underlying data provider/format, whole dataset is either stored in memory or


s/Base/Based/ ?

wonder-sk · 2018-05-16T11:18:19Z

src/core/mesh/qgsmeshdataprovider.h

+ */
+class CORE_EXPORT QgsMeshDatasetValue
+{
+    Q_GADGET


do we use the fact this is a gadget anywhere?

wonder-sk · 2018-05-16T11:18:48Z

python/core/core_auto.sip

@@ -1,4 +1,3 @@
-// Include auto-generated SIP files


Unintentionally removed?

wonder-sk · 2018-05-16T11:21:36Z

src/core/mesh/qgsmeshrenderersettings.h

+{
+  public:
+    //! Algorithm how to transform vector magnitude to length of arrow on the device in pixels
+    enum VectorRenderingType


Maybe rename to ArrowScalingMethod ?

wonder-sk · 2018-05-16T11:23:50Z

src/core/mesh/qgsmeshvectorrenderer.cpp

+    }
+    case QgsMeshRendererVectorSettings::VectorRenderingType::Scaled:
+    {
+      double scaleFactor = mCfg.scaleFactor();


I think here we should also convert from millimeters to pixels? otherwise the scaling will be to pixels...

don't think so, this is just a factor to multiply the magnitude, no units

These references are to objects belonging to another thread, which can cause crashes if the object on the main thread is deleted while the handler is still active Refs a asan report: ==677416==ERROR: AddressSanitizer: heap-use-after-free on address 0x6070029bc278 at pc 0x7f95719ccc45 bp 0x7f94bdd7a310 sp 0x7f94bdd7a300 READ of size 4 at 0x6070029bc278 thread T36 (Thread (pooled)) #0 0x7f95719ccc44 in QgsLine3DSymbol::extrusionHeight() const /home/nyall/dev/qgis-asan/src/3d/symbols/qgsline3dsymbol.h:78 #1 0x7f95674a7c01 in QgsBufferedLine3DSymbolHandler::processFeature(QgsFeature&, Qgs3DRenderContext const&) /home/nyall/dev/qgis-asan/src/3d/symbols/qgsline3dsymbol_p.cpp:126 #2 0x7f9567457045 in operator() /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.cpp:97 #3 0x7f95674597fd in runFunctor /usr/include/qt5/QtConcurrent/qtconcurrentstoredfunctioncall.h:70 #4 0x7f956744acf7 in QtConcurrent::RunFunctionTask<void>::run() (/home/nyall/dev/build-QGIS-asan/output/lib/libqgis_3d.so.3.15.0+0x2adcf7) #5 0x7f956a275d59 (/usr/lib64/libQt5Core.so.5+0xc9d59) #6 0x7f956a27268f (/usr/lib64/libQt5Core.so.5+0xc668f) #7 0x7f956a193431 in start_thread (/usr/lib64/libpthread.so.0+0x9431) #8 0x7f955ad59912 in __GI___clone (/usr/lib64/libc.so.6+0x101912) 0x6070029bc278 is located 56 bytes inside of 72-byte region [0x6070029bc240,0x6070029bc288) freed by thread T0 here: #0 0x7f9572b86b87 in operator delete(void*) (/usr/lib64/libasan.so.6+0xb2b87) #1 0x7f956749c00b in QgsLine3DSymbol::~QgsLine3DSymbol() /home/nyall/dev/qgis-asan/src/3d/symbols/qgsline3dsymbol.cpp:30 #2 0x7f95719664ca in std::default_delete<QgsAbstract3DSymbol>::operator()(QgsAbstract3DSymbol*) const /usr/include/c++/10/bits/unique_ptr.h:85 #3 0x7f95674428ce in std::unique_ptr<QgsAbstract3DSymbol, std::default_delete<QgsAbstract3DSymbol> >::~unique_ptr() /usr/include/c++/10/bits/unique_ptr.h:361 #4 0x7f9567459eb6 in QgsVectorLayerChunkLoaderFactory::~QgsVectorLayerChunkLoaderFactory() /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.h:53 #5 0x7f9567459edd in QgsVectorLayerChunkLoaderFactory::~QgsVectorLayerChunkLoaderFactory() /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.h:53 #6 0x7f956746e4db in QgsChunkedEntity::~QgsChunkedEntity() /home/nyall/dev/qgis-asan/src/3d/chunks/qgschunkedentity_p.cpp:122 #7 0x7f9567459358 in QgsVectorLayerChunkedEntity::~QgsVectorLayerChunkedEntity() /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.cpp:164 #8 0x7f9567459373 in QgsVectorLayerChunkedEntity::~QgsVectorLayerChunkedEntity() /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.cpp:168 #9 0x7f956a42e960 in QObject::event(QEvent*) (/usr/lib64/libQt5Core.so.5+0x282960) #10 0x7f956ada2062 in QApplicationPrivate::notify_helper(QObject*, QEvent*) (/usr/lib64/libQt5Widgets.so.5+0x172062) previously allocated by thread T0 here: #0 0x7f9572b86067 in operator new(unsigned long) (/usr/lib64/libasan.so.6+0xb2067) #1 0x7f95674a3018 in qgis::_Unique_if<QgsLine3DSymbol>::_Single_object qgis::make_unique<QgsLine3DSymbol>() /home/nyall/dev/qgis-asan/src/core/qgis.h:425 #2 0x7f956749c0b9 in QgsLine3DSymbol::clone() const /home/nyall/dev/qgis-asan/src/3d/symbols/qgsline3dsymbol.cpp:34 #3 0x7f9567458b5f in QgsVectorLayerChunkLoaderFactory::QgsVectorLayerChunkLoaderFactory(Qgs3DMapSettings const&, QgsVectorLayer*, QgsAbstract3DSymbol*, int) /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.cpp:141 #4 0x7f9567458d88 in QgsVectorLayerChunkedEntity::QgsVectorLayerChunkedEntity(QgsVectorLayer*, double, double, QgsVectorLayer3DTilingSettings const&, QgsAbstract3DSymbol*, Qgs3DMapSettings const&) /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayerchunkloader_p.cpp:159 #5 0x7f956745558f in QgsVectorLayer3DRenderer::createEntity(Qgs3DMapSettings const&) const /home/nyall/dev/qgis-asan/src/3d/qgsvectorlayer3drenderer.cpp:76 #6 0x7f95673a71c0 in Qgs3DMapScene::addLayerEntity(QgsMapLayer*) /home/nyall/dev/qgis-asan/src/3d/qgs3dmapscene.cpp:693 #7 0x7f95673a5523 in Qgs3DMapScene::onLayerRenderer3DChanged() /home/nyall/dev/qgis-asan/src/3d/qgs3dmapscene.cpp:598 #8 0x7f95673c6c33 in QtPrivate::FunctorCall<QtPrivate::IndexesList<>, QtPrivate::List<>, void, void (Qgs3DMapScene::*)()>::call(void (Qgs3DMapScene::*)(), Qgs3DMapScene*, void**) (/home/nyall/dev/build-QGIS-asan/output/lib/libqgis_3d.so.3.15.0+0x229c33) #9 0x7f95673c5468 in void QtPrivate::FunctionPointer<void (Qgs3DMapScene::*)()>::call<QtPrivate::List<>, void>(void (Qgs3DMapScene::*)(), Qgs3DMapScene*, void**) /usr/include/qt5/QtCore/qobjectdefs_impl.h:185 #10 0x7f95673c1748 in QtPrivate::QSlotObject<void (Qgs3DMapScene::*)(), QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) /usr/include/qt5/QtCore/qobjectdefs_impl.h:418 #11 0x7f956a435f75 (/usr/lib64/libQt5Core.so.5+0x289f75) #12 0x7f956252106c in QgsMapLayer::renderer3DChanged() src/core/qgis_core_autogen/EWIEGA46WW/moc_qgsmaplayer.cpp:702 #13 0x7f9563917a12 in QgsMapLayer::setRenderer3D(QgsAbstract3DRenderer*) /home/nyall/dev/qgis-asan/src/core/qgsmaplayer.cpp:1813 #14 0x7f95719aaf52 in QgsApp3DSymbolWidgetWithPreview::updatePreview(QgsAbstract3DSymbol*) /home/nyall/dev/qgis-asan/src/app/3d/qgsapp3dsymbolwidget.cpp:243 #15 0x7f95719a97af in operator() /home/nyall/dev/qgis-asan/src/app/3d/qgsapp3dsymbolwidget.cpp:175 #16 0x7f95719ac2dd in call /usr/include/qt5/QtCore/qobjectdefs_impl.h:146 #17 0x7f95719ac24f in call<QtPrivate::List<>, void> /usr/include/qt5/QtCore/qobjectdefs_impl.h:256 #18 0x7f95719ac21e in impl /usr/include/qt5/QtCore/qobjectdefs_impl.h:443 #19 0x7f956a435f75 (/usr/lib64/libQt5Core.so.5+0x289f75) #20 0x7f95708d15ec in QgsApp3DSymbolWidget::widgetChanged() src/app/qgis_app_autogen/6LADBHSVD5/moc_qgsapp3dsymbolwidget.cpp:144 #21 0x7f95719ae1dd in QtPrivate::FunctorCall<QtPrivate::IndexesList<>, QtPrivate::List<>, void, void (QgsApp3DSymbolWidget::*)()>::call(void (QgsApp3DSymbolWidget::*)(), QgsApp3DSymbolWidget*, void**) /usr/include/qt5/QtCore/qobjectdefs_impl.h:152 #22 0x7f95719add9c in void QtPrivate::FunctionPointer<void (QgsApp3DSymbolWidget::*)()>::call<QtPrivate::List<>, void>(void (QgsApp3DSymbolWidget::*)(), QgsApp3DSymbolWidget*, void**) /usr/include/qt5/QtCore/qobjectdefs_impl.h:185 #23 0x7f95719adbfa in QtPrivate::QSlotObject<void (QgsApp3DSymbolWidget::*)(), QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) /usr/include/qt5/QtCore/qobjectdefs_impl.h:418 #24 0x7f956a435f75 (/usr/lib64/libQt5Core.so.5+0x289f75) #25 0x7f956c91c63e in Qgs3DSymbolWidget::changed() src/gui/qgis_gui_autogen/EWIEGA46WW/moc_qgs3dsymbolwidget.cpp:131 #26 0x7f95719ce2ad in QtPrivate::FunctorCall<QtPrivate::IndexesList<>, QtPrivate::List<>, void, void (Qgs3DSymbolWidget::*)()>::call(void (Qgs3DSymbolWidget::*)(), Qgs3DSymbolWidget*, void**) /usr/include/qt5/QtCore/qobjectdefs_impl.h:152 #27 0x7f95719ce014 in void QtPrivate::FunctionPointer<void (Qgs3DSymbolWidget::*)()>::call<QtPrivate::List<>, void>(void (Qgs3DSymbolWidget::*)(), Qgs3DSymbolWidget*, void**) /usr/include/qt5/QtCore/qobjectdefs_impl.h:185 #28 0x7f95719cdbfc in QtPrivate::QSlotObject<void (Qgs3DSymbolWidget::*)(), QtPrivate::List<>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) /usr/include/qt5/QtCore/qobjectdefs_impl.h:418 #29 0x7f956a435f75 (/usr/lib64/libQt5Core.so.5+0x289f75)

PeterPetrik and others added 4 commits May 16, 2018 12:37

update to MDAL 0.0.3

bfbc64c

[FEATURE] Scalar/vector data in mesh data providers

3154102

Reading and processing scalar (e.g. water depth) and vector (e.g. velocity) data from mesh data providers (e.g. MDAL)

[FEATURE] Rendering of scalar data on mesh layers

9296528

Rudimentary support for rendering of scalar data (e.g. water depth) on mesh map layers.

[FEATURE] Rendering of vector data on mesh layers

aea3dcc

Rudimentary support of rendering of vector data (e.g. velocity) on mesh map layers. Rendering can be adjusted by QgsMeshRenderer*Settings. Only in Python API, no GUI widgets for styling present.

PeterPetrik requested a review from wonder-sk May 16, 2018 11:05

PeterPetrik changed the title ~~Qgsmeshlayer 2 scalar vector datasets~~ [FEATURE] Rendering of scalar and vector datasets of mesh layers May 16, 2018

PeterPetrik self-assigned this May 16, 2018

PeterPetrik added the wontfix label May 16, 2018

wonder-sk reviewed May 16, 2018

View reviewed changes

code cleanup

3fc99c0

wonder-sk closed this May 16, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEATURE] Rendering of scalar and vector datasets of mesh layers #6

[FEATURE] Rendering of scalar and vector datasets of mesh layers #6

PeterPetrik commented May 16, 2018 •

edited

Loading

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

wonder-sk May 16, 2018

PeterPetrik May 16, 2018

[FEATURE] Rendering of scalar and vector datasets of mesh layers #6

[FEATURE] Rendering of scalar and vector datasets of mesh layers #6

Conversation

PeterPetrik commented May 16, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PeterPetrik commented May 16, 2018 •

edited

Loading