[feature] Added identify and highlight feature #10

sklencar · 2018-05-23T13:23:31Z

This pull request is a subset of (#6490 )
This adds identifyKit and highlight feature with related classes.
For background information see the associated QEP.

PeterPetrik

very good. In general can you update docs a bit?

PeterPetrik · 2018-05-23T13:26:19Z

src/quickgui/qgsquickfeature.cpp

+  }
+}
+
+QgsQuickFeature::QgsQuickFeature(): mLayer( 0 )


move to header, use nullptr?

PeterPetrik · 2018-05-23T13:28:20Z

src/quickgui/qgsquickfeature.h

+    bool valid() const;
+
+  private:
+    QgsVectorLayer *mLayer;


add comment "not owned"

PeterPetrik · 2018-05-23T13:31:07Z

src/quickgui/qgsquickfeaturehighlight.h

+    void mapSettingsChanged();
+
+  private slots:
+    //! Connects new model to slots.


remove, no need of docs for private

PeterPetrik · 2018-05-23T13:31:22Z

src/quickgui/qgsquickfeaturehighlight.h

+  private slots:
+    //! Connects new model to slots.
+    void onDataChanged();
+    //! Updates feature highlight.


remove, no need of docs for private

PeterPetrik · 2018-05-23T13:31:48Z

src/quickgui/qgsquickfeaturehighlight.h

+    void onModelDataChanged();
+
+  private:
+    virtual QSGNode *updatePaintNode( QSGNode *n, UpdatePaintNodeData * ) override;


remove virtual, https://stackoverflow.com/questions/39932391/virtual-override-or-both-c?rq=1

PeterPetrik · 2018-05-23T13:46:26Z

src/quickgui/qgsquickidentifykit.h

+    void featuresLimitChanged();
+
+  private:
+    QgsQuickMapSettings *mMapSettings = nullptr;


PeterPetrik · 2018-05-23T13:46:40Z

src/quickgui/qgsquickidentifykit.h

+    QgsRectangle toLayerCoordinates( QgsMapLayer *layer, const QgsRectangle &rect ) const;
+    QgsFeatureList identifyVectorLayer( QgsVectorLayer *layer, const QgsPointXY &point ) const;
+
+    double mSearchRadiusMm;


initialize here both

PeterPetrik · 2018-05-23T13:46:51Z

src/quickgui/qgsquickmaptransform.cpp

+#include "qgsquickmaptransform.h"
+#include "qgsquickmapsettings.h"
+
+QgsQuickMapTransform::QgsQuickMapTransform()


PeterPetrik · 2018-05-23T13:46:57Z

src/quickgui/qgsquickmaptransform.cpp

+{
+}
+
+QgsQuickMapTransform::~QgsQuickMapTransform()


PeterPetrik · 2018-05-23T13:47:30Z

src/quickgui/qgsquickmaptransform.h

+    void setMapSettings( QgsQuickMapSettings *mapSettings );
+
+  signals:
+    //! Map settings changed


replaced QgsFeature/QgsFeatureList for QgsQuickFeature/QgsQuickFeatureList

Refactoring and added test.

PeterPetrik · 2018-05-24T12:10:27Z

src/quickgui/qgsquickfeature.cpp

