Merge from trunk.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1848 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c8e1376894207c8c08896f750f71c115e07f6d95

4 files changed, 238 insertions, 234 deletions

diff --git a/src/GudhUI/view/FirstCoordProjector.h b/src/GudhUI/view/FirstCoordProjector.h
index 529d2d42..1333f5d3 100644
--- a/src/GudhUI/view/FirstCoordProjector.h
+++ b/src/GudhUI/view/FirstCoordProjector.h
@@ -32,8 +32,12 @@ class FirstCoordProjector3D : public Projector3D {
   typedef Projector3D::Point_3 Point_3;
 
   Point_3 operator()(const Point& p) const {
-    assert(p.dimension() >= 3);
-    return Point_3(p.x(), p.y(), p.z());
+    if (p.dimension() >= 3)
+      return Point_3(p.x(), p.y(), p.z());
+    else if  (p.dimension() >= 2)
+      return Point_3(p.x(), p.y(), 0.0);
+    else
+      return Point_3(0.0, 0.0, 0.0);
   }
 };
 
diff --git a/src/GudhUI/view/Viewer.h b/src/GudhUI/view/Viewer.h
index 48427099..797ddc53 100644
--- a/src/GudhUI/view/Viewer.h
+++ b/src/GudhUI/view/Viewer.h
@@ -1,117 +1,117 @@
-/* This file is part of the Gudhi Library. The Gudhi library 

- *    (Geometric Understanding in Higher Dimensions) is a generic C++ 

- *    library for computational topology.

- *

- *    Author(s):       David Salinas

- *

- *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)

- *

- *    This program is free software: you can redistribute it and/or modify

- *    it under the terms of the GNU General Public License as published by

- *    the Free Software Foundation, either version 3 of the License, or

- *    (at your option) any later version.

- *

- *    This program is distributed in the hope that it will be useful,

- *    but WITHOUT ANY WARRANTY; without even the implied warranty of

- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *    GNU General Public License for more details.

- *

- *    You should have received a copy of the GNU General Public License

- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * 

- */

-

-#ifndef VIEW_VIEWER_H_

-#define VIEW_VIEWER_H_

-

-#include <QGLViewer/qglviewer.h>

-

-#include <vector>

-

-#include "View_parameter.h"

-#include "model/Complex_typedefs.h"

-#include "Color.h"

-#include "Viewer_instructor.h"

-

-class Viewer_instructor;

-

-class Viewer : public QGLViewer {

-  Q_OBJECT

-

-  Viewer_instructor * instructor;

-

-  /**

-   * light angles

-   */

-  double theta, phi;

-  typedef Complex::GT Gudhi_kernel;

-  typedef Gudhi_kernel::Point_3 Point_3;

-

- public:

-  Viewer(QWidget* parent);

-

-  void set_instructor(Viewer_instructor* instructor_);

-

-  void show_entire_scene();

-

-  void draw();

-

-  void set_bounding_box(const Point_3 & lower_left, const Point_3 & upper_right);

-

-  void update_GL();

-

-  void init_scene();

-

-  void init_light();

-

-  void set_light();

-

-  void set_light_direction(double theta, double phi);

-

-  /**

-   * set the light in the direction of the observer

-   */

-  void set_light_direction();

-

- protected:

-  virtual void postSelection(const QPoint& point);

-

- public:

-  ////////////////////////

-  // draw

-  ////////////////////////

-  void set_size_point(double size_points);

-

-  void set_color(const Color& color);

-

-  void draw_point(const Point_3& p, const Color& color, double size_points);

-

-  void begin_draw_points(double size, bool light = false);

-

-  void draw_points(const Point_3 & point);

-

-  void end_draw_points();

-

-  void draw_edge(const Point_3 &a, const Point_3 &b, const Color& color, double size);

-

-  void begin_draw_edges(double size, bool light = false);

-

-  void draw_edges(const Point_3 &a, const Point_3 &b);

-

-  void end_draw_edges();

-

-  void begin_draw_triangles(double size, bool light, bool transparent = false);

-

-  void draw_triangles(const Point_3& p1, const Point_3& p2, const Point_3& p3);

-

-  // todo remove

-  void draw_triangles(const std::vector<Point_3*>& points);

-

-  void end_draw_triangles();

-

-

- signals:

-  void click(const Point_3& position);

-};

-

-#endif  // VIEW_VIEWER_H_

