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

Merge pull request #8548 from gdamiand/CMap_LCC_automatic_attribute_bug-gdamiand 

Bug fix in LCC method set_automatic_attributes_management
This commit is contained in:
Sébastien Loriot 2024-10-18 18:03:20 +02:00
parent 7d4fc58765 b3762ede88
commit 12fe9a1b83
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -3707,6 +3707,9 @@ namespace CGAL {
this->automatic_attributes_management = newval; this->automatic_attributes_management = newval;
} }
void set_automatic_attributes_management_without_correction(bool newval)
{ this->automatic_attributes_management = newval; }
/** Create an half-edge. /** Create an half-edge.
* @return a dart of the new half-edge. * @return a dart of the new half-edge.
*/ */

3
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -2946,6 +2946,9 @@ namespace CGAL {
this->automatic_attributes_management = newval; this->automatic_attributes_management = newval;
} }
void set_automatic_attributes_management_without_correction(bool newval)
{ this->automatic_attributes_management = newval; }
/** Create an half-edge. /** Create an half-edge.
* @return a dart of the new half-edge. * @return a dart of the new half-edge.
*/ */

12
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
View File

@ -1012,7 +1012,7 @@ void MainWindow::on_actionMerge_coplanar_faces_triggered()
timer.start(); timer.start();
#endif #endif
scene.lcc->set_update_attributes(false); scene.lcc->set_automatic_attributes_management(false);
std::vector<Dart_descriptor> edges; std::vector<Dart_descriptor> edges;
LCC::size_type treated = scene.lcc->get_new_mark(); LCC::size_type treated = scene.lcc->get_new_mark();
@ -1073,7 +1073,7 @@ void MainWindow::on_actionMerge_coplanar_faces_triggered()
scene.lcc->free_mark(treated); scene.lcc->free_mark(treated);
scene.lcc->free_mark(treated2); scene.lcc->free_mark(treated2);
scene.lcc->set_update_attributes(true); scene.lcc->set_automatic_attributes_management(true);
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO
timer.stop(); timer.stop();
@ -1100,7 +1100,7 @@ void MainWindow::on_actionMerge_all_volumes_triggered()
LCC::Dart_range::iterator prev; LCC::Dart_range::iterator prev;
bool first = true; bool first = true;
scene.lcc->set_update_attributes(false); scene.lcc->set_automatic_attributes_management(false);
for (LCC::Dart_range::iterator it(scene.lcc->darts().begin()), for (LCC::Dart_range::iterator it(scene.lcc->darts().begin()),
itend=scene.lcc->darts().end(); it!=itend; ) itend=scene.lcc->darts().end(); it!=itend; )
@ -1127,7 +1127,7 @@ void MainWindow::on_actionMerge_all_volumes_triggered()
} }
} }
scene.lcc->set_update_attributes(true); scene.lcc->set_automatic_attributes_management(true);
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO
timer.stop(); timer.stop();
@ -1751,7 +1751,7 @@ void MainWindow::onMengerInc()
if (!mengerUpdateAttributes) if (!mengerUpdateAttributes)
{ {
scene.lcc->set_update_attributes(false); scene.lcc->set_automatic_attributes_management(false);
} }
std::vector<Dart_descriptor> edges; std::vector<Dart_descriptor> edges;
@ -1838,7 +1838,7 @@ void MainWindow::onMengerInc()
update_volume_list_add(scene.lcc->attribute<3>(mengerVolumes[i])); update_volume_list_add(scene.lcc->attribute<3>(mengerVolumes[i]));
} }
scene.lcc->set_update_attributes(true); scene.lcc->set_automatic_attributes_management(true);
} }
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO

6
Linear_cell_complex/include/CGAL/Linear_cell_complex_base.h
View File

@ -836,7 +836,7 @@ namespace CGAL {
/** Set the status of the management of the attributes of the Map /** Set the status of the management of the attributes of the Map
*/ */
void set_update_attributes(bool newval) void set_automatic_attributes_management(bool newval)
{ {
if (this->automatic_attributes_management == false && newval == true) if (this->automatic_attributes_management == false && newval == true)
{ {
@ -847,6 +847,10 @@ namespace CGAL {
this->automatic_attributes_management = newval; this->automatic_attributes_management = newval;
} }
void set_automatic_attributes_management_without_correction(bool newval)
{ this->automatic_attributes_management = newval; }
}; };
} // namespace CGAL } // namespace CGAL