songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
81,923 Commits 3 Branches 156 Tags 966 MiB
Commit Graph

5787 Commits

Author SHA1 Message Date
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 8a0dc2f279 Add one draw example in each user manual. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 8018675aef Update package description 2018-05-29 11:11:49 +02:00
Guillaume Damiand fb95a8e0d9 Add doc for draw 2018-05-29 11:11:49 +02:00
Guillaume Damiand ff586425af All 4 new examples to illustrate the usage of CGAL::draw. 2018-05-29 11:11:49 +02:00
Guillaume Damiand ddfb8204dc Add figures for all the basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC) 
* Update FindQGLViewel to add a target.
 2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5d375eff74 Update all basic viewers to have the correct behavior when CGAL_USE_BASIC_VIEWER is not defined. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 8870e304a3 Update basic viewer; now it works for LCC, Polyhedron and Surface_mesh. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand b7f5c709f0 rename filename for polyhedron viewer 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 592d770dea Add polyhedron viewer 2018-05-29 10:47:42 +02:00
Sébastien Loriot d3a9f655af replace bool parameter throw_on_self_intersection with a named parameter 
used it at the same time in Boolean operation functions
 2018-05-28 17:37:17 +02:00
Sébastien Loriot 3c382accca document the default new face visitor 
I have to move everything in the CGAL::PMP::Corefinement because
CGAL::Corefinement was strange for a publicly documented type
 2018-05-28 17:37:16 +02:00
Maxime Gimeno f74e5491cd Add an extrusion plugin. 2018-05-28 16:49:54 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 13:58:41 +02:00
Laurent Rineau 2ad4781a05 Merge pull request #3092 from maxGimeno/Travis-Check_including_all_headers-GF 
Infrastructure : Test compilation of headers
 2018-05-28 13:58:19 +02:00
Laurent Rineau 265a81bf76 Merge pull request #2967 from maxGimeno/CGAL-With_QGLViewer-GF 
CGAL_Qt5: include QGLViewer
 2018-05-28 13:58:10 +02:00
Laurent Rineau 851dfabd29 Merge pull request #2757 from maxGimeno/BGL-Add_facegraph_validity_check_function-GF 
BGL:  Add a  FaceGraph validity check function
 2018-05-28 13:58:07 +02:00
Laurent Rineau f20743cc20 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF 
Fix some deprecation-related issues
 2018-05-28 11:00:45 +02:00
Andreas Fabri ee02f35888 Increase BOOST_PARAMETER_MAX_ARITY 2018-05-26 08:18:58 +01:00
Maxime Gimeno 88fd95c116 return if less that 2 selected items 2018-05-25 15:23:28 +02:00
Andreas Fabri 5af63b5893 Fix #include 2018-05-25 10:27:45 +01:00
Maxime Gimeno 754cb2c491 Fix switch case in shortest_path_item 2018-05-23 16:29:03 +02:00
Maxime Gimeno a6ffea9f58 Remove unused scene_c2t3_item 2018-05-23 16:28:51 +02:00
Maxime Gimeno e97d45d07d Update Classification Plugin 2018-05-23 16:21:57 +02:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Maxime Gimeno 5fc0022d92 make copy_face_graph use NamedParameters 2018-05-17 10:49:58 +02:00
Maxime Gimeno 5f9d01c37a Add includes to constraint.h 2018-05-17 10:38:35 +02:00
Maxime Gimeno a3f84409cd Fix after rebase 2018-05-17 10:20:57 +02:00
Maxime Gimeno f7d0fc72cd fix the <:: error 2018-05-17 10:20:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Andreas Fabri ff0836ec79 cleanup 2018-05-17 10:20:56 +02:00
Jane Tournois e9c7042c05 remove include of moc file (causes a warning on msvc) 2018-05-17 10:20:56 +02:00
Jane Tournois 3042d68fb1 remove code that depends on QGLViewer version 2018-05-17 10:20:56 +02:00
Maxime Gimeno 2779034aa1 Fix Triangulation_2 2018-05-17 10:20:56 +02:00
Maxime Gimeno 495b087c6f Finish snapshot implem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 4c6546a558 Clean-up the viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 3995c80524 fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer 
Begin the implementation of the graphcal hints
 2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Sebastien Loriot 9938100097
Merge pull request #2955 from afabri/BGL-include_cleanup-GF 
Do not include some BGL related header files
 2018-05-15 22:21:42 +02:00
Laurent Rineau 5a5195a4f4
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-05-15 16:11:14 +02:00
Laurent Rineau 28ae3c1370 Remove the domain wrapper file, that is no longer used 2018-05-15 14:56:23 +02:00
Laurent Rineau 4d1f569bab Fix -Wconversion warnings 2018-05-15 14:56:22 +02:00
Laurent Rineau 82f900bcb6 Add Labeled_mesh_domain_3<K>::create_labeled_image_mesh_domain 
... and deprecate `CGAL::Labeled_image_mesh_domain_3`.
 2018-05-15 14:56:22 +02:00