+  : mLayer( layer )
+  , mFeature( feature )
+{
+  if ( !mLayer )


remove, it is not needed, based on implementation of QgsQuickFeature::valid()

PeterPetrik · 2018-05-24T12:10:51Z

src/quickgui/qgsquickfeature.h

+ * \ingroup quick
+ * Helper class for QgsFeature and QgsVectorLayer where it belongs.
+ *
+ * \note QML Type: IdentifyResult


PeterPetrik · 2018-05-24T12:12:31Z

src/quickgui/qgsquickfeature.h

+    Q_PROPERTY( QgsFeature feature READ feature )
+
+    /**
+     * Whether the feature is valid. This is a readonly property.


and layer is assigned

PeterPetrik · 2018-05-24T12:13:05Z

src/quickgui/qgsquickfeature.h

+
+    /**
+     * Constructor of a new feature.
+     * \param feature New feature itself.


I would say QgsFeature associated

PeterPetrik · 2018-05-24T12:13:48Z

src/quickgui/qgsquickfeature.h

+    //! \copydoc QgsQuickFeature::valid
+    bool valid() const;
+
+    void setFeature( const QgsFeature &feature );


PeterPetrik · 2018-05-24T12:17:39Z

src/quickgui/qgsquickfeaturemodel.cpp

+  emit layerChanged();
+}
+
+//QgsVectorLayer *QgsQuickFeatureModel::layer() const


PeterPetrik · 2018-05-24T12:18:15Z

src/quickgui/qgsquickfeaturemodel.h

+     */
+    Q_PROPERTY( QgsQuickFeature feature READ feature WRITE setFeatureOnly NOTIFY featureChanged )
+
+//    /**


PeterPetrik · 2018-05-24T12:18:22Z

src/quickgui/qgsquickfeaturemodel.h

+    Q_OBJECT
+
+    /**
+     * Instance of QgsFeature.


PeterPetrik · 2018-05-24T12:18:32Z

src/quickgui/qgsquickfeaturemodel.h

+    /**
+     * Instance of QgsFeature.
+     */
+    Q_PROPERTY( QgsQuickFeature feature READ feature WRITE setFeatureOnly NOTIFY featureChanged )


PeterPetrik · 2018-05-24T12:18:44Z

src/quickgui/qgsquickfeaturemodel.h

+
+
+    //! \copydoc QgsQuickFeatureModel::feature
+    void setFeatureOnly( const QgsFeature &feature );


wonder-sk · 2018-05-28T14:06:31Z

src/quickgui/qgsquickhighlightsgnode.cpp

+
+QSGGeometryNode *QgsQuickHighlightSGNode::createPolygonGeometry( const QgsPolygon &polygon )
+{
+  QgsTessellator tes( 0.0, 0.0, false, false, false );


would be good to set origin based on polygon's first vertex or so, because vertices are stored as floats and we would be loosing precision. It should be possible to set offset transform to the QSGGeometryNode to shift the origin again.

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)

[feature] Added identify and highlight feature

738db61

PeterPetrik requested changes May 23, 2018

View reviewed changes

viktor.sklencar@lutraconsulting.co.uk added 2 commits May 24, 2018 11:54

WIP - updates after review

e33254a

replaced QgsFeature/QgsFeatureList for QgsQuickFeature/QgsQuickFeatureList

Using QgsQuickFeature instead of QgsFeature.

d160fe0

Refactoring and added test.

PeterPetrik requested changes May 24, 2018

View reviewed changes

viktor.sklencar@lutraconsulting.co.uk and others added 5 commits May 24, 2018 15:21

small fixes/changes

d5a4e68

formatted

a35e794

some misc docs changes

7c38023

move tessellator from 3d to core (need also for quick library)

adf170b

add polygon highlight support (not working properly)

223d3e2

wonder-sk reviewed May 28, 2018

View reviewed changes

PeterPetrik added 4 commits May 28, 2018 16:42

fix install header

dd20de1

fix bug for polygonize

44641ef

rename qgsquickfeature and remove featuremodel

7f748cd

fix docs

0274dfb

PeterPetrik closed this May 29, 2018

PeterPetrik deleted the qgs-quick-identify_and_highlight_feature branch May 30, 2018 10:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[feature] Added identify and highlight feature #10

[feature] Added identify and highlight feature #10

sklencar commented May 23, 2018 •

edited

Loading

PeterPetrik left a comment

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 23, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

PeterPetrik May 24, 2018

wonder-sk May 28, 2018



		//! \copydoc QgsQuickFeatureModel::feature
		void setFeatureOnly( const QgsFeature &feature );

[feature] Added identify and highlight feature #10

[feature] Added identify and highlight feature #10

Conversation

sklencar commented May 23, 2018 • edited Loading

PeterPetrik left a 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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sklencar commented May 23, 2018 •

edited

Loading