diff options
Diffstat (limited to 'src/GudhUI')
| -rw-r--r-- | src/GudhUI/todo.txt | 2 | ||||
| -rw-r--r-- | src/GudhUI/utils/Critical_points.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/utils/Edge_contractor.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/utils/Furthest_point_epsilon_net.h | 4 | ||||
| -rw-r--r-- | src/GudhUI/utils/K_nearest_builder.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/utils/Lloyd_builder.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/utils/Vertex_collapsor.h | 2 | ||||
| -rw-r--r-- | src/GudhUI/view/Viewer.cpp | 4 | ||||
| -rw-r--r-- | src/GudhUI/view/Viewer_instructor.h | 2 |
9 files changed, 13 insertions, 9 deletions
diff --git a/src/GudhUI/todo.txt b/src/GudhUI/todo.txt index 19d99a77..e59d06d4 100644 --- a/src/GudhUI/todo.txt +++ b/src/GudhUI/todo.txt @@ -18,5 +18,5 @@ x faire le lien MainWindow - Model -- bug -x bug ordre contraction -> just that first vertex placement dont work great +x bug ordre contraction -> just that first vertex placement doesn't work great x pb construction rips diff --git a/src/GudhUI/utils/Critical_points.h b/src/GudhUI/utils/Critical_points.h index 97e58737..65695434 100644 --- a/src/GudhUI/utils/Critical_points.h +++ b/src/GudhUI/utils/Critical_points.h @@ -103,7 +103,7 @@ template<typename SkBlComplex> class Critical_points { // reduced to one point -> contractible return 1; else - // we dont know + // we don't know return 2; } diff --git a/src/GudhUI/utils/Edge_contractor.h b/src/GudhUI/utils/Edge_contractor.h index 0707b186..a71d0742 100644 --- a/src/GudhUI/utils/Edge_contractor.h +++ b/src/GudhUI/utils/Edge_contractor.h @@ -65,7 +65,7 @@ template<typename SkBlComplex> class Edge_contractor { /** * @brief Modify complex to be the expansion of the k-nearest neighbor - * symetric graph. + * symmetric graph. */ Edge_contractor(SkBlComplex& complex, unsigned num_contractions) : complex_(complex), num_contractions_(num_contractions) { diff --git a/src/GudhUI/utils/Furthest_point_epsilon_net.h b/src/GudhUI/utils/Furthest_point_epsilon_net.h index 6eb71071..195d0014 100644 --- a/src/GudhUI/utils/Furthest_point_epsilon_net.h +++ b/src/GudhUI/utils/Furthest_point_epsilon_net.h @@ -27,7 +27,7 @@ template<typename SkBlComplex> class Furthest_point_epsilon_net { /** * Let V be the set of vertices. - * Initially v0 is one arbitrarly vertex and the set V0 is {v0}. + * Initially v0 is one, arbitrary, vertex and the set V0 is {v0}. * Then Vk is computed as follows. * First we compute the vertex pk that is the furthest from Vk * then Vk = Vk \cup pk. @@ -54,7 +54,7 @@ template<typename SkBlComplex> class Furthest_point_epsilon_net { /** * @brief Modify complex to be the expansion of the k-nearest neighbor - * symetric graph. + * symmetric graph. */ Furthest_point_epsilon_net(SkBlComplex& complex) : complex_(complex) { diff --git a/src/GudhUI/utils/K_nearest_builder.h b/src/GudhUI/utils/K_nearest_builder.h index 34483e58..454b2587 100644 --- a/src/GudhUI/utils/K_nearest_builder.h +++ b/src/GudhUI/utils/K_nearest_builder.h @@ -41,7 +41,7 @@ template<typename SkBlComplex> class K_nearest_builder { public: /** * @brief Modify complex to be the expansion of the k-nearest neighbor - * symetric graph. + * symmetric graph. */ K_nearest_builder(SkBlComplex& complex, unsigned k) : complex_(complex) { complex.keep_only_vertices(); diff --git a/src/GudhUI/utils/Lloyd_builder.h b/src/GudhUI/utils/Lloyd_builder.h index c042564f..57e3dc0f 100644 --- a/src/GudhUI/utils/Lloyd_builder.h +++ b/src/GudhUI/utils/Lloyd_builder.h @@ -27,7 +27,7 @@ template<typename SkBlComplex> class Lloyd_builder { /** * @brief Modify complex to be the expansion of the k-nearest neighbor - * symetric graph. + * symmetric graph. */ Lloyd_builder(SkBlComplex& complex, unsigned num_iterations) : complex_(complex), dim(-1) { if (!complex_.empty()) { diff --git a/src/GudhUI/utils/Vertex_collapsor.h b/src/GudhUI/utils/Vertex_collapsor.h index 030e4bb0..b1c48efd 100644 --- a/src/GudhUI/utils/Vertex_collapsor.h +++ b/src/GudhUI/utils/Vertex_collapsor.h @@ -31,7 +31,7 @@ template<typename SkBlComplex> class Vertex_collapsor { /** * @brief Modify complex to be the expansion of the k-nearest neighbor - * symetric graph. + * symmetric graph. */ Vertex_collapsor(SkBlComplex& complex, size_t num_collapses) : complex_(complex), num_collapses_(num_collapses) { diff --git a/src/GudhUI/view/Viewer.cpp b/src/GudhUI/view/Viewer.cpp index 6b17c833..2c00f86f 100644 --- a/src/GudhUI/view/Viewer.cpp +++ b/src/GudhUI/view/Viewer.cpp @@ -31,7 +31,11 @@ void Viewer::set_bounding_box(const Point_3 & lower_left, const Point_3 & upper_ } void Viewer::update_GL() { +#if QGLVIEWER_VERSION >= 0x020700 + this->update(); +#else this->updateGL(); +#endif } void Viewer::init_scene() { diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h index 58cbcd31..09ed102f 100644 --- a/src/GudhUI/view/Viewer_instructor.h +++ b/src/GudhUI/view/Viewer_instructor.h @@ -11,7 +11,7 @@ #ifndef VIEW_VIEWER_INSTRUCTOR_H_ #define VIEW_VIEWER_INSTRUCTOR_H_ -// todo do a viewer instructor that have directely a pointer to a QGLviewer and buffer ot not triangles +// todo do a viewer instructor that has directly a pointer to a QGLviewer and buffer ot not triangles #include <QFileDialog> #include <QKeyEvent> |