Laurent Rineau c4274c9d57 Use the new API of Labeled_mesh_domain_3 for the demo 2018-05-15 14:56:22 +02:00
Laurent Rineau 54dc1de0d5 Fix a -Wconversion warning 2018-05-15 14:56:22 +02:00
Laurent Rineau d07f7d818c Remove -Wconversion warnings 2018-05-15 14:56:22 +02:00
Laurent Rineau 21074a5c19 Fix -Wconversion warnings 2018-05-15 14:56:21 +02:00
Laurent Rineau 7e9165d78a WIP: Change the template parameters of Labeled_image_mesh_domain_3 (TODO) 
TODO: document the changes, once that is over.
 2018-05-15 14:56:21 +02:00
Laurent Rineau 569b823cd5 Protection of triple lines of the bbox for scalar images 
Now that work. I have to work a bit on the precision of the approximation.
 2018-05-15 14:56:20 +02:00
Sebastien Loriot a362d94106
Merge pull request #3026 from maxGimeno/Demo-Add_partiton_plugin-GF 
Polyhedron demo: METIS Partition plugin
 2018-05-07 12:02:48 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Maxime Gimeno 861a6a16c5 Fixes 2018-05-03 12:49:34 +02:00
Maxime Gimeno 4a8375ce85 Optimize 2018-05-03 12:49:34 +02:00
Maxime Gimeno 68de1819cf Move the code to the PMP functio nand document. 2018-05-03 12:49:34 +02:00
Maxime Gimeno 7aa9c940e7 Add action for stitching by CC to stitching_plugin 2018-05-03 12:49:34 +02:00
Maxime Gimeno 132cf694a0 remove is_valid() from the graph_traits 2018-05-03 12:03:14 +02:00
Mael Rouxel-Labbé a0427ec756 Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations 
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.

Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.

- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
  and then built Delaunay triangulations with that (Alpha Shapes, etc.)
  are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
  wouldn't compile if you actually provided a model of
  TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
  MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
  and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
 2018-04-26 13:21:53 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Maxime Gimeno 1e25019cb2 fix flat_shader 2018-04-25 10:21:17 +02:00
Laurent Rineau 7b44a7b681 Merge pull request #3002 from sgiraudot/Polyhedron_demo-Fix_selection_blinking_display-GF 
Polyhedron demo: Fix selection blinking display
 2018-04-24 17:34:13 +02:00
Laurent Rineau 935b40e266 Merge pull request #3034 from maxGimeno/Demo-Fix_orient_for_surface_mesh-GF 
Polyhedron demo: Fix the orientation of polygon soup to surface_mesh
 2018-04-24 17:33:46 +02:00
Laurent Rineau 7cf8c73b65 Merge pull request #3032 from sloriot/Demo-accelerate_offset_meshing 
Accelerate distance queries for offset meshing plugin
 2018-04-24 17:33:38 +02:00
Laurent Rineau d57df10832 Merge pull request #2991 from afabri/BGL-fix_add_vertex_and_face_to_border-GF 
Fix Euler::add_vertex_and_face_to_border()
 2018-04-24 17:33:13 +02:00
Laurent Rineau 03e68d8740 Merge pull request #2985 from afabri/CGAL-std_latest-GF 
Support C++17 (Replace std::random_shuffle() with CGAL::random_shuffle(), and other adjustments)
 2018-04-24 17:32:55 +02:00
Laurent Rineau 1c8da87ec5 Merge pull request #2979 from maxGimeno/Demo-add_a_verbose_option-GF 
Polyhedron demo: Add a verbose option
 2018-04-24 17:32:39 +02:00
Andreas Fabri 707de38534 Use CGAL::cpp98::random_shuffle 2018-04-24 16:23:56 +01:00
Maxime Gimeno b92a328df2 Add a UI feature to the viewer to change the lighting settings 2018-04-20 15:48:18 +02:00
Maxime Gimeno a6531ca8ac add missing collect_garbage() 2018-04-20 09:04:46 +02:00
Sébastien Loriot 8a39c99557 accelerate distance queries for offset meshing 2018-04-19 17:55:03 +02:00
Maxime Gimeno fbff900d82 Add property to other plugins to work with join_and_split_plugin 2018-04-17 10:06:53 +02:00
Maxime Gimeno bf8699976a Add a plugin to Partition a mesh according to its dual or its nodal graph. 2018-04-16 16:55:10 +02:00
Maxime Gimeno ca41f37a05 Fix Save_as. 2018-04-11 13:46:25 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Simon Giraudot 74db6a6ba2 Fix selection blinking display 2018-04-10 12:52:58 +02:00
Laurent Rineau d1509b4e3e Merge pull request #2990 from janetournois/Polyhedron_demo-add_quads_stats-jtournois 
Polyhedron statistics (demo) - add "is pure quad"
 2018-04-06 18:12:41 +02:00
