Commit Graph

8039 Commits

Author SHA1 Message Date
Laurent Rineau 61f5354246 Fix current content in the destroy of the Scene
Fix the error:
> QOpenGLVertexArrayObject::destroy() failed to restore current context
2023-01-31 17:35:21 +01:00
Laurent Rineau a7e15cadee Merge pull request #7140 from sloriot/CGAL-demo_fix_warnings
Fix warnings
2023-01-27 21:02:16 +01:00
Laurent Rineau 65103a9c70 Merge pull request #7161 from afabri/Polyhedron_demo-clamp-GF
3D Demo: Fix statistics on angles
2023-01-27 21:02:09 +01:00
Andreas Fabri 9a92b93e77 remove unused variable 2023-01-11 12:39:38 +00:00
Andreas Fabri 2290c78881 Use CGAL::approximate_angle() 2023-01-05 13:26:34 +00:00
Andreas Fabri 4afd1d247f 3D Demo: Clamp as acos operates on [-1,1] 2023-01-04 11:34:40 +00:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Sébastien Loriot a0efa439c1 fix warnings 2022-12-22 09:59:32 +01:00
Laurent Rineau f1e1878b8d
Merge pull request #7094 from afabri/PMP_named_parameters-GF
PMP: Replace parameter with named parameter
2022-12-16 10:52:17 +01:00
Laurent Rineau ae3ae6e8d6 Merge pull request #7083 from afabri/Demo-readBMP-GF
3d Demo: Try to read bmp files
2022-12-14 10:39:53 +01:00
Laurent Rineau 8497dcda55 Merge pull request #7109 from afabri/Three-fix_for_no_deprecated-GF
Three, and Polyhedron Demo: Add an #include and remove deprecated code
2022-12-14 10:39:42 +01:00
Andreas Fabri 0ac2d8ec0f Remove the parameters which have become nps 2022-12-09 07:37:03 +00:00
Andreas Fabri 39ebebdb5b merge master 2022-12-08 16:49:09 +00:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Andreas Fabri da3a3b300d Upgrade deprecated code 2022-12-07 15:10:01 +00:00
Mael Rouxel-Labbé b219436ba1 use Stream_support's get_file_extension() 2022-12-07 14:19:48 +01:00
Andreas Fabri 272ffa8e2f Don't use deprecated code in the demo 2022-12-07 13:03:35 +00:00
Mael Rouxel-Labbé 2cdaa26125 Minor UI update 2022-12-07 12:37:22 +01:00
Mael Rouxel-Labbé 282166307c Misc minor changes 2022-12-07 12:20:39 +01:00
Mael Rouxel-Labbé f3ec4653e9 List the main item above its volume plane in item list 2022-12-07 12:20:22 +01:00
Mael Rouxel-Labbé f7925fdd1a Reposition DCM / BMP underneath "Load..." (instead of the bottom of "Files") 2022-12-07 12:19:50 +01:00
Mael Rouxel-Labbé 1c04eea703 Refactor DCM / BMP to avoid code duplication + add smoothing selection to GUI 2022-12-07 12:19:24 +01:00
Mael Rouxel-Labbé c36c54c139 Fix "Planes for unnamed" 2022-12-07 11:42:30 +01:00
Mael Rouxel-Labbé d90d47fb79 Fix indentation (no real changes) 2022-12-06 22:57:42 +01:00
Mael Rouxel-Labbé 9a607498be Avoid some code duplication 2022-12-06 22:43:05 +01:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Andreas Fabri 1adb13edc8 Do not use deprecated functions 2022-12-06 12:34:26 +00:00
Laurent Rineau 67b5c791e9 Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau 7f1486ffb3 Merge pull request #7089 from janetournois/Polyhedron_demo-fix_available_features_for_gray_images-jtournois
Polyhedron demo for Mesh_3 - disable features detection for gray level images
2022-12-05 12:21:53 +01:00
Laurent Rineau ec8262d58c Merge pull request #7091 from afabri/Demo3D-unamed-GF
Polyhedron Demo: unamed
2022-12-05 12:21:48 +01:00
albert-github f79d8bb542 Spelling corrections
After review
2022-11-30 10:31:13 +01:00
Andreas Fabri 2a2e319061 Don't use deprecated code in demo 2022-11-30 08:16:57 +00:00
Andreas Fabri 92a4a4180d Polyhedron demo: unamed 2022-11-28 14:15:53 +00:00
Jane Tournois 5fbeecaef8 disable sharpFeaturesGroup for gray level images 2022-11-28 10:54:54 +01:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Mael Rouxel-Labbé 0f0bd3ff6d WIP bmp reading 2022-11-25 01:04:45 +01:00
Andreas Fabri b2f3eedb2f 3d Demo: Try to read bmp files 2022-11-24 16:14:11 +00:00
Sébastien Loriot c5207cb5ad Merge remote-tracking branch 'cgal/master' into HEAD 2022-11-24 09:54:56 +01:00
Mael Rouxel-Labbé b5c21e1f5d Http -> https + update some dead links 2022-11-23 18:54:37 +01:00
Laurent Rineau 24cc17e152
Merge pull request #7001 from MaelRL/SMS-Add_EF_stop_predicates-GF 2022-11-22 12:55:44 +01:00
albert-github 01a7852f70 Merge branch 'master' into feature/bug_documentation_spell_20221113
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Synchronize with master
2022-11-16 13:58:05 +01:00
albert-github eed54a0ae5 spelling corrections
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Laurent Rineau 5437042f3d Merge pull request #7018 from janetournois/Polyhedron-demo-read_nrrd-jtournois
Polyhedron demo - add *.nrrd reader for images
2022-11-15 17:01:34 +01:00
Laurent Rineau c5bcb46241 Merge pull request #7020 from janetournois/Polyhedron_demo-mesh_3_plugin_cleaning-jtournois
Polyhedron demo - meshing from images of any word type
2022-11-15 17:01:31 +01:00
albert-github 3674c937f7 spelling corrections
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Laurent Rineau 44f6d1349f
Merge branch 'master' into SMS-Add_EF_stop_predicates-GF 2022-11-15 11:42:03 +01:00
Andreas Fabri f3f3af10bb Remove CGAL_USE(dirname) as not defined 2022-11-09 08:18:22 +00:00
Laurent Rineau 01f8f1bc1d
Merge pull request #7027 from afabri/Polyhdron_demo-grid_generator-GF 2022-11-08 14:04:35 +01:00
Andreas Fabri 06417e14de Polyhedron Demo: Fix upper right corner 2022-11-08 12:17:02 +00:00