memory dataset group and persist them #22
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vcloarec
changed the title
vcloarec
force-pushed
the
registryInLayer
branch
4 times, most recently
from
79443bb
to
53ac95c
Compare
vcloarec
commented
Jun 17, 2020
vcloarec
commented
Jun 17, 2020
vcloarec
commented
Jun 17, 2020
vcloarec
commented
Jun 17, 2020
vcloarec
commented
Jun 17, 2020
vcloarec
commented
Jun 17, 2020
vcloarec
force-pushed
the
registryInLayer
branch
2 times, most recently
from
7567283
to
65a3342
Compare
vcloarec
changed the title
PeterPetrik
reviewed
Jun 18, 2020
| @@ -233,15 +267,52 @@ QgsMeshCalculator::Result QgsMeshCalculator::processCalculation( QgsFeedback *fe | |||
| } | |||
| } | |||
|
|
|||
| // calculate statistics | |||
| double minGroup = std::numeric_limits<double>::max(); | |||
There was a problem hiding this comment.
best to create small helper function for calculate statistics
| @@ -188,6 +225,7 @@ class ANALYSIS_EXPORT QgsMeshCalculator | |||
| bool mUseMask = false; | |||
| double mStartTime = 0.0; | |||
| double mEndTime = 0.0; | |||
| bool mResultlInMemory = false; | |||
There was a problem hiding this comment.
mResultlInMemory -> mResultInMemory
| @@ -45,14 +46,18 @@ QgsMeshCalculatorDialog::QgsMeshCalculatorDialog( QgsMeshLayer *meshLayer, QWidg | |||
| QgsGui::enableAutoGeometryRestore( this ); | |||
|
|
|||
| cboLayerMask->setFilters( QgsMapLayerProxyModel::PolygonLayer ); | |||
| getDatasetGroupNames(); | |||
| QgsMeshDatasetGroupListModel *model = new QgsMeshDatasetGroupListModel( this ); | |||
There was a problem hiding this comment.
std::unique_ptr< QgsMeshDatasetGroupListModel>
There was a problem hiding this comment.
Model is a QObject and it has QgsMeshCalculatorDialog ("this") as parent on creation and will be destructed with it.
There was a problem hiding this comment.
that I understand, but with solution I suggested there will be no memory leak never (even if the c++ code throw some exception on line 50) and with .release() you transfer ownership
| int nativeIndexToGroupIndex( QgsMeshDatasetSourceInterface *source, int providerIndex ); | ||
| void createDatasetGroupTreeItems( const QList<int> &indexes ); | ||
|
|
||
| //! Erase from the where this is store, not from the store (registery and tree item), for peristent dataset group, do nothing |
There was a problem hiding this comment.
registery -> register
Erase -> Erases
There was a problem hiding this comment.
for registery, it is the noun not the verb.
There was a problem hiding this comment.
maybe, but unfortunately I do not understand at all the sentence
vcloarec
force-pushed
the
registryInLayer
branch
from
114de87
to
673ba87
Compare
|
feel free to create official PR |
vcloarec
force-pushed
the
registryInLayer
branch
from
673ba87
to
9bb93f4
Compare
|
need this for official PR : lutraconsulting/MDAL#271 |
vcloarec
commented
Jun 22, 2020
| for ( const QgsMeshDriverMetadata driver : allDrivers ) | ||
| { | ||
| QString driverName = driver.name(); | ||
| QString suffix = driver.writeDatasetOnFileSuffix(); |
There was a problem hiding this comment.
vcloarec
commented
Jun 22, 2020
| QString currentDriver = mOutputFormatComboBox->currentData().toString(); | ||
| QString suffix; | ||
| if ( mMeshDrivers.contains( currentDriver ) ) | ||
| suffix = mMeshDrivers[currentDriver].writeDatasetOnFileSuffix(); |
There was a problem hiding this comment.
Fixes qgis#37352 No idea why the signal wasn't connected :/
PG: fix "name" field length (63 instead of 64)
Try to fix qgis#37297
OpenCL quote paths
vcloarec
force-pushed
the
registryInLayer
branch
from
de87125
to
82bff91
Compare
vcloarec
force-pushed
the
registryInLayer
branch
from
82bff91
to
a0aec5d
Compare
|
can we close this one ? |
vcloarec
pushed a commit
that referenced
this pull request
Aug 24, 2020
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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Memory dataset group and possibility to persist it
I still have some issue when saving dataset, sometime it fails...
And I have to look for active/inactive when saving dataset on faces