Laurent Rineau 11d0ef3659 Merge pull request #2997 from maxGimeno/Demo-Fix_eigen_dependencies-GF 
Polyhedron demo: Fix MCF whithout Eigen
 2018-04-06 18:12:33 +02:00
Laurent Rineau 7c43bd0402 Merge pull request #2980 from maxGimeno/Demo-Fix_NM_simplices_extraction-GF 
Polyhedron demo: Fix NM simplices extraction
 2018-04-06 18:12:25 +02:00
Maxime Gimeno 7bfdc96781 Move MCF plugin and items in if EIGEN_FOUND 2018-04-06 15:52:02 +02:00
Maxime Gimeno 01a82a3ef2 Fix selection tool accordingly 2018-04-06 10:38:42 +01:00
Jane Tournois 9afbc37316 add "is pure quad" to the polyhedron statistics 2018-04-05 13:38:55 +02:00
Maxime Gimeno 4d8eff5c91 Fix scaling in translation 2018-04-04 16:45:15 +02:00
Andreas Fabri 3955f031bd Fix examples/tests/demos 2018-04-04 14:18:22 +01:00
Laurent Rineau 0e61c629fc Trivial fix: yet another makeCurrent was missing! 2018-04-03 16:15:32 +02:00
Maxime Gimeno be02003aa8 Don't add NM vertices if they are already in a NM edge, for visibility. 2018-04-03 16:07:52 +02:00
Maxime Gimeno b41aa13a0c clean-up 2018-04-03 14:44:04 +02:00
Maxime Gimeno 04415251c9 Add a verbose option to the Demo for displaying the logs 2018-04-03 12:06:07 +02:00
Laurent Rineau 1b273903cb Merge pull request #2968 from afabri/Convex_hull_3-remove_Polyhedron_3_dependency-GF 
Convex_hull_3: Remove dependency on Polyhedron_3
 2018-03-30 10:56:47 +02:00
Laurent Rineau 1a858e94e3 Merge pull request #2960 from maxGimeno/Demo-Fix_bbox_after_deformation-GF 
Polyhedron demo: Fix Bbox computation in facegraph_items
 2018-03-30 10:56:14 +02:00
Laurent Rineau ceec03a1b9 Merge pull request #2940 from sgiraudot/Classification-Additional_enhancements-GF 
Classification Plug-In: Better Widget & Cluster Classification
 2018-03-28 17:46:15 +02:00
Andreas Fabri 76ccc9ab6f Convex_hull_3: Remove dependency on package Polyhedron 2018-03-28 14:59:22 +01:00
Simon Giraudot 3903c795a2 Fix conversion warning 2018-03-27 12:57:09 +02:00
Maxime Gimeno 51120e5413 Fix Bbox computation in facegraph_items 2018-03-27 11:47:53 +02:00
Laurent Rineau 237735ab73 Merge pull request #2946 from afabri/CGAL-dependencies-GF 
Move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh
 2018-03-27 10:35:23 +02:00
Laurent Rineau 624bb54475 Merge pull request #2953 from gdamiand/LCC-remove_one_dependency-gdamiand 
Remove one useless dependency in LCC to Polyhedron.
 2018-03-27 10:11:36 +02:00
Laurent Rineau e8adff9cd4 Merge pull request #2926 from sloriot/CGAL-https_links 
Use https for all links to www.cgal.org and doc.cgal.org
 2018-03-26 10:56:00 +02:00
Laurent Rineau 4f02b8c9f0 Merge pull request #2929 from maxGimeno/Demo-Fix_selection_edge_to_face-GF 
Polyhedron demo: Fix the selection edge to faces
 2018-03-26 10:55:59 +02:00
Laurent Rineau 1ef766c19b Merge pull request #2932 from kkatrio/null-edge-hole-filling 
PMP hole filling: null edge
 2018-03-26 10:55:58 +02:00
