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

improve user messages

This commit is contained in:
iyaz 2013-08-25 02:34:45 +03:00
parent 261e22be19
commit 2a5e37c048
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Polyhedron/demo/Polyhedron/Polyhedron_demo_hole_filling_plugin.cpp
View File

@ -450,20 +450,21 @@ void Polyhedron_demo_hole_filling_plugin::on_Fill_selected_holes_button() {
} }
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
// fill selected holes // fill selected holes
bool any_filled = false;
int counter = 0; int counter = 0;
int filled_counter = 0;
for(Scene_polylines_collection::Selected_holes_set::iterator it = polyline_item->selected_holes.begin(); for(Scene_polylines_collection::Selected_holes_set::iterator it = polyline_item->selected_holes.begin();
it != polyline_item->selected_holes.end(); ++it, ++counter) { it != polyline_item->selected_holes.end(); ++it, ++counter) {
print_message(tr("Hole %1:").arg(counter)); print_message(tr("Hole %1:").arg(counter));
any_filled |= fill(*(polyline_item->poly_item->polyhedron()), (*it)->halfedge); if( fill(*(polyline_item->poly_item->polyhedron()), (*it)->halfedge) ) { ++filled_counter;}
} }
if(any_filled) { if(filled_counter > 0) {
scene->itemChanged(polyline_item->poly_item); scene->itemChanged(polyline_item->poly_item);
last_active_item = polyline_item->poly_item; last_active_item = polyline_item->poly_item;
accept_reject_toggle(true); accept_reject_toggle(true);
} }
print_message(tr("%1 of %2 holes are filled!").arg(filled_counter).arg(counter));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
}; };
// fills all holes and removes associated Scene_polylines_collection if any // fills all holes and removes associated Scene_polylines_collection if any
@ -500,18 +501,19 @@ void Polyhedron_demo_hole_filling_plugin::on_Fill_all_holes_button() {
} }
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
bool any_filled = false;
int counter = 0; int counter = 0;
int filled_counter = 0;
for(std::vector<Halfedge_iterator>::iterator it = border_reps.begin(); it != border_reps.end(); ++it, ++counter) { for(std::vector<Halfedge_iterator>::iterator it = border_reps.begin(); it != border_reps.end(); ++it, ++counter) {
print_message(tr("Hole %1:").arg(counter)); print_message(tr("Hole %1:").arg(counter));
any_filled |= fill(poly, *it); if( fill(poly, *it) ) { ++filled_counter; }
} }
if(any_filled) { if(filled_counter > 0) {
scene->itemChanged(poly_item); scene->itemChanged(poly_item);
last_active_item = poly_item; last_active_item = poly_item;
accept_reject_toggle(true); accept_reject_toggle(true);
} }
print_message(tr("%1 of %2 holes are filled!").arg(filled_counter).arg(counter));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
} }
// Simply create polyline items and put them into scene - nothing related with other parts of the plugin // Simply create polyline items and put them into scene - nothing related with other parts of the plugin
@ -593,7 +595,7 @@ bool Polyhedron_demo_hole_filling_plugin::fill
if(!success) { print_message("Error: fairing is not successful, only triangulation and refinement are applied!"); } if(!success) { print_message("Error: fairing is not successful, only triangulation and refinement are applied!"); }
} }
print_message(QString("Filled in %1 sec.").arg(timer.time())); print_message(QString("Took %1 sec.").arg(timer.time()));
if(patch.empty()) { if(patch.empty()) {
print_message(tr("Warning: generating patch is not successful! %1") print_message(tr("Warning: generating patch is not successful! %1")