Jane Tournois
99c0df22ad
Merge remote-tracking branch 'cgal/master' into Mesh_3-manifold_and_min_size-jtournois
...
# Conflicts:
# Polyhedron/demo/Polyhedron/resources/shader_c3t3.frag
2023-10-24 12:55:09 +02:00
Sébastien Loriot
18e233c036
fix warnings
2023-10-18 11:56:00 +02:00
ange-clement
b4188a5011
Fix intersection not having color +
...
Domains colors better follow item color
2023-10-17 15:02:16 +02:00
Mael Rouxel-Labbé
021d1fe8bd
Use the sorted priority queue in the plugin
2023-10-16 17:05:38 +02:00
Laurent Rineau
3ec0c7e186
Merge pull request #7737 from ange-clement/Polyhedron-demo-Clipping-box-more-support-aclement
...
Polyhedron demo : Add clip box plugin support for more items
2023-10-16 11:13:26 +02:00
ange-clement
4aa796bcab
Only use subdomain's color when meshing from labeled images
2023-10-13 17:43:15 +02:00
Mael Rouxel-Labbé
76aeec9805
Replace try-catch with go_further()
2023-10-13 10:59:29 +02:00
Mael Rouxel-Labbé
91c679234b
Rename the builder class
2023-10-13 10:56:58 +02:00
Laurent Rineau
ff095fe31e
fix loading of a polygon mesh from VTK
...
- fix a memory leak
- allow to read a polygon soup, in addition to surface meshes
2023-10-12 16:50:55 +02:00
Laurent Rineau
4c2bbb812d
remove a fake dependency
2023-10-12 16:50:55 +02:00
Jane Tournois
6b8eaa4e5c
remove CGAL workaround from cpp files
2023-10-12 10:12:09 +02:00
Sébastien Loriot
ffea30946f
fix the second demo plugin
2023-10-09 18:55:33 -07:00
Sébastien Loriot
5b67e30e86
fix demo
2023-10-09 17:08:49 -07:00
ange-clement
abedd731a7
Fix warning (i, j and k can be negative)
2023-10-06 16:31:54 +02:00
Laurent Rineau
a5d44aa808
fix the random appearance of clip plane
...
For the `Scene_c3t3_item` (and probably `Scene_triangulation_item` as
well) most of the time the clip plane was not shown. This is because of
Boolean data member `cut_plane_enabled` that was not initialized.
2023-10-06 16:04:21 +02:00
ange-clement
40f5ac0023
Fixed warnings +
...
deleted unsused variables
2023-10-05 15:56:59 +02:00
ange-clement
41617958c6
Fixed wrong initialization
2023-10-05 15:00:04 +02:00
ange-clement
f088028fea
Renamed visible_biteset to visible_bitset +
...
Fixed warnings
2023-10-05 14:43:45 +02:00
Jane Tournois
7727bb8364
facet_min_size and cell_min_size disabled by default in the dialog
2023-10-05 13:36:52 +02:00
ange-clement
857de8b110
Fixed warning
2023-10-04 11:21:02 +02:00
Jane Tournois
2461ae3bba
Merge remote-tracking branch 'ange/Mesh-3-Fix-demo-many-subdomain-tetrahedral-mesh' into Mesh_3-manifold_and_min_size-jtournois
2023-10-02 16:00:42 +01:00
Mael Rouxel-Labbé
9fa445f217
Change nomenclature to clarify the different types of gate permissiveness
2023-10-02 13:18:14 +02:00
ange-clement
92cb998499
Diabled "Alpha slider" on edit box
2023-10-02 13:16:28 +02:00
ange-clement
685caf955d
Renamed variable for clarity
2023-09-29 10:54:53 +02:00
ange-clement
f324943fba
Added item in dropdown for selected edges +
...
Fixed logic tautology when selecting edges before mesh
2023-09-28 17:16:03 +02:00
ange-clement
67bfce985b
Fixed reset button + Filtering can be deleted an recreated on subdomain page
2023-09-28 14:54:53 +02:00
ange-clement
a3ab2aa68e
Mooved templeted function load_vtk_file out of Io_image_plugin class
2023-09-26 15:57:05 +02:00
ange-clement
7edb061915
Added dual contouring plugin from isosurfacing_3 package
2023-09-26 15:44:30 +02:00
ange-clement
595897e7c7
Factorized vtk image loading
2023-09-26 15:22:49 +02:00
ange-clement
98ba8b68e3
Fix wrong linkage
2023-09-26 12:38:34 +02:00
ange-clement
031594e0db
Replaced Q_FOREACH with c++11 for each
2023-09-26 12:23:52 +02:00
ange-clement
c8545e8f06
Add link to scene_edit_box_item
...
+ small fix of triangulation_3 cut plane
2023-09-26 12:14:52 +02:00
ange-clement
c803f0f8d8
Merge branch 'Polyhedron-demo-upgrade-image-visualization-aclement' into Polyhedron-demo-Clipping-box-more-support-aclement
2023-09-26 10:52:19 +02:00
ange-clement
aa125fe1db
Quick fix : Made images draw surfaces even if they are inside
2023-09-26 10:48:21 +02:00
ange-clement
384e7fad38
Added epsilon on clipping
...
+ try fix test undefined reference to Scene_edit_box_item
2023-09-26 10:16:17 +02:00
ange-clement
c5b2d4d00b
Added reset button on clip box
2023-09-26 10:12:22 +02:00
ange-clement
0c090b80e2
Disabled tetrahedra clip plane when clipping box is active
2023-09-25 17:13:56 +02:00
ange-clement
eb5c2816d5
Adapted clip button to a toggle behaviour
2023-09-25 11:55:28 +02:00
ange-clement
45f0c6665a
Added clip support for tetrahedral meshes
2023-09-25 10:50:29 +02:00
ange-clement
41702c944b
Added clip box support for image items
2023-09-22 16:05:50 +02:00
ange-clement
c44d66f84f
Changed limit from 24 to 128
...
This limit can be changed by updating number_of_bitset in
* Scene_triangulation_3_item.h
* shader_c3t3.frag
* shader_c3t3_edges.frag
2023-09-22 11:55:55 +02:00
ange-clement
7674684146
Dirty Fix : diminished maximum number of subdomain
...
+ rebased branch on cgal-5.6
2023-09-21 13:12:41 +02:00
Laurent Rineau
8718201f3e
Merge pull request #7613 from MaelRL/AW3-Tet_remesh_example-GF
...
Add an example on combining 3D Alpha Wrap and Tetrahedral Remeshing
2023-09-19 16:29:25 +02:00
Laurent Rineau
90fdb93702
Merge pull request #7697 from ange-clement/Polyhedron-demo-meshing-segmented-image-color-aclement
...
Polyhedron demo : meshing a segmented image and preserving color
2023-09-19 16:29:20 +02:00
Laurent Rineau
40a7f324d3
fix a compilation error
...
The generated `ui_Deform_mesh.h` was not is in the right directory.
I have moved the definition of the item in the plugin directory.
2023-09-15 11:27:43 +02:00
Laurent Rineau
28632f21fc
Merge branch 'master' into CGAL-Qt6-GF
...
# Conflicts:
# Installation/CHANGES.md
2023-09-14 17:40:05 +02:00
Laurent Rineau
b05e1e9e46
Remove UseCGAL.cmake
...
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Laurent Rineau
68f7646dcb
remove stray CMake debug messages
2023-09-14 17:02:49 +02:00
Laurent Rineau
2f6d51b49b
Remove a few occurrences of CGAL_Qt5
...
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Laurent Rineau
e93a09901c
finish review of polyhedron demo
2023-09-14 15:13:46 +02:00
Laurent Rineau
b01da56a56
remove occurrences of OpenGLWidgets in demos' CMake scripts
2023-09-13 17:13:39 +02:00
Mael Rouxel-Labbé
70c79da6fc
Merge remote-tracking branch 'cgal/master' into AW3-Tet_remesh_example-GF
2023-09-13 15:31:10 +02:00
Sébastien Loriot
af95dae8c6
Merge remote-tracking branch 'cgal/master' into HEAD
2023-09-12 15:27:54 +02:00
Ivan Paden
426c6f9f5b
Update polyhedron demo with ball_radius np in Adaptive_sizing_field
2023-11-16 09:34:40 +01:00
ange-clement
7d79636f0b
Removed unnecessary lines
2023-09-11 17:48:24 +02:00
Laurent Rineau
873c3b26cf
remove a few occurrences of "qt5"
...
There are still a lot!
2023-09-11 17:46:27 +02:00
Laurent Rineau
303282aec6
fix "Save as..." in CGAL Lab
2023-09-11 17:33:34 +02:00
ange-clement
b77659beb2
Added support for vtk images (vti format)
2023-09-11 17:21:37 +02:00
Laurent Rineau
46923342ad
Merge pull request #7576 from albert-github/feature/issue_7395
...
issue #7395 Improvement of layout of model relations
# Conflicts:
# Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau
c50c72fd28
Merge pull request #7648 from albert-github/feature/bug_pkgdesc_incl
...
Better showing of `#include`
2023-09-07 10:46:32 +02:00
ange-clement
1bfc83421f
Merge branch 'master' into Polyhedron-demo-meshing-segmented-image-color-aclement
2023-09-07 10:32:52 +02:00
ange-clement
c059ee5be3
Updated scene mesh creation
...
The color is initialized to the base item's color.
2023-09-07 10:06:25 +02:00
ange-clement
6f8116c4d5
Update mesh coloring.
...
Visible surface patches uses the domains' colors.
The mesh generated from an image has now the same color
(if their base color is the same).
2023-09-06 18:24:27 +02:00
ange-clement
7beae3e8be
Made images colors adapt to their base color
2023-09-06 16:19:02 +02:00
Laurent Rineau
4740f81a1b
add a target to compile all CGALlab
2023-08-31 15:43:44 +02:00
Sébastien Loriot
a528464f31
Merge branch 'cgal/master' into PMP-BF_autorefine
2023-08-28 13:44:44 +02:00
hoskillua
46ac0f9060
trim whitespaces
2023-08-27 19:27:23 +03:00
hoskillua
28efeb2056
integrated curvature vis to display property
...
still need to add the radius setting part
2023-08-27 19:13:42 +03:00
hoskillua
a94a7337c2
Merge remote-tracking branch 'upstream/master' into gsoc2022
2023-08-25 14:51:46 +03:00
Laurent Rineau
f9c213735b
last deprecation warning in a full build of demo/Polyhedron
2023-08-24 17:53:32 +02:00
Laurent Rineau
dc7f6af55d
check that we have an exact match (whole string)
2023-08-24 16:48:22 +02:00
Laurent Rineau
d8583c93d5
replace deprecated QMatrix4x4*QVector3D by map
2023-08-24 16:48:22 +02:00
Laurent Rineau
da0b65d7c9
fix QSJ/C++ exceptions handling
...
The javascript testsuite passes.
2023-08-24 15:29:23 +02:00
Laurent Rineau
79a563bfbc
fix more deprecation warnings
2023-08-24 15:19:11 +02:00
Sébastien Loriot
608d0c81c4
use a macro
2023-08-24 14:56:48 +02:00
Laurent Rineau
740b57003c
Merge remote-tracking branch 'refs/remotes/afabri/CGAL-Qt6-GF' into CGAL-Qt6-GF
2023-08-24 14:20:44 +02:00
Sébastien Loriot
68bc244d02
Merge remote-tracking branch 'cgal/master' into HEAD
2023-08-24 14:14:12 +02:00
Laurent Rineau
48bd7cc0c7
fix deprecation warnings from Qt6
2023-08-24 10:26:21 +02:00
Ivan Paden
613b0a8914
Merge branch 'master' into PMP-add_sizing_in_isotropic_remeshing-GF
2023-08-21 22:18:37 +02:00
Ivan Paden
dccf973186
Fix templating error in isotropic remeshing overload
2023-11-16 09:31:19 +01:00
Ivan Paden
e3727e4a88
Remove todos
2023-11-16 09:31:19 +01:00
Ivan Paden
6ee23c6fdd
Replace pmesh with vertex property maps in sizing field classes
2023-11-16 09:31:19 +01:00
Ivan Paden
600f72fd0e
Reintroduce constraints_are_short_enough for adaptive remeshing
2023-11-16 09:31:19 +01:00
Ivan Paden
050c7f9512
Add split_long_edges functionality using adaptive sizing field as an input
2023-11-16 09:31:19 +01:00
Ivan Paden
4a8974d256
Move sizing classes to 'public' headers
2023-11-16 09:31:19 +01:00
Ivan Paden
00b4b93d1c
Remove the adaptive sizing field dependency in remesh.h
2023-11-16 09:30:10 +01:00
Mael Rouxel-Labbé
b6cc7cabc5
Fix UI + fix connections
2023-11-16 09:30:10 +01:00
Mael Rouxel-Labbé
41bddc72d6
Display plugin fixes
2023-11-16 09:30:10 +01:00
Jane Tournois
58e0bf13a6
reintroduce mean curvature and gaussian curvature in "display properties"
...
broken for now
2023-11-16 09:30:10 +01:00
albert-github
93001308f4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot
28f904f4e2
Merge remote-tracking branch 'cgal/master'
2023-08-15 07:16:14 +02:00
Sébastien Loriot
eada3ee8ca
Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl'
2023-08-14 14:19:25 +02:00
albert-github
0ce82c0bd5
Better showing of `#include`
...
Getting a better (and consistent) output for the include file to be used with some functions.
Normally `#include` are sown as in a typewrite font, but the `#include` in these cases were shown in a code block way.
2023-08-13 18:22:07 +02:00
Mael Rouxel-Labbé
dab6394215
Introduce AW3 Vb/Cb to avoid using T3_Vb/Cb_with_info_3
2023-08-03 12:05:40 +02:00
Sébastien Loriot
1f61a84e49
add demo plugin that support refinement of one or several items
...
(soup or mesh)
2023-08-02 10:30:05 +02:00
Jane Tournois
b7aeab378f
Merge remote-tracking branch 'cgal/master' into PMP-add_sizing_in_isotropic_remeshing-GF
2023-08-01 12:22:15 +02:00
Jane Tournois
4b1b04eb8d
fix compilation
2023-11-16 09:16:00 +01:00
Ivan Paden
cc0c46c7ef
Fix polyhedron demo with TBB
2023-11-16 09:16:00 +01:00
Ivan Paden
1c597a07cf
Move sizing map calculation to constructor
2023-11-16 09:16:00 +01:00
Ivan Paden
91216f7875
Add adaptive remeshing to Polyhedorn demo, PMP plugin
2023-11-16 09:16:00 +01:00
Ivan Paden
0fbcb4175c
Add UI support for adaptive remeshing in Polyhedron demo (WIP)
2023-11-16 09:16:00 +01:00
Mael Rouxel-Labbé
7ec586ca73
Temporary workaround the selection item emitting way too many signals
2023-07-19 10:56:14 +02:00
albert-github
ad41766454
issue #7395 Improvement of layout of model relations
...
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
2023-07-18 13:23:37 +02:00
Mael
c6fd1d0316
Merge branch 'master' into CGAL-Qt6-GF
2023-07-18 10:49:58 +02:00
albert-github
de3ba0f47c
Merge remote-tracking branch 'upstream/master' into feature/issue_7395
2023-07-17 10:17:34 +02:00
Laurent Rineau
c5fd2070e3
Merge pull request #7539 from MaelRL/Demo-Display_plugin-GF
...
Display property / Heat method plugins improvements
2023-07-17 09:52:39 +02:00
albert-github
4e5578d469
issue #7395 Improvement of layout of model relations
...
- based on review
2023-07-15 13:12:15 +02:00
albert-github
a0320dd7b4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h
2023-07-13 10:33:18 +02:00
Mael Rouxel-Labbé
39983615cd
Remove unused variable
2023-07-12 15:57:35 +02:00
Mael Rouxel-Labbé
047be0a3b6
Merge remote-tracking branch 'cgal/master' into Demo-Display_plugin-GF
2023-07-12 15:44:16 +02:00
Laurent Rineau
9c21ec9c50
Merge pull request #7540 from nmnobre/docs
...
Improve the manuals for the 3D Polyhedral Surface and Triangulated Surface Mesh Segmentation pkgs
2023-07-12 15:30:13 +02:00
Laurent Rineau
5ef509cc39
Merge pull request #7540 from nmnobre/docs
...
Improve the manuals for the 3D Polyhedral Surface and Triangulated Surface Mesh Segmentation pkgs
2023-07-12 15:23:51 +02:00
Sébastien Loriot
125542eb62
Merge remote-tracking branch 'cgal/master'
2023-07-11 12:59:21 +02:00
albert-github
301728a8a9
issue #7395 Improvement of layout of model relations
...
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
albert-github
ee2a55279d
issue #7395 Improvement of layout of model relations
...
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Laurent Rineau
aca86b9d27
Merge pull request #7500 from MaelRL/AW3-Stop_demo-GF
...
Add stop button for AW3 demo
2023-07-05 16:32:39 +02:00
Laurent Rineau
2e8ce4006d
Merge pull request #7549 from afabri/Polyhedron-fix_surface_remeshing-GF
...
Polyhedron demo: Fix remeshing of a surface
2023-07-05 16:32:34 +02:00
Nuno Miguel Nobre
56097acf82
Add Polyhedron_items_with_id_3 to PolyhedronItems_3 concept reference
2023-07-05 14:12:13 +01:00
Sébastien Loriot
b66afab814
Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD
2023-07-05 11:29:35 +02:00
Sébastien Loriot
68813c5c63
Merge pull request #7403 from sloriot/CGAL-replace_boost_by_std
...
Replace boost by std
2023-07-05 11:08:36 +02:00
Andreas Fabri
1066af14f4
Add #include
2023-06-26 15:09:10 +01:00
Andreas Fabri
be5a44af6a
whitespace
2023-06-26 12:20:15 +01:00
Andreas Fabri
a007995215
Polyhedron demo: Fix remeshing of a surface
2023-06-26 12:11:22 +01:00
Sébastien Loriot
dfc386d65b
Merge branch 'master' into HEAD
2023-06-22 14:05:45 +02:00
Sébastien Loriot
573de7f29e
Merge branch 'master'
2023-06-22 13:38:49 +02:00
Laurent Rineau
70ac38bed0
Merge pull request #7523 from nmnobre/doc_segmentation
...
Fix typos in multiple manuals
2023-06-22 11:59:32 +02:00
Laurent Rineau
1a47c45688
Merge pull request #7533 from janetournois/Polyhedron_demo-fix_default_sigma-jtournois
...
Polyhedron demo - fix Mesh_3 dialog initialization
2023-06-22 11:59:16 +02:00
Laurent Rineau
6e5070c302
Merge pull request #7523 from nmnobre/doc_segmentation
...
Fix typos in multiple manuals
2023-06-22 11:58:48 +02:00
Sébastien Loriot
cce3dfd075
Merge pull request #7416 from sloriot/CGAL-toward_6.0
...
CGAL 6.0 requires c++17
2023-06-22 09:28:15 +02:00
Mael Rouxel-Labbé
96ce2a28af
Apply suggestion from @lrineau
2023-06-21 14:36:17 +02:00
Mael Rouxel-Labbé
c4f4bc4cac
Work on display property plugin (+ heat method)
...
- separated property display and Heat method into two independent plugins
- redesigned UIs
- added "Largest Angle per face" and "face areas" to the display properties
- enable using a selection item to select heat method's source vertices
- fixed smallest angle computation
- fixed storing wrong display values
- fixed applicable() returning true too often
- fixed zoom not working for property maps other than the plugin's
- fixed zoom not working for simplices other than faces
- fixed zoom not working for point sets
- fixed color map ignoring the user's color choice
- fixed property combobox resetting on pretty much other action
- fixed not resetting colors when items are modified
- fixed broken connections in the heat method plugin
- fixed not actually emitting anything when a list selection is changed
- much more stuff
2023-06-21 13:23:31 +02:00
Nuno Miguel Nobre
0469f46105
Fix plurals in a number of manuals
2023-06-20 13:29:44 +01:00
Nuno Miguel Nobre
e22e256e69
Tweak wording in the manuals for the 3D Polyhedral Surface pkg
2023-06-20 13:29:23 +01:00
Jane Tournois
3a33bc8330
do not access null image
2023-06-19 16:19:52 +02:00
Laurent Rineau
e60e7b8010
Merge pull request #7508 from MaelRL/CGAL-Fix_offset_function-GF
...
Offset Meshing Plugin Improvements
2023-06-16 10:11:08 +02:00
Laurent Rineau
3c0a490440
Merge pull request #7518 from janetournois/Polyhedron_demo-remove_c3t3_io_verbosity-jtournois
...
CGAL Lab - disable verbosity of `.mesh` reader
2023-06-16 10:11:03 +02:00
Laurent Rineau
ad130ba0e0
Merge pull request #7518 from janetournois/Polyhedron_demo-remove_c3t3_io_verbosity-jtournois
...
CGAL Lab - disable verbosity of `.mesh` reader
2023-06-16 10:10:35 +02:00
Sébastien Loriot
f936680600
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 18:48:39 +02:00
Sébastien Loriot
9cdfe70abb
Merge remote-tracking branch 'sloriot/CGAL-toward_6.0'
2023-06-15 11:34:09 +02:00
Sébastien Loriot
bbc48b2c7e
more fixes
...
use Mesh_3::internal::get_index
std::dynamic_point_cast
std::get_if
2023-06-15 10:57:10 +02:00
Sébastien Loriot
56499e017d
do not use API that did not go into the standard
2023-06-15 10:57:10 +02:00
Sébastien Loriot
9a0bdb5d96
boost::variant ---> std::variant
2023-06-15 10:57:10 +02:00
Sébastien Loriot
557b64e4a6
boost::any ==> std::any
2023-06-15 10:57:09 +02:00
Sébastien Loriot
604dcdc435
boost::optional => std::optional
2023-06-15 10:57:09 +02:00
Sébastien Loriot
71b4e4f08f
boost::shared_ptr => std::shared_ptr
2023-06-15 10:57:01 +02:00
Sébastien Loriot
bbc4d08ee0
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 10:47:07 +02:00
Sébastien Loriot
c8a88b9014
remove CGAL_static_assertion*
2023-06-15 10:42:10 +02:00
Jane Tournois
7a101937c6
disable verbosity of `build_triangulation_from_file` - too verbose
2023-06-13 17:04:39 +02:00
Mael Rouxel-Labbé
efd68a5f92
Update offset meshing plugin
...
- fixed not working for polygon soups
- fixed broken formula for both giving Mesh_3 assertions and inverted meshes
- fixed applicable() allowing wrong combinations
- fixed inflate() needlessly normalizing normals
- fixed crashing for non triangulated inputs
- fixed some memory leaks
- fixed dialog name
- removed useless sqrts
- avoid recomputing bbox 4 times
- cleaned UI
- etc.
2023-06-09 19:15:16 +02:00
Laurent Rineau
97bd67d78e
Merge pull request #7504 from lrineau/Polyhedron_demo-fix_memory_leaks-GF
...
fix various memory leaks in CGAL Lab
2023-06-09 16:26:23 +02:00