Andreas Fabri b918ab4ba7 Move internal class from Polyhedron to BGL 2018-03-24 11:41:30 +01:00
Andreas Fabri 598fd59ea1 fix Polyhedron demo 2018-03-22 18:01:50 +01:00
Andreas Fabri 8c41669fb7 move properties from Mesh_3 to BGL, Polyhedron_3 and Surface_mesh 2018-03-22 16:37:37 +01:00
Simon Giraudot 5cbf1e1abd Fix errors/warnings 2018-03-21 07:42:48 +01:00
Maxime Gimeno da90725e66 Don't use a pointer for the fbo. 2018-03-20 14:05:45 +01:00
Maxime Gimeno 85524668e8 Fix for 2.7 2018-03-20 12:49:55 +01:00
Maxime Gimeno 32f0a3fba8 Fix for qglviewer 2.6. 2.7 only captures the background. 2018-03-20 12:42:55 +01:00
Simon Giraudot bfceda2d76 Create one item per label for clusters 2018-03-19 12:12:37 +01:00
Simon Giraudot d421271937 Fix warnings 2018-03-19 12:04:19 +01:00
Simon Giraudot 1cb3feb31d Bugfix: do not compare unsigned with signed 2018-03-19 11:37:27 +01:00
Simon Giraudot c5cb2a9cf5 Classification smoothed on clusters 2018-03-19 11:37:26 +01:00
Simon Giraudot c92916e374 Latest updates 2018-03-19 11:37:26 +01:00
Simon Giraudot 2aadae6f60 Method to reset training of selection 2018-03-19 11:37:26 +01:00
Simon Giraudot 2af94d1143 Fix comment update 2018-03-19 11:37:26 +01:00
Simon Giraudot 51c1cfbdee Display inliers informations before training 2018-03-19 11:37:26 +01:00
Simon Giraudot c4b542a74d Better handling of default colors for labels 2018-03-19 11:37:26 +01:00
Simon Giraudot 7c9c3a7007 Use shortcuts for training 2018-03-19 11:37:26 +01:00
Simon Giraudot 5ee040ad99 Add several labels altogether 2018-03-19 11:37:26 +01:00
Simon Giraudot 1e61542de6 Select random region 2018-03-19 11:37:26 +01:00
Simon Giraudot b0b0ec5b55 Add option to use clusters in plug-in 2018-03-19 11:37:26 +01:00
Simon Giraudot 790ad0ba67 Clean up: use position instead of name 2018-03-19 11:37:26 +01:00
Simon Giraudot 142189bb88 Add classification of clusters in plug-in 2018-03-19 11:37:25 +01:00
Simon Giraudot 53049bd07c Add rainbow ramp 2018-03-19 11:37:25 +01:00
Konstantinos Katrioplas 9b4c24223b fix warning message on Polyhedron demo when not using DT 2018-03-16 14:47:02 +01:00
Maxime Gimeno f0fce954d9 Make the code for edge_to_facets selection safer. 2018-03-15 15:23:10 +01:00
Mael Rouxel-Labbé 8646350d47 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-03-15 14:42:21 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau e687e38d9c Merge pull request #2911 from lrineau/CGAL-prefix_CMake_options_with_CGAL-GF 
Prefix CMake options with `CGAL_`
 2018-03-09 18:41:24 +01:00
Laurent Rineau ba041a5dc1 Merge pull request #2909 from maxGimeno/Demo-Selection_item_tooltip-GF 
Polyhedron demo: Fix tooltip for selection item
 2018-03-09 18:41:08 +01:00
Laurent Rineau d9a966287e Merge pull request #2908 from maxGimeno/Demo-Fix_aabb_plugin-GF 
Polyhedron demo: Fix cut plugin
 2018-03-09 18:40:57 +01:00
Laurent Rineau b4bfda04ca Merge pull request #2905 from maxGimeno/c3t3_item-Fix-GF 
Polyhedron_demo : Add a check before trying to load a cdt_3 to avoid crashing
 2018-03-09 18:40:34 +01:00
Laurent Rineau c3ac7f70c4 Merge pull request #2904 from maxGimeno/Demo-Fix_rotation_point-GF 
Polyhedron demo: More fixes for the Viewer
 2018-03-09 18:40:26 +01:00
Laurent Rineau 4a7966d145 Merge pull request #2860 from lrineau/Installation-fix_check_headers-GF 
Fix CGAL_ENABLE_CHECK_HEADERS, again
 2018-03-09 18:39:26 +01:00
Maxime Gimeno 491243a24f update available operations when selecting boundary edges or inverting selection 2018-03-08 12:14:32 +01:00
Laurent Rineau f12b3bf302 Prefix CMake options with `CGAL_` 
- in `examples/Mesh_3/`,
- in `examples/Point_set_processing_3/`,
- in `demo/Polyhedron/`, and
- in `demo/Triangulation_3/`.
 2018-03-08 12:07:49 +01:00
Maxime Gimeno d76ba39104 Fix selection_item tooltip so it shows the number of selected simplices 2018-03-07 16:20:05 +01:00
Laurent Rineau c741950dd2 Merge pull request #2901 from sloriot/Demo-add_exp_autorefinement 
Add actions to use autorefinement
 2018-03-07 16:06:13 +01:00
Maxime Gimeno 60e6e4b35d add missing curly brackets 2018-03-07 14:13:44 +01:00
Maxime Gimeno 4ce3a55096 Add a check before trying to load a cdt_3 to avoid crashing. 2018-03-07 11:00:49 +01:00
Maxime Gimeno 2b250c5d07 Fix the RotationPoint setting. 2018-03-07 09:52:47 +01:00
Sébastien Loriot a66834b976 add actions to use autorefinement 2018-03-06 19:30:25 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Laurent Rineau cca666e28f Merge pull request #2844 from maxGimeno/Orient_soup-Output_nm_edges_in_polyline-GF 
Polyhedron demo: Make Polyline from non manifold edges
 2018-03-06 16:24:16 +01:00
