Commit Graph

7781 Commits

Author SHA1 Message Date
Jane Tournois f46caacdad WIP fix weighted images in demo 2021-07-27 16:38:33 +02:00
Laurent Rineau 2599d8e41a Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:55:11 +02:00
Laurent Rineau 71175aad53 Merge pull request #5863 from MaelRL/BGL-Fix_FFG_nonconst_index_pmaps-GF
Fix index maps for non-const Face_filtered_graph
2021-07-27 15:52:23 +02:00
Jane Tournois 2637bf6343 add weighted images to the demo 2021-07-27 09:33:49 +02:00
Maxime Gimeno 22edbbe428 Merge remote-tracking branch 'cgal/master' into PMP-Add_a_visitor_to_orient_polygon_soup-maxGimeno 2021-07-26 11:46:51 +02:00
Mael Rouxel-Labbé 5240e402de Fix wrong PMap type 2021-07-23 14:26:40 +02:00
Maxime Gimeno f8315e09b7 DOn't use a pair. 2021-07-22 15:19:58 +02:00
Maxime Gimeno f36e5eadf9 Remove to_remove 2021-07-22 09:37:48 +02:00
Maxime Gimeno 83e7abf042 Changes after review 2021-07-21 12:48:11 +02:00
Maxime Gimeno 3cfa3e8c86 Use a NP to pass the visitor 2021-07-19 13:40:19 +02:00
Maxime Gimeno 1b04db1fad Give the visitor by copy (1st step for the Named Parameters) 2021-07-19 13:18:26 +02:00
Maxime Gimeno 36dd5be796 more fixes 2021-07-19 13:05:17 +02:00
Maxime Gimeno b027d31bfd remove the "Extract NM Simplicies" action 2021-07-19 12:06:43 +02:00
Maxime Gimeno 67b2fd1454 Fix default visitor mechanism 2021-07-19 11:48:20 +02:00
Maxime Gimeno 05761799e8 Fix the filtering in the plugin 2021-07-19 11:25:37 +02:00
Sebastien Loriot 40f507a1f1
Merge pull request #5800 from MaelRL/SS-Doc_fixes-GF
Harmonization of some IO stream documentation
2021-07-19 07:56:48 +02:00
Sebastien Loriot 9b27f53b28
Merge pull request #5544 from maxGimeno/PMP-compare_faces_from_meshes-maxGimeno
PMP: compare_meshes
2021-07-19 07:54:00 +02:00
Sebastien Loriot 4efdf52c0e
Merge pull request #5654 from maxGimeno/Demo-OFF_choose_normals_export-maxGimeno
Polyhedron Demo: Popup for OFF
2021-07-19 07:50:54 +02:00
Sebastien Loriot edc456e7c2
Merge pull request #5636 from maxGimeno/Demo-Enhance_Animate_plugin-maxGimeno
Polyhedron_demo: Animate plugin
2021-07-19 07:49:29 +02:00
Maxime Gimeno 4989eadb19 WIP 2021-07-13 16:06:52 +02:00
Maxime Gimeno 83b69b5a98 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-07-08 11:33:42 +02:00
Dmitry Anisimov c5bea93e58 renamed max to maximum and min to minimum in NP to be consistent with other packages 2021-06-30 12:39:01 +02:00
Maxime Gimeno 06525e0ca5 Fixes and cleanup 2021-06-29 15:25:29 +02:00
Maxime Gimeno a29d8b183c change the colors of the button to make it more obvious when it is disabled. 2021-06-29 14:54:55 +02:00
Maxime Gimeno 56c920112a Better display fir buttons 2021-06-29 10:33:45 +02:00
Maxime Gimeno 5526db6942 add a tooltip to the reset button 2021-06-29 09:27:35 +02:00
Maxime Gimeno e8efd07a5b Fix init of the bitsets 2021-06-29 09:21:21 +02:00
Maxime Gimeno 4602a18a8f WIP Fixing the init 2021-06-28 15:43:18 +02:00
Maxime Gimeno 0deb49a84a add missing if 2021-06-28 14:02:16 +02:00
Maxime Gimeno f79ec025cd The edges are dealt with now. 2021-06-28 13:11:28 +02:00
Maxime Gimeno 200a340149 Secured in case there are too many subdomains or the GL version is too old. Fix the colors of the button. 2021-06-28 11:08:56 +02:00
Dmitry Anisimov b7e0e37ba3 fixed regularization in the polyhedron demo 2021-06-25 18:02:05 +02:00
Maxime Gimeno e5914cf70f The plugin works. Still needs to secure it all 2021-06-25 12:27:49 +02:00
Maxime Gimeno 4f9fc89a10 fix logic for discard 2021-06-25 10:11:32 +02:00
Maxime Gimeno 73eafddd39 WIP: Patches per facet are not good 2021-06-24 14:14:46 +02:00
Mael Rouxel-Labbé 78ff9185b3 Harmonize ASCII usage across all packages 2021-06-23 23:34:32 +02:00
Mael Rouxel-Labbé 084a1efe2d Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-06-23 22:30:03 +02:00
Maxime Gimeno 2c36a1797c WIP 2021-06-23 15:58:57 +02:00
Maxime Gimeno ec41af7e33 Add a widget for filtering c3t3 subdomains 2021-06-22 15:24:33 +02:00
Maxime Gimeno 663ebce7bb Add a plugin to interact with the c3t3_item, and allow some filtering in the display. 2021-06-18 14:12:48 +02:00
Maxime Gimeno 1a9a578df8 Apply google-readability-casting to the off_plugin 2021-06-18 10:54:35 +02:00
Dmitry Anisimov d98cc1ebcb polyhedron demo, refactoring internal weights representation 2021-06-09 14:05:18 +02:00
Dmitry Anisimov 8be257b663 updated weights in the polyhedron demo 2021-06-04 14:39:31 +02:00
Laurent Rineau 5cbadbede6 Merge pull request #5701 from maxGimeno/Ctest-Adapt_scripts_to_windows-maxGimeno
Testsuite: Adapt ctest scripts for use with cygwin
2021-06-02 17:20:49 +02:00
Laurent Rineau 10cdb759b9 Merge pull request #5739 from maxGimeno/Demo-Fixes_for_scale_scene-maxGimeno
Polyhedron Demo: Fix Scene Recentering while Scaled
2021-06-02 17:20:47 +02:00
Maxime Gimeno 18c7e6f513 Fix scene recenter with scaling ON 2021-05-31 14:09:07 +02:00
Laurent Rineau 4b414ca8c5 Merge pull request #5718 from maxGimeno/Demo-fix_statistics-maxGimeno
Polyhedron Demo: Fix classname property for selection_item

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
2021-05-27 19:12:22 +02:00
Laurent Rineau e745ff3fab Merge pull request #5718 from maxGimeno/Demo-fix_statistics-maxGimeno
Polyhedron Demo: Fix classname property for selection_item

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
2021-05-27 19:10:03 +02:00
Maxime Gimeno 2d5f91f763 Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno 2021-05-27 09:06:59 +02:00
Maxime Gimeno 5f3dd59231 Fix conversion warning 2021-05-25 12:15:57 +02:00
Maxime Gimeno ab182dd46a Merge remote-tracking branch 'cgal/master' into CGAL-Clang_tidy_new_pass-maxGimeno 2021-05-21 14:04:07 +02:00
Maxime Gimeno 2dac372ccd Demo pass 2021-05-21 14:01:30 +02:00
Maxime Gimeno 797c5ad08b Merge remote-tracking branch 'cgal/master' into PMP-compare_faces_from_meshes-maxGimeno 2021-05-20 08:58:24 +02:00
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:23:53 +02:00
Laurent Rineau 82bec8a1d6 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
2021-05-19 17:11:37 +02:00
Maxime Gimeno b21f8a412d Fix string comparison 2021-05-19 14:02:29 +02:00
Maxime Gimeno c1f315f500 Fix classname property for selection_item 2021-05-19 13:16:55 +02:00
Laurent Rineau 2c4a5db3ce Merge pull request #5631 from GilesBathgate/STL_ext-fix_uncaught_exceptions_cleanup-GilesBathgate
Fix uncaught exceptions cleanup
2021-05-18 18:14:14 +02:00
Laurent Rineau 26ad68e486 Merge pull request #5649 from sloriot/CGAL-no_boost_shared_ptr
Replace internal use of boost shared_ptr
2021-05-18 18:14:12 +02:00
Laurent Rineau 1e4899ecb8 Merge pull request #5651 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron Demo : Fix a warning
2021-05-18 18:14:09 +02:00
Laurent Rineau bd98013623 Merge pull request #5665 from GilesBathgate/Polyhedron_3_TDS_3-compare_handle_nullptr-GilesBathgate
Polyhedron_3 and TDS_3 compare handle nullptr
2021-05-18 18:13:57 +02:00
Laurent Rineau 607dadcf2b Merge pull request #5666 from alefy/Fix-demo_Polyhedron_mesh_3_linking_with_VTK-alefy
Fix linking issue with VTK for Mesh_3 Polyhedron demo
2021-05-18 18:13:55 +02:00
Laurent Rineau 7eef8b64e1 Merge pull request #5651 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron Demo : Fix a warning
2021-05-18 17:32:23 +02:00
Laurent Rineau 4ab1000d30 Merge pull request #5666 from alefy/Fix-demo_Polyhedron_mesh_3_linking_with_VTK-alefy
Fix linking issue with VTK for Mesh_3 Polyhedron demo
2021-05-18 17:32:18 +02:00
Maxime Gimeno c272741714 Fix sleep_for() call in Use_ssh.cpp 2021-05-17 11:41:56 +02:00
Maxime Gimeno 96fe2393a8 Fix chrono in Use_ssh 2021-05-12 10:45:34 +02:00
Maxime Gimeno 827a5ae8aa review 2021-05-11 14:40:40 +02:00
Maxime Gimeno dfab2a3d3c clean-up 2021-05-11 13:25:25 +02:00
Maxime Gimeno 889119e800 Update add_test to directly use msbuild when running on cygwin 2021-05-11 12:48:44 +02:00
Maxime Gimeno 33cefe1be7 remove calls to cpp11::sleep_for() 2021-05-07 11:13:03 +02:00
Maxime Gimeno 3e03d50b8a replace usages of CGAL::cpp11::atomic and thread by std:: calls 2021-05-07 11:10:30 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sébastien Loriot 0a13731eea prevent generic overload to be picked 2021-05-06 10:27:12 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot 22be8671f7 move read_vtk_image_data to IO 2021-05-04 14:59:28 +02:00
Sébastien Loriot 56025fb5f9 fix release number of depreciation 2021-05-04 14:38:47 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Maxime Gimeno 14b1b3b8cc WIP 2021-05-04 11:38:07 +02:00
Adrien Lefieux 5c66c5d0e1 Solve linking issue on macOS with VTK for Mesh3 Polyhedron demo 2021-05-03 18:19:06 +02:00
Sébastien Loriot 70058db9b7 add IO namespace for Mesh_3 package 2021-05-03 15:39:07 +02:00
Maxime Gimeno 26621062e2 add an `s` 2021-04-30 08:38:51 +02:00
Maxime Gimeno 11bb420ac2 Clean-up 2021-04-29 15:49:48 +02:00
Maxime Gimeno d6c68a9fe2 List concerned properties 2021-04-29 14:57:28 +02:00
Maxime Gimeno d7ee3066ee Add a pop-up to ask if the user wants to export the internal properties in the off plugin. 2021-04-29 13:28:48 +02:00
Giles Bathgate 5ecd85248a Fix capitalisation of macro name. 2021-04-28 21:03:45 +01:00
Giles Bathgate 0ef8127c71 The CGAL_NOEXCEPT macro is no longer needed 2021-04-28 21:03:00 +01:00
Giles Bathgate 0dcadee486 Fix dereference after null in Polyhedron_incremental_builder_3.h 2021-04-28 17:54:19 +01:00
Maxime Gimeno 971004cfee Fix a warning 2021-04-28 15:40:18 +02:00
Sébastien Loriot 1faa0e2992 replace internal use of boost::shared_ptr by std::shared_ptr 2021-04-28 10:55:26 +02:00
Maxime Gimeno 21319d744a Remove target all_scene_items as it fails the building inside ctest on windows 2021-04-22 14:26:22 +02:00
Maxime Gimeno c64128a282 Fix offset in points 2021-04-22 12:46:47 +02:00
Maxime Gimeno 34a53d36ad Store states on a stack to "read last frame" as it was, not simply apply the last frame, as it might not be the same points that are impacted. 2021-04-22 12:34:14 +02:00
Sébastien Loriot f513a791e2 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-21 15:48:36 +02:00
Sébastien Loriot eef92fbef7 Merge remote-tracking branch 'cgal/5.1.x-branch' 2021-04-21 15:47:06 +02:00
Sebastien Loriot 7a68dfd3fa
Merge pull request #5623 from maxGimeno/Demo-Fix_dll_warning-maxGimeno
Polyhedron_demo : Fix a warning
2021-04-21 15:34:14 +02:00
Sebastien Loriot 4f3c2b7ee4
Merge pull request #5621 from sloriot/Demo-polylines_in_offset_meshing
Add support for protecting features in offset meshing
2021-04-21 15:31:36 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Sebastien Loriot 076cb5fa13
Merge pull request #5573 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron Demo:  Trivial Warning
2021-04-17 10:53:46 +02:00
Maxime Gimeno 9384b064eb Make `children` a pointer to silent an annoying warning about QList<int> not being a dll-interface class. 2021-04-16 13:39:30 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Sébastien Loriot fef75785cb handle polyline to protect in offset meshing 2021-04-14 17:38:49 +02:00
Mael Rouxel-Labbé fba303341f Merge remote-tracking branch 'cgal/master' into Distance_3-Add_Tri_Tri-GF 2021-04-12 15:33:14 +02:00
Mael Rouxel-Labbé 7e62c02176 Re-organize into Distance_2/X_Y.h to align with Distance_3 2021-04-12 15:31:55 +02:00
Mael Rouxel-Labbé 5deb509374 Move to Distance_3/X_Y.h rather than squared_distance_X_Y.h (as Intersections) 2021-04-12 14:42:44 +02:00
Maxime GIMENO 7629e25d40
Update Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2021-04-09 14:26:51 +02:00
Maxime Gimeno 83badb138c Fix description of corner_item 2021-04-09 14:15:04 +02:00
Maxime Gimeno db9b78017e Add nissing viewer->makeCurrent() 2021-04-09 12:56:22 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Laurent Rineau 8dc3256685 Merge pull request #5488 from sgiraudot/Classification-Remove_TensorFlow_support-GF
[Small Feature] Remove TensorFlow support
2021-04-06 15:13:15 +02:00
Laurent Rineau ed884ad2e7 Merge pull request #5525 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_dialog-jtournois
Polyhedron demo - improve PMP::isotropic_remeshing dialog box
2021-04-06 15:13:05 +02:00
Laurent Rineau 8247232cf1 Merge pull request #5535 from sloriot/CGAL-more_cmake_support_files
Add more cmake support files
2021-04-06 15:13:04 +02:00
Maxime Gimeno 8f7e12ebdc Fix another similar warning 2021-04-06 13:17:37 +02:00
Maxime Gimeno 0dd0b96586 Don't add empty items in plugin 2021-04-01 15:39:45 +02:00
Maxime Gimeno 34e2180b22 rename match_faces 2021-04-01 13:50:41 +02:00
Maxime Gimeno c349448ec5 add braces 2021-04-01 10:13:19 +02:00
Sebastien Loriot 3a409e6ac2
Update Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-03-31 14:16:56 +02:00
Sébastien Loriot f4a79aebd8 catch const ref 2021-03-31 14:12:43 +02:00
Laurent Rineau c453420dd6 Merge pull request #5513 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron_demo: Move LAS code from item to plugin
2021-03-24 15:05:20 +01:00
Laurent Rineau 8886d3fda9 Merge pull request #5529 from maxGimeno/Demo-Fixes_for_5_1-maxGimeno
Polyhedron_demo: Fix Affine_transform_plugin crash
2021-03-24 15:05:12 +01:00
Laurent Rineau 33ed7a9995 Merge pull request #5529 from maxGimeno/Demo-Fixes_for_5_1-maxGimeno
Polyhedron_demo: Fix Affine_transform_plugin crash
2021-03-24 15:00:25 +01:00
Maxime Gimeno 9e6eaa504a Orientation requirements always on, as it won't work without it on non triangle meshes 2021-03-23 13:43:49 +01:00
Maxime Gimeno 277117613b Add a NP for orientation requirement 2021-03-23 11:49:47 +01:00
Maxime Gimeno dd90a3ce84 OutputIterators 2021-03-23 10:17:39 +01:00
Simon Giraudot 8e06889d90 Rebase 2021-03-22 15:17:34 +01:00
Maxime Gimeno 7d4a661671 Overloads, plugin and data sets 2021-03-22 14:59:01 +01:00
Maxime Gimeno 735567531b RENAME 2021-03-19 12:00:08 +01:00
Sébastien Loriot 887b7d0eaa add METIS cmake support file 2021-03-18 14:58:04 +01:00
Sébastien Loriot ac15312260 add Ceres support cmake file 2021-03-18 14:47:56 +01:00
Maxime Gimeno fdcd84b031 Use copy_face_graph to duplicate the surface_mesh in affine_transformation to avoid problems related to the extra properties (it may cause a crash in the cas eof the face patch_id map, for example) 2021-03-16 14:18:05 +01:00
Maxime Gimeno 1cc00a32eb Move LAS code from item to plugin to prevent BOOL declaration to conflict with the one form lib3mf. 2021-03-16 13:27:36 +01:00
Mael Rouxel-Labbé 27069d423c Update header includes 2021-03-12 12:52:05 +01:00
Jane Tournois b0d871bf8f change the tab-order for options in UI 2021-03-11 15:21:08 +01:00
Jane Tournois 6b50fb2f10 disable nbSmoothing_spinbox when splitEdgesOnly_checkbox is checked 2021-03-11 15:14:34 +01:00
Laurent Rineau ddd2d70274 Merge pull request #5489 from danston/Polyhedron_demo-macos_warnings_fixed-danston
Fixed Polyhedron demo warnings in the macOS test suite
2021-03-10 10:35:18 +01:00
Laurent Rineau 5c8e8f5ec4 Merge pull request #5508 from maxGimeno/Demo-new_features-maxGimeno
Polyhedron Demo: New features
2021-03-10 10:35:13 +01:00
Laurent Rineau f712a2a3a0 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1

