Commit Graph

6557 Commits

Author SHA1 Message Date
Maxime Gimeno cc8aa0ec41 Make the lighting preference affect the active viewer and remove unconnected action "Set Lighting..." from the viewers menu. 2019-04-24 11:06:21 +02:00
Maxime Gimeno bd00eed73b Fix crash in clipping box after action renaming. 2019-04-24 10:40:59 +02:00
Maxime Gimeno d4b70a7703 Add a mechanism to specify default loaders when loading, not just for saving. Make the off plugin the default loader for .off files so that lcc_plugin doesn't come first in the list. 2019-04-24 10:35:45 +02:00
Maxime Gimeno ac72c3a069 Add stats to polygon_soup 2019-04-23 15:49:33 +02:00
Simon Giraudot 70aab39fa6 Replace pair property map with 2 property maps (simpler for IO) 2019-04-23 12:30:36 +02:00
Simon Giraudot fe18f20d05 Fix PLY plugin 2019-04-23 12:30:23 +02:00
Simon Giraudot 207a432dfd Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-23 12:08:44 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF
Polyhedron demo: Multiple Viewers
2019-04-23 10:34:26 +02:00
Sebastien Loriot 6c2427e615
Merge pull request #3815 from maxGimeno/Demo-Fix_zoom_on_id-GF
Polyhedron_demo: Fix zoom to Id
2019-04-23 09:45:52 +02:00
Sebastien Loriot fdc8d79a69
Merge pull request #3843 from sloriot/PMP-speed_orient_soup
Speed-up polygon soup orientation
2019-04-23 09:43:55 +02:00
Maxime Gimeno 9315c9cb79 Fix warnings 2019-04-17 13:16:08 +02:00
Maxime Gimeno fb98c5773d Reset settings if preference dialog is canceled 2019-04-17 11:10:36 +02:00
Maxime Gimeno df7de2fb54 Incorporate the clip() function with poly instead of plane 2019-04-17 10:56:49 +02:00
Maxime Gimeno ebfe1e9ca5 WIP clipping_plugin 2019-04-16 16:37:09 +02:00
Maxime Gimeno 62b0044d9e Add an action to the menu of plane_items to set it by hand 2019-04-16 15:52:22 +02:00
Maxime Gimeno 3f230e7567 Add tooltips to repair_polygon_soup argumetns 2019-04-16 10:46:01 +02:00
Sébastien Loriot 7945ffeea2 update surf plugin 2019-04-12 19:11:04 +02:00
Sébastien Loriot 03ec0dfbe1 update demo plugin 2019-04-12 19:09:25 +02:00
Andreas Fabri 864ba4249d Merge branch 'Surface_mesh-PLY_IO-GF-old' into Surface_mesh-PLY_IO-GF 2019-04-12 16:19:53 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sebastien Loriot fd273fe850
Merge pull request #3779 from afabri/Polyhedron-read_off-GF
Polyhedron:  read_OFF() must not set the badbit if there are 0 vertices
2019-04-12 15:27:24 +02:00
Maxime Gimeno f973dfa9a9 Fix warnigns 2019-04-12 15:04:26 +02:00
Maxime Gimeno 8cfbbd1ee4 Fix CMake Error 2019-04-12 11:11:52 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Maxime Gimeno 765146c7de Add an action for repairing polygon soups items. 2019-04-11 10:44:34 +02:00
Maxime Gimeno 41c67e16f8 Fix polyline generator 2019-04-11 09:47:57 +02:00
Maxime Gimeno c2262672c3 Add missing include 2019-04-11 08:54:17 +02:00
Maxime Gimeno 393b1aceb2 WIP 2019-04-10 16:46:35 +02:00
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +02:00
Simon Giraudot fe6f00203c Add comments of PLY mesh in demo 2019-04-09 15:04:25 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau c14308f300 Merge pull request #3788 from maxGimeno/VTU_output-Add-attribute-GF
Mesh_3: New Attributes Type for VTU Output
2019-04-08 15:58:40 +02:00
Laurent Rineau 68f321c58d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-04-08 15:58:27 +02:00
Laurent Rineau 65ebf7d386 Merge branch 'Mesh_3-fix_output_to_vtu-GF' into VTU_output-Add-attribute-GF 2019-04-03 19:57:36 +02:00
Laurent Rineau eb769f13fd Fix the error message 2019-04-03 14:10:57 +02:00
Laurent Rineau bba76c20f3 Fix that find_path in case of cross-compilation 2019-04-03 14:10:42 +02:00
Laurent Rineau aed5a55354 Fix the syntax of find_path 2019-04-03 14:10:27 +02:00
Simon Giraudot 7518d5642a Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-04-03 11:51:29 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Maxime Gimeno 81eeed3615 Fix crash when adding an item and the selected viewer is the mainViewer. 2019-04-02 14:21:48 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Maxime Gimeno 4542a2a808 Be careful to not select a infinite face in the process. 2019-03-29 16:24:28 +01:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Sébastien Loriot 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot e6cdf9f62b remove condition for cpp11 to be present in face graph related packages 2019-03-29 10:41:50 +01:00
Maxime Gimeno 4ea7d50521 Set default behavior of visibility updates offset to false. 2019-03-28 11:45:59 +01:00
Laurent Rineau d27c222e54 Merge pull request #3799 from maxGimeno/Demo-Select_only_in_clipped_zone-GF
Polyhedron Demo: Only Select in the clipped zone
2019-03-27 18:05:12 +01:00
Simon Giraudot 71dc567566 Integrate clipping test in selection functor 2019-03-27 10:18:02 +01:00
Maxime Gimeno 38709a737e Fix c3t3 reload 2019-03-27 09:49:46 +01:00
Maxime Gimeno 1bd785ae44 Don't select clipped points 2019-03-26 15:30:34 +01:00
Maxime Gimeno 2a261c1d2f Fix event filter problems 2019-03-26 15:24:28 +01:00
Maxime Gimeno 49a109fa36 Add a button to enable clipping 2D to avoid conflict with selection 2019-03-26 15:06:40 +01:00
Maxime Gimeno b619fbeb28 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-03-26 10:57:54 +01:00
Maxime Gimeno 9f9bd9b1fd Set the initial transformation to Translation to get the maximum length and set the box horizontal policy to fixed. Also move a button to gain space. 2019-03-25 09:12:28 +01:00
Andreas Fabri 5d58bde7f2 Polyhedron: Fix Issue #3108 2019-03-19 17:39:04 +01:00
Maxime Gimeno c787e40ca7 Use boost variant for attributes to be able to send `double`s, `uint_8`s and `std::size_t`s 2019-03-18 13:14:00 +01:00
Maxime Gimeno 3760964322 Also fix the initial state of the clipping_box widget 2019-03-15 16:05:39 +01:00
Maxime Gimeno 38c671f4b7 Don't forget the offset in the tooltip() 2019-03-15 16:00:50 +01:00
Maxime Gimeno b96bd1058f Fix mesh_3 2019-03-13 13:16:12 +01:00
Maxime Gimeno 1d04ad4d90 Merge pull request #3761 from maxGimeno/Demo-Fix_visualization-GF
Polyhedron_Demo: Fix warning
2019-03-12 17:04:21 +01:00
Maxime Gimeno 324f4e9b4a Fix warning 2019-03-12 15:00:41 +01:00
Maxime Gimeno ec656e280e Use c++11 init method for cursor to avoid msvc bug due to "most vexing parse" 2019-03-12 12:08:00 +01:00
Laurent Rineau c668f3095b Merge pull request #3732 from maxGimeno/Demo-Stats_for_selection-GF
Polyhedron_demo: Add stats to the selection_item
2019-03-11 17:26:21 +01:00
Laurent Rineau 6f67752ba5 Merge pull request #3738 from sgiraudot/Polyhedron_demo-Fix_point_set_selection_speed-GF
Polyhedron demo: Fix point set selection speed
2019-03-11 17:26:18 +01:00
Maxime Gimeno 8886bc5e6a Add offset management 2019-03-11 16:47:21 +01:00
Maxime Gimeno e00a489bc0 Add a plugin to cisualize LCC data structures. (IO plugin for *.off and *.3map) 2019-03-11 16:25:07 +01:00
Maxime Gimeno 5c433eab01 Fix show/hide 2019-03-08 11:32:50 +01:00
Maxime Gimeno 93d665e01f Fix clipping box plugin 2019-03-08 11:04:46 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Maxime Gimeno d7baf67a43 Add initialization 2019-03-07 12:54:12 +01:00
Maxime Gimeno 8d6c35f1b5 Fix warning 2019-03-06 15:53:06 +01:00
Simon Giraudot ae5a828dc7 Fix point set selection speed 2019-03-06 14:22:18 +01:00
Maxime Gimeno bd8b39d162 Add stats to the selection_item 2019-03-04 17:21:51 +01:00
Maxime Gimeno 2fd1a984af Fix blending order so that the edges with antialiasing blend with the triangles and not with the background 2019-03-04 10:35:14 +01:00
Laurent Rineau b3b513c20d Merge pull request #3708 from aboudev/VSA-lingjie
Surface mesh approximation: handle degenerate cases
2019-02-28 20:54:40 +01:00
Laurent Rineau 669dfc67bd Merge pull request #3699 from maxGimeno/Demo-Fix_Mesh_3_surface-GF
Polyhedron_Demo: fix mesh_3_plugin
2019-02-28 20:54:37 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Maxime Gimeno 3dc5ee1513 Remove unused capture in lambda 2019-02-28 15:55:46 +01:00
Lingjie Zhu b34eadc7fd fix approximate_sqrt for EPICK 2019-02-28 20:18:30 +08:00
Lingjie Zhu 91be8fbcf5 typo 2019-02-26 23:30:56 +08:00
Lingjie Zhu 24e83fc944 std::sqrt -> CGAL::approximate_sqrt 2019-02-26 22:55:52 +08:00
Simon Giraudot e6fc07bf17 Reset failbit after failing to load a surface mesh 2019-02-26 15:34:32 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Simon Giraudot 19169d9cae Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-02-26 13:50:34 +01:00
Simon Giraudot 9256c04157 Replace old color API using global const variable with new one using functions 2019-02-26 13:48:59 +01:00
Lingjie Zhu 31247193d0 replace invalid planes in rendering
CGAL::linear_least_squares_fitting_3 may return invalid plane
2019-02-26 16:55:14 +08:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau c334407c46 Merge pull request #3681 from maxGimeno/Demo-New_batch_of_bug_fixes-GF
Polyhedron Demo: new batch of bug fixes
2019-02-22 16:39:05 +01:00
Maxime Gimeno 992ed255c9 Add commentaries to map a little of the cursors set/reset 2019-02-22 09:14:24 +01:00
Maxime Gimeno 252a416bb5 Fix facegraph creation 2019-02-21 12:53:15 +01:00
Maxime Gimeno 222bd62a52 Fix waitcursor 2019-02-21 12:50:32 +01:00
Maxime Gimeno 39472ec85d Put the offset_meshing in a thread that can be interrupted. 2019-02-20 12:56:16 +01:00
Maxime Gimeno 893e2a055a Remove useless typename 2019-02-20 09:32:05 +01:00
Maxime Gimeno f467027e4b Add an action to the polylines item that allows to extract a point set from the polylines 2019-02-19 14:09:16 +01:00
Maxime Gimeno 9440020cb6 Add a button to validate the affine tranformation. 2019-02-19 13:47:51 +01:00
Maxime Gimeno a52fccb997 Move typedefs to avoid error 2019-02-19 12:18:16 +01:00
Maxime Gimeno 0d4b7185bd Test if the two constraints vertices are different before inserting to avoid crash. 2019-02-19 08:45:57 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Andreas Fabri e989b87dfe Distance, Generator, HDS, Convex_hull, Polyhedron, PCA 2019-02-14 10:39:56 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 42b9a0be04 fix level 2019-02-14 10:26:05 +01:00
Maxime Gimeno b8e03cdf49 Use cgal dynamic_property_maps for source points 2019-02-13 17:00:49 +01:00
Laurent Rineau 3c23ca625e
Merge pull request #3662 from maxGimeno/Demo-Fix_polylines_display-GF
Remove Z offset.
2019-02-13 15:05:31 +00:00
Laurent Rineau 962afbfade Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Laurent Rineau 5c5357a279 Merge pull request #3658 from maxGimeno/Demo-Fix_isotropic_remeshing-GF
Polyhedron Demo: Fix isotropic remeshing plugin
2019-02-13 15:38:39 +01:00
Laurent Rineau f74d33af49 Merge pull request #3659 from maxGimeno/Demo-Fix_VTU_visu-GF
Polyhedron Demo: Rework of VTK_io_plugin
2019-02-13 15:38:36 +01:00
Laurent Rineau 7f00deb05c Merge pull request #3664 from maxGimeno/Demo-Fix_display_of_groups_in_groups-GF
Polyhedron Demo: Fix Rendering of Nested Groups
2019-02-13 15:38:33 +01:00
Laurent Rineau d216131c79 New undocumented AABB primitive: cells of a 3D triangulation
The `Scene_c3t3_item` from our 3D demos now uses an AABB tree of
cells, instead of an AABB tree of triangles. That divides the number
of primitives by 4, and save times:

Before:
```
C3t3 facets AABB tree built in 22.010006904602051 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.50893402099609375 wall-clock seconds
```

After:
```
C3t3 cells AABB tree built in 13.072829008102417 wall-clock seconds
Scene_c3t3_item_priv::computeIntersections in 0.41458892822265625 wall-clock seconds
```

The gain seems mostly in the construction of the tree (40% saved), and
the gain on the queries seems lower (about 20%).
2019-02-11 13:22:11 +01:00
Maxime Gimeno fecc589b4c Move restoreoverridecursor() 2019-02-11 10:25:47 +01:00
Maxime Gimeno c7a77e1a97 Fix typo 2019-02-11 10:15:24 +01:00
Maxime Gimeno f146d099ac Fix selection_files loading 2019-02-11 10:14:29 +01:00
Maxime Gimeno e679c824af Make the deletion of an item faster 2019-02-08 16:32:03 +01:00
Maxime Gimeno f5f2ebfb51 Force Fusion style for colored button so they are displayed on all platforms. 2019-02-08 14:26:02 +01:00
Maxime Gimeno aad63b61ff Remove "as Surface_mesh" 2019-02-08 13:14:36 +01:00
Maxime Gimeno 82fc6cf698 Offset_meshing produces outward oriented meshes. 2019-02-08 13:12:17 +01:00
Maxime Gimeno c86362ac86 fix stats labels 2019-02-08 12:51:54 +01:00
Maxime Gimeno 13d673915b Don't count twice the extremity of a closed polyline. 2019-02-08 12:44:21 +01:00
Maxime Gimeno 4a6dc5bfd6 Fix lasso for 0 facet 2019-02-08 12:03:32 +01:00
Maxime Gimeno e3f615bc2a Add an action specifically for the heat method. 2019-02-08 11:48:18 +01:00
Maxime Gimeno 64cf08ddc1 Final Fixes 2019-02-08 11:23:32 +01:00
Sébastien Loriot de4297b81a if an edge is selected and we ask to split faces, incident faces are modified 2019-02-08 10:50:30 +01:00
Sébastien Loriot 0099e12246 make isotropic remeshing working with sharp edges detected (not selection) 2019-02-08 10:34:43 +01:00
Maxime Gimeno 9bbe9177fc Allow resetColors also for vcolors. 2019-02-08 10:26:52 +01:00
Maxime Gimeno 852283d38a Fix the way the items are selected for the statistics table. 2019-02-07 16:47:41 +01:00
Maxime Gimeno e96bb84077 Update ramp when button Min/Max button is clicked. 2019-02-07 16:25:20 +01:00
Maxime Gimeno 7747332e94 If child is group, call renderChildren. 2019-02-07 14:52:33 +01:00
Maxime Gimeno 50eed65f41 Merge remote-tracking branch 'cgal/master' into Demo-Fix_VTU_visu-GF 2019-02-07 14:30:03 +01:00
Maxime Gimeno 703ea08255 Merge remote-tracking branch 'cgal/master' into Demo-Fix_polylines_display-GF 2019-02-07 14:22:24 +01:00
Maxime Gimeno 6a93f23208 Fix case where required renderingmdoe is unsupported. Won't infinit loop anymore. 2019-02-07 14:15:53 +01:00
Maxime Gimeno d8ac1ce761 Fix children management in reload group. 2019-02-07 14:04:53 +01:00
Laurent Rineau 9a03d47cb0 Merge pull request #3297 from maxGimeno/Stream_support-Dont_use_vtk_for_vtu-GF
Stream support: VTP and VTU writing functions
2019-02-07 13:31:23 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
Laurent Rineau b4cab8e6b6 Merge pull request #3611 from maxGimeno/Demo-Rename_shader_files-GF
Polyhedron_demo: Rename shader files
2019-02-07 13:31:18 +01:00
Laurent Rineau 55ad7b726b Merge pull request #3628 from aboudev/VSA-lingjie
Surface mesh approximation: Fix demo crash
2019-02-07 13:31:12 +01:00
Laurent Rineau 1cfe370b49 Merge pull request #3632 from maxGimeno/Demo-Fix_eraseAll-GF
Polyhedron Demo: Fix Erase_all
2019-02-07 13:31:10 +01:00
Laurent Rineau 3429c6c9df Merge pull request #3648 from maxGimeno/Demo-Fix_connection-GF
Polyhedron demo: Small Fix for Qt missing Connection
2019-02-07 13:30:57 +01:00
Maxime Gimeno 535acc73a2 Add preprocessing for build_triangulation 2019-02-07 12:10:57 +01:00
Simon Giraudot f6e65759fa Propagate API to Point Set To Distance Plugin 2019-02-07 11:36:05 +01:00
Simon Giraudot 33377a93da Propagate API change to Point_inside_polyhedron_plugin 2019-02-07 11:36:05 +01:00
Simon Giraudot 1b7a2eb2c5 Replace cancel_removal() by cancel_removals() 2019-02-07 11:36:04 +01:00
Simon Giraudot 6af4189b64 Use new method 2019-02-07 11:36:04 +01:00
Simon Giraudot aaad5d7a1e Bug fix: stop losing properties when creating point item from selection 2019-02-07 11:36:04 +01:00