Laurent Rineau a3ee6a03b8 Merge pull request #2896 from maxGimeno/C3t3_item-Add_offset-GF 
Polyhedron demo: fix c3t3 display with big coordinates
 2018-03-06 16:24:08 +01:00
Laurent Rineau f092c04180 Merge pull request #2607 from maxGimeno/Selection_plugin_fix-GF 
Polyhedron demo: Fixes for QGLViewer 2.7 and remove GlSplat
 2018-03-06 16:23:58 +01:00
Laurent Rineau 91e2d65e97 Merge pull request #2892 from sgiraudot/Polyhedron_demo-Fix_region_selection-GF 
Polyhedron demo: Fix Region Selection / Position Request
 2018-03-06 16:23:41 +01:00
Laurent Rineau 9e31b1874b Merge pull request #2887 from maxGimeno/Fix_polylines_item-GF 
Polyhedron demo: Fix operations for polyline
 2018-03-06 16:23:00 +01:00
Laurent Rineau 34c8857c9e Merge pull request #2884 from maxGimeno/CGAL-Remove_gl_h-GF 
Remove remaining native GL code
 2018-03-06 16:22:34 +01:00
Andreas Fabri f91a93d02b Quit VC++ warning concerning a third party lib for reading LAS files 2018-03-06 15:05:21 +00:00
Maxime Gimeno 2cd2319af9 Fix display with offset 2018-03-05 15:04:41 +01:00
Maxime Gimeno 3f4641623f Fix cut_plane when loading c3t3 with offset 2018-03-05 14:53:51 +01:00
Simon Giraudot 219d1e4f80 Fix selection/point info with offset 2018-03-05 10:39:57 +01:00
Laurent Rineau 4d8b25d409 Merge pull request #2847 from maxGimeno/Selection_tool-Filter_operations-GF 
Polyhedron demo: Enhance selection tool
 2018-03-02 16:33:56 +01:00
Laurent Rineau 8290c80c6a Merge pull request #2878 from maxGimeno/Statistics-restore_for_multiple_items-GF 
Polyhedron demo: Restore statistics for multiple items
 2018-03-02 16:33:48 +01:00
Laurent Rineau 2fcdcf120c Merge pull request #2876 from sloriot/Demo-restore_cursor 
Restore cursor in case of failure
 2018-03-02 16:33:40 +01:00
Laurent Rineau 8b07fffb78 Merge pull request #2834 from maxGimeno/Polyhedron_demo-Save_as_enhancement-GF 
Polyhedron demo: Save as enhancement
 2018-03-02 16:32:49 +01:00
Maxime Gimeno 6609313ae1 Fix typo 2018-03-02 15:48:25 +01:00
Maxime Gimeno fb38eaec4a Clean-up and add a dialog in the probably impossible case nothing is non-manifold. (in this cas eit is orientable and so it is not a soup). 2018-03-02 11:47:45 +01:00
Maxime Gimeno 9db54327db conflict resolution 2018-03-01 08:48:02 +01:00
Maxime Gimeno 02044f2993 change highlight api for Scene_edit_box_item 2018-03-01 08:41:27 +01:00
Maxime Gimeno 8a50397cd9 Fix Edit_box 2018-03-01 08:40:27 +01:00
Maxime Gimeno 59e8a2c52c fix volume planes manipulation 2018-03-01 08:40:26 +01:00
Maxime Gimeno ad8d97e566 Fix highlighting 2018-03-01 08:40:26 +01:00
Maxime Gimeno 3c770e07df Fix 2d painting for selection 2018-03-01 08:40:26 +01:00
Maxime Gimeno f7aef14b49 Actually fix the Basic Objects menu 2018-03-01 08:40:26 +01:00
Maxime Gimeno ade8725046 add a makeCurrent() in the item's constructor 2018-03-01 08:40:26 +01:00
Maxime Gimeno 6fd37cbfab Fix segfault in selection 2018-03-01 08:39:35 +01:00
Maxime Gimeno 6389050f9b Fix depth problem in selection 2018-03-01 08:39:35 +01:00
Maxime Gimeno a5a6cc7c1e Fix warnings 2018-02-28 15:25:52 +01:00
Maxime Gimeno 8706ec9342 Fix operations for polyline 2018-02-28 12:01:56 +01:00
Maxime Gimeno bc2410d4ad Fixes 2018-02-28 11:40:49 +01:00
Maxime Gimeno 2156017402 Remove native gl.h include and native gl code in Surface_mesher/archive 2018-02-28 10:36:26 +01:00
Maxime Gimeno d1fcfab838 Restore statistics for multiple items 2018-02-27 12:23:26 +01:00
Sébastien Loriot 0cac04a04b restore cursor in case of failure 2018-02-27 10:58:31 +01:00
Maxime Gimeno 0c5d906736 Rename action and adds a dialog when orienting. 2018-02-26 13:42:50 +01:00
Mael Rouxel-Labbé d9168d011c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 18:24:39 +01:00
Laurent Rineau de4f63f20d Merge pull request #2838 from maxGimeno/BGL-remove_self_intersection-GF 
Improve experimental repairing functions
 2018-02-23 17:34:49 +01:00
