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

Onsplit again...

This commit is contained in:
Guillaume Damiand 2013-01-28 22:13:56 +01:00
parent 2f19803fb8
commit 7f6cf79490
4 changed files with 111 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
View File

@ -233,7 +233,7 @@ namespace CGAL {
for (int j=0; j<Map::Helper::nb_attribs; ++j) for (int j=0; j<Map::Helper::nb_attribs; ++j)
{ {
mark_for_incident_cells [j] = amap.get_new_mark(); mark_for_incident_cells [j] = amap.get_new_mark();
CGAL_assertion( mark_for_incident_cells [j]!=-1 ); CGAL_assertion( mark_for_incident_cells[j]!=-1 );
} }
// First we store and mark all the darts of the i-cell to remove. // First we store and mark all the darts of the i-cell to remove.
@ -254,11 +254,11 @@ namespace CGAL {
to_erase.begin(); to_erase.begin();
for (; it != to_erase.end(); ++it) for (; it != to_erase.end(); ++it)
{ {
d1 = (*it)->beta_inv(i); d1 = (*it)->beta(iinv);
while ( d1!=Map::null_dart_handle && amap.is_marked(d1, mark) ) while ( d1!=Map::null_dart_handle && amap.is_marked(d1, mark) )
{ {
d1 = d1->beta(i+1)->beta_inv(i); d1 = d1->beta(i+1)->beta(iinv);
if (d1 == (*it)->beta_inv(i)) d1 = Map::null_dart_handle; if (d1 == (*it)->beta(iinv)) d1 = Map::null_dart_handle;
} }
d2 = (*it)->beta(i+1)->beta(i); d2 = (*it)->beta(i+1)->beta(i);
@ -273,6 +273,14 @@ namespace CGAL {
if (d2 != Map::null_dart_handle) if (d2 != Map::null_dart_handle)
{ {
if ( dg1==NULL ) { dg1 = d1; dg2=d2; } if ( dg1==NULL ) { dg1 = d1; dg2=d2; }
Map::Helper::template Foreach_enabled_attributes
<internal::Store_incident_cells<Map,i> >::
run(&amap, d1, mark, &mark_for_incident_cells[0],
&incident_cells[0]);
Map::Helper::template Foreach_enabled_attributes
<internal::Store_incident_cells<Map,i> >::
run(&amap, d2, mark, &mark_for_incident_cells[0],
&incident_cells[0]);
} }
else else
{ {
@ -280,7 +288,7 @@ namespace CGAL {
{ {
Map::Helper::template Foreach_enabled_attributes Map::Helper::template Foreach_enabled_attributes
<internal::Store_incident_cells<Map,i> >:: <internal::Store_incident_cells<Map,i> >::
run(&amap, d1, mark, &mark_for_incident_cells[0], run(&amap, d1->beta(i), mark, &mark_for_incident_cells[0],
&incident_cells[0]); &incident_cells[0]);
} }
} }
@ -319,11 +327,11 @@ namespace CGAL {
// For each dart of the i-cell, we modify i-links of neighbors. // For each dart of the i-cell, we modify i-links of neighbors.
for ( it=to_erase.begin(); it != to_erase.end(); ++it) for ( it=to_erase.begin(); it != to_erase.end(); ++it)
{ {
d1 = (*it)->beta_inv(i); d1 = (*it)->beta(iinv);
while ( d1!=Map::null_dart_handle && amap.is_marked(d1, mark) ) while ( d1!=Map::null_dart_handle && amap.is_marked(d1, mark) )
{ {
d1 = d1->beta(i+1)->beta_inv(i); d1 = d1->beta(i+1)->beta(iinv);
if (d1 == (*it)->beta_inv(i)) d1 = Map::null_dart_handle; if (d1 == (*it)->beta(iinv)) d1 = Map::null_dart_handle;
} }
d2 = (*it)->beta(i+1)->beta(i); d2 = (*it)->beta(i+1)->beta(i);
@ -349,17 +357,17 @@ namespace CGAL {
} }
else if (d2 != Map::null_dart_handle) else if (d2 != Map::null_dart_handle)
{ {
if ( !d2->is_free(CGAL_BETAINV(i)) ) if ( !d2->is_free(iinv) )
{ {
d2->unlink_beta(CGAL_BETAINV(i)); d2->unlink_beta(iinv);
} }
} }
if ((*it)->is_free(i+1) && !(*it)->is_free(i)) if ((*it)->is_free(i+1) && !(*it)->is_free(i))
{ {
d1 = (*it)->beta(i); d1 = (*it)->beta(i);
if ( !d1->is_free(CGAL_BETAINV(i)) ) if ( !d1->is_free(iinv) )
{ {
d1->unlink_beta(CGAL_BETAINV(i)); d1->unlink_beta(iinv);
} }
} }
} }
@ -386,7 +394,6 @@ namespace CGAL {
amap.free_mark( mark_for_incident_cells[j] ); amap.free_mark( mark_for_incident_cells[j] );
} }
assert(amap.is_valid());
CGAL_expensive_postcondition( amap.is_valid() ); CGAL_expensive_postcondition( amap.is_valid() );
return res; return res;
@ -409,11 +416,6 @@ namespace CGAL {
int mark = amap.get_new_mark(); int mark = amap.get_new_mark();
size_t res = 0; size_t res = 0;
// Stack of couple of dart for which we must call degroup_all_attributes
typedef std::pair<typename Map::Dart_handle, typename Map::Dart_handle>
Dart_pair;
std::deque<Dart_pair> todegroup;
int mark_for_incident_cells[Map::Helper::nb_attribs]; int mark_for_incident_cells[Map::Helper::nb_attribs];
std::deque<std::deque<typename Map::Dart_handle> > std::deque<std::deque<typename Map::Dart_handle> >
incident_cells[Map::Helper::nb_attribs]; incident_cells[Map::Helper::nb_attribs];
@ -421,19 +423,17 @@ namespace CGAL {
// Marks used to mark all the incident cells. // Marks used to mark all the incident cells.
for (int j=0; j<Map::Helper::nb_attribs; ++j) for (int j=0; j<Map::Helper::nb_attribs; ++j)
{ {
mark_for_incident_cells [j] = amap.get_new_mark(); mark_for_incident_cells[j] = amap.get_new_mark();
CGAL_assertion( mark_for_incident_cells [j]!=-1 ); CGAL_assertion( mark_for_incident_cells[j]!=-1 );
} }
// 1) We mark all the darts of the d-cell. // 1) We mark all the darts of the d-cell.
for (CMap_dart_iterator_basic_of_cell<Map,Map::dimension>
it(amap,adart,mark); it.cont(); ++it)
{ {
for (CMap_dart_iterator_basic_of_cell<Map,Map::dimension> to_erase.push_back(it);
it(amap,adart,mark); it.cont(); ++it) amap.mark(it,mark);
{ ++res;
to_erase.push_back(it);
amap.mark(it,mark);
++res;
}
} }
typename std::deque<typename Map::Dart_handle>::iterator typename std::deque<typename Map::Dart_handle>::iterator
@ -462,20 +462,20 @@ namespace CGAL {
} }
} }
// 4) We remove all the darts of the d-cell. // 4) We test the split of all the incident cells for all the non
for ( it = to_erase.begin(); it != to_erase.end(); ++it )
{ amap.erase_dart(*it); }
CGAL_assertion( amap.is_whole_map_unmarked(mark) );
amap.free_mark(mark);
// 5) We test the split of all the incident cells for all the non
// void attributes. // void attributes.
Map::Helper::template Foreach_enabled_attributes Map::Helper::template Foreach_enabled_attributes
<internal::Test_split_with_deque<Map,i> >:: <internal::Test_split_with_deque<Map,i> >::
run(&amap, &mark_for_incident_cells[0], run(&amap, &mark_for_incident_cells[0],
&incident_cells[0]); &incident_cells[0]);
// 5) We remove all the darts of the d-cell.
for ( it = to_erase.begin(); it != to_erase.end(); ++it )
{ amap.erase_dart(*it); }
CGAL_assertion( amap.is_whole_map_unmarked(mark) );
amap.free_mark(mark);
// We free the marks. // We free the marks.
for (int j=0; j<Map::Helper::nb_attribs; ++j) for (int j=0; j<Map::Helper::nb_attribs; ++j)
{ {
@ -484,7 +484,6 @@ namespace CGAL {
amap.free_mark( mark_for_incident_cells [j] ); amap.free_mark( mark_for_incident_cells [j] );
} }
assert(amap.is_valid());
CGAL_expensive_postcondition( amap.is_valid() ); CGAL_expensive_postcondition( amap.is_valid() );
return res; return res;
@ -540,23 +539,20 @@ namespace CGAL {
if ( !(*it)->is_free(0) ) if ( !(*it)->is_free(0) )
{ {
if ( !(*it)->is_free(1) && (*it)->beta(0)!=(*it) ) if ( !(*it)->is_free(1) && (*it)->beta(0)!=(*it) )
amap.template basic_link_beta<1>((*it)->beta(0), (*it)->beta(1)); {
if ( dg1==NULL ) { dg1=(*it)->beta(0); dg2=(*it)->beta(1); }
Map::Helper::template Foreach_enabled_attributes
<internal::Store_incident_cells<Map,0> >::
run(&amap, *it, mark, &mark_for_incident_cells[0],
&incident_cells[0]);
}
else else
{ {
Map::Helper::template Foreach_enabled_attributes Map::Helper::template Foreach_enabled_attributes
<internal::Store_incident_cells<Map,0> >:: <internal::Store_incident_cells<Map,0> >::
run(&amap, *it, mark, &mark_for_incident_cells[0], run(&amap, *it, mark, &mark_for_incident_cells[0],
&incident_cells[0]); &incident_cells[0]);
// todegroup.push(Dart_pair((*it)->beta(0), *it));
// (*it)->beta(0)->unlink_beta(1);
} }
/* for ( unsigned int j=2; j<=Map::dimension; ++j )
{
if ( !(*it)->is_free(j) )
amap.basic_link_beta((*it)->beta(0), (*it)->beta(j), j);
//((*it)->beta(0))->basic_link_beta((*it)->beta(j),j);
} */
} }
else else
{ {
@ -566,15 +562,7 @@ namespace CGAL {
<internal::Store_incident_cells<Map,0> >:: <internal::Store_incident_cells<Map,0> >::
run(&amap, (*it)->beta(1), mark, &mark_for_incident_cells[0], run(&amap, (*it)->beta(1), mark, &mark_for_incident_cells[0],
&incident_cells[0]); &incident_cells[0]);
//todegroup.push(Dart_pair((*it)->beta(1), *it));
//(*it)->beta(1)->unlink_beta(0);
} }
/* for ( unsigned int j=2; j<=Map::dimension; ++j )
{
if ( !(*it)->is_free(j) )
amap.unlink_beta(*it, j);
} */
} }
} }
@ -618,13 +606,6 @@ namespace CGAL {
} }
} }
// We remove all the darts of the i-cell.
for ( it=to_erase.begin(); it!=to_erase.end(); ++it )
{ amap.erase_dart(*it); }
CGAL_assertion( amap.is_whole_map_unmarked(mark) );
amap.free_mark(mark);
// We test the split of all the incident cells for all the non // We test the split of all the incident cells for all the non
// void attributes. // void attributes.
Map::Helper::template Foreach_enabled_attributes Map::Helper::template Foreach_enabled_attributes
@ -632,6 +613,13 @@ namespace CGAL {
run(&amap, &mark_for_incident_cells[0], run(&amap, &mark_for_incident_cells[0],
&incident_cells[0]); &incident_cells[0]);
// We remove all the darts of the i-cell.
for ( it=to_erase.begin(); it!=to_erase.end(); ++it )
{ amap.erase_dart(*it); }
CGAL_assertion( amap.is_whole_map_unmarked(mark) );
amap.free_mark(mark);
// We free the marks. // We free the marks.
for (int j=0; j<Map::Helper::nb_attribs; ++j) for (int j=0; j<Map::Helper::nb_attribs; ++j)
{ {
@ -640,7 +628,6 @@ namespace CGAL {
amap.free_mark( mark_for_incident_cells [j] ); amap.free_mark( mark_for_incident_cells [j] );
} }
assert(amap.is_valid());
CGAL_expensive_postcondition( amap.is_valid() ); CGAL_expensive_postcondition( amap.is_valid() );
return res; return res;

11
Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
View File

@ -581,34 +581,33 @@ namespace CGAL {
for ( typename std::deque<typename Map::Dart_handle>::iterator for ( typename std::deque<typename Map::Dart_handle>::iterator
itj=it->begin(); itj!=it->end(); ++itj ) itj=it->begin(); itj!=it->end(); ++itj )
{ {
if ( !amap->is_marked( *itj, mark_for_jcells) ) if ( !amap->is_marked(*itj, mark_for_jcells) )
{ {
++nbofjcell; ++nbofjcell;
if ( nbofjcell>1 ) if ( nbofjcell>1 )
{ {
a2 = amap->template create_attribute<j>(*a1); a2 = amap->template create_attribute<j>(*a1);
std::cout<<"A2 "<<&*a2<<" "<<&**itj<<": "; // std::cout<<"A2 "<<&*a2<<" "<<&**itj<<": ";
// We call the on_split functor // We call the on_split functor
} }
else else
{ {
a1=(*itj)->template attribute<j>(); a1=(*itj)->template attribute<j>();
// TODO
a1->set_dart(*itj); a1->set_dart(*itj);
std::cout<<"A1 "<<&*a1<<" "<<&**itj<<": "; // std::cout<<"A1 "<<&*a1<<" "<<&**itj<<": ";
} }
for ( CMap_dart_iterator_basic_of_cell<Map,j> for ( CMap_dart_iterator_basic_of_cell<Map,j>
itj2(*amap, *itj, mark_for_jcells); itj2(*amap, *itj, mark_for_jcells);
itj2.cont(); ++itj2 ) itj2.cont(); ++itj2 )
{ {
std::cout<<&*itj2<<", "; // std::cout<<&*itj2<<", ";
if ( nbofjcell>1 ) if ( nbofjcell>1 )
amap->template set_attribute_of_dart<j>(itj2, a2); amap->template set_attribute_of_dart<j>(itj2, a2);
amap->mark(itj2, mark_for_jcells); amap->mark(itj2, mark_for_jcells);
} }
std::cout<<std::endl; // std::cout<<std::endl;
if ( nbofjcell>1 ) if ( nbofjcell>1 )
Apply_cell_functor Apply_cell_functor

4
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
View File

@ -11,6 +11,8 @@ else()
cmake_policy(VERSION 2.6) cmake_policy(VERSION 2.6)
endif() endif()
# add_definitions("-DCGAL_CHECK_EXPENSIVE")
find_package(CGAL COMPONENTS Qt4) find_package(CGAL COMPONENTS Qt4)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
@ -23,7 +25,7 @@ find_package(Qt4)
find_package(OpenGL) find_package(OpenGL)
find_package(QGLViewer) find_package(QGLViewer)
if ( NOT (CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND AND if ( NOT (CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND AND
OPENGL_FOUND AND QGLVIEWER_FOUND) ) OPENGL_FOUND AND QGLVIEWER_FOUND) )
MESSAGE(STATUS "NOTICE: This demo requires CGAL, QGLViewer, OpenGL " MESSAGE(STATUS "NOTICE: This demo requires CGAL, QGLViewer, OpenGL "

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

@ -40,7 +40,7 @@ MainWindow::MainWindow (QWidget * parent):CGAL::Qt::DemosMainWindow (parent),
setupUi (this); setupUi (this);
scene.lcc = new LCC; scene.lcc = new LCC;
volumeListDock = new QDockWidget(QString(tr("Volume List")),this); volumeListDock = new QDockWidget(QString(tr("Volume List")),this);
volumeListDock->setAllowedAreas(Qt::RightDockWidgetArea | volumeListDock->setAllowedAreas(Qt::RightDockWidgetArea |
Qt::LeftDockWidgetArea); Qt::LeftDockWidgetArea);
@ -68,7 +68,7 @@ MainWindow::MainWindow (QWidget * parent):CGAL::Qt::DemosMainWindow (parent),
QObject::connect(&dialogmesh, SIGNAL(accepted()), QObject::connect(&dialogmesh, SIGNAL(accepted()),
this, SLOT(onCreateMeshOk())); this, SLOT(onCreateMeshOk()));
this->viewer->setScene(&scene); this->viewer->setScene(&scene);
connect_actions (); connect_actions ();
@ -87,7 +87,7 @@ MainWindow::MainWindow (QWidget * parent):CGAL::Qt::DemosMainWindow (parent),
} }
void MainWindow::connect_actions () void MainWindow::connect_actions ()
{ {
QObject::connect (this->actionQuit, SIGNAL (triggered ()), QObject::connect (this->actionQuit, SIGNAL (triggered ()),
qApp, SLOT (quit ())); qApp, SLOT (quit ()));
@ -134,7 +134,7 @@ void MainWindow::onSceneChanged ()
cells.push_back(2); cells.push_back(2);
cells.push_back(3); cells.push_back(3);
cells.push_back(4); cells.push_back(4);
std::vector<unsigned int> res = scene.lcc->count_cells (cells); std::vector<unsigned int> res = scene.lcc->count_cells (cells);
std::ostringstream os; std::ostringstream os;
@ -225,14 +225,14 @@ void MainWindow::on_actionAddOFF_triggered()
void MainWindow::load_off (const QString & fileName, bool clear) void MainWindow::load_off (const QString & fileName, bool clear)
{ {
QApplication::setOverrideCursor (Qt::WaitCursor); QApplication::setOverrideCursor (Qt::WaitCursor);
if (clear) this->clear_all(); if (clear) this->clear_all();
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO
CGAL::Timer timer; CGAL::Timer timer;
timer.start(); timer.start();
#endif #endif
std::ifstream ifs (qPrintable (fileName)); std::ifstream ifs (qPrintable (fileName));
CGAL::import_from_polyhedron_3_flux < LCC > (*scene.lcc, ifs); CGAL::import_from_polyhedron_3_flux < LCC > (*scene.lcc, ifs);
@ -284,7 +284,7 @@ void MainWindow::load_3DTDS (const QString & fileName, bool clear)
<<" seconds (counting the time to compute denaulay triangulation)." <<" seconds (counting the time to compute denaulay triangulation)."
<<std::endl; <<std::endl;
#endif #endif
init_all_new_volumes(); init_all_new_volumes();
QApplication::restoreOverrideCursor (); QApplication::restoreOverrideCursor ();
@ -354,7 +354,7 @@ void MainWindow::on_actionCreate2Volumes_triggered ()
Dart_handle d2 = make_iso_cuboid(Point_3(nbcube + 1, nbcube, nbcube), 1); Dart_handle d2 = make_iso_cuboid(Point_3(nbcube + 1, nbcube, nbcube), 1);
Dart_handle d3 = make_iso_cuboid(Point_3(nbcube, nbcube + 1, nbcube), 1); Dart_handle d3 = make_iso_cuboid(Point_3(nbcube, nbcube + 1, nbcube), 1);
Dart_handle d4 = make_iso_cuboid(Point_3(nbcube + 1, nbcube + 1, nbcube), 1); Dart_handle d4 = make_iso_cuboid(Point_3(nbcube + 1, nbcube + 1, nbcube), 1);
scene.lcc->sew<3>(d1->beta(1)->beta(1)->beta(2), d2->beta (2)); scene.lcc->sew<3>(d1->beta(1)->beta(1)->beta(2), d2->beta (2));
scene.lcc->sew<3>(d1->beta(2)->beta(1)->beta(1)->beta (2), d3); scene.lcc->sew<3>(d1->beta(2)->beta(1)->beta(1)->beta (2), d3);
@ -378,7 +378,7 @@ void MainWindow::on_actionCreate_mesh_triggered ()
{ {
dialogmesh.show(); dialogmesh.show();
} }
void MainWindow::onCreateMeshOk() void MainWindow::onCreateMeshOk()
{ {
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO
@ -404,7 +404,7 @@ void MainWindow::onCreateMeshOk()
#endif #endif
statusBar ()->showMessage (QString ("mesh created"),DELAY_STATUSMSG); statusBar ()->showMessage (QString ("mesh created"),DELAY_STATUSMSG);
emit (sceneChanged ()); emit (sceneChanged ());
} }
@ -464,7 +464,7 @@ void MainWindow::on_actionCompute_Voronoi_3D_triggered ()
tr ("Data file (*)")); tr ("Data file (*)"));
if (fileName.isEmpty ()) return; if (fileName.isEmpty ()) return;
this->clear_all(); this->clear_all();
#ifdef CGAL_PROFILE_LCC_DEMO #ifdef CGAL_PROFILE_LCC_DEMO
@ -477,7 +477,7 @@ void MainWindow::on_actionCompute_Voronoi_3D_triggered ()
LCC delaunay_lcc; LCC delaunay_lcc;
Dart_handle dh; Dart_handle dh;
std::ifstream ifs (qPrintable (fileName)); std::ifstream ifs (qPrintable (fileName));
T.insert (std::istream_iterator < Point_3 >(ifs), T.insert (std::istream_iterator < Point_3 >(ifs),
std::istream_iterator < Point_3 >() ); std::istream_iterator < Point_3 >() );
@ -494,14 +494,14 @@ void MainWindow::on_actionCompute_Voronoi_3D_triggered ()
{ {
LCC::Dart_range::iterator it1=delaunay_lcc.darts().begin(); LCC::Dart_range::iterator it1=delaunay_lcc.darts().begin();
LCC::Dart_range::iterator it2=scene.lcc->darts().begin(); LCC::Dart_range::iterator it2=scene.lcc->darts().begin();
std::map<LCC::Dart_handle, LCC::Dart_handle> dual; std::map<LCC::Dart_handle, LCC::Dart_handle> dual;
for ( ; it1!=delaunay_lcc.darts().end(); ++it1, ++it2 ) for ( ; it1!=delaunay_lcc.darts().end(); ++it1, ++it2 )
{ {
dual[it1]=it2; dual[it1]=it2;
} }
// We update the geometry of dual_lcc by using the std::map face_to_dart. // We update the geometry of dual_lcc by using the std::map face_to_dart.
for ( std::map<Triangulation::Cell_handle, LCC::Dart_handle> for ( std::map<Triangulation::Cell_handle, LCC::Dart_handle>
::iterator it=vol_to_dart.begin(), itend=vol_to_dart.end(); ::iterator it=vol_to_dart.begin(), itend=vol_to_dart.end();
@ -546,7 +546,7 @@ void MainWindow::on_actionCompute_Voronoi_3D_triggered ()
std::cout<<"Time to compute Voronoi 3D from "<<qPrintable(fileName)<<": " std::cout<<"Time to compute Voronoi 3D from "<<qPrintable(fileName)<<": "
<<timer.time()<<" seconds."<<std::endl; <<timer.time()<<" seconds."<<std::endl;
#endif #endif
init_all_new_volumes(); init_all_new_volumes();
emit (sceneChanged ()); emit (sceneChanged ());
statusBar ()->showMessage (QString ("Voronoi 3D of points in ") + fileName, statusBar ()->showMessage (QString ("Voronoi 3D of points in ") + fileName,
@ -582,7 +582,7 @@ void MainWindow::on_actionDual_3_triggered ()
scene.lcc = duallcc; scene.lcc = duallcc;
this->viewer->setScene(&scene); this->viewer->setScene(&scene);
init_all_new_volumes(); init_all_new_volumes();
statusBar ()->showMessage (QString ("Dual_3 computed"), DELAY_STATUSMSG); statusBar ()->showMessage (QString ("Dual_3 computed"), DELAY_STATUSMSG);
emit (sceneChanged ()); emit (sceneChanged ());
} }
@ -734,7 +734,7 @@ void MainWindow::on_actionTriangulate_all_facets_triggered()
std::cout<<"Time to triangulate all filled faces: " std::cout<<"Time to triangulate all filled faces: "
<<timer.time()<<" seconds."<<std::endl; <<timer.time()<<" seconds."<<std::endl;
#endif #endif
emit (sceneChanged ()); emit (sceneChanged ());
statusBar()->showMessage statusBar()->showMessage
(QString ("Facets of visible and filled volume(s) triangulated"), (QString ("Facets of visible and filled volume(s) triangulated"),
@ -829,7 +829,7 @@ void MainWindow::update_volume_list_add(LCC::Attribute_handle<3>::type ah)
} }
void MainWindow::update_volume_list_remove(int i) void MainWindow::update_volume_list_remove(int i)
{ {
assert(i<volumeList->rowCount()); assert(i<volumeList->rowCount());
volumeList->removeRow(i); volumeList->removeRow(i);
} }
@ -987,10 +987,10 @@ void MainWindow::on_actionExtend_filled_volumes_triggered()
volumeList->disconnect(this); volumeList->disconnect(this);
std::vector<LCC::Attribute_handle<3>::type> tofill; std::vector<LCC::Attribute_handle<3>::type> tofill;
int mark_volume = scene.lcc->get_new_mark(); int mark_volume = scene.lcc->get_new_mark();
bool already_tofill; bool already_tofill;
for (LCC::Attribute_range<3>::type::iterator for (LCC::Attribute_range<3>::type::iterator
it=scene.lcc->attributes<3>().begin(), it=scene.lcc->attributes<3>().begin(),
itend=scene.lcc->attributes<3>().end(); it!=itend; ++it) itend=scene.lcc->attributes<3>().end(); it!=itend; ++it)
@ -1020,7 +1020,7 @@ void MainWindow::on_actionExtend_filled_volumes_triggered()
} }
CGAL_assertion( scene.lcc->is_whole_map_marked(mark_volume) ); CGAL_assertion( scene.lcc->is_whole_map_marked(mark_volume) );
scene.lcc->free_mark(mark_volume); scene.lcc->free_mark(mark_volume);
if ( tofill.size()>0 ) if ( tofill.size()>0 )
{ {
@ -1029,7 +1029,7 @@ void MainWindow::on_actionExtend_filled_volumes_triggered()
{ {
(*it)->info().set_filled(true); (*it)->info().set_filled(true);
} }
update_volume_list_all_ckeckstates(); update_volume_list_all_ckeckstates();
emit(sceneChanged()); emit(sceneChanged());
} }
@ -1042,10 +1042,10 @@ void MainWindow::on_actionExtend_hidden_volumes_triggered()
volumeList->disconnect(this); volumeList->disconnect(this);
std::vector<LCC::Attribute_handle<3>::type> tohide; std::vector<LCC::Attribute_handle<3>::type> tohide;
int mark_volume = scene.lcc->get_new_mark(); int mark_volume = scene.lcc->get_new_mark();
bool already_tohide; bool already_tohide;
for (LCC::Attribute_range<3>::type::iterator for (LCC::Attribute_range<3>::type::iterator
it=scene.lcc->attributes<3>().begin(), it=scene.lcc->attributes<3>().begin(),
itend=scene.lcc->attributes<3>().end(); it!=itend; ++it) itend=scene.lcc->attributes<3>().end(); it!=itend; ++it)
@ -1075,7 +1075,7 @@ void MainWindow::on_actionExtend_hidden_volumes_triggered()
} }
CGAL_assertion( scene.lcc->is_whole_map_marked(mark_volume) ); CGAL_assertion( scene.lcc->is_whole_map_marked(mark_volume) );
scene.lcc->free_mark(mark_volume); scene.lcc->free_mark(mark_volume);
if ( tohide.size()>0 ) if ( tohide.size()>0 )
{ {
@ -1084,7 +1084,7 @@ void MainWindow::on_actionExtend_hidden_volumes_triggered()
{ {
(*it)->info().set_visible(false); (*it)->info().set_visible(false);
} }
update_volume_list_all_ckeckstates(); update_volume_list_all_ckeckstates();
emit(sceneChanged()); emit(sceneChanged());
} }
@ -1095,10 +1095,10 @@ void MainWindow::on_actionExtend_hidden_volumes_triggered()
void MainWindow::on_actionCreate_Menger_Sponge_triggered () void MainWindow::on_actionCreate_Menger_Sponge_triggered ()
{ {
dialogmenger.mengerLevel->disconnect(this); dialogmenger.mengerLevel->disconnect(this);
dialogmenger.mengerLevel->setValue(0); dialogmenger.mengerLevel->setValue(0);
mengerLevel=0; mengerLevel=0;
assert( mengerVolumes.empty() ); assert( mengerVolumes.empty() );
mengerVolumes.push_back(on_actionCreate_cube_triggered()); mengerVolumes.push_back(on_actionCreate_cube_triggered());
update_operations_entries(false); update_operations_entries(false);
@ -1115,7 +1115,7 @@ void MainWindow::onMengerCancel()
{ {
CGAL::remove_cell<LCC,3>(*scene.lcc, *it); CGAL::remove_cell<LCC,3>(*scene.lcc, *it);
} }
recreate_whole_volume_list(); recreate_whole_volume_list();
mengerVolumes.clear(); mengerVolumes.clear();
emit(sceneChanged()); emit(sceneChanged());
@ -1228,14 +1228,14 @@ void MainWindow::split_edge_in_three(Dart_handle dh)
{ {
LCC::Point p1 = LCC::point(dh); LCC::Point p1 = LCC::point(dh);
LCC::Point p2 = LCC::point(dh->other_extremity()); LCC::Point p2 = LCC::point(dh->other_extremity());
LCC::Vector v1 = LCC::Traits::Construct_vector() (p1,p2); LCC::Vector v1 = LCC::Traits::Construct_vector() (p1,p2);
LCC::Vector v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3); LCC::Vector v2 = LCC::Traits::Construct_scaled_vector() (v1,1.0/3);
LCC::Vector v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3); LCC::Vector v3 = LCC::Traits::Construct_scaled_vector() (v1,2.0/3);
LCC::Point p3 = LCC::Traits::Construct_translated_point() (p1,v2); LCC::Point p3 = LCC::Traits::Construct_translated_point() (p1,v2);
LCC::Point p4 = LCC::Traits::Construct_translated_point() (p1,v3); LCC::Point p4 = LCC::Traits::Construct_translated_point() (p1,v3);
(scene.lcc)->insert_point_in_cell<1>(dh,p4); (scene.lcc)->insert_point_in_cell<1>(dh,p4);
(scene.lcc)->insert_point_in_cell<1>(dh,p3); (scene.lcc)->insert_point_in_cell<1>(dh,p3);
} }
@ -1251,12 +1251,12 @@ void MainWindow::split_face_in_nine(Dart_handle dh)
{ {
Dart_handle d2 = dh->beta(1)->beta(1)->beta(1)->beta(1) Dart_handle d2 = dh->beta(1)->beta(1)->beta(1)->beta(1)
->beta(1)->beta(1)->beta(1); ->beta(1)->beta(1)->beta(1);
Dart_handle e2= CGAL::insert_cell_1_in_cell_2(*(scene.lcc), Dart_handle e2= CGAL::insert_cell_1_in_cell_2(*(scene.lcc),
dh->beta(1)->beta(1),d2); dh->beta(1)->beta(1),d2);
Dart_handle e1= CGAL::insert_cell_1_in_cell_2(*(scene.lcc), Dart_handle e1= CGAL::insert_cell_1_in_cell_2(*(scene.lcc),
dh->beta(1),d2->beta(1)); dh->beta(1),d2->beta(1));
split_edge_in_three(e1); split_edge_in_three(e1);
split_edge_in_three(e2); split_edge_in_three(e2);
@ -1289,10 +1289,10 @@ void MainWindow::split_vol_in_three(Dart_handle dh, bool removecenter)
Dart_handle f1= Dart_handle f1=
insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end()); insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end());
Dart_handle f2= Dart_handle f2=
insert_cell_2_in_cell_3(*(scene.lcc),edges2.begin(),edges2.end()); insert_cell_2_in_cell_3(*(scene.lcc),edges2.begin(),edges2.end());
f1->attribute<3>()->info().color()= f1->attribute<3>()->info().color()=
(CGAL::Color(myrandom.get_int(0,256), (CGAL::Color(myrandom.get_int(0,256),
myrandom.get_int(0,256), myrandom.get_int(0,256),
@ -1303,7 +1303,7 @@ void MainWindow::split_vol_in_three(Dart_handle dh, bool removecenter)
myrandom.get_int(0,256))); myrandom.get_int(0,256)));
update_volume_list_add(dh->attribute<3>()); update_volume_list_add(dh->attribute<3>());
if ( removecenter ) if ( removecenter )
CGAL::remove_cell<LCC,3>(*scene.lcc,f1); CGAL::remove_cell<LCC,3>(*scene.lcc,f1);
else else
@ -1338,10 +1338,10 @@ void MainWindow::split_vol_in_nine(Dart_handle dh, bool removecenter)
Dart_handle f1= Dart_handle f1=
insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end()); insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end());
Dart_handle f2= Dart_handle f2=
insert_cell_2_in_cell_3(*(scene.lcc),edges2.begin(),edges2.end()); insert_cell_2_in_cell_3(*(scene.lcc),edges2.begin(),edges2.end());
f1->attribute<3>()->info().color()= f1->attribute<3>()->info().color()=
(CGAL::Color(myrandom.get_int(0,256), (CGAL::Color(myrandom.get_int(0,256),
myrandom.get_int(0,256), myrandom.get_int(0,256),
@ -1350,7 +1350,7 @@ void MainWindow::split_vol_in_nine(Dart_handle dh, bool removecenter)
(CGAL::Color(myrandom.get_int(0,256), (CGAL::Color(myrandom.get_int(0,256),
myrandom.get_int(0,256), myrandom.get_int(0,256),
myrandom.get_int(0,256))); myrandom.get_int(0,256)));
update_volume_list_add(dh->attribute<3>()); update_volume_list_add(dh->attribute<3>());
if ( !removecenter) if ( !removecenter)
update_volume_list_add(f1->attribute<3>()); update_volume_list_add(f1->attribute<3>());
@ -1359,7 +1359,7 @@ void MainWindow::split_vol_in_nine(Dart_handle dh, bool removecenter)
split_face_in_three(f2); split_face_in_three(f2);
split_vol_in_three(dh,removecenter); split_vol_in_three(dh,removecenter);
mengerVolumes.push_back(f2->beta(2)->beta(1)); mengerVolumes.push_back(f2->beta(2)->beta(1));
split_vol_in_three(f2->beta(2)->beta(1),removecenter); split_vol_in_three(f2->beta(2)->beta(1),removecenter);
@ -1392,7 +1392,7 @@ void MainWindow::split_vol_in_twentyseven(Dart_handle dh)
curd=curd->beta(1)->beta(2)->beta(1); curd=curd->beta(1)->beta(2)->beta(1);
} }
assert( curd==dh->beta(1)->beta(1)->beta(2)->beta(1)->beta(1)->beta(2) ); assert( curd==dh->beta(1)->beta(1)->beta(2)->beta(1)->beta(1)->beta(2) );
Dart_handle f1= Dart_handle f1=
insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end()); insert_cell_2_in_cell_3(*(scene.lcc),edges1.begin(),edges1.end());
@ -1408,9 +1408,9 @@ void MainWindow::split_vol_in_twentyseven(Dart_handle dh)
myrandom.get_int(0,256), myrandom.get_int(0,256),
myrandom.get_int(0,256))); myrandom.get_int(0,256)));
update_volume_list_add(dh->attribute<3>()); update_volume_list_add(dh->attribute<3>());
update_volume_list_add(f1->attribute<3>()); update_volume_list_add(f1->attribute<3>());
mengerVolumes.push_back(f1->beta(2)); mengerVolumes.push_back(f1->beta(2));
mengerVolumes.push_back(f2->beta(2)); mengerVolumes.push_back(f2->beta(2));
@ -1427,7 +1427,7 @@ void MainWindow::process_full_slice(Dart_handle init,
int markVols) int markVols)
{ {
Dart_handle d[12]; Dart_handle d[12];
d[0]=init->beta(1)->beta(2); d[0]=init->beta(1)->beta(2);
d[1]=d[0]->beta(3)->beta(1)->beta(2)->beta(1); d[1]=d[0]->beta(3)->beta(1)->beta(2)->beta(1);
d[2]=d[1]->beta(1)->beta(2)->beta(1); d[2]=d[1]->beta(1)->beta(2)->beta(1);
d[3]=d[2]->beta(3)->beta(1)->beta(2)->beta(1); d[3]=d[2]->beta(3)->beta(1)->beta(2)->beta(1);
@ -1548,7 +1548,7 @@ void MainWindow::onMengerDec()
{ {
if ( (scene.lcc)->is_marked(*itvol, markVols) ) if ( (scene.lcc)->is_marked(*itvol, markVols) )
CGAL::unmark_cell<LCC,3>(*(scene.lcc), *itvol, markVols); CGAL::unmark_cell<LCC,3>(*(scene.lcc), *itvol, markVols);
for (LCC::Dart_of_cell_range<3>::iterator for (LCC::Dart_of_cell_range<3>::iterator
it=scene.lcc->darts_of_cell<3>(*itvol).begin(), it=scene.lcc->darts_of_cell<3>(*itvol).begin(),
itend=scene.lcc->darts_of_cell<3>(*itvol).end(); itend=scene.lcc->darts_of_cell<3>(*itvol).end();
@ -1558,7 +1558,7 @@ void MainWindow::onMengerDec()
edges.push_back(it); edges.push_back(it);
} }
} }
assert( (scene.lcc)->is_whole_map_unmarked(markVols) ); assert( (scene.lcc)->is_whole_map_unmarked(markVols) );
for(unsigned int i = 0; i < edges.size(); i++) for(unsigned int i = 0; i < edges.size(); i++)
@ -1568,7 +1568,7 @@ void MainWindow::onMengerDec()
CGAL::remove_cell<LCC,1>(*scene.lcc, edges[i]); CGAL::remove_cell<LCC,1>(*scene.lcc, edges[i]);
} }
edges.clear(); edges.clear();
// Lastly we remove vertices. // Lastly we remove vertices.
for ( std::vector<Dart_handle>::iterator itvol=mengerVolumes.begin(); for ( std::vector<Dart_handle>::iterator itvol=mengerVolumes.begin();
itvol!=mengerVolumes.end(); ++itvol) itvol!=mengerVolumes.end(); ++itvol)
@ -1587,8 +1587,8 @@ void MainWindow::onMengerDec()
} }
} }
} }
(scene.lcc)->negate_mark(markVols); (scene.lcc)->negate_mark(markVols);
for ( std::vector<Dart_handle>::iterator itvol=mengerVolumes.begin(); for ( std::vector<Dart_handle>::iterator itvol=mengerVolumes.begin();
itvol!=mengerVolumes.end(); ++itvol) itvol!=mengerVolumes.end(); ++itvol)
{ {
@ -1602,8 +1602,8 @@ void MainWindow::onMengerDec()
CGAL::unmark_cell<LCC, 0>(*scene.lcc, it, markVertices); CGAL::unmark_cell<LCC, 0>(*scene.lcc, it, markVertices);
} }
} }
(scene.lcc)->negate_mark(markVols); (scene.lcc)->negate_mark(markVols);
assert( (scene.lcc)->is_whole_map_unmarked(markVols) ); assert( (scene.lcc)->is_whole_map_unmarked(markVols) );
assert( (scene.lcc)->is_whole_map_unmarked(markVertices) ); assert( (scene.lcc)->is_whole_map_unmarked(markVertices) );
@ -1612,7 +1612,7 @@ void MainWindow::onMengerDec()
CGAL::remove_cell<LCC,0>(*scene.lcc, vertices[i]); CGAL::remove_cell<LCC,0>(*scene.lcc, vertices[i]);
} }
vertices.clear(); vertices.clear();
(scene.lcc)->free_mark(markVols); (scene.lcc)->free_mark(markVols);
(scene.lcc)->free_mark(markVertices); (scene.lcc)->free_mark(markVertices);