songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix connect infinite loop in heat method plugin (#7605) 

## Summary of Changes

The proper fixes would be to prevent the "reset colors" and the creation
of a selection item from emitting "item changed": in neither case the
item changed. Future work...

## Release Management

* Affected package(s): `Polyhedron`
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): -
* License and copyright ownership: no change
This commit is contained in:
Sebastien Loriot 2023-08-14 11:58:26 +02:00 committed by GitHub
parent bdbba81ea9 7ec586ca73
commit 464930ec2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method_plugin.cpp
View File

@ -605,13 +605,20 @@ private:
sm_item->setRenderingMode(GouraudPlusEdges); sm_item->setRenderingMode(GouraudPlusEdges);
sm_item->redraw(); sm_item->redraw();
scene->addItem(heat_item); auto heat_item_id = scene->addItem(heat_item);
scene->setSelectedItem(scene->item_id(sm_item)); scene->setSelectedItem(heat_item_id);
// any change of sm_item destroys everything // any change of sm_item destroys everything
connect(sm_item, &Scene_surface_mesh_item::itemChanged,
this, [this, sm_item, heat_item]() // @todo do not emit itemChanged when the colors are reset
// @todo with qt6, single connection can be performed with `static_cast<Qt::ConnectionType>(Qt::SingleShotConnection)`
// see https://www.kdab.com/single-shot-connections/
auto connection = std::make_shared<QMetaObject::Connection>();
*connection = connect(sm_item, &Scene_surface_mesh_item::itemChanged,
this, [this, sm_item, heat_item, connection]()
{ {
QObject::disconnect(*connection);
sm_item->resetColors(); sm_item->resetColors();
removePluginProperties(sm_item); removePluginProperties(sm_item);
scene->erase(scene->item_id(heat_item)); scene->erase(scene->item_id(heat_item));
@ -765,7 +772,8 @@ private Q_SLOTS:
Scene_polyhedron_selection_item* source_vertices = new Scene_polyhedron_selection_item(sm_item, mw); Scene_polyhedron_selection_item* source_vertices = new Scene_polyhedron_selection_item(sm_item, mw);
source_vertices->setName(tr("%1 (source vertices)").arg(sm_item->name())); source_vertices->setName(tr("%1 (source vertices)").arg(sm_item->name()));
scene->addItem(source_vertices); auto source_vertices_id = scene->addItem(source_vertices);
scene->setSelectedItem(source_vertices_id);
link_mesh_and_selection(sm_item, source_vertices); link_mesh_and_selection(sm_item, source_vertices);