Simon Giraudot efb52c8fde Fix outdated name in dialog 2018-02-23 13:19:12 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Andreas Fabri 90d6424b0d Remove typename in non-template code 2018-02-23 07:59:31 +00:00
Simon Giraudot 170ceb60c4 Add remaining time estimation 2018-02-22 14:45:36 +01:00
Simon Giraudot d0328e54a5 Add comment about shape = -1 for clarity 2018-02-21 10:25:19 +01:00
Simon Giraudot 86d6738ecd Do not clear PLY comments, just remove previous labels 2018-02-21 10:13:55 +01:00
Simon Giraudot f77bf61301 Save shape definitions in PLY comments 2018-02-21 10:13:40 +01:00
Maxime Gimeno 1d37fa8a47 If the extension for the corresponding filter is already present in the filename, don't add it a second time. 2018-02-21 09:54:09 +01:00
Simon Giraudot 15caaabf08 Add option to save cluster_id in point set item + console progress bar 2018-02-20 16:33:24 +01:00
Simon Giraudot d589bc1e94 Parallelize buffer filling 2018-02-20 16:33:24 +01:00
Simon Giraudot 75fb744119 Region selection + expand/reduce + parallelized selection test 2018-02-20 16:33:24 +01:00
Simon Giraudot 80b2b77b77 Add Region Selector 2018-02-20 16:33:24 +01:00
Maxime Gimeno e784259f0e Use c++11 to make the string list initialization look better 2018-02-20 14:52:13 +01:00
Maxime Gimeno b7b93c8b93 Remove bugged topology detection in selection_plugin. 2018-02-20 08:27:38 +01:00
Maxime Gimeno cde00f7757 Clean-up and overload. 2018-02-19 18:04:54 +01:00
Maxime Gimeno 3fdc7b67b2 remove non_filled_holes 2018-02-19 18:04:54 +01:00
Maxime Gimeno 2758143116 fixing the topology test. 2018-02-19 18:04:03 +01:00
Maxime Gimeno 2ff403e55d Enhance the selection_plugin with the new function 2018-02-19 18:04:01 +01:00
Laurent Rineau addb9230ce Merge pull request #2782 from maxGimeno/Boundary_edges_selection_fix-GF 
Polyhedron demo: Fix edge selection -> face selection conversion
 2018-02-19 14:28:27 +01:00
Laurent Rineau b0c6e37c1d Merge pull request #2772 from MaelRL/SMP-Clean_internal_from_example-GF 
SMP: Documented some functions used in the Orbifold Tutte parameterizer

# Conflicts:
#	Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
 2018-02-19 14:27:59 +01:00
Laurent Rineau 637bf71645 Merge pull request #2828 from lrineau/CGAL-fix_various_issues-GF 
fix various minor issues
 2018-02-19 14:27:16 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF 
BGL: Document graph_has_property
 2018-02-19 14:26:33 +01:00
Laurent Rineau 705056526c Merge pull request #2828 from lrineau/CGAL-fix_various_issues-GF 
fix various minor issues
 2018-02-19 14:24:32 +01:00
Laurent Rineau 2afbcc7fa5 Merge pull request #2772 from MaelRL/SMP-Clean_internal_from_example-GF 
SMP: Documented some functions used in the Orbifold Tutte parameterizer
 2018-02-19 14:24:23 +01:00
Maxime Gimeno e7a6bb5619 Add points item export for non-manifold vertices of the soup. 2018-02-19 11:51:54 +01:00
Maxime Gimeno 1105e32896 Filter operations in QComboBox according to what simplices are currently in the selection. 2018-02-15 16:22:32 +01:00
Maxime Gimeno c6b9a282ee Add an action to create a polyline from non manifold edges of a soup. 2018-02-15 15:15:06 +01:00
Laurent Rineau 0eaabaa711 Merge pull request #2811 from maxGimeno/Polyhedron_demo-Fix_selection_IO-GF 
Polyhedron_demo: Fix some crashes when saving an item.
 2018-02-14 15:35:29 +01:00
Laurent Rineau 6e2d0aa4a1 Merge pull request #2810 from maxGimeno/Fix_colors-Polyhedron_demo-GF 
Polyhedron demo: fix color selection in the SceneView.
 2018-02-14 15:35:21 +01:00
Laurent Rineau bcfad15b16 Merge pull request #2802 from afabri/Polyhedron-STL-GF 
Polyhedron: Add *STL to nameFilters()
 2018-02-14 15:34:38 +01:00
Laurent Rineau 8a55d4cd94 Merge pull request #2798 from sgiraudot/Polyhedron_demo-Fix_reconstruction_angle_parameter-GF 
Polyhedron Demo Surface Reco. Plugin: Fix missing conversion from degrees to radiants
 2018-02-14 15:34:15 +01:00