+/* This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#ifndef VIEW_VIEWER_H_
+#define VIEW_VIEWER_H_
+
+#include <QGLViewer/qglviewer.h>
+
+#include <vector>
+
+#include "View_parameter.h"
+#include "model/Complex_typedefs.h"
+#include "Color.h"
+#include "Viewer_instructor.h"
+
+class Viewer_instructor;
+
+class Viewer : public QGLViewer {
+  Q_OBJECT
+
+  Viewer_instructor * instructor;
+
+  /**
+   * light angles
+   */
+  double theta, phi;
+  typedef Complex::GT Gudhi_kernel;
+  typedef Gudhi_kernel::Point_3 Point_3;
+
+ public:
+  Viewer(QWidget* parent);
+
+  void set_instructor(Viewer_instructor* instructor_);
+
+  void show_entire_scene();
+
+  void draw();
+
+  void set_bounding_box(const Point_3 & lower_left, const Point_3 & upper_right);
+
+  void update_GL();
+
+  void init_scene();
+
+  void init_light();
+
+  void set_light();
+
+  void set_light_direction(double theta, double phi);
+
+  /**
+   * set the light in the direction of the observer
+   */
+  void set_light_direction();
+
+ protected:
+  virtual void postSelection(const QPoint& point);
+
+ public:
+  ////////////////////////
+  // draw
+  ////////////////////////
+  void set_size_point(double size_points);
+
+  void set_color(const Color& color);
+
+  void draw_point(const Point_3& p, const Color& color, double size_points);
+
+  void begin_draw_points(double size, bool light = false);
+
+  void draw_points(const Point_3 & point);
+
+  void end_draw_points();
+
+  void draw_edge(const Point_3 &a, const Point_3 &b, const Color& color, double size);
+
+  void begin_draw_edges(double size, bool light = false);
+
+  void draw_edges(const Point_3 &a, const Point_3 &b);
+
+  void end_draw_edges();
+
+  void begin_draw_triangles(double size, bool light, bool transparent = false);
+
+  void draw_triangles(const Point_3& p1, const Point_3& p2, const Point_3& p3);
+
+  // todo remove
+  void draw_triangles(const std::vector<Point_3*>& points);
+
+  void end_draw_triangles();
+
+
+ signals:
+  void click(const Point_3& position);
+};
+
+#endif  // VIEW_VIEWER_H_
diff --git a/src/GudhUI/view/Viewer_instructor.cpp b/src/GudhUI/view/Viewer_instructor.cpp
index 4446d209..1ddd4d8b 100644
--- a/src/GudhUI/view/Viewer_instructor.cpp
+++ b/src/GudhUI/view/Viewer_instructor.cpp
@@ -159,7 +159,7 @@ void Viewer_instructor::set_color_edge(Edge_handle eh) {
   viewer_->set_color(Color(view_params_.light_edges, view_params_.light_edges, view_params_.light_edges));
 }
 
