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

Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno 

Graphics_view : Fix QTime warnings
This commit is contained in:
Laurent Rineau 2020-01-15 17:19:22 +01:00
parent 4a9eea9778 3b6888e2a9
commit 25bcb34608
35 changed files with 84 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
View File

@ -195,7 +195,6 @@ void
DemosMainWindow::setUseAntialiasing(bool checked) DemosMainWindow::setUseAntialiasing(bool checked)
{ {
view->setRenderHint(QPainter::Antialiasing, checked); view->setRenderHint(QPainter::Antialiasing, checked);
view->setRenderHint(QPainter::HighQualityAntialiasing, checked);
statusBar()->showMessage(tr("Antialiasing %1activated").arg(checked?"":"de-"), statusBar()->showMessage(tr("Antialiasing %1activated").arg(checked?"":"de-"),
1000); 1000);

3
GraphicsView/include/CGAL/Qt/manipulatedFrame.h
View File

@ -21,6 +21,7 @@
#include <QDateTime> #include <QDateTime>
#include <QString> #include <QString>
#include <QTimer> #include <QTimer>
#include <QElapsedTimer>
namespace CGAL{ namespace CGAL{
namespace qglviewer { namespace qglviewer {
@ -348,7 +349,7 @@ private:
qreal zoomSensitivity_; qreal zoomSensitivity_;
// Mouse speed and spinning // Mouse speed and spinning
QTime last_move_time; QElapsedTimer last_move_time;
qreal mouseSpeed_; qreal mouseSpeed_;
int delay_; int delay_;
bool isSpinning_; bool isSpinning_;

4
GraphicsView/include/CGAL/Qt/qglviewer.h
View File

@ -28,7 +28,7 @@
#include <QOpenGLBuffer> #include <QOpenGLBuffer>
#include <QMap> #include <QMap>
#include <QVector> #include <QVector>
#include <QTime> #include <QElapsedTimer>
#include <QTimer> #include <QTimer>
#include <QGLContext> #include <QGLContext>
#include <QOpenGLWidget> #include <QOpenGLWidget>
@ -1038,7 +1038,7 @@ protected:
int animationTimerId_; int animationTimerId_;
// F P S d i s p l a y // F P S d i s p l a y
QTime fpsTime_; QElapsedTimer fpsTime_;
unsigned int fpsCounter_; unsigned int fpsCounter_;
QString fpsString_; QString fpsString_;
qreal f_p_s_; qreal f_p_s_;

3
GraphicsView/include/CGAL/Qt/qglviewer_impl.h
View File

@ -46,6 +46,7 @@
#include <QColorDialog> #include <QColorDialog>
#include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <QFileDialog> #include <QFileDialog>
#include <QElapsedTimer>
namespace CGAL{ namespace CGAL{
// Static private variable // Static private variable
@ -2244,7 +2245,7 @@ void CGAL::QGLViewer::keyPressEvent(QKeyEvent *e) {
unsigned int index = pathIndex_[::Qt::Key(key)]; unsigned int index = pathIndex_[::Qt::Key(key)];
// not safe, but try to double press on two viewers at the same time ! // not safe, but try to double press on two viewers at the same time !
static QTime doublePress; static QElapsedTimer doublePress;
if (modifiers == playPathKeyboardModifiers()) { if (modifiers == playPathKeyboardModifiers()) {
int elapsed = doublePress.restart(); int elapsed = doublePress.restart();

10
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.h
View File

@ -106,9 +106,8 @@ public Q_SLOTS:
void insert_mp() { void insert_mp() {
insert_point(moving_point); insert_point(moving_point);
QString str; ui->viewer->displayMessage(QString("Added point (%1, %2, %3)").arg(
ui->viewer->displayMessage(str.sprintf("Added point (%f, %f, %f)", moving_point.x()).arg(moving_point.y()).arg(moving_point.z()));
moving_point.x(),moving_point.y(),moving_point.z()));
changed(); changed();
} }
@ -117,9 +116,8 @@ public Q_SLOTS:
Point pt = *rp+Vector(0.5,0.5,0.5); Point pt = *rp+Vector(0.5,0.5,0.5);
rp++; rp++;
insert_point(Point(pt.x(),pt.y(),(in_plane? 0.0:pt.z()))); insert_point(Point(pt.x(),pt.y(),(in_plane? 0.0:pt.z())));
QString str; ui->viewer->displayMessage(QString("Added point (%1, %2, %3)").arg(
ui->viewer->displayMessage(str.sprintf("Added point (%f, %f, %f)", pt.x()).arg(pt.y()).arg((in_plane? 0.0:pt.z())));
pt.x(),pt.y(),(in_plane? 0.0:pt.z())));
changed(); changed();
} }
void insert_point(Point p) { void insert_point(Point p) {

6
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -38,7 +38,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <stdexcept> #include <stdexcept>
#include <fstream> #include <fstream>
#include <QTime> #include <QElapsedTimer>
#include <QWidgetAction> #include <QWidgetAction>
#include <QJsonArray> #include <QJsonArray>
#include <QSequentialIterable> #include <QSequentialIterable>
@ -1477,11 +1477,11 @@ void MainWindow::showSceneContextMenu(int selectedItemIndex,
this, SLOT(reloadItem())); this, SLOT(reloadItem()));
} }
QAction* saveas = menu->addAction(tr("&Save as...")); QAction* saveas = menu->addAction(tr("&Save as..."));
saveas->setData(qVariantFromValue((void*)item)); saveas->setData(QVariant::fromValue((void*)item));
connect(saveas, SIGNAL(triggered()), connect(saveas, SIGNAL(triggered()),
this, SLOT(on_actionSaveAs_triggered())); this, SLOT(on_actionSaveAs_triggered()));
QAction* showobject = menu->addAction(tr("&Zoom to this Object")); QAction* showobject = menu->addAction(tr("&Zoom to this Object"));
showobject->setData(qVariantFromValue((void*)item)); showobject->setData(QVariant::fromValue((void*)item));
connect(showobject, SIGNAL(triggered()), connect(showobject, SIGNAL(triggered()),
this, SLOT(viewerShowObject())); this, SLOT(viewerShowObject()));

4
Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp
View File

@ -27,7 +27,7 @@
#include <CGAL/bounding_box.h> #include <CGAL/bounding_box.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
@ -1241,7 +1241,7 @@ void Polyhedron_demo_cut_plugin::computeIntersection()
Simple_kernel::Plane_3 plane(n[0], n[1], n[2], - n * pos); Simple_kernel::Plane_3 plane(n[0], n[1], n[2], - n * pos);
//std::cerr << plane << std::endl; //std::cerr << plane << std::endl;
edges_item->edges.clear(); edges_item->edges.clear();
QTime time; QElapsedTimer time;
time.start(); time.start();
bool does_intersect = false; bool does_intersect = false;
for(Facet_sm_trees::iterator it = facet_sm_trees.begin(); it != facet_sm_trees.end(); ++it) for(Facet_sm_trees::iterator it = facet_sm_trees.begin(); it != facet_sm_trees.end(); ++it)

10
Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp
View File

@ -8,7 +8,7 @@
#include <QMenu> #include <QMenu>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
#include <QTime> #include <QElapsedTimer>
#include <QMessageBox> #include <QMessageBox>
using namespace CGAL::Three; using namespace CGAL::Three;
class Polyhedron_demo_nef_plugin : class Polyhedron_demo_nef_plugin :
@ -115,7 +115,7 @@ Polyhedron_demo_nef_plugin::on_actionToNef_triggered()
} }
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cerr << "Convert facegraph to nef polyhedron..."; std::cerr << "Convert facegraph to nef polyhedron...";
@ -146,7 +146,7 @@ Polyhedron_demo_nef_plugin::on_actionConvexDecomposition_triggered()
: qobject_cast<Scene_nef_polyhedron_item*>(scene->item(index)); : qobject_cast<Scene_nef_polyhedron_item*>(scene->item(index));
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
if(item) { if(item) {
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cerr << "Convex decomposition..."; std::cerr << "Convex decomposition...";
@ -188,7 +188,7 @@ Polyhedron_demo_nef_plugin::on_actionToPoly_triggered()
if(item) if(item)
{ {
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cerr << "Convert nef polyhedron to facegraph..."; std::cerr << "Convert nef polyhedron to facegraph...";
@ -277,7 +277,7 @@ void Polyhedron_demo_nef_plugin::boolean_operation(const Boolean_operation opera
// perform Boolean operation // perform Boolean operation
std::cout << "Boolean operation..."; std::cout << "Boolean operation...";
QTime time; QElapsedTimer time;
time.start(); time.start();
switch(operation) switch(operation)
{ {

4
Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp
View File

@ -1,4 +1,4 @@
#include <QTime> #include <QElapsedTimer>
#include <QApplication> #include <QApplication>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
@ -74,7 +74,7 @@ void Polyhedron_demo_convex_hull_plugin::on_actionConvexHull_triggered()
// wait cursor // wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Convex hull..."; std::cout << "Convex hull...";

6
Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp
View File

@ -35,7 +35,7 @@
#include <CGAL/boost/graph/Euler_operations.h> #include <CGAL/boost/graph/Euler_operations.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
@ -264,14 +264,14 @@ private:
typedef CGAL::Delaunay_mesh_size_criteria_2<CDT> Criteria; typedef CGAL::Delaunay_mesh_size_criteria_2<CDT> Criteria;
typedef CGAL::Delaunay_mesher_2<CDT, Criteria> Mesher; typedef CGAL::Delaunay_mesher_2<CDT, Criteria> Mesher;
QTime time; // global timer QElapsedTimer time; // global timer
time.start(); time.start();
std::cout << " Building Constrained_Delaunay_triangulation_2..." std::cout << " Building Constrained_Delaunay_triangulation_2..."
<< std::flush; << std::flush;
CDT cdt; CDT cdt;
QTime ltime; //local timer QElapsedTimer ltime; //local timer
ltime.start(); ltime.start();
double constant_coordinate = double constant_coordinate =
polylines_items.back()->polylines.back().back()[constant_coordinate_index]; polylines_items.back()->polylines.back().back()[constant_coordinate_index];

6
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp
View File

@ -708,9 +708,9 @@ private:
Volume_plane<y_tag> *y_item = new Volume_plane<y_tag>(img->image()->tx,img->image()->ty, img->image()->tz); Volume_plane<y_tag> *y_item = new Volume_plane<y_tag>(img->image()->tx,img->image()->ty, img->image()->tz);
Volume_plane<z_tag> *z_item = new Volume_plane<z_tag>(img->image()->tx,img->image()->ty, img->image()->tz); Volume_plane<z_tag> *z_item = new Volume_plane<z_tag>(img->image()->tx,img->image()->ty, img->image()->tz);
x_item->setProperty("img",qVariantFromValue((void*)seg_img)); x_item->setProperty("img",QVariant::fromValue((void*)seg_img));
y_item->setProperty("img",qVariantFromValue((void*)seg_img)); y_item->setProperty("img",QVariant::fromValue((void*)seg_img));
z_item->setProperty("img",qVariantFromValue((void*)seg_img)); z_item->setProperty("img",QVariant::fromValue((void*)seg_img));
x_item->setColor(QColor("red")); x_item->setColor(QColor("red"));
y_item->setColor(QColor("green")); y_item->setColor(QColor("green"));

4
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_thread.cpp
View File

@ -16,7 +16,7 @@
#include "config.h" #include "config.h"
#include <QTime> #include <QElapsedTimer>
#include <QApplication> #include <QApplication>
#include "Meshing_thread.h" #include "Meshing_thread.h"
@ -52,7 +52,7 @@ void
Meshing_thread:: Meshing_thread::
run() run()
{ {
QTime timer; QElapsedTimer timer;
timer.start(); timer.start();
CGAL::Three::Three::CursorScopeGuard guard(Qt::BusyCursor); CGAL::Three::Three::CursorScopeGuard guard(Qt::BusyCursor);
f_->launch(); f_->launch();

4
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimizer_thread.cpp
View File

@ -16,7 +16,7 @@
#include "config_mesh_3.h" #include "config_mesh_3.h"
#include <QTime> #include <QElapsedTimer>
#include <QTimer> #include <QTimer>
#include "Optimizer_thread.h" #include "Optimizer_thread.h"
#include "Scene_c3t3_item.h" #include "Scene_c3t3_item.h"
@ -47,7 +47,7 @@ void
Optimizer_thread:: Optimizer_thread::
run() run()
{ {
QTime timer; QElapsedTimer timer;
timer.start(); timer.start();
//SEGFAULT //SEGFAULT
rc_ = f_->launch(); rc_ = f_->launch();

2
Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp
View File

@ -14,7 +14,7 @@
#include <QMenu> #include <QMenu>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
#include <QTime> #include <QElapsedTimer>
#include <QMessageBox> #include <QMessageBox>
typedef Scene_surface_mesh_item Scene_facegraph_item; typedef Scene_surface_mesh_item Scene_facegraph_item;

2
Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp
View File

@ -21,7 +21,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <QDialog> #include <QDialog>
#include <QApplication> #include <QApplication>
#include <QTime> #include <QElapsedTimer>
#include <QMessageBox> #include <QMessageBox>
#include "ui_Transformation_widget.h" #include "ui_Transformation_widget.h"

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp
View File

@ -14,7 +14,7 @@ typedef Scene_surface_mesh_item Scene_facegraph_item;
#include <CGAL/Polygon_mesh_processing/fair.h> #include <CGAL/Polygon_mesh_processing/fair.h>
#include <CGAL/Polygon_mesh_processing/refine.h> #include <CGAL/Polygon_mesh_processing/refine.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp
View File

@ -18,7 +18,7 @@
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>

8
Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp
View File

@ -23,7 +23,7 @@
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include <CGAL/property_map.h> #include <CGAL/property_map.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
@ -341,7 +341,7 @@ public Q_SLOTS:
// wait cursor // wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
typedef boost::graph_traits<FaceGraph>::edge_descriptor edge_descriptor; typedef boost::graph_traits<FaceGraph>::edge_descriptor edge_descriptor;
@ -699,7 +699,7 @@ public Q_SLOTS:
detect_and_split_duplicates(selection, edges_to_protect, target_length); detect_and_split_duplicates(selection, edges_to_protect, target_length);
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
QTime time; QElapsedTimer time;
time.start(); time.start();
tbb::parallel_for( tbb::parallel_for(
@ -715,7 +715,7 @@ public Q_SLOTS:
target_length, nb_iter, protect, smooth_features); target_length, nb_iter, protect, smooth_features);
for(Scene_facegraph_item* poly_item : selection) for(Scene_facegraph_item* poly_item : selection)
{ {
QTime time; QElapsedTimer time;
time.start(); time.start();
remesher(poly_item, edges_to_protect[poly_item->polyhedron()]); remesher(poly_item, edges_to_protect[poly_item->polyhedron()]);

20
Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp
View File

@ -14,7 +14,7 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QInputDialog> #include <QInputDialog>
#include <QTime> #include <QElapsedTimer>
#include <QMessageBox> #include <QMessageBox>
#include <Eigen/Sparse> #include <Eigen/Sparse>
@ -360,7 +360,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSegment()
if (num_vertices(item->skeleton_curve)==0 ) { QApplication::restoreOverrideCursor(); return;} if (num_vertices(item->skeleton_curve)==0 ) { QApplication::restoreOverrideCursor(); return;}
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
// init the polyhedron simplex indices // init the polyhedron simplex indices
@ -453,7 +453,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConvert_to_me
if ( !is_mesh_valid(pMesh) ) return; if ( !is_mesh_valid(pMesh) ) return;
QTime time; QElapsedTimer time;
time.start(); time.start();
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -491,7 +491,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionContract()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Contract...\n"; std::cout << "Contract...\n";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -516,7 +516,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionCollapse()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Collapse...\n"; std::cout << "Collapse...\n";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -542,7 +542,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSplit()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Split...\n"; std::cout << "Split...\n";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -567,7 +567,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionDegeneracy()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Detect degeneracy...\n"; std::cout << "Detect degeneracy...\n";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -618,7 +618,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionRun()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -741,7 +741,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSkeletonize()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -802,7 +802,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConverge()
return; return;
} }
QTime time; QElapsedTimer time;
time.start(); time.start();
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);

6
Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp
View File

@ -16,7 +16,7 @@
#include <CGAL/bounding_box.h> #include <CGAL/bounding_box.h>
#include <CGAL/Polygon_mesh_slicer.h> #include <CGAL/Polygon_mesh_slicer.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
@ -287,7 +287,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::on_Generate_button_clicked()
if(!new_polyline_item_for_polylines) if(!new_polyline_item_for_polylines)
{ {
Scene_polylines_item* new_polylines_item = new Scene_polylines_item(); Scene_polylines_item* new_polylines_item = new Scene_polylines_item();
QTime time; time.start(); QElapsedTimer time; time.start();
// call algorithm and fill polylines in polylines_item // call algorithm and fill polylines in polylines_item
intersection_of_plane_Polyhedra_3_using_AABB_wrapper(*smesh, planes, plane_positions, new_polylines_item->polylines); intersection_of_plane_Polyhedra_3_using_AABB_wrapper(*smesh, planes, plane_positions, new_polylines_item->polylines);
// set names etc and print timing // set names etc and print timing
@ -301,7 +301,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::on_Generate_button_clicked()
scene->addItem(new_polylines_item); scene->addItem(new_polylines_item);
} }
else { else {
QTime time; time.start(); QElapsedTimer time; time.start();
std::list<std::vector<Epic_kernel::Point_3> > polylines; std::list<std::vector<Epic_kernel::Point_3> > polylines;
// call algorithm and fill polylines in polylines_item // call algorithm and fill polylines in polylines_item
intersection_of_plane_Polyhedra_3_using_AABB_wrapper(*smesh, planes, plane_positions, polylines); intersection_of_plane_Polyhedra_3_using_AABB_wrapper(*smesh, planes, plane_positions, polylines);

4
Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_plugin.cpp
View File

@ -16,7 +16,7 @@
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <CGAL/property_map.h> #include <CGAL/property_map.h>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
@ -94,7 +94,7 @@ public Q_SLOTS:
// wait cursor // wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Perturbation..." << std::endl; std::cout << "Perturbation..." << std::endl;

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.cpp
View File

@ -17,7 +17,7 @@
#include "ui_Smoothing_plugin.h" #include "ui_Smoothing_plugin.h"
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>

8
Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp
View File

@ -15,7 +15,7 @@
#include <QMenu> #include <QMenu>
#include <QMainWindow> #include <QMainWindow>
#include <QApplication> #include <QApplication>
#include <QTime> #include <QElapsedTimer>
#include <QMessageBox> #include <QMessageBox>
typedef Scene_surface_mesh_item Scene_face_graph_item; typedef Scene_surface_mesh_item Scene_face_graph_item;
@ -130,7 +130,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfaces()
Scene_polylines_item* new_item = new Scene_polylines_item(); Scene_polylines_item* new_item = new Scene_polylines_item();
// perform Boolean operation // perform Boolean operation
QTime time; QElapsedTimer time;
time.start(); time.start();
try{ try{
@ -193,7 +193,7 @@ void Polyhedron_demo_intersection_plugin::intersectionPolylines()
Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item(); Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item();
Scene_polylines_item* new_pol_item = new Scene_polylines_item(); Scene_polylines_item* new_pol_item = new Scene_polylines_item();
// perform Boolean operation // perform Boolean operation
QTime time; QElapsedTimer time;
time.start(); time.start();
std::vector<Polyline_3> polyA, polyB; std::vector<Polyline_3> polyA, polyB;
Q_FOREACH(const Polyline_3& poly, itemA->polylines) Q_FOREACH(const Polyline_3& poly, itemA->polylines)
@ -289,7 +289,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfacePolyline()
Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item(); Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item();
Scene_polylines_item* new_pol_item = new Scene_polylines_item(); Scene_polylines_item* new_pol_item = new Scene_polylines_item();
// perform Boolean operation // perform Boolean operation
QTime time; QElapsedTimer time;
time.start(); time.start();
Scene_face_graph_item::Face_graph tm = *itemA->face_graph(); Scene_face_graph_item::Face_graph tm = *itemA->face_graph();
std::vector<face_descriptor> Afaces; std::vector<face_descriptor> Afaces;

2
Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp
View File

@ -1,4 +1,4 @@
#include <QTime> #include <QElapsedTimer>
#include <QApplication> #include <QApplication>
#include <QAction> #include <QAction>
#include <QList> #include <QList>

10
Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp
View File

@ -1,4 +1,4 @@
#include <QTime> #include <QElapsedTimer>
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QAction> #include <QAction>
@ -81,7 +81,7 @@ template<class FaceGraphItem>
void Polyhedron_demo_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, int nb_steps) void Polyhedron_demo_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, int nb_steps)
{ {
typename FaceGraphItem::Face_graph* graph = item->face_graph(); typename FaceGraphItem::Face_graph* graph = item->face_graph();
QTime time; QElapsedTimer time;
time.start(); time.start();
CGAL::Three::Three::information("Loop subdivision..."); CGAL::Three::Three::information("Loop subdivision...");
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -113,7 +113,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_catmullclark(FaceGraphIte
{ {
typename FaceGraphItem::Face_graph* graph = item->face_graph(); typename FaceGraphItem::Face_graph* graph = item->face_graph();
if(!graph) return; if(!graph) return;
QTime time; QElapsedTimer time;
time.start(); time.start();
CGAL::Three::Three::information("Catmull-Clark subdivision..."); CGAL::Three::Three::information("Catmull-Clark subdivision...");
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -143,7 +143,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_sqrt3(FaceGraphItem* item
{ {
typename FaceGraphItem::Face_graph* graph = item->face_graph(); typename FaceGraphItem::Face_graph* graph = item->face_graph();
if(!graph) return; if(!graph) return;
QTime time; QElapsedTimer time;
time.start(); time.start();
CGAL::Three::Three::information("Sqrt-3 subdivision..."); CGAL::Three::Three::information("Sqrt-3 subdivision...");
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
@ -175,7 +175,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_doosabin(FaceGraphItem* i
{ {
typename FaceGraphItem::Face_graph* graph = item->face_graph(); typename FaceGraphItem::Face_graph* graph = item->face_graph();
if(!graph) return; if(!graph) return;
QTime time; QElapsedTimer time;
time.start(); time.start();
CGAL::Three::Three::information("Doo-Sabin subdivision..."); CGAL::Three::Three::information("Doo-Sabin subdivision...");
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);

4
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_plane_detection_plugin.cpp
View File

@ -9,7 +9,7 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QInputDialog> #include <QInputDialog>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QObject> #include <QObject>
@ -196,7 +196,7 @@ void Polyhedron_demo_mesh_plane_detection_plugin::on_actionPlaneDetection_trigge
if(dialog.exec() == QDialog::Rejected) if(dialog.exec() == QDialog::Rejected)
return; return;
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cerr << "Detecting planes... "; std::cerr << "Detecting planes... ";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);

6
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp
View File

@ -10,7 +10,7 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QInputDialog> #include <QInputDialog>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QObject> #include <QObject>
@ -211,7 +211,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_SDF_button_clicked(Facegrap
typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap = typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap =
get(CGAL::face_index, *pair->first->face_graph()); get(CGAL::face_index, *pair->first->face_graph());
FaceGraph_with_id_to_vector_property_map<Facegraph, double> sdf_pmap(&pair->second, fidmap); FaceGraph_with_id_to_vector_property_map<Facegraph, double> sdf_pmap(&pair->second, fidmap);
QTime time; QElapsedTimer time;
time.start(); time.start();
std::pair<double, double> min_max_sdf = sdf_values(*(pair->first->face_graph()), sdf_pmap, cone_angle, number_of_rays); std::pair<double, double> min_max_sdf = sdf_values(*(pair->first->face_graph()), sdf_pmap, cone_angle, number_of_rays);
std::cout << "ok (" << time.elapsed() << " ms)" << std::endl; std::cout << "ok (" << time.elapsed() << " ms)" << std::endl;
@ -284,7 +284,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_Partition_button_clicked(Fa
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
} }
check_and_set_ids(pair->first->face_graph()); check_and_set_ids(pair->first->face_graph());
QTime time; QElapsedTimer time;
time.start(); time.start();
typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap = typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap =
get(CGAL::face_index, *pair->first->face_graph()); get(CGAL::face_index, *pair->first->face_graph());

4
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp
View File

@ -6,7 +6,7 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QInputDialog> #include <QInputDialog>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <CGAL/Surface_mesh_simplification/edge_collapse.h> #include <CGAL/Surface_mesh_simplification/edge_collapse.h>
@ -136,7 +136,7 @@ void Polyhedron_demo_mesh_simplification_plugin::on_actionSimplify_triggered()
return; return;
// simplify // simplify
QTime time; QElapsedTimer time;
time.start(); time.start();
std::cout << "Simplify..."; std::cout << "Simplify...";
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);

4
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp
View File

@ -11,7 +11,7 @@
#include <CGAL/Three/Polyhedron_demo_plugin_interface.h> #include <CGAL/Three/Polyhedron_demo_plugin_interface.h>
#include <CGAL/Three/Three.h> #include <CGAL/Three/Three.h>
#include "Scene.h" #include "Scene.h"
#include <QTime> #include <QElapsedTimer>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QPen> #include <QPen>
@ -602,7 +602,7 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio
////////// PARAMETERIZE /////////// ////////// PARAMETERIZE ///////////
/////////////////////////////////// ///////////////////////////////////
QTime time; QElapsedTimer time;
time.start(); time.start();
// add textured polyhedon to the scene // add textured polyhedon to the scene

2
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp
View File

@ -472,7 +472,7 @@ bool Scene_polyhedron_shortest_path_item_priv::run_point_select(const Ray_3& ray
CGAL::Three::Three::information(QObject::tr("Computing shortest path polyline...")); CGAL::Three::Three::information(QObject::tr("Computing shortest path polyline..."));
QTime time; QElapsedTimer time;
time.start(); time.start();
//~ m_shortestPaths->m_debugOutput=true; //~ m_shortestPaths->m_debugOutput=true;
m_shortestPaths->shortest_path_points_to_source_points( m_shortestPaths->shortest_path_points_to_source_points(

2
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp
View File

@ -12,7 +12,7 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QInputDialog> #include <QInputDialog>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QObject> #include <QObject>

4
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp
View File

@ -1,6 +1,6 @@
#include <QApplication> #include <QApplication>
#include <QMainWindow> #include <QMainWindow>
#include <QTime> #include <QElapsedTimer>
#include <QAction> #include <QAction>
#include <QObject> #include <QObject>
#include <QDockWidget> #include <QDockWidget>
@ -305,7 +305,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSeeding_clicked
approx.set_metric(static_cast<VSA_wrapper::Metric>( approx.set_metric(static_cast<VSA_wrapper::Metric>(
ui_widget.comboMetric->currentIndex())); ui_widget.comboMetric->currentIndex()));
QTime time; QElapsedTimer time;
time.start(); time.start();
approx.initialize_seeds(CGAL::parameters::seeding_method( approx.initialize_seeds(CGAL::parameters::seeding_method(
static_cast<VSA::Seeding_method>(ui_widget.comboMethod->currentIndex())) static_cast<VSA::Seeding_method>(ui_widget.comboMethod->currentIndex()))

2
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
View File

@ -10,7 +10,7 @@
#include <CGAL/Three/Point_container.h> #include <CGAL/Three/Point_container.h>
#include <CGAL/Qt/constraint.h> #include <CGAL/Qt/constraint.h>
#include <algorithm> #include <algorithm>
#include <QTime> #include <QElapsedTimer>
#include <QApplication> #include <QApplication>

6
Surface_mesher/demo/Surface_mesher/volume.cpp
View File

@ -21,7 +21,7 @@
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QMessageBox> #include <QMessageBox>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QTime> #include <QElapsedTimer>
#include <QColor> #include <QColor>
#include <QColorDialog> #include <QColorDialog>
#include <QSettings> #include <QSettings>
@ -708,7 +708,7 @@ void Volume::display_marchin_cube()
#ifdef CGAL_SURFACE_MESH_DEMO_USE_MARCHING_CUBE #ifdef CGAL_SURFACE_MESH_DEMO_USE_MARCHING_CUBE
if(m_surface_mc.empty()) if(m_surface_mc.empty())
{ {
QTime total_time; QElapsedTimer total_time;
total_time.start(); total_time.start();
values_list->save_values(fileinfo.absoluteFilePath()); values_list->save_values(fileinfo.absoluteFilePath());
@ -824,7 +824,7 @@ void Volume::display_surface_mesher_result()
m_view_surface) // Or it is computed and displayed, and one want m_view_surface) // Or it is computed and displayed, and one want
// to recompute it. // to recompute it.
{ {
QTime total_time; QElapsedTimer total_time;
total_time.start(); total_time.start();
values_list->save_values(fileinfo.absoluteFilePath()); values_list->save_values(fileinfo.absoluteFilePath());