Commit Graph

5787 Commits

Author SHA1 Message Date
Laurent Rineau 74844169a7 Fix a few -Wconversion warnings in the demo 2018-06-05 14:48:47 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Sébastien Loriot 45433848db move clipping to PMP/Corefinement 2018-06-05 14:24:52 +02:00
Andreas Fabri 4f0e124325 Undo adding the _. Instead remove the typedef ... Point; 2018-06-05 12:56:11 +01:00
Sébastien Loriot 2601581096 catches exceptions thrown by (co)refinement related plugins 2018-06-05 12:54:46 +02:00
Maxime Gimeno 605bf1da52 Add missing includes in other plugins 2018-06-05 12:08:08 +02:00
Maxime Gimeno d4644ed9a5 Add dependency to selection_plugin 2018-06-05 09:34:51 +02:00
Maxime Gimeno 6d60cd99ba Add static functions to gain access to the mainwindow and the scene.
Use it to automatically decide which selection_io_plugin should be used.
2018-06-04 12:27:22 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Maxime Gimeno b02e86453a Add missing definition 2018-06-04 12:00:22 +02:00
Maxime Gimeno 6e187054fc Fix bbox_diag in rendering_helper 2018-06-04 12:00:22 +02:00
Maxime Gimeno 12ba1084ad Add classes and functions to factorize and facilitate rendering an item.
Make Surface_mesh_item use them.
2018-06-04 12:00:21 +02:00
Maxime Gimeno 9e8465f9d7 Fix transparency for QOpenGLWidget. 2018-06-04 12:00:21 +02:00
Maxime Gimeno 0add845fae Fix snapshot with alpha. 2018-06-04 12:00:21 +02:00
Maxime Gimeno cf6a5f7cae fix moverowup/down 2018-06-04 12:00:21 +02:00
Maxime Gimeno c8d5453a31 Fix c3t3 and add action to viewer to set total number of passes 2018-06-04 12:00:21 +02:00
Maxime Gimeno 1882658a94 Add depth-peeling to the scene. 2018-06-04 12:00:20 +02:00
Maxime GIMENO 0517c35f59
Merge branch 'master' into BGL-Copy_face_graph_use_np-GF 2018-06-04 11:58:43 +02:00
Maxime Gimeno 025968643b Fix_orthographic selection 2018-06-04 11:44:56 +02:00
Laurent Rineau b814620557 Merge pull request #3130 from afabri/CGAL-M_PI-GF
Replace M_PI with CGAL_PI
2018-06-01 17:26:09 +02:00
Laurent Rineau ab973c90e0 Merge pull request #2739 from lrineau/Mesh_3-improve_polylines_to_protect-GF
Mesh_3 new improvements: polylines_to_protect(), new API of Labeled_mesh_domain_3
2018-06-01 17:25:52 +02:00
Laurent Rineau ebfb64d4b8 Merge pull request #3118 from maxGimeno/Demo-Fix_Set_different_colors-GF
Polyhedron demo: Fix for Set Different Colors for Selected Items
2018-06-01 17:24:14 +02:00
Sébastien Loriot 2569c271e5 improve doc and plugin 2018-06-01 16:50:39 +02:00
Sébastien Loriot 94a73232d5 document clip functions 2018-06-01 11:06:29 +02:00
Maxime Gimeno f92a40f321 Update QGLViewer calls 2018-05-31 09:55:24 +02:00
Maxime Gimeno 23d25e46b5 Extend the fix to other items 2018-05-31 09:50:46 +02:00
Maxime Gimeno 392fd98ea3 Fix precision problem in triangulation of facets 2018-05-31 09:50:46 +02:00
Maxime Gimeno c96fdaba88 Update Plugin after integrating QGLViewer 2018-05-30 14:52:15 +02:00
Maxime Gimeno 825143ae05 update Polyhedron example to make it similar to the Surface_mesh example 2018-05-30 11:47:37 +02:00
Mael Rouxel-Labbé 14a919b587 Fixed including deprecated header 2018-05-29 17:35:49 +02:00
Mael Rouxel-Labbé 558f1ea2f9 Fixed optimization plugin not using the new domain API 2018-05-29 14:51:32 +02:00
Andreas Fabri 69a4b68e16 Replace M_PI with CGAL_PI 2018-05-29 11:54:42 +01:00
Maxime Gimeno fd15c8e040 Fix Polyhedron example 2018-05-29 11:57:13 +02:00
Simon Giraudot f34d09eee9 Use function run_with_qprogressdialog() in plugins 2018-05-29 11:42:04 +02:00
Simon Giraudot cea723cbff Add sequential qprogressdialog 2018-05-29 11:42:03 +02:00
Simon Giraudot 9851cd7856 Mechanism to lauch QProgressDialog either in thread or modal 2018-05-29 11:42:03 +02:00
Simon Giraudot ee0579d6e0 Callbacks in PSP plugins 2018-05-29 11:42:03 +02:00
Simon Giraudot 7313b64618 Make ASCII callback have the same constructor as Qt one 2018-05-29 11:42:03 +02:00
Simon Giraudot 31acf93a1d Fix include guard 2018-05-29 11:42:02 +02:00
Simon Giraudot a2fd0c7630 Callback for bilateral smoothing 2018-05-29 11:42:02 +02:00
Simon Giraudot e1dac37b74 Average spacing plugin: use Qt progress bar in sequential, ASCII in parallel 2018-05-29 11:42:02 +02:00
Simon Giraudot a01ee0c2a5 Use Qt progress bar in shape detection plugin 2018-05-29 11:42:02 +02:00
Simon Giraudot 5ddb92da98 Add a Qt progress bar (modal, no multithread mode) 2018-05-29 11:42:02 +02:00
Simon Giraudot 651b9d3e85 Move Progress_bar_callback out of plugin 2018-05-29 11:42:02 +02:00
Guillaume Damiand 9a3bdd3252 Add input for draw_polyhedron example 2018-05-29 11:11:50 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand b2c0a3f740 Remove a &= 2018-05-29 11:11:50 +02:00
Guillaume Damiand cc5a0f6150 Remove a *= 2018-05-29 11:11:49 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
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