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

Replace all QTimers

This commit is contained in:
Maxime Gimeno 2020-01-09 14:11:50 +01:00
parent 3debd4813e
commit 93c2247335
28 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/MainWindow.cpp
View File

@ -16,8 +16,8 @@ MainWindow::MainWindow(QWidget* parent): CGAL::Qt::DemosMainWindow(parent)
scene.eight_copies=false;
scene.two_dimensional=false;
qtimer = new QTimer(this);
connect(qtimer, SIGNAL(timeout()), this, SLOT(lloydStep()));
QTimer = new QTimer(this);
connect(QTimer, SIGNAL(timeout()), this, SLOT(lloydStep()));
}
void
@ -65,9 +65,9 @@ MainWindow::togglePause(bool p)
{
if (p) {
int speed = (100-(speedSlider->value()))*100;
qtimer->start(speed);
QTimer->start(speed);
}
else qtimer->stop();
else QTimer->stop();
}
void
@ -158,9 +158,9 @@ void
MainWindow::speedChanged(int i)
{
int speed = (100-i)*100;
if (qtimer->isActive()) {
qtimer->stop();
qtimer->start(speed);
if (QTimer->isActive()) {
QTimer->stop();
QTimer->start(speed);
}
}

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

@ -38,7 +38,7 @@
#include <QSpinBox>
#include <stdexcept>
#include <fstream>
#include <QTime>
#include <QElapsedTimer>
#include <QWidgetAction>
#ifdef QT_SCRIPT_LIB

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

@ -23,7 +23,7 @@
#include <CGAL/bounding_box.h>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
@ -1370,7 +1370,7 @@ void Polyhedron_demo_cut_plugin::computeIntersection()
Simple_kernel::Plane_3 plane(n[0], n[1], n[2], - n * pos);
//std::cerr << plane << std::endl;
edges_item->edges.clear();
QTime time;
QElapsedTimer time;
time.start();
bool does_intersect = false;
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 <QMainWindow>
#include <QApplication>
#include <QTime>
#include <QElapsedTimer>
#include <QMessageBox>
using namespace CGAL::Three;
class Polyhedron_demo_nef_plugin :
@ -115,7 +115,7 @@ Polyhedron_demo_nef_plugin::on_actionToNef_triggered()
}
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
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));
QApplication::restoreOverrideCursor();
if(item) {
QTime time;
QElapsedTimer time;
time.start();
std::cerr << "Convex decomposition...";
@ -188,7 +188,7 @@ Polyhedron_demo_nef_plugin::on_actionToPoly_triggered()
if(item)
{
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
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
std::cout << "Boolean operation...";
QTime time;
QElapsedTimer time;
time.start();
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 <QAction>
#include <QMainWindow>
@ -74,7 +74,7 @@ void Polyhedron_demo_convex_hull_plugin::on_actionConvexHull_triggered()
// wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
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 <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
#include <QApplication>
@ -267,14 +267,14 @@ private:
typedef CGAL::Delaunay_mesh_size_criteria_2<CDT> Criteria;
typedef CGAL::Delaunay_mesher_2<CDT, Criteria> Mesher;
QTime time; // global timer
QElapsedTimer time; // global timer
time.start();
std::cout << " Building Constrained_Delaunay_triangulation_2..."
<< std::flush;
CDT cdt;
QTime ltime; //local timer
QElapsedTimer ltime; //local timer
ltime.start();
double constant_coordinate =
polylines_items.back()->polylines.back().back()[constant_coordinate_index];

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

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

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

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

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

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

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

@ -17,7 +17,7 @@
#include <QDockWidget>
#include <QDialog>
#include <QApplication>
#include <QTime>
#include <QElapsedTimer>
#include <QMessageBox>
#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/refine.h>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
#include <QApplication>

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

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

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

@ -23,7 +23,7 @@
#include <boost/unordered_set.hpp>
#include <CGAL/property_map.h>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
#include <QApplication>
@ -340,7 +340,7 @@ public Q_SLOTS:
// wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
typedef boost::graph_traits<FaceGraph>::edge_descriptor edge_descriptor;
@ -698,7 +698,7 @@ public Q_SLOTS:
detect_and_split_duplicates(selection, edges_to_protect, target_length);
#ifdef CGAL_LINKED_WITH_TBB
QTime time;
QElapsedTimer time;
time.start();
tbb::parallel_for(
@ -714,7 +714,7 @@ public Q_SLOTS:
target_length, nb_iter, protect, smooth_features);
BOOST_FOREACH(Scene_facegraph_item* poly_item, selection)
{
QTime time;
QElapsedTimer time;
time.start();
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 <QMainWindow>
#include <QInputDialog>
#include <QTime>
#include <QElapsedTimer>
#include <QMessageBox>
#include <Eigen/Sparse>
@ -368,7 +368,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSegment()
if (num_vertices(item->skeleton_curve)==0 ) { QApplication::restoreOverrideCursor(); return;}
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
// init the polyhedron simplex indices
@ -461,7 +461,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConvert_to_me
if ( !is_mesh_valid(pMesh) ) return;
QTime time;
QElapsedTimer time;
time.start();
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -499,7 +499,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionContract()
return;
}
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Contract...\n";
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -524,7 +524,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionCollapse()
return;
}
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Collapse...\n";
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -550,7 +550,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSplit()
return;
}
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Split...\n";
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -575,7 +575,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionDegeneracy()
return;
}
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Detect degeneracy...\n";
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -626,7 +626,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionRun()
return;
}
QTime time;
QElapsedTimer time;
time.start();
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -749,7 +749,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSkeletonize()
return;
}
QTime time;
QElapsedTimer time;
time.start();
QApplication::setOverrideCursor(Qt::WaitCursor);
@ -810,7 +810,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConverge()
return;
}
QTime time;
QElapsedTimer time;
time.start();
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/Polygon_mesh_slicer.h>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
#include <QApplication>
@ -287,7 +287,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::on_Generate_button_clicked()
if(!new_polyline_item_for_polylines)
{
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
intersection_of_plane_Polyhedra_3_using_AABB_wrapper(*smesh, planes, plane_positions, new_polylines_item->polylines);
// 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);
}
else {
QTime time; time.start();
QElapsedTimer time; time.start();
std::list<std::vector<Epic_kernel::Point_3> > polylines;
// call algorithm and fill polylines in polylines_item
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 <CGAL/property_map.h>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QMainWindow>
#include <QApplication>
@ -94,7 +94,7 @@ public Q_SLOTS:
// wait cursor
QApplication::setOverrideCursor(Qt::WaitCursor);
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Perturbation..." << std::endl;

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

@ -16,7 +16,7 @@
#include <QMenu>
#include <QMainWindow>
#include <QApplication>
#include <QTime>
#include <QElapsedTimer>
#include <QMessageBox>
typedef Scene_surface_mesh_item Scene_face_graph_item;
@ -131,7 +131,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfaces()
Scene_polylines_item* new_item = new Scene_polylines_item();
// perform Boolean operation
QTime time;
QElapsedTimer time;
time.start();
try{
@ -194,7 +194,7 @@ void Polyhedron_demo_intersection_plugin::intersectionPolylines()
Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item();
Scene_polylines_item* new_pol_item = new Scene_polylines_item();
// perform Boolean operation
QTime time;
QElapsedTimer time;
time.start();
std::vector<Polyline_3> polyA, polyB;
Q_FOREACH(const Polyline_3& poly, itemA->polylines)
@ -290,7 +290,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfacePolyline()
Scene_points_with_normal_item* new_point_item = new Scene_points_with_normal_item();
Scene_polylines_item* new_pol_item = new Scene_polylines_item();
// perform Boolean operation
QTime time;
QElapsedTimer time;
time.start();
Scene_face_graph_item::Face_graph tm = *itemA->face_graph();
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 <QAction>
#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 <QMainWindow>
#include <QAction>
@ -81,7 +81,7 @@ template<class FaceGraphItem>
void Polyhedron_demo_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, int nb_steps)
{
typename FaceGraphItem::Face_graph* graph = item->face_graph();
QTime time;
QElapsedTimer time;
time.start();
CGAL::Three::Three::information("Loop subdivision...");
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();
if(!graph) return;
QTime time;
QElapsedTimer time;
time.start();
CGAL::Three::Three::information("Catmull-Clark subdivision...");
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();
if(!graph) return;
QTime time;
QElapsedTimer time;
time.start();
CGAL::Three::Three::information("Sqrt-3 subdivision...");
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();
if(!graph) return;
QTime time;
QElapsedTimer time;
time.start();
CGAL::Three::Three::information("Doo-Sabin subdivision...");
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 <QMainWindow>
#include <QInputDialog>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QDebug>
#include <QObject>
@ -196,7 +196,7 @@ void Polyhedron_demo_mesh_plane_detection_plugin::on_actionPlaneDetection_trigge
if(dialog.exec() == QDialog::Rejected)
return;
QTime time;
QElapsedTimer time;
time.start();
std::cerr << "Detecting planes... ";
QApplication::setOverrideCursor(Qt::WaitCursor);

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

@ -10,7 +10,7 @@
#include <QApplication>
#include <QMainWindow>
#include <QInputDialog>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <QDebug>
#include <QObject>
@ -210,7 +210,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_SDF_button_clicked(Facegrap
typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap =
get(CGAL::face_index, *pair->first->face_graph());
FaceGraph_with_id_to_vector_property_map<Facegraph, double> sdf_pmap(&pair->second, fidmap);
QTime time;
QElapsedTimer time;
time.start();
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;
@ -283,7 +283,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_Partition_button_clicked(Fa
QApplication::setOverrideCursor(Qt::WaitCursor);
}
check_and_set_ids(pair->first->face_graph());
QTime time;
QElapsedTimer time;
time.start();
typename boost::property_map<Facegraph, CGAL::face_index_t>::type fidmap =
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 <QMainWindow>
#include <QInputDialog>
#include <QTime>
#include <QElapsedTimer>
#include <QAction>
#include <CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h>
@ -137,7 +137,7 @@ void Polyhedron_demo_mesh_simplification_plugin::on_actionSimplify_triggered()
return;
// simplify
QTime time;
QElapsedTimer time;
time.start();
std::cout << "Simplify...";
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/Three.h>
#include "Scene.h"
#include <QTime>
#include <QElapsedTimer>
#include <QGraphicsScene>
#include <QGraphicsItem>
#include <QPen>
@ -594,7 +594,7 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio
////////// PARAMETERIZE ///////////
///////////////////////////////////
QTime time;
QElapsedTimer time;
time.start();
// add textured polyhedon to the scene

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

@ -445,7 +445,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..."));
QTime time;
QElapsedTimer time;
time.start();
//~ m_shortestPaths->m_debugOutput=true;
m_shortestPaths->shortest_path_points_to_source_points(faceLocation.first, faceLocation.second, std::back_inserter(polylines->polylines.back()));

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

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

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

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

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

@ -7,7 +7,7 @@
#include <CGAL/Qt/constraint.h>
#include <boost/foreach.hpp>
#include <algorithm>
#include <QTime>
#include <QElapsedTimer>
#include <QApplication>

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

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