Conflicts:
	Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert
	Polyhedron/demo/Polyhedron/resources/shader_spheres.vert
2021-03-03 18:27:33 +01:00
Laurent Rineau 3ab3b10d47 Merge pull request #5247 from MaelRL/SDG-Fix_doc-GF
Doc improvements for TDS-related classes
2021-03-03 17:38:18 +01:00
Laurent Rineau ab6145babc Merge pull request #5501 from maxGimeno/CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
CMake Fixes when CGAL_Core is disabled (5.2)
2021-03-03 17:20:55 +01:00
Laurent Rineau 11e3c689ed Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +01:00
Laurent Rineau 1435e37232 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:31:08 +01:00
Maxime GIMENO 2349ba6d39
Update Polyhedron/demo/Polyhedron/MainWindow.cpp
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-03-03 11:51:14 +01:00
Maxime Gimeno 8b058d90d9 Fixes 2021-03-03 11:02:39 +01:00
Maxime Gimeno 714d7091ce WIP save items. Need tests. 2021-03-02 15:44:00 +01:00
Maxime Gimeno b4de351840 Merge branch 'CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.1-maxGimeno' into CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno 2021-03-02 10:16:01 +01:00
Maxime Gimeno 7c94a1f2bf Replace condition for a clearer equivalent one, and use APPEND for env property in Arrangement_2 2021-03-02 09:59:28 +01:00
Maxime Gimeno 7d21d5b62d De-activate some things that depend on CGAL_Core if it is not FOUND 2021-03-01 11:27:43 +01:00
Maxime Gimeno bcb9940eb7 WIP for groups in save_scene 2021-02-26 13:05:48 +01:00
Maxime Gimeno 2eac79c326 Fix names of the diff items 2021-02-25 14:20:42 +01:00