-void Viewer_instructor::set_color_triangle(const Simplex_handle& triangle) {
+void Viewer_instructor::set_color_triangle(const Simplex& triangle) {
   viewer_->set_color(Color(view_params_.light_triangles, view_params_.light_triangles, view_params_.light_triangles));
 }
 
diff --git a/src/GudhUI/view/Viewer_instructor.h b/src/GudhUI/view/Viewer_instructor.h
index 96b25c77..05c5c1fc 100644
--- a/src/GudhUI/view/Viewer_instructor.h
+++ b/src/GudhUI/view/Viewer_instructor.h
@@ -1,114 +1,114 @@
-/* This file is part of the Gudhi Library. The Gudhi library 

- *    (Geometric Understanding in Higher Dimensions) is a generic C++ 

- *    library for computational topology.

- *

- *    Author(s):       David Salinas

- *

- *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)

- *

- *    This program is free software: you can redistribute it and/or modify

- *    it under the terms of the GNU General Public License as published by

- *    the Free Software Foundation, either version 3 of the License, or

- *    (at your option) any later version.

- *

- *    This program is distributed in the hope that it will be useful,

- *    but WITHOUT ANY WARRANTY; without even the implied warranty of

- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *    GNU General Public License for more details.

- *

- *    You should have received a copy of the GNU General Public License

- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.

- * 

- */

-

-#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

-

-#include <QFileDialog>

-#include <QKeyEvent>

-#include <QGLViewer/camera.h>

-

-#include <memory>

-#include <utility>  // for pair<>

-

-#include "model/Complex_typedefs.h"

-

-#include "Projector3D.h"

-#include "View_parameter.h"

-#include "Viewer.h"

-

-class Viewer;

-class Viewer_parameter;

-

-class Viewer_instructor : public QWidget {

-  Q_OBJECT

-

-  typedef Geometry_trait::Point_3 Point_3;

-  typedef Complex::Point Point;

-  typedef Complex::Vertex_handle Vertex_handle;

-  typedef Complex::Edge_handle Edge_handle;

-  typedef Complex::Simplex_handle Simplex_handle;

-

-  Viewer* viewer_;

-  View_parameter view_params_;

-  const Complex& mesh_;

-  std::unique_ptr<Projector3D> projector_;

-

- public:

-  Viewer_instructor(QWidget* parent, Viewer* viewer, const Complex& mesh);

-

-  void initialize_bounding_box();

-

-  std::pair<Point, Point> compute_bounding_box_corners();

-

-  void show_entire_scene();

-

-  const qglviewer::Camera* camera() const;

-

-  int width() const;

-  int height() const;

-

-  /**

-   * to change display parameters

-   */

-  View_parameter& view_params();

-

- public:

-  /**

-   * gives instructions to the viewer

-   */

-  void give_instructions();

-

-  void draw_edges();

-  void draw_triangles();

-  void draw_points();

-

-  void draw_edge(const Point&, const Point&);

-

-  void draw_point(const Point&);

-

-  /**

-   * set the right color of vertex/edge/triangle considering the view_params choice

-   */

-  void set_color_vertex(Vertex_handle vh);

-  void set_color_edge(Edge_handle eh);

-

-  void set_color_triangle(const Simplex_handle& triangle);

-

- private:

-  /**

-   * Projection to 3D needed for the viewer.

-   */

-  Point_3 proj(const Point& p) const;

-

- public slots:

-  void sceneChanged();

-  void change_draw_vertices();

-  void change_draw_edges();

-  void change_draw_triangles();

-  void change_light();

-};

-

-#endif  // VIEW_VIEWER_INSTRUCTOR_H_

+/* This file is part of the Gudhi Library. The Gudhi library 
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#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
+
+#include <QFileDialog>
+#include <QKeyEvent>
+#include <QGLViewer/camera.h>
+
+#include <memory>
+#include <utility>  // for pair<>
+
+#include "model/Complex_typedefs.h"
+
+#include "Projector3D.h"
+#include "View_parameter.h"
+#include "Viewer.h"
+
+class Viewer;
+class Viewer_parameter;
+
+class Viewer_instructor : public QWidget {
+  Q_OBJECT
+
+  typedef Geometry_trait::Point_3 Point_3;
+  typedef Complex::Point Point;
+  typedef Complex::Vertex_handle Vertex_handle;
+  typedef Complex::Edge_handle Edge_handle;
+  typedef Complex::Simplex Simplex;
+
+  Viewer* viewer_;
+  View_parameter view_params_;
+  const Complex& mesh_;
+  std::unique_ptr<Projector3D> projector_;
+
+ public:
+  Viewer_instructor(QWidget* parent, Viewer* viewer, const Complex& mesh);
+
+  void initialize_bounding_box();
+
+  std::pair<Point, Point> compute_bounding_box_corners();
+
+  void show_entire_scene();
+
+  const qglviewer::Camera* camera() const;
+
+  int width() const;
+  int height() const;
+
+  /**
+   * to change display parameters
+   */
+  View_parameter& view_params();
+
+ public:
+  /**
+   * gives instructions to the viewer
+   */
+  void give_instructions();
+
+  void draw_edges();
+  void draw_triangles();
+  void draw_points();
+
+  void draw_edge(const Point&, const Point&);
+
+  void draw_point(const Point&);
+
+  /**
+   * set the right color of vertex/edge/triangle considering the view_params choice
+   */
+  void set_color_vertex(Vertex_handle vh);
+  void set_color_edge(Edge_handle eh);
+
+  void set_color_triangle(const Simplex& triangle);
+
+ private:
+  /**
+   * Projection to 3D needed for the viewer.
+   */
+  Point_3 proj(const Point& p) const;
+
+ public slots:
+  void sceneChanged();
+  void change_draw_vertices();
+  void change_draw_edges();
+  void change_draw_triangles();
+  void change_light();
+};
+
+#endif  // VIEW_VIEWER_INSTRUCTOR_H_