Laurent Rineau 0ad9e405dd Merge pull request #2789 from afabri/Classification-fix_CMakeLists-GF 
win32 fix concerning bzip headers in the classification plugin CMakeLists.txt
 2018-02-14 15:33:58 +01:00
Laurent Rineau 9e7115ac2e Merge pull request #2784 from maxGimeno/Travis_check_package_dep-GF 
TravisCI:  check package dependencies
 2018-02-14 15:33:31 +01:00
Maxime Gimeno 4cb8afebee Use default filepath of item when saving if exists, if not use last path used when save_as in the current session if exists, if not use build dir like before. 2018-02-14 14:12:31 +01:00
Maxime Gimeno b50fddc9d8 Add a function to decide which filter should be the default when saving. 2018-02-14 13:56:00 +01:00
Laurent Rineau 741dbaf9f3 Fix a bug in demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt 
The file "Polyhedron_demo_mesh_3_plugin_cgal_code.cpp" was renamed *long*
ago. I do not know why I got that CMake error only recently.
 2018-02-13 16:00:29 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno 16b8999c14 If the filters are empty, filters.first().split(";;") will trigger an assertion and probably segfault, so I add a check before that. 2018-02-08 15:19:23 +01:00
Maxime Gimeno 1dfbced8d5 If the color column selected clicked is not in the selection, edit the corresponding item, not the current selection. 2018-02-08 13:23:57 +01:00
Maxime Gimeno dae33259c5 Use toLower() in the mainWindow to read indistinctly lower and capital extensions. 2018-02-07 14:36:45 +01:00
Andreas Fabri 73ba2a8e5b Polyhedron: Add *STL to nameFilters() 2018-02-07 08:53:37 +00:00
Simon Giraudot d84119056b Fix missing conversion from degrees to radiants 2018-02-06 14:10:41 +01:00
Maxime Gimeno 7a5e92d307 replace halfedge by fg_halfedge 2018-02-05 08:03:08 +01:00
Andreas Fabri f750c27354 win32 fix concerning bzip headers in the classification plugin CMakeLists.txt 2018-02-02 15:21:53 +00:00
Laurent Rineau 36514e2c65 Merge pull request #2759 from maxGimeno/Minor_feature_requests-GF 
Polyhedron demo: small new features
 2018-02-02 16:08:01 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno e7ebbd731d Add a butotn in edge selection mode that allows to select the whole boundary. 2018-02-02 09:27:41 +01:00
Maxime Gimeno 1ef82e471b check if the edge is NOT a border edge before calling its opposite. 2018-02-02 08:48:04 +01:00
Andreas Fabri 7d5b51c4f0 cast and reindent 2018-02-01 16:36:23 +00:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF 
Classification: ETHZ Random Forest
 2018-02-01 17:35:30 +01:00
Simon Giraudot 361f132290 Fix conversion warning 2018-01-31 13:55:51 +01:00
Maxime Gimeno f46e805c77 Make inherit the usage of TBB in the cmake macro 2018-01-30 14:09:47 +01:00
Maxime Gimeno 60b2f8ac58 Fix c3t3_io_plugin with TBB 2018-01-30 14:02:44 +01:00
Mael Rouxel-Labbé b352738d70 Documented some functions used in SMP/Orbifold Tutte Embedding parameterizer 
Along the way, fix a few mistakes and generalize the API of these newly
documented functions.
 2018-01-29 18:32:25 +01:00
Maxime Gimeno 44283d17c2 un-clip when item is erased 2018-01-26 16:30:58 +01:00
Maxime Gimeno b6181e7c2a Fix points size in point_set reload. 2018-01-23 17:47:48 +01:00
Maxime Gimeno 604c1ed006 fix load_obj in off_io_plugin 2018-01-23 17:31:21 +01:00
Maxime Gimeno 254a734beb Change saving extensions management 2018-01-23 17:22:45 +01:00
Maxime Gimeno f946773a6c Fix Group deletion 2018-01-23 15:34:58 +01:00
Maxime Gimeno 102f78fc88 initialize c3t3 cutplane to visible. 2018-01-23 14:32:07 +01:00
Maxime Gimeno ce4a801b6c Add isolated vertices counting for surface_mesh 2018-01-23 12:17:39 +01:00
Maxime Gimeno 34268821a8 replace facets by faces in polyhedron_item's tooltip 2018-01-23 11:53:52 +01:00
Maxime Gimeno 23cdc9fb63 split filters for surface_mesh and polyhedron in save and load namefilters to avoid weird names in save dialog 2018-01-23 11:51:50 +01:00
Maxime Gimeno 6f54aac350 Fix c3t3 events and plane after reload. 2018-01-23 11:42:49 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Maxime Gimeno 8c8b9c5ae4 Disable scene_edit_box's events when it is not visible 2018-01-23 09:48:33 +01:00
Maxime Gimeno ec3438ff44 Add a check for finiteness(???) to applicable() for the create_bbox_mesh_plugin and make the scene_intersection_item not finite. 2018-01-23 09:38:35 +01:00
Maxime Gimeno 78bda89857 Add a function to the group_item that specifies which of its children are selected along with it. 
This allows the c3t3_item to override it and return an empty list, so it ignores the selection behavior of the group and keeps it possible to apply an operation only to the c3t3 when it has children like visible tets.
 2018-01-23 09:26:11 +01:00
