diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-23 16:35:23 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-23 16:35:23 +0000 |
commit | b3c3e0d75c717dbd94caf96c9ba827fb17b4d5b3 (patch) | |
tree | d4e706c81d54f54438aa681cd666e3854a80a37b /src/GudhUI/view | |
parent | fe78c077b00e91b3d316f1d64541008a615664e7 (diff) | |
parent | 061e43a2a48525bc5a69482a1ea80f20ff505e55 (diff) |
Backmerge of trunk
Add alpha complex in bibtex
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@929 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: c8975be439b3e9e91d1fd6ad988db12c75d0395b
Diffstat (limited to 'src/GudhUI/view')
-rw-r--r-- | src/GudhUI/view/Viewer_instructor.cpp | 2 | ||||
-rw-r--r-- | src/GudhUI/view/Viewer_instructor.h | 4 |
2 files changed, 3 insertions, 3 deletions
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 31a1d273..82c8e346 100644 --- a/src/GudhUI/view/Viewer_instructor.h +++ b/src/GudhUI/view/Viewer_instructor.h @@ -52,7 +52,7 @@ class Viewer_instructor : public QWidget { typedef Complex::Point Point;
typedef Complex::Vertex_handle Vertex_handle;
typedef Complex::Edge_handle Edge_handle;
- typedef Complex::Simplex_handle Simplex_handle;
+ typedef Complex::Simplex Simplex;
Viewer* viewer_;
View_parameter view_params_;
@@ -98,7 +98,7 @@ class Viewer_instructor : public QWidget { void set_color_vertex(Vertex_handle vh);
void set_color_edge(Edge_handle eh);
- void set_color_triangle(const Simplex_handle& triangle);
+ void set_color_triangle(const Simplex& triangle);
private:
/**
|