Commit Graph

1346 Commits

Author SHA1 Message Date
Laurent Rineau aa527e9ae7 Fix a warning
```
/mnt/testsuite/include/CGAL/draw_face_graph.h:172:16: warning: 'keyPressEvent' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
  virtual void keyPressEvent(QKeyEvent *e)
               ^
/mnt/testsuite/include/CGAL/Qt/Basic_viewer_qt.h:1306:16: note: overridden virtual function is here
  virtual void keyPressEvent(QKeyEvent *e)
               ^
```
2020-10-14 16:28:44 +02:00
Laurent Rineau 41ef36a90d Fix a compilation error
```
.../include/CGAL/draw_face_graph.h:116:23: error: ‘is_border’ was not declared in this scope
  116 |         if (!is_border(h, sm))
      |              ~~~~~~~~~^~~~~~~
```
2020-10-14 14:20:46 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sebastien Loriot 47d2189f8e
Merge pull request #3268 from afabri/PMP-visitor-GF
PMP::triangulate_faces() Add a visitor that allows to map each triangle to its original face
2020-10-02 15:26:05 +02:00
Sébastien Loriot 4e0fc267af Merge pull request #4715 from afabri/BGL-test_face-GF
BGL: Add a function to check if add_face() can be called successfully
2020-10-02 15:24:45 +02:00
Sebastien Loriot 6294784792
Merge pull request #4738 from sloriot/BGL-ffg_default_cst
Add a constuctor with an empty selection
2020-10-02 15:20:33 +02:00
Sebastien Loriot 7652091b9c
Merge pull request #4931 from sloriot/CGAL-cosmetic_cleanup
Cosmetic cleaning
2020-10-02 15:15:31 +02:00
Laurent Rineau 5e532d9cf3
Merge branch 'master' into PMP-visitor-GF 2020-09-18 13:26:45 +02:00
Laurent Rineau baef74295c
Merge pull request #4790 from sloriot/PMP-corefine_no_modify 2020-09-18 12:41:08 +02:00
Jane Tournois bfd4e9915f rename named parameter graph_visitor to visitor 2020-09-15 15:42:24 +02:00
Jane Tournois 66fa7d1d1d remove remeshing_visitor and use graph_visitor instead 2020-09-15 15:00:06 +02:00
Jane Tournois 4745308384 use graph_visitor instead of creating new triangulate_visitor 2020-09-15 14:38:29 +02:00
Laurent Rineau fc40738343
Merge branch 'master' into PMP-visitor-GF 2020-09-15 12:42:47 +02:00
Jane Tournois be7d9d1728 doc fixes 2020-09-10 14:31:48 +02:00
Jane Tournois 39e75e7530 rename split_visitor to triangulate_visitor and add PMPTriangulateFaceVisitor 2020-09-10 12:06:10 +02:00
Jane Tournois 626ba2745c replace done() by end() to be consistent with start() 2020-09-08 21:42:00 +02:00
Jane Tournois 268c0eabee replace operator() with more explicit visit() function 2020-09-08 19:03:34 +02:00
Jane Tournois 5490227707 fix compilation after rebase 2020-09-08 18:45:30 +02:00
Andreas Fabri f2ff13d6c4 Add a visitor that allows to map each triangle to its original face
# Conflicts:
#	BGL/include/CGAL/boost/graph/named_params_helper.h
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/triangulate_faces_example.cpp
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
2020-09-08 15:17:18 +02:00
Sébastien Loriot e2733ddeb0 add missing include directive for header checking 2020-08-28 08:10:04 +02:00
Sébastien Loriot c24ec4cfc4 tws 2020-08-19 17:29:06 +02:00
Sébastien Loriot b03fa54299 add a convenience header file to inherit from face graphs 2020-08-19 14:29:09 +02:00
Sébastien Loriot e697f91349 remove PMP dependency 2020-08-18 10:34:22 +02:00
Sébastien Loriot 0243e4d42a remove workaround, boost minimal version required is 1.58 now 2020-08-18 10:08:59 +02:00
Sébastien Loriot e893ac1178 cosmetic changes 2020-08-18 10:06:51 +02:00
Sébastien Loriot b29a31ae27 remove boost header as nothing from the original file remains 2020-08-18 10:06:22 +02:00
Sébastien Loriot 9e3345f68f Update from master 2020-08-12 16:05:45 +02:00
Sébastien Loriot 7c7f21e2dd avoid warning 2020-08-12 15:48:18 +02:00
Sébastien Loriot a1abdf372a add a constuctor with an empty selection 2020-08-12 15:32:58 +02:00
Laurent Rineau 962b681abd Merge pull request #4871 from janetournois/Tet_remeshing-add_smoothing_of_features-jtournois
Tetrahedral remeshing - smoothing along 1D features
2020-07-31 15:52:56 +02:00
Laurent Rineau f7d899a901 fix license header 2020-07-27 15:01:34 +02:00
Laurent Rineau 6ebe6d6845 <CGAL/draw_face_graph.h>
That factorizes the code for the `draw()` function for `Polyhedron_3`
and `Surface_mesh`.
2020-07-24 13:09:53 +02:00
Laurent Rineau a84927d380 Merge pull request #4849 from MaelRL/PMP-No_caps_on_doc-GF
Use lower case for function documentation starting with a verb (BGL/PMP)

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
2020-07-23 17:15:44 +02:00
Jane Tournois 32edd68ab0 Merge remote-tracking branch 'cgal/master' into Tet_remeshing-add_smoothing_of_features-jtournois
# Conflicts:
#	Tetrahedral_remeshing/doc/Tetrahedral_remeshing/NamedParameters.txt
#	Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
2020-07-23 17:08:12 +02:00
Jane Tournois 42b272d8ca reintroduce smoothing along polyline features
introduce named parameter smooth_constrained_edges
2020-07-23 12:19:58 +02:00
Mael Rouxel-Labbé ebd65c9637 Use lower case for function doc starting with a verb (BGL/PMP) 2020-07-20 11:47:30 +02:00
Mael Rouxel-Labbé 93f1cd99ca Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-07-16 09:53:31 +02:00
Mael Rouxel-Labbé d567a0d9d0 Fix doc warnings 2020-07-16 09:52:32 +02:00
Andreas Fabri a635c9425d Merge remote-tracking branch 'cgal/master' into BGL-test_face-GF 2020-07-15 11:13:09 +01:00
Sébastien Loriot e43221ae8b add an option to not refine one of the two meshes 2020-06-16 15:15:48 +02:00
Sébastien Loriot 983d958e7d make the non-manifold test depends on the input size in case of append 2020-06-10 17:39:56 +02:00
Sébastien Loriot 19ed8f9f39 take append into account for reserve 2020-06-10 17:21:01 +02:00
Mael Rouxel-Labbé 071565467d Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-06-03 19:01:46 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Andreas Fabri bd04336674 Fix variable name. Why did this compile locally?? 2020-05-19 16:42:44 +01:00
Laurent Rineau af456548af Merge pull request #4471 from MaelRL/PMP-Halfedge_comparer_for_stitch_borders-GF
PMP: Enable enforcing which edge is kept during stitching
2020-05-18 12:25:01 +02:00
Andreas Fabri 8c68031de1 Move the code into Euler_operations.h 2020-05-15 15:23:52 +01:00
Andreas Fabri 6e26cf0a39 Change name of function and variable 2020-05-15 15:16:25 +01:00
Mael Rouxel-Labbé 4b9f7fe425 Merge remote-tracking branch 'cgal/master' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-05-12 19:19:41 +02:00
Mael Rouxel-Labbé 038869cab9 Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF 2020-05-12 15:12:21 +02:00