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

8169 Commits

Author SHA1 Message Date
Sébastien Loriot 531beafb79 copy color vector 
colors are not deterministic...
 2023-02-24 16:37:46 +01:00
Laurent Rineau 3dd087f80b Merge pull request #7273 from lrineau/Polyhedron_demo-fix_mesh_3_sizing_field_message-GF 
Polyhedron demo, Mesh_3 plugin: modify the criptic debug message "USE SIZING FIELD!"
 2023-02-24 16:14:29 +01:00
Sébastien Loriot c587df44a6 fix correspondance between faces 2023-02-24 14:45:01 +01:00
Jane Tournois 02bffbde99 use reference for p::weights 2023-02-24 11:38:09 +01:00
Sébastien Loriot c90d97635d first version of the demo plugin 2023-02-24 10:41:08 +01:00
Jane Tournois 6a1977c2c2 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp

and fix compilation of mesh_3D_image_with_detection_of_features.cpp
 2023-02-21 11:22:09 +01:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
 2023-02-21 11:05:30 +01:00
Jane Tournois 0f84326756 there may be facets in complex, or even just vertices 
so the bbox should not be the default when cells_in_complex is empty
 2023-02-20 16:56:17 +01:00
Sébastien Loriot 851485d645 force unassigned regions to be black 
this is more a hack than a correct fix
 2023-02-16 18:28:37 +01:00
Sébastien Loriot 640910288b Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-16 14:18:17 +01:00
Laurent Rineau a5052f4cd8 Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF 
Some CMakeLists.txts cleaning
 2023-02-16 10:52:29 +01:00
Laurent Rineau 8c04deee38 Modify the criptic debug message "USE SIZING FIELD!" 2023-02-15 15:41:54 +01:00
Laurent Rineau d33d71a4e0 Merge pull request #7125 from MaelRL/PMP-flip_criterion-GF 
Modify flipping criteria in PMP::isotropic_remeshing and PMP::refine
 2023-02-10 15:40:49 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Laurent Rineau 6df18b668c CGAL CTest support: rename the test names 
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of  <target_name>`.
 2023-02-06 12:04:57 +01:00
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
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +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
Jane Tournois 293f851f46 rename NP detect_features to features_detector 2023-01-24 12:18:17 +01:00
Jane Tournois cf5979189c deal with input features + detected features in a valid feature graph 
+ remove Feature_range.h. A range of polylines can be given directly to
the named parameter `input_features`
+ fix the demo behaviour
 2023-01-19 15:15:42 +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
Mael Rouxel-Labbé 1e4cec6b03 Fix not unchecking smoothing (if enabled) when protecting (+ui improvements) 2022-12-16 16:19:40 +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
Sebastien Loriot b9a87af07e
Merge pull request #7023 from MaelRL/Weights-v2.0-GF-5.5.x 
Weights fixes (5.5.x)
 2022-12-08 15:21:58 +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
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01: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
Laurent Rineau 2e2d001d61 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 11:57:09 +01:00
Laurent Rineau 50f8c40142 Merge pull request #7091 from afabri/Demo3D-unamed-GF 
Polyhedron Demo: unamed
 2022-12-05 11:57:04 +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
Laurent Rineau b363b7e4af Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF 
Fix autotest_cgal_with_ctest
 2022-11-25 10:14:18 +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
Jane Tournois f21b8819bc rename header to match struct capitals 2022-11-14 15:48:47 +01:00
Andreas Fabri f3f3af10bb Remove CGAL_USE(dirname) as not defined 2022-11-09 08:18:22 +00:00
Jane Tournois c42166814b create_labeled_image_mesh_domain_with_features has been removed 2022-11-08 18:32:30 +01:00
Jane Tournois 4ebbe922bd Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF 
# Conflicts:
#	BGL/include/CGAL/boost/parameter.h
#	Installation/CHANGES.md
#	Mesh_3/doc/Mesh_3/CGAL/Labeled_mesh_domain_3.h
#	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h

+ fix compilation
+ prepare for using detect_features
 2022-11-08 16:17:33 +01: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
Mael Rouxel-Labbé 83b0b0bdef Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-07 14:23:29 +01:00
Mael Rouxel-Labbé 7564b761ac Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-07 14:11:10 +01:00
Jane Tournois 26472284e4 the demo can now mesh images with any word type 
thanks to the new domain constructors that do not
need to be defined explicitly a priori
 2022-11-07 12:01:23 +00:00
Jane Tournois 41f1acc465 reorder if/else conditions 2022-11-07 12:41:53 +01:00
Jane Tournois 57c6d59ddc add vtkNrrd reader to Io_image_plugin 2022-11-07 12:20:14 +01:00
Jane Tournois b609f5364b remove duplicate include 2022-11-07 12:19:16 +01:00
Laurent Rineau 8c9281f440 Merge pull request #6642 from sloriot/gsoc2022-boost_np 
Replace usage of Boost parameters with CGAL named function parameters
 2022-11-07 10:08:38 +01:00
Laurent Rineau 8e8153c0ac Merge pull request #6871 from afabri/CGAL_assertions-GF 
CGAL: No longer per package assertions
 2022-11-03 09:44:48 +01:00
Laurent Rineau 56453b7e9f Merge pull request #6953 from afabri/CGAL-Wunused-but-set-variable-GF 
Address -Wunused-but-set-variable
 2022-11-03 09:44:45 +01:00
Mael Rouxel-Labbé ba3a0d7d22 Replace SMS::Count_* stop predicates with new Edge/Face_count_* stop predicates 2022-11-02 13:46:45 +01:00
Laurent Rineau d24b180293 Merge branch 'master' into gsoc2022-boost_np 2022-10-28 15:39:36 +02:00
Andreas Fabri cd2210dc90 Addess -Warray-parameter warning in Polyhedron demo code 2022-10-25 07:42:49 +01:00
Andreas Fabri e3ca157992 Addess -Warray-parameter warning in Polyhedron demo code 2022-10-21 09:04:33 +01:00
Andreas Fabri 9072a9c936 Polyhedron demo code 2022-10-21 09:01:48 +01:00
Mael Rouxel-Labbé 6cd5c24f70 Pass traits to the secure Vor-weighted cotan functor 2022-10-20 17:27:26 +02:00
Sébastien Loriot bac56d78b4 add convenience functions 2022-10-17 15:34:17 +02:00
Andreas Fabri c04dceb71d Merge master 2022-10-14 14:40:58 +01:00
Jane Tournois 3216d64be1 reintroduce weights + features in demo 2022-10-14 11:11:57 +02:00
Jane Tournois 8915ea0024 Merge branch 'Mesh_3-triple_line_extraction-GF' into Mesh_3-triple_line_extraction_and_weights-GF 
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
 2022-10-14 10:27:47 +02:00
Jane Tournois f60a3a8a33 reorganize demo code with new API 2022-10-14 10:25:53 +02:00
Laurent Rineau bb62879a4f Merge pull request #6926 from janetournois/Polyhedron_demo-add_tetra_am_reader-jtournois 
Polyhedron demo - add C3T3 `.tetra.am` reader
 2022-10-13 15:17:44 +02:00
Laurent Rineau b232f4bcfd Merge pull request #6942 from sloriot/CGAL-header_clean_up 
Clean up in headers
 2022-10-13 15:17:39 +02:00
Sébastien Loriot e8c5de51b7 remove useless header to directly include the right file 2022-10-06 15:40:05 +02:00