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

8503 Commits

Author SHA1 Message Date
Laurent Rineau 9262c6a8b6 Re-add CGAL_ITK_support.cmake 
That will allow to be compatible with ITK version 4.13 and 5.x.
 2023-11-23 17:25:18 +01:00
Sébastien Loriot 15af7605fe Q_DECL_OVERRIDE -> override 2023-11-22 11:34:27 +01:00
Laurent Rineau 74896b99c0 Use ITK 5.x instead of 4.13 2023-11-16 16:27:23 +01:00
Sébastien Loriot 94d1234913 restore Mael's version 2023-11-16 12:00:35 +01:00
Sébastien Loriot cfac63f156 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 11:35:35 +01:00
Sébastien Loriot 4d834098b8 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 10:39:31 +01:00
Ivan Pađen 34c126839f Address warnings 2023-11-16 09:37:41 +01:00
Sébastien Loriot e885155c22 fix warnings 2023-11-16 09:37:41 +01:00
Ivan Paden 324f133125 Update removed arguments 2023-11-16 09:37:40 +01:00
Andreas Fabri 9ead7b59f5 Address unused variable warnings 2023-11-16 07:26:44 +00:00
Laurent Rineau 69d9025736 Merge pull request #6760 from hoskillua/gsoc2022 
GSoC2022 - Interpolated Corrected Curvatures

# Conflicts:
#	Installation/CHANGES.md
 2023-11-15 16:00:36 +01:00
Laurent Rineau e4f68a6e22 Merge pull request #7831 from ange-clement/Polyhedron-demo-fix-cells-not-in-complex-aclement 
Polyhedron demo : Fix bug in "Show cells not in complex" of a C3t3
 2023-11-15 15:44:19 +01:00
Andreas Fabri 3c07d9a591 Add virtual 2023-11-15 10:05:58 +00:00
Andreas Fabri 652f7b26c0 Replace Q_FOREACH 2023-11-15 08:59:17 +00:00
Andreas Fabri dc0cd7f1e6 make ~Show_point_dialog() virtual 2023-11-15 07:51:58 +00:00
Jane Tournois 0b73361226 remove CGAL_ITK_support.cmake 
and adapt the CMakeLists that were using it
 2023-11-13 12:47:39 +01:00
Laurent Rineau bdfe153cd9 Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois 
BGL - no need to workaround boost 1.54 anymore
 2023-11-06 12:52:24 +01:00
Laurent Rineau e92d42f0dc Merge pull request #7795 from lrineau/CGAL_Lab-fix_VTK_io_plugin-GF 
CGAL Lab: fix reading of VTK files
 2023-11-06 12:52:21 +01:00
Laurent Rineau 65183a9057 Merge pull request #7800 from ange-clement/Polyhedron-demo-Surface_patch_index-color 
Polyhedron demo - Use subdomain's color only when meshing from labeled images

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp
 2023-11-06 12:51:34 +01:00
Puneet Matharu 7944441068 Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject. 2023-11-02 18:09:03 +00:00
Laurent Rineau 5f27627e02 Merge remote-tracking branch 'cgal/master' into pr/janetournois/7754 
# Conflicts:
#	Polyhedron/demo/Polyhedron/resources/shader_c3t3.frag
 2023-11-01 22:59:58 +01:00
Laurent Rineau 51627e3505 Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF 
# Conflicts:
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
 2023-11-01 20:59:44 +01:00
Laurent Rineau dda4bf8449 fix regression about MOC compilations 
The commit b05e1e9e46 was indeed the
cause of the regression. But the root cause was an incorrect
usage of `qt6_generate_moc`.

The addition of `TARGET ${plugin_name}` triggered the use of the
property `INCLUDE_DIRECTORIES` of the target.

See https://doc.qt.io/qt-6/qt-generate-moc.html#arguments
 2023-11-01 20:52:10 +01:00
Mael Rouxel-Labbé 3879b13c0e Misc minor improvements 2023-10-30 23:46:46 +01:00
Mael Rouxel-Labbé 21fddd1c13 Fix default values' bbox not being computed for point set items 2023-10-30 23:40:42 +01:00
Laurent Rineau 7dc4b624aa fix a link error about ~Scene_item_with_properties 
```
            Creating library C:/CGAL_ROOT/CGAL-6.0-Ic-93/cmake/platforms/MSVC-2022-Community-Release/test/Polyhedron_Demo/Release/scene_points_with_normal_item.lib and object C:/CGAL_ROOT/CGAL-6.0-Ic-93/cmake/platforms/MSVC-2022-Community-Release/test/Polyhedron_Demo/Release/scene_points_with_normal_item.exp
   158>Scene_points_with_normal_item.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: virtual __cdecl CGAL::Three::Scene_item_with_properties::~Scene_item_with_properties(void)" (__imp_??1Scene_item_with_properties@Three@CGAL@@UEAA@XZ) referenced in function "int `public: __cdecl Scene_points_with_normal_item::Scene_points_with_normal_item(class dtor$1 const &)'::`1'::dtor$1" (?dtor$1@?0???0Scene_points_with_normal_item@@QEAA@AEBV0@@Z@4HA) [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
   158>Scene_points_with_normal_item.obj : error LNK2019: unresolved external symbol "__declspec(dllimport) public: __cdecl CGAL::Three::Scene_item_with_properties::Scene_item_with_properties(void)" (__imp_??0Scene_item_with_properties@Three@CGAL@@QEAA@XZ) referenced in function "public: __cdecl Scene_points_with_normal_item::Scene_points_with_normal_item(class Scene_points_with_normal_item const &)" (??0Scene_points_with_normal_item@@QEAA@AEBV0@@Z) [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
   158>C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\Release\scene_points_with_normal_item.dll : fatal error LNK1120: 2 unresolved externals [C:\CGAL_ROOT\CGAL-6.0-Ic-93\cmake\platforms\MSVC-2022-Community-Release\test\Polyhedron_Demo\scene_points_with_normal_item.vcxproj]
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-93/Polyhedron_Demo/TestReport_Christo_MSVC-2022-Community-Release.gz
 2023-10-30 15:04:24 +01:00
ange-clement 8aa8fb9397 Fixed issue (minimal) 2023-10-26 14:22:38 +02:00
Sébastien Loriot 39ad72706e Merge remote-tracking branch 'cgal/5.6.x-branch' 2023-10-26 08:59:18 +02:00
Sebastien Loriot b82958377f
fix demo warnings (#7806) 
Fix warnings
[here](https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-I-85/Polyhedron_Demo/TestReport_lrineau_Fedora-with-LEDA.gz)
 2023-10-25 08:33:15 -07:00
Sebastien Loriot 9e6abb7291
Mesh 3 : improved meshing with selected polylines (#7750) 
## Summary of Changes

Added a drop-down item "Input polyline only" in "Protect sharp edges"
when a polyline item is selected.
Fixed polyline item not working depending on the order of selection.

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
* License and copyright ownership:
 2023-10-25 08:31:50 -07:00
Sebastien Loriot dfb9b3407f
Mesh_3 Polyhedron demo : Added support for vtk images (vti format) (#7729) 
## Summary of Changes

Added support for vtk image (.vti files) opening in the demo in the
plugin Mesh_3/Io_image_plugin

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
* Feature/Small Feature (if any):
* License and copyright ownership:
 2023-10-25 08:29:58 -07:00
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