Maxime Gimeno 19af16022c remove display all ids and initialize ids displaying to false. 2018-01-22 16:40:41 +01:00
Maxime Gimeno 36ec70659f No error when cancelling a zoom to id 2018-01-22 16:20:57 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Maxime Gimeno 50aa20906f Specify different names for dock widgets SM/Polyhedron 2018-01-19 15:56:52 +01:00
Laurent Rineau 87ddddf04b Merge pull request #2278 from maxGimeno/Integrate_remeshing_plugin_into_mesh_3-GF 
Polyhedron_demo: Remove the Remeshing_plugin
 2018-01-19 15:22:41 +01:00
Simon Giraudot 5d1aa4de87 Fix conversion warning 2018-01-19 14:13:51 +01:00
Maxime Gimeno e920af7e06 Don't use lambda in addAction() for travis 2018-01-19 09:22:52 +01:00
Maxime Gimeno 6fa6b2afdd Add a fucntion to the point set selection plugin to print coordinates of a point. 2018-01-18 16:38:25 +01:00
Maxime Gimeno 3629e3e7de add Grid and axis 2018-01-18 15:05:01 +01:00
Maxime Gimeno da2524fa49 remove the remeshing_plugin from the cgal_test_with_cmake file 2018-01-18 12:15:32 +01:00
Andreas Fabri 22bd2815a3 Polyhedron 2018-01-17 17:13:53 +00:00
Maxime Gimeno 96c145d0b6 F5 reloads selected items 2018-01-17 15:41:33 +01:00
Maxime Gimeno dc6e87c081 Selected actions propagated to all selected items. 2018-01-17 15:29:01 +01:00
Laurent Rineau 9fbdb501c5 Merge pull request #2716 from maxGimeno/Fix_polyhedron_item_ids-GF 
Polyhedron demo: Fix Scene_polyhedron_item ids
 2018-01-17 10:43:22 +01:00
Laurent Rineau bf52faed93 Merge pull request #2694 from sgiraudot/Point_set_processing-Use_named_parameters-GF 
Point Set Processing: Use Named Parameters
 2018-01-17 10:42:33 +01:00
Maxime Gimeno 8c53cdc29c fix after rebase 2018-01-15 11:20:27 +01:00
Maxime Gimeno f65b12bf47 Fix after rebase 2018-01-15 11:20:27 +01:00
Maxime Gimeno 449e187ff9 Remove the Remeshing_plugin.(Mesh_3 does better.) 2018-01-15 11:20:23 +01:00
Maxime Gimeno 81800eb937 Add a feature to the Mesh_3_plugin that allows to create a Facegraph_item when performing a surface_meshing. 2018-01-15 11:17:37 +01:00
Simon Giraudot 3d17f81308 Fix bug in CMakeLists: WIN23 -> WIN32 2018-01-15 11:00:20 +01:00
Simon Giraudot 86090bf447 Adapt CMakeLists.txt to the Win32 specific Boost/ZLIB dependencies 2018-01-12 14:15:04 +01:00
Simon Giraudot 9f4aaddd46 Fix CMakeLists: move all classification plugin lines inside Boost condition 2018-01-12 14:15:04 +01:00
Simon Giraudot 739ccc00bb Make Boost IO Streams/serialization optional in demo 2018-01-12 14:15:03 +01:00
Simon Giraudot b9126941ad Improve CMakeLists of classification 2018-01-12 14:15:02 +01:00
Simon Giraudot 04ab6ed3d5 Fix classification plugin CMakeLists 2018-01-12 14:15:02 +01:00
Simon Giraudot 73d2b5d68a Fix IO methods for ETHZ RF config 2018-01-12 14:15:00 +01:00
Simon Giraudot d65cdbd8d9 Update plugin with Random forest name change 2018-01-12 14:15:00 +01:00
Simon Giraudot 54ec66b1e7 Random forest parameters settable from plugin 2018-01-12 14:14:59 +01:00
Simon Giraudot 40e497a6da Use newly added QMultipleInputDialog 2018-01-12 14:14:59 +01:00
Simon Giraudot 13decf854d Add a simple way to create a multiple input dialog 2018-01-12 14:14:59 +01:00
Simon Giraudot 9acd8bbe3c Fix duplicate code 2018-01-12 14:14:58 +01:00
Jane Tournois c2a1804c0b re-indent CMakeLists.txt 2018-01-12 14:14:58 +01:00