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

5787 Commits

Author SHA1 Message Date
Laurent Rineau f12b3bf302 Prefix CMake options with `CGAL_` 
- in `examples/Mesh_3/`,
- in `examples/Point_set_processing_3/`,
- in `demo/Polyhedron/`, and
- in `demo/Triangulation_3/`.
 2018-03-08 12:07:49 +01:00
Maxime Gimeno d76ba39104 Fix selection_item tooltip so it shows the number of selected simplices 2018-03-07 16:20:05 +01:00
Laurent Rineau c741950dd2 Merge pull request #2901 from sloriot/Demo-add_exp_autorefinement 
Add actions to use autorefinement
 2018-03-07 16:06:13 +01:00
Maxime Gimeno 60e6e4b35d add missing curly brackets 2018-03-07 14:13:44 +01:00
Maxime Gimeno 4ce3a55096 Add a check before trying to load a cdt_3 to avoid crashing. 2018-03-07 11:00:49 +01:00
Maxime Gimeno 2b250c5d07 Fix the RotationPoint setting. 2018-03-07 09:52:47 +01:00
Sébastien Loriot a66834b976 add actions to use autorefinement 2018-03-06 19:30:25 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 182239d6b6
Merge branch 'master' into CGAL-remove_SCL_SECURE_NO_DEPRECATE-GF 2018-03-06 16:49:30 +01:00
Laurent Rineau cca666e28f Merge pull request #2844 from maxGimeno/Orient_soup-Output_nm_edges_in_polyline-GF 
Polyhedron demo: Make Polyline from non manifold edges
 2018-03-06 16:24:16 +01:00
Laurent Rineau a3ee6a03b8 Merge pull request #2896 from maxGimeno/C3t3_item-Add_offset-GF 
Polyhedron demo: fix c3t3 display with big coordinates
 2018-03-06 16:24:08 +01:00
Laurent Rineau f092c04180 Merge pull request #2607 from maxGimeno/Selection_plugin_fix-GF 
Polyhedron demo: Fixes for QGLViewer 2.7 and remove GlSplat
 2018-03-06 16:23:58 +01:00
Laurent Rineau 91e2d65e97 Merge pull request #2892 from sgiraudot/Polyhedron_demo-Fix_region_selection-GF 
Polyhedron demo: Fix Region Selection / Position Request
 2018-03-06 16:23:41 +01:00
Laurent Rineau 9e31b1874b Merge pull request #2887 from maxGimeno/Fix_polylines_item-GF 
Polyhedron demo: Fix operations for polyline
 2018-03-06 16:23:00 +01:00
Laurent Rineau 34c8857c9e Merge pull request #2884 from maxGimeno/CGAL-Remove_gl_h-GF 
Remove remaining native GL code
 2018-03-06 16:22:34 +01:00
Andreas Fabri f91a93d02b Quit VC++ warning concerning a third party lib for reading LAS files 2018-03-06 15:05:21 +00:00
Maxime Gimeno 2cd2319af9 Fix display with offset 2018-03-05 15:04:41 +01:00
Maxime Gimeno 3f4641623f Fix cut_plane when loading c3t3 with offset 2018-03-05 14:53:51 +01:00
Simon Giraudot 219d1e4f80 Fix selection/point info with offset 2018-03-05 10:39:57 +01:00
Laurent Rineau 4d8b25d409 Merge pull request #2847 from maxGimeno/Selection_tool-Filter_operations-GF 
Polyhedron demo: Enhance selection tool
 2018-03-02 16:33:56 +01:00
Laurent Rineau 8290c80c6a Merge pull request #2878 from maxGimeno/Statistics-restore_for_multiple_items-GF 
Polyhedron demo: Restore statistics for multiple items
 2018-03-02 16:33:48 +01:00
Laurent Rineau 2fcdcf120c Merge pull request #2876 from sloriot/Demo-restore_cursor 
Restore cursor in case of failure
 2018-03-02 16:33:40 +01:00
Laurent Rineau 8b07fffb78 Merge pull request #2834 from maxGimeno/Polyhedron_demo-Save_as_enhancement-GF 
Polyhedron demo: Save as enhancement
 2018-03-02 16:32:49 +01:00
Maxime Gimeno 6609313ae1 Fix typo 2018-03-02 15:48:25 +01:00
Maxime Gimeno fb38eaec4a Clean-up and add a dialog in the probably impossible case nothing is non-manifold. (in this cas eit is orientable and so it is not a soup). 2018-03-02 11:47:45 +01:00
Maxime Gimeno 9db54327db conflict resolution 2018-03-01 08:48:02 +01:00
Maxime Gimeno 02044f2993 change highlight api for Scene_edit_box_item 2018-03-01 08:41:27 +01:00
Maxime Gimeno 8a50397cd9 Fix Edit_box 2018-03-01 08:40:27 +01:00
Maxime Gimeno 59e8a2c52c fix volume planes manipulation 2018-03-01 08:40:26 +01:00
Maxime Gimeno ad8d97e566 Fix highlighting 2018-03-01 08:40:26 +01:00
Maxime Gimeno 3c770e07df Fix 2d painting for selection 2018-03-01 08:40:26 +01:00
Maxime Gimeno f7aef14b49 Actually fix the Basic Objects menu 2018-03-01 08:40:26 +01:00
Maxime Gimeno ade8725046 add a makeCurrent() in the item's constructor 2018-03-01 08:40:26 +01:00
Maxime Gimeno 6fd37cbfab Fix segfault in selection 2018-03-01 08:39:35 +01:00
Maxime Gimeno 6389050f9b Fix depth problem in selection 2018-03-01 08:39:35 +01:00
Maxime Gimeno a5a6cc7c1e Fix warnings 2018-02-28 15:25:52 +01:00
Maxime Gimeno 8706ec9342 Fix operations for polyline 2018-02-28 12:01:56 +01:00
Maxime Gimeno bc2410d4ad Fixes 2018-02-28 11:40:49 +01:00
Maxime Gimeno 2156017402 Remove native gl.h include and native gl code in Surface_mesher/archive 2018-02-28 10:36:26 +01:00
Maxime Gimeno d1fcfab838 Restore statistics for multiple items 2018-02-27 12:23:26 +01:00
Sébastien Loriot 0cac04a04b restore cursor in case of failure 2018-02-27 10:58:31 +01:00
Maxime Gimeno 0c5d906736 Rename action and adds a dialog when orienting. 2018-02-26 13:42:50 +01:00
Mael Rouxel-Labbé d9168d011c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 18:24:39 +01:00
Laurent Rineau de4f63f20d Merge pull request #2838 from maxGimeno/BGL-remove_self_intersection-GF 
Improve experimental repairing functions
 2018-02-23 17:34:49 +01:00
Simon Giraudot efb52c8fde Fix outdated name in dialog 2018-02-23 13:19:12 +01:00
Mael Rouxel-Labbé c28e05be0c Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-02-23 12:50:06 +01:00
Andreas Fabri 90d6424b0d Remove typename in non-template code 2018-02-23 07:59:31 +00:00
Simon Giraudot 170ceb60c4 Add remaining time estimation 2018-02-22 14:45:36 +01:00
Simon Giraudot d0328e54a5 Add comment about shape = -1 for clarity 2018-02-21 10:25:19 +01:00
Simon Giraudot 86d6738ecd Do not clear PLY comments, just remove previous labels 2018-02-21 10:13:55 +01:00
Simon Giraudot f77bf61301 Save shape definitions in PLY comments 2018-02-21 10:13:40 +01:00
Maxime Gimeno 1d37fa8a47 If the extension for the corresponding filter is already present in the filename, don't add it a second time. 2018-02-21 09:54:09 +01:00
Simon Giraudot 15caaabf08 Add option to save cluster_id in point set item + console progress bar 2018-02-20 16:33:24 +01:00
Simon Giraudot d589bc1e94 Parallelize buffer filling 2018-02-20 16:33:24 +01:00
Simon Giraudot 75fb744119 Region selection + expand/reduce + parallelized selection test 2018-02-20 16:33:24 +01:00
Simon Giraudot 80b2b77b77 Add Region Selector 2018-02-20 16:33:24 +01:00
Maxime Gimeno e784259f0e Use c++11 to make the string list initialization look better 2018-02-20 14:52:13 +01:00
Maxime Gimeno b7b93c8b93 Remove bugged topology detection in selection_plugin. 2018-02-20 08:27:38 +01:00
Maxime Gimeno cde00f7757 Clean-up and overload. 2018-02-19 18:04:54 +01:00
Maxime Gimeno 3fdc7b67b2 remove non_filled_holes 2018-02-19 18:04:54 +01:00
Maxime Gimeno 2758143116 fixing the topology test. 2018-02-19 18:04:03 +01:00
Maxime Gimeno 2ff403e55d Enhance the selection_plugin with the new function 2018-02-19 18:04:01 +01:00
Laurent Rineau addb9230ce Merge pull request #2782 from maxGimeno/Boundary_edges_selection_fix-GF 
Polyhedron demo: Fix edge selection -> face selection conversion
 2018-02-19 14:28:27 +01:00
Laurent Rineau b0c6e37c1d Merge pull request #2772 from MaelRL/SMP-Clean_internal_from_example-GF 
SMP: Documented some functions used in the Orbifold Tutte parameterizer

# Conflicts:
#	Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp
#	Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/orbifold_shortest_path.h
 2018-02-19 14:27:59 +01:00
Laurent Rineau 637bf71645 Merge pull request #2828 from lrineau/CGAL-fix_various_issues-GF 
fix various minor issues
 2018-02-19 14:27:16 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF 
BGL: Document graph_has_property
 2018-02-19 14:26:33 +01:00
Laurent Rineau 705056526c Merge pull request #2828 from lrineau/CGAL-fix_various_issues-GF 
fix various minor issues
 2018-02-19 14:24:32 +01:00
Laurent Rineau 2afbcc7fa5 Merge pull request #2772 from MaelRL/SMP-Clean_internal_from_example-GF 
SMP: Documented some functions used in the Orbifold Tutte parameterizer
 2018-02-19 14:24:23 +01:00
Maxime Gimeno e7a6bb5619 Add points item export for non-manifold vertices of the soup. 2018-02-19 11:51:54 +01:00
Maxime Gimeno 1105e32896 Filter operations in QComboBox according to what simplices are currently in the selection. 2018-02-15 16:22:32 +01:00
Maxime Gimeno c6b9a282ee Add an action to create a polyline from non manifold edges of a soup. 2018-02-15 15:15:06 +01:00
Laurent Rineau 0eaabaa711 Merge pull request #2811 from maxGimeno/Polyhedron_demo-Fix_selection_IO-GF 
Polyhedron_demo: Fix some crashes when saving an item.
 2018-02-14 15:35:29 +01:00
Laurent Rineau 6e2d0aa4a1 Merge pull request #2810 from maxGimeno/Fix_colors-Polyhedron_demo-GF 
Polyhedron demo: fix color selection in the SceneView.
 2018-02-14 15:35:21 +01:00
Laurent Rineau bcfad15b16 Merge pull request #2802 from afabri/Polyhedron-STL-GF 
Polyhedron: Add *STL to nameFilters()
 2018-02-14 15:34:38 +01:00
Laurent Rineau 8a55d4cd94 Merge pull request #2798 from sgiraudot/Polyhedron_demo-Fix_reconstruction_angle_parameter-GF 
Polyhedron Demo Surface Reco. Plugin: Fix missing conversion from degrees to radiants
 2018-02-14 15:34:15 +01:00
Laurent Rineau 0ad9e405dd Merge pull request #2789 from afabri/Classification-fix_CMakeLists-GF 
win32 fix concerning bzip headers in the classification plugin CMakeLists.txt
 2018-02-14 15:33:58 +01:00
Laurent Rineau 9e7115ac2e Merge pull request #2784 from maxGimeno/Travis_check_package_dep-GF 
TravisCI:  check package dependencies
 2018-02-14 15:33:31 +01:00
Maxime Gimeno 4cb8afebee Use default filepath of item when saving if exists, if not use last path used when save_as in the current session if exists, if not use build dir like before. 2018-02-14 14:12:31 +01:00
Maxime Gimeno b50fddc9d8 Add a function to decide which filter should be the default when saving. 2018-02-14 13:56:00 +01:00
Laurent Rineau 741dbaf9f3 Fix a bug in demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt 
The file "Polyhedron_demo_mesh_3_plugin_cgal_code.cpp" was renamed *long*
ago. I do not know why I got that CMake error only recently.
 2018-02-13 16:00:29 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno 16b8999c14 If the filters are empty, filters.first().split(";;") will trigger an assertion and probably segfault, so I add a check before that. 2018-02-08 15:19:23 +01:00
Maxime Gimeno 1dfbced8d5 If the color column selected clicked is not in the selection, edit the corresponding item, not the current selection. 2018-02-08 13:23:57 +01:00
Maxime Gimeno dae33259c5 Use toLower() in the mainWindow to read indistinctly lower and capital extensions. 2018-02-07 14:36:45 +01:00
Andreas Fabri 73ba2a8e5b Polyhedron: Add *STL to nameFilters() 2018-02-07 08:53:37 +00:00
Simon Giraudot d84119056b Fix missing conversion from degrees to radiants 2018-02-06 14:10:41 +01:00
Maxime Gimeno 7a5e92d307 replace halfedge by fg_halfedge 2018-02-05 08:03:08 +01:00
Andreas Fabri f750c27354 win32 fix concerning bzip headers in the classification plugin CMakeLists.txt 2018-02-02 15:21:53 +00:00
Laurent Rineau 36514e2c65 Merge pull request #2759 from maxGimeno/Minor_feature_requests-GF 
Polyhedron demo: small new features
 2018-02-02 16:08:01 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno e7ebbd731d Add a butotn in edge selection mode that allows to select the whole boundary. 2018-02-02 09:27:41 +01:00
Maxime Gimeno 1ef82e471b check if the edge is NOT a border edge before calling its opposite. 2018-02-02 08:48:04 +01:00
Andreas Fabri 7d5b51c4f0 cast and reindent 2018-02-01 16:36:23 +00:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF 
Classification: ETHZ Random Forest
 2018-02-01 17:35:30 +01:00
Simon Giraudot 361f132290 Fix conversion warning 2018-01-31 13:55:51 +01:00
Maxime Gimeno f46e805c77 Make inherit the usage of TBB in the cmake macro 2018-01-30 14:09:47 +01:00
Maxime Gimeno 60b2f8ac58 Fix c3t3_io_plugin with TBB 2018-01-30 14:02:44 +01:00
Mael Rouxel-Labbé b352738d70 Documented some functions used in SMP/Orbifold Tutte Embedding parameterizer 
Along the way, fix a few mistakes and generalize the API of these newly
documented functions.
 2018-01-29 18:32:25 +01:00
Maxime Gimeno 44283d17c2 un-clip when item is erased 2018-01-26 16:30:58 +01:00
Maxime Gimeno b6181e7c2a Fix points size in point_set reload. 2018-01-23 17:47:48 +01:00
Maxime Gimeno 604c1ed006 fix load_obj in off_io_plugin 2018-01-23 17:31:21 +01:00
Maxime Gimeno 254a734beb Change saving extensions management 2018-01-23 17:22:45 +01:00
Maxime Gimeno f946773a6c Fix Group deletion 2018-01-23 15:34:58 +01:00
Maxime Gimeno 102f78fc88 initialize c3t3 cutplane to visible. 2018-01-23 14:32:07 +01:00
Maxime Gimeno ce4a801b6c Add isolated vertices counting for surface_mesh 2018-01-23 12:17:39 +01:00
Maxime Gimeno 34268821a8 replace facets by faces in polyhedron_item's tooltip 2018-01-23 11:53:52 +01:00
Maxime Gimeno 23cdc9fb63 split filters for surface_mesh and polyhedron in save and load namefilters to avoid weird names in save dialog 2018-01-23 11:51:50 +01:00
Maxime Gimeno 6f54aac350 Fix c3t3 events and plane after reload. 2018-01-23 11:42:49 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Maxime Gimeno 8c8b9c5ae4 Disable scene_edit_box's events when it is not visible 2018-01-23 09:48:33 +01:00
Maxime Gimeno ec3438ff44 Add a check for finiteness(???) to applicable() for the create_bbox_mesh_plugin and make the scene_intersection_item not finite. 2018-01-23 09:38:35 +01:00
Maxime Gimeno 78bda89857 Add a function to the group_item that specifies which of its children are selected along with it. 
This allows the c3t3_item to override it and return an empty list, so it ignores the selection behavior of the group and keeps it possible to apply an operation only to the c3t3 when it has children like visible tets.
 2018-01-23 09:26:11 +01:00
Maxime Gimeno 19af16022c remove display all ids and initialize ids displaying to false. 2018-01-22 16:40:41 +01:00
Maxime Gimeno 36ec70659f No error when cancelling a zoom to id 2018-01-22 16:20:57 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Maxime Gimeno 50aa20906f Specify different names for dock widgets SM/Polyhedron 2018-01-19 15:56:52 +01:00
Laurent Rineau 87ddddf04b Merge pull request #2278 from maxGimeno/Integrate_remeshing_plugin_into_mesh_3-GF 
Polyhedron_demo: Remove the Remeshing_plugin
 2018-01-19 15:22:41 +01:00
Simon Giraudot 5d1aa4de87 Fix conversion warning 2018-01-19 14:13:51 +01:00
Maxime Gimeno e920af7e06 Don't use lambda in addAction() for travis 2018-01-19 09:22:52 +01:00
Maxime Gimeno 6fa6b2afdd Add a fucntion to the point set selection plugin to print coordinates of a point. 2018-01-18 16:38:25 +01:00
Maxime Gimeno 3629e3e7de add Grid and axis 2018-01-18 15:05:01 +01:00
Maxime Gimeno da2524fa49 remove the remeshing_plugin from the cgal_test_with_cmake file 2018-01-18 12:15:32 +01:00
Andreas Fabri 22bd2815a3 Polyhedron 2018-01-17 17:13:53 +00:00
Maxime Gimeno 96c145d0b6 F5 reloads selected items 2018-01-17 15:41:33 +01:00
Maxime Gimeno dc6e87c081 Selected actions propagated to all selected items. 2018-01-17 15:29:01 +01:00
Laurent Rineau 9fbdb501c5 Merge pull request #2716 from maxGimeno/Fix_polyhedron_item_ids-GF 
Polyhedron demo: Fix Scene_polyhedron_item ids
 2018-01-17 10:43:22 +01:00
Laurent Rineau bf52faed93 Merge pull request #2694 from sgiraudot/Point_set_processing-Use_named_parameters-GF 
Point Set Processing: Use Named Parameters
 2018-01-17 10:42:33 +01:00
Maxime Gimeno 8c53cdc29c fix after rebase 2018-01-15 11:20:27 +01:00
Maxime Gimeno f65b12bf47 Fix after rebase 2018-01-15 11:20:27 +01:00
Maxime Gimeno 449e187ff9 Remove the Remeshing_plugin.(Mesh_3 does better.) 2018-01-15 11:20:23 +01:00
Maxime Gimeno 81800eb937 Add a feature to the Mesh_3_plugin that allows to create a Facegraph_item when performing a surface_meshing. 2018-01-15 11:17:37 +01:00
Simon Giraudot 3d17f81308 Fix bug in CMakeLists: WIN23 -> WIN32 2018-01-15 11:00:20 +01:00
Simon Giraudot 86090bf447 Adapt CMakeLists.txt to the Win32 specific Boost/ZLIB dependencies 2018-01-12 14:15:04 +01:00
Simon Giraudot 9f4aaddd46 Fix CMakeLists: move all classification plugin lines inside Boost condition 2018-01-12 14:15:04 +01:00
Simon Giraudot 739ccc00bb Make Boost IO Streams/serialization optional in demo 2018-01-12 14:15:03 +01:00
Simon Giraudot b9126941ad Improve CMakeLists of classification 2018-01-12 14:15:02 +01:00
Simon Giraudot 04ab6ed3d5 Fix classification plugin CMakeLists 2018-01-12 14:15:02 +01:00
Simon Giraudot 73d2b5d68a Fix IO methods for ETHZ RF config 2018-01-12 14:15:00 +01:00
Simon Giraudot d65cdbd8d9 Update plugin with Random forest name change 2018-01-12 14:15:00 +01:00
Simon Giraudot 54ec66b1e7 Random forest parameters settable from plugin 2018-01-12 14:14:59 +01:00
Simon Giraudot 40e497a6da Use newly added QMultipleInputDialog 2018-01-12 14:14:59 +01:00
Simon Giraudot 13decf854d Add a simple way to create a multiple input dialog 2018-01-12 14:14:59 +01:00
Simon Giraudot 9acd8bbe3c Fix duplicate code 2018-01-12 14:14:58 +01:00
Jane Tournois c2a1804c0b re-indent CMakeLists.txt 2018-01-12 14:14:58 +01:00
Jane Tournois 63beb82029 add libraries that the classification_plugin needs to link to 2018-01-12 14:14:58 +01:00
Simon Giraudot 1a2dc57fcd Fix saving dialog 2018-01-12 14:14:58 +01:00
Simon Giraudot f709cc1804 Better load/save windows for classif config 2018-01-12 14:14:58 +01:00
Simon Giraudot af4bbf37a0 Move ETHZ code to auxiliary 2018-01-12 14:14:58 +01:00
Simon Giraudot 7bd5916fce Include ETHZ random forest in plugin 2018-01-12 14:14:57 +01:00
Simon Giraudot bb03a73ffc Better organisation of classification plugin 2018-01-12 14:14:57 +01:00
Simon Giraudot c50c12a451 Select random regions + interpret LAS classification property in plugin 2018-01-12 14:14:57 +01:00
Simon Giraudot 39a779b9b4 Remove random forest item from default widget 2018-01-12 14:14:57 +01:00
Jane Tournois 4847980422 remove extra typename 2018-01-12 14:14:57 +01:00
Simon Giraudot 75d11d288e Use a set of default colors for preexisting labels 2018-01-12 14:14:57 +01:00
Simon Giraudot 9285ffb6fd Add all properties in point set as classification feature 2018-01-12 14:14:57 +01:00
Simon Giraudot 345e10671b Better handling of OpenCV dependency in plugin + timers 2018-01-12 14:14:56 +01:00
Simon Giraudot b74b1fd226 Filter unused indices in plugin 2018-01-12 14:14:56 +01:00
Simon Giraudot f9384c3453 Select random regions + interpret LAS classification property in plugin 2018-01-12 14:14:56 +01:00
Laurent Rineau 66676b6a35 Merge pull request #2707 from sloriot/Scripts-enhance_release_creation_with_cmake 
Improve release creation cmake script
 2018-01-11 16:47:18 +01:00
Simon Giraudot c52b32b744 Add trick to get FT right for general PointRange AND for CGAL::Point_set_3 2018-01-11 14:04:19 +01:00
Simon Giraudot 86e37c9a34 Update demo plugins with new PSP API 2018-01-10 16:39:32 +01:00
Simon Giraudot 3aac53929a Add parameters() to demo Point_set_3 + selection range handling 2018-01-10 16:39:32 +01:00
Simon Giraudot 1fa899760f Use standard deprecation tools + minor fixes 2018-01-10 16:39:31 +01:00
Simon Giraudot ed27cd1356 Update namespace 2018-01-10 16:38:37 +01:00
Simon Giraudot 2be7e3f10f Do not use derecated API in demo 2018-01-10 16:38:36 +01:00
Sébastien Loriot c5da1cf2a4 remove no longer use file 2018-01-08 21:02:39 +01:00
Maxime Gimeno 8b0a2a032b set ids in polyhedron_item after creation and in invalidateOpenGLBuffers. 2018-01-08 11:22:18 +01:00
Mael Rouxel-Labbé b8df8ba29b Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-01-08 10:44:01 +01:00
Laurent Rineau 42b11ddf29 Revert the merge of PR #2478 
This reverts the merge commit 46cc91e787 onto
488c3e2879.
 2018-01-04 17:54:08 +01:00
Sébastien Loriot 9fe73a801e Merge pull request #2552 from maxGimeno/PMP_does_intersect-GF 
PMP: do_intersect
 2018-01-04 15:34:18 +01:00
Sebastien Loriot e3f78ff10e
Merge pull request #2545 from maxGimeno/PMP_orient_connected_components-GF 
PMP :  Orient_connected_components function
 2018-01-04 15:31:21 +01:00
Sebastien Loriot 625df00b19
Merge pull request #2219 from afabri/BGL-generic_property_map-GF 
BGL: Add an API for adding and removing a property map
 2018-01-04 15:28:54 +01:00
Sébastien Loriot b94631496a Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch' 2017-12-22 22:50:15 +01:00
Sebastien Loriot a68ee4833b
Merge pull request #2684 from janetournois/Polyhedron_demo-fix_warnings-GF 
Demo parameterization plugin : avoid conversion warning
 2017-12-22 22:12:58 +01:00
Sebastien Loriot b6cdb1ae5b
Merge pull request #2686 from sloriot/Demo-duplicate_nm_vertices 
Add plugin to duplicate non-manifold vertices
 2017-12-22 22:10:50 +01:00
Sébastien Loriot 029290589c all_default is a function 2017-12-22 09:05:34 +01:00
Maxime Gimeno 5a2af31e81 Add misisng CGAL_target_use_TBB for scene_c3t3_item 2017-12-20 11:51:46 +01:00
Sébastien Loriot 66797a5d87 remove unused type 2017-12-20 09:30:44 +01:00
Sébastien Loriot 8f0c098408 do not use Polyline typedef as it conflicts on windows 2017-12-20 09:24:44 +01:00
Sébastien Loriot d1597f2fb5 Merge branch 'maxGimeno/PMP_orient_connected_components-GF' into cgal/master 2017-12-19 17:34:51 +01:00
Sébastien Loriot 430ad5bc72 Merge branch 'maxGimeno/PMP_does_intersect-GF' into cgal/master 2017-12-19 17:31:29 +01:00
Mael Rouxel-Labbé 0bca01d872 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-19 17:22:03 +01:00
Laurent Rineau fd1045dcd3 Merge pull request #2574 from lrineau/Polyhedron_demo-update_SEP_reader-GF 
Polyhedron demo: update the SEP reader
 2017-12-19 16:30:43 +01:00
Laurent Rineau 553faa9590 Merge pull request #2670 from maxGimeno/Segmented_image_plugin_small_fixes-GF 
Polyhedron demo: small fixes for io_image_plugin
 2017-12-19 16:30:34 +01:00
Laurent Rineau 6a2f3263a1 Merge pull request #2314 from maxGimeno/Add_plugins_info_in_preferences-GF 
Polyhedron_demo: Enhance the plugins management in Preferences
 2017-12-19 16:30:20 +01:00
Mael Rouxel-Labbé fdd3af3445 Fixed conversion warning 2017-12-19 16:09:29 +01:00
Sébastien Loriot 569649e810 add function to duplicate non-manifold vertices + add plugin 2017-12-15 09:16:45 +01:00
Jane Tournois 0f923fec04 avoid conversion warning 2017-12-14 15:33:26 +01:00
Laurent Rineau 7df26c594b
Merge branch 'master' into BGL-generic_property_map-GF 2017-12-14 09:46:01 +01:00
Sébastien Loriot 0425be7d15 handle namespace change in the demo 2017-12-13 16:46:35 +01:00
Laurent Rineau fe81d31ec2
Merge branch 'master' into PMP_does_intersect-GF 2017-12-13 16:25:32 +01:00
Laurent Rineau 4b0b1a86c8
Update CMakeLists.txt 
This branch is based on `releases/CGAL-4.11-branch` and the new CMake syntax is only in CGAL-4.12/master.
 2017-12-13 11:43:09 +01:00
Maxime Gimeno 6c42ce6958 Doc review 2017-12-13 10:17:08 +01:00
Maxime Gimeno 67d06cadb6 Add a function that orient a closed triangle mesh to make it bound a volume. 2017-12-13 10:17:04 +01:00
Maxime Gimeno 9fd5dda4fe Add an action to inside out plugin for orienting connected components 2017-12-13 10:16:40 +01:00
Laurent Rineau c83d3ce1d2 Fix Polyhedron CMake 2017-12-12 09:55:25 +01:00
Maxime Gimeno 65dca20f82 Fix flat shaders 2017-12-11 14:07:00 +01:00
Laurent Rineau 2481043d6c
Merge branch 'master' into Polyhedron_demo-update_SEP_reader-GF 2017-12-11 13:58:17 +01:00
Maxime Gimeno e0f00ce89f fix stuffs 2017-12-08 15:37:40 +01:00
Mael Rouxel-Labbé a5bfb8659f M3/P3M3 doc improvements 2017-12-08 11:02:19 +01:00
Mael Rouxel-Labbé 34d53aa2d9 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-05 20:32:30 +01:00
Laurent Rineau 3b0ca9fafc Merge pull request #2647 from janetournois/Polyhedron_demo-export_sm_selection_item-jtournois 
Polyhedron demo : export surface_mesh_selection_item for external plugins
 2017-12-05 18:27:26 +01:00
Laurent Rineau 65f4e42acc Merge pull request #2606 from sloriot/CGAL-create_release_with_cmake 
Add script to create release with cmake
 2017-12-05 18:24:58 +01:00
Laurent Rineau 9af5e4a8f8 Merge pull request #2593 from maxGimeno/CGAL_meeting_fixes-GF 
Polyhedron demo: CGAL meeting fixes
 2017-12-05 18:20:48 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF 
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
 2017-12-05 18:20:05 +01:00
Mael Rouxel-Labbé 529e73e57b Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-05 17:03:14 +01:00
Mael Rouxel-Labbé 4734e87a9b Fixed typos 2017-12-05 13:10:10 +01:00
Mael Rouxel-Labbé 1210ed0d49 Revert "Linked the parameterization plugin with CGAL_Core" 
This reverts commit c113eab209.

Removing dependency on Core from SMP (ARAP)
 2017-12-05 11:32:29 +01:00
Laurent Rineau 1c7d1eb359 That check is useless 2017-12-04 16:41:03 +01:00
Laurent Rineau a752da3a28 Update the SEP reader 2017-12-04 16:40:58 +01:00
Mael Rouxel-Labbé 320ec3dc30 Fixed .mesh reading 
- The exterior of a mesh is not the set of infinite cells
- Do not assign a uniform index to border facets
 2017-12-04 15:22:04 +01:00
Laurent Rineau 3f6400b40e Fix a warning [-Wcatch-value] 
```
test/Polyhedron_Demo/MainWindow.cpp:1075:26: warning: catching polymorphic type 'class std::logic_error' by value [-Wcatch-value=]
test/Polyhedron_Demo/Plugins/Mesh_2/Mesh_2_plugin.cpp:287:6: warning: catching polymorphic type 'class std::runtime_error' by value [-Wcatch-value=]
```
 2017-12-04 11:55:51 +01:00
Maxime Gimeno 900a8948c6 Fix QBrush clang error 2017-12-04 09:26:13 +01:00
Maxime Gimeno 1f27530e8b Add error tracking and color code to hte preference window 2017-12-01 17:07:55 +01:00
Laurent Rineau acc29cc153 Fix the link to CGAL_Core with the new API 2017-12-01 11:36:49 +01:00
Laurent Rineau 3e97c3b9cb CMake: Fix the export of the 3D demo in HEADER_ONLY 
The error was:
```
CMake Error in CMakeLists.txt:
  export called with target "CGAL_Qt5" which requires target
  "CGAL_Qt5_moc_and_resources" that is not in the export set.

  If the required target is not easy to reference in this call, consider
  using the APPEND option with multiple separate calls.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.12-Ic-106/Polyhedron_Demo/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
 2017-12-01 11:18:20 +01:00
Jane Tournois ac127a6611 export surface_mesh_selection_item for external plugins 2017-12-01 10:19:15 +01:00
Mael Rouxel-Labbé b00e65ec67 Fixed missing parameters in some "do_is_bad" 2017-11-30 17:01:33 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Mael Rouxel-Labbé 84ff9c2d17 internal::Mesh_3 --> Mesh_3::internal 2017-11-30 15:16:39 +01:00
Andreas Fabri de166d8be7 Fix testsuite 2017-11-29 10:51:06 +00:00
Laurent Rineau da6ef91463 Remove the #include of OpenGL headers 2017-11-28 18:19:39 +01:00
Laurent Rineau bb3515ca38 io_image_plugin needs CGAL_ImageIO 2017-11-28 17:59:09 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Maxime Gimeno 27f29bc6f2 Add overloads for polylines ranges and tests that go with them 2017-11-17 12:55:27 +01:00
Maxime Gimeno edc49e77b7 Move intersection computation functions in internal. 2017-11-17 12:55:05 +01:00
Maxime Gimeno ece79dd277 Add default values for NPs and no more need for Kernel in do_intersect. Also rename and un-document intersection functions. 2017-11-17 12:55:05 +01:00
Maxime Gimeno 71817eb67a Add polylines intersections detection to the surface_intersection plugin 2017-11-17 12:55:05 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Sébastien Loriot 8b72eacb8b use a uniform name for TODO files 2017-11-16 17:10:05 +01:00
Laurent Rineau 49a138a9a4 Fix compilations of Polyhedron demo 2017-11-15 21:36:37 +01:00
Laurent Rineau 379f5b3bb3 Remove unused module 2017-11-15 19:44:26 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau bb0cee5b07 Merge pull request #2542 from maxGimeno/Separate_selection_plugins-GF 
Polyhedron demo: Split selection plugins
 2017-11-15 16:48:29 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Laurent Rineau 476e547265 Merge pull request #2561 from maxGimeno/Add_statistics-GF 
Polyhedron demo: add length of polylines
 2017-11-15 16:48:25 +01:00
Laurent Rineau 4a7752002e Merge pull request #2578 from maxGimeno/Gray_images-2D_support-GF 
Polyhedron demo: Add 2D image management.
 2017-11-15 16:48:22 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-15 16:47:42 +01:00
Laurent Rineau 6a59fa98d5 Merge pull request #2584 from maxGimeno/Basic_generator_orientation_fix-GF 
Polyhedron demo: minor fixes
 2017-11-15 16:45:14 +01:00
Laurent Rineau 7f40c51f62 Merge pull request #2589 from maxGimeno/Image_plugin-Isovalue-Fix 
Polyhedron demo: Fix pixel value in Io_image_plugin
 2017-11-15 16:45:11 +01:00
Laurent Rineau e6f0119d07 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-15 16:44:31 +01:00
Laurent Rineau ffef8a2a8b Merge pull request #2589 from maxGimeno/Image_plugin-Isovalue-Fix 
Polyhedron demo: Fix pixel value in Io_image_plugin
 2017-11-15 16:44:29 +01:00
Laurent Rineau 14e7091e1c Remove the need for the Qt5 Xml and Svg libraries 2017-11-14 14:09:37 +01:00
Guillaume Damiand 7e57a9acd4 Add Svg module in polyhedron demo 2017-11-13 21:01:56 +01:00
Maxime Gimeno 4539948158 If a point item has less than 30 points, make their initial siwe "5" 2017-11-13 12:06:05 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-13 12:01:39 +01:00
Maxime Gimeno e8aa58627f Add missing update when background color is changed 2017-11-13 11:55:54 +01:00
Maxime Gimeno 474db3ffa8 Check if a loading file is empty before trying to read it. 2017-11-13 11:50:03 +01:00
Maxime Gimeno a72ce2d005 Fix operations disappearing bug (kind of) 2017-11-13 11:11:13 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot 72cda50a5e fix incorrect LGPL version tags 2017-11-12 10:17:52 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Maxime Gimeno fde9a1ee2c Fix signals to display int OR double depending on the isovalue type. 2017-11-09 14:58:58 +01:00
Simon Giraudot 3e5665ce75 Expend bounds of double spin box in widget 2017-11-09 12:28:59 +01:00
Maxime Gimeno 7ff7559834 Add misisng ids removal to sm_item's destructor 2017-11-08 10:21:38 +01:00
Maxime Gimeno fcc3a2d26c Fix hexahedron vertices order and default value. 2017-11-08 10:15:02 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10 
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
 2017-11-06 14:58:36 +01:00
Maxime Gimeno 5856eb2f67 Add 2D image management. 2017-11-06 14:53:20 +01:00
Laurent Rineau 53502d087a Merge pull request #2560 from maxGimeno/VTK_filters_fix-GF 
Polyhedron demo: fix VTK plugin name filters
 2017-11-03 14:29:32 +01:00
Simon Giraudot 568d67ff90 Expend bounds of double spin box in widget 2017-10-31 12:06:52 +01:00
Laurent Rineau 0a0887e2d9 Merge pull request #2554 from maxGimeno/Display_property_plugin_silence_warnings-GF 
Polyhedron demo: Silence warnings in Display_property_plugin
 2017-10-27 18:01:34 +02:00
Maxime Gimeno 027f8b4b7e Add path length in mw messages. 2017-10-26 14:02:02 +02:00
Maxime Gimeno 08e363a263 Add polyline's length info in polyline item and remove "on Polyhedron" form the statistics dialog. 2017-10-25 17:09:00 +02:00
Maxime Gimeno a3ae6c1107 Fix filters 2017-10-24 17:45:00 +02:00
Laurent Rineau aae3ce779c Merge pull request #2540 from maxGimeno/Fix_redraw-GF 
Polyhedron demo: Fix some missing redraw
 2017-10-23 18:10:13 +02:00
Laurent Rineau 3dcc4cf5d7 Merge pull request #2491 from janetournois/Mesh_3-document_manifold_criterion-jtournois 
Mesh 3 : document manifold criterion
 2017-10-23 17:24:51 +02:00
Laurent Rineau 4d273ba492 Merge pull request #2490 from maxGimeno/Point_items_make_unicolor-GF 
Polyhedron demo: Make point_item unicolor.
 2017-10-23 17:24:33 +02:00
Laurent Rineau a1d6d2a7a7 Merge pull request #2514 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois 
Polyhedron demo - fix isotropic remeshing plugin
 2017-10-23 17:14:37 +02:00
Laurent Rineau 3dd190addc Merge pull request #2510 from maxGimeno/Isotropic_remeshing_plugin_fix-GF 
Polyhedron demo: Fix Isotropic_remeshing_sm_plugin
 2017-10-23 17:13:46 +02:00
Laurent Rineau 603ab4b2f6 Merge pull request #2546 from maxGimeno/Demo_fixes-GF 
Polyhedron demo: minor fixes
 2017-10-23 17:13:35 +02:00
Laurent Rineau 17ff2ce194 Merge pull request #2540 from maxGimeno/Fix_redraw-GF 
Polyhedron demo: Fix some missing redraw
 2017-10-23 17:07:32 +02:00
Laurent Rineau 0ffdb6bdc9 Merge pull request #2539 from sloriot/Demo-handle_open_mesh_in_offset_mesh 
Handle open meshes in offset mesh generation
 2017-10-23 17:07:19 +02:00
Laurent Rineau 5ecd090ab6 Merge pull request #2315 from lrineau/Mesh_3-imported_newest_improvements_into_CGAL-GF 
Mesh_3: import newest improvements
 2017-10-23 17:07:00 +02:00
Laurent Rineau 7caa6ea021 Merge pull request #2514 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois 
Polyhedron demo - fix isotropic remeshing plugin
 2017-10-23 16:53:18 +02:00
Maxime Gimeno ac1d0a4d67 Silence warnings. 2017-10-23 16:13:24 +02:00
Maxime Gimeno 26061263c1 Fix selection segfault 2017-10-19 14:00:26 +02:00
Maxime Gimeno ec1d3cf7fc fixes : 
- Change the names of the action and widget according to the facegraph type.
- If the selected item is not of the right type, just say it and don't select the first correct item in the scene entries like before.
 2017-10-18 10:08:51 +02:00
Jane Tournois 96857e44ed fix multicolor Surface_mesh 2017-10-17 16:01:23 +02:00
Jane Tournois 47283bc7cb pmesh cannot be const when a property map is added by get() 
and add missing includes

# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp
 2017-10-17 15:59:50 +02:00
Laurent Rineau 144101d3b5 Merge pull request #2522 from maxGimeno/Surface_mesh_item_fix_feature_edges-GF 
Polyhedron demo: Fix for detect_sharp_edges_sm_plugin
 2017-10-17 15:20:39 +02:00
Laurent Rineau 1762bc31b4 Merge pull request #2505 from sgiraudot/Classification-Fixes_and_improved_plugin-GF 
Classification: fixes and improved plugin
 2017-10-17 15:20:37 +02:00
Laurent Rineau 2510dc44d5 Merge pull request #2538 from sgiraudot/Polyhedron_demo-Improve_point_set_selection_widget-GF 
Polyhedron demo: improve point set selection widget
 2017-10-17 15:20:36 +02:00
Laurent Rineau 9f40374700 Merge pull request #2537 from maxGimeno/Basic_generator_fix-GF 
Polyhedron demo: Fix for Basic_generator _plugin
 2017-10-17 15:20:35 +02:00
Laurent Rineau fd9be189d8 Merge pull request #2536 from sloriot/Demo-add_STL_writer 
Add STL writer
 2017-10-17 15:20:34 +02:00
Laurent Rineau 39782e0573 Merge pull request #2532 from maxGimeno/Export_stats_fix-GF 
Polyhedron demo: Fix statistics exportation
 2017-10-17 15:20:30 +02:00
Laurent Rineau 3054cb35e5 Merge pull request #2521 from maxGimeno/Cut_plugin_fix_trees_maintainance-GF 
Polyhedron demo: Fix Cut_plugin
 2017-10-17 15:20:29 +02:00
Sébastien Loriot b5d830c7f3 handle open meshes in offset mesh generation 2017-10-17 02:44:26 +02:00
Jane Tournois 03e7265cef a Polyhedron_3 does not have an internal pmap for face_patch_id_t 
so the condition was always returning false for a Polyhedron
we are inside the demo, so this condition can be safely removed
 2017-10-16 13:04:42 +02:00
Maxime Gimeno 5ea03758c4 Add an action to make the point item unicolor if it isn't. 
Also fix segfault when load is cancelled.
 2017-10-16 10:29:15 +02:00
Maxime Gimeno ed93a924ae Connect redraw() in replaceItem() 2017-10-16 10:21:57 +02:00
Laurent Rineau 46cc91e787 Merge pull request #2478 from mtola/master 
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
 2017-10-13 17:06:22 +02:00
Laurent Rineau 488c3e2879 Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7 
Fix some warnings
 2017-10-13 17:04:02 +02:00
Laurent Rineau 0533547da9 Merge pull request #2447 from sloriot/Demo-add_more_repair_functions 
add more repair functions in the Polyhedron demo
 2017-10-13 17:00:47 +02:00
Laurent Rineau 0479a74c8e Merge pull request #2526 from maxGimeno/Index_displaying_fix-GF 
Polyhedron demo: Fix ids displaying
 2017-10-13 17:00:38 +02:00
Laurent Rineau 00d444e84c Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7 
Fix some warnings
 2017-10-13 16:54:52 +02:00
Laurent Rineau 288d254765 Merge pull request #2494 from maxGimeno/Display_plugin_can_zoom_to_extrema-GF 
Polyhedron_demo: Display_plugin can zoom to extrema
 2017-10-13 16:54:44 +02:00
Laurent Rineau 1d46a17214 Merge pull request #2515 from sloriot/BGL-fix_argument_order 
Change argument order to be consistent with other selection functions
 2017-10-13 16:54:27 +02:00
Laurent Rineau 037d1149f5 Merge pull request #2477 from sgiraudot/Polyhedron_demo-Fix_load_ply_empty_soup-GF 
Polyhedron demo: several fixes and enhancements for PLY I/O
 2017-10-13 16:54:19 +02:00
Laurent Rineau e478825265 Merge pull request #2509 from sloriot/Demo-add_offset_meshing 
Add a plugin for inset and offset of a polyhedron
 2017-10-13 16:53:57 +02:00
Laurent Rineau 6c48bd85c0 Merge pull request #2503 from maxGimeno/Instancied_rendering_fix-GF 
Polyhedron demo: Fix instanced vertex shaders.
 2017-10-13 16:53:35 +02:00
Laurent Rineau edac6aaa5a Merge pull request #2454 from maxGimeno/Mesh_3_plugin_fix-GF 
Polyhedron demo: Fix tets rendering on Windows
 2017-10-13 16:53:26 +02:00
Laurent Rineau 946af7f3c7 Fix the polyhedron demo after the API changes 2017-10-13 15:59:48 +02:00
Laurent Rineau 38617b17a3 Refactoring of Sizing_field_with_aabb_tree (API breakage too) 
The refactoring allows to compute a better size of corners in a cycle.
 2017-10-13 15:57:02 +02:00
Maxime Gimeno d935e0384d cast std::size_t in int. 2017-10-13 14:52:11 +02:00
Simon Giraudot 942f3e8dd6 Rework point set selection plugin 2017-10-13 14:26:42 +02:00
Simon Giraudot 5590d70747 Add icons for point set selection 2017-10-13 14:26:30 +02:00
Maxime Gimeno e2a54cde22 Move the menu addition after its operations creation and add a mnemonic. 2017-10-13 10:09:43 +02:00
Sébastien Loriot 8f50be14c0 add function to write triangle mesh as STL file (binary+ascii) 
update IO plugin in the demo
 2017-10-12 19:23:11 +02:00
Jane Tournois 876b9456fe fix compilation error on msvc2013 2017-10-12 15:37:47 +02:00
Simon Giraudot cb71eb9347 Fix conversion warning 2017-10-12 12:39:26 +02:00
Simon Giraudot 14049e99ae Fix closing behavior and merge menus 2017-10-12 11:15:18 +02:00
Maxime Gimeno b8d3198e82 Make it work for Surface_mesh_items 2017-10-12 10:44:14 +02:00
Simon Giraudot 8094f4faba Do not remove training property when closing widget 2017-10-12 10:22:45 +02:00
Maxime Gimeno 1d7b585e32 Widget rework to gain space 2017-10-12 10:06:47 +02:00
Simon Giraudot a5a5960108 Fix conversion warning 2017-10-12 10:03:31 +02:00
Maxime Gimeno c971f1fd64 Remove unwanted duplicated incrementation. 2017-10-12 09:44:30 +02:00
Sébastien Loriot d88dd3f83c add target in cgal_test_with_cmake 2017-10-12 09:26:53 +02:00
Laurent Rineau 52b85358d8 Merge pull request #2489 from maxGimeno/Hole_filling_plugin_fix-GF 
Polyhedron demo: Fix hole filling plugin
 2017-10-11 19:18:49 +02:00
Laurent Rineau f8c58172fe Merge pull request #2452 from maxGimeno/Merge_poit_set-GF 
Polyhedron demo: fix Merge_point_sets_plugin
 2017-10-11 19:18:34 +02:00
Laurent Rineau eb3b325a00 Merge pull request #2512 from maxGimeno/Degenerated_faces_plugin_fix-GF 
Polyhedron demo: Trivial fix on degenerated_faces_plugin
 2017-10-11 19:15:31 +02:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF 
Fix counting iterator warnings
 2017-10-11 19:15:15 +02:00
Laurent Rineau 2209964817 Merge pull request #2506 from maxGimeno/PCA-transformation_plugin_SM-GF 
Polyhedron demo: Add an Affine_transformation_plugin for Surface_mesh_items
 2017-10-11 19:15:07 +02:00
Laurent Rineau b2e4e6950b Merge pull request #2504 from maxGimeno/Fix_for_transformation_plugin-GF 
Polyhedron demo: Fix for transformation plugin
 2017-10-11 19:14:57 +02:00
Laurent Rineau 107cdccd6d Merge pull request #2438 from lrineau/Mesh_3-test_polyhedral_complex_with_surface_mesh-GF 
Mesh_3: make it work with Surface_mesh
 2017-10-11 19:14:49 +02:00
Laurent Rineau aff1c25633 Merge pull request #2498 from maxGimeno/SM_item_reset_colors-GF 
Polyhedron demo: Reset Colors for Surface_mesh_items.
 2017-10-11 19:14:25 +02:00
Laurent Rineau ff9fdf710c Merge pull request #2489 from maxGimeno/Hole_filling_plugin_fix-GF 
Polyhedron demo: Fix hole filling plugin
 2017-10-11 19:11:37 +02:00
Laurent Rineau bd488ab5b9 Merge pull request #2452 from maxGimeno/Merge_poit_set-GF 
Polyhedron demo: fix Merge_point_sets_plugin
 2017-10-11 19:11:29 +02:00
Sébastien Loriot 78eb0fda4b remove unused parameter 2017-10-11 18:31:07 +02:00
Maxime Gimeno 999ce55644 Check if the faces we test are not the null face before we insert into the displayed faces and add offset to the tested point for hiding ids. 2017-10-11 10:16:00 +02:00
Maxime Gimeno f7d13e79c8 Delete trees whenever invalidateOpenGLBuffers is changed, as it deletes the item's tree. 2017-10-10 16:36:17 +02:00
Maxime Gimeno 32ae84a56d Replace the halfedge_is_feature_map by a edge_is_feature_map in the item to fit the real map. 2017-10-10 15:48:19 +02:00
Maxime Gimeno 9fcdf2ce75 Isotropic_remeshing resets the color and itemChanged() reset the property maps 2017-10-09 17:15:54 +02:00
Sébastien Loriot be4635a1f6 change argument order to be consistent with expand/reduce_face_selection() 2017-10-09 15:09:42 +02:00
Jane Tournois dd43e97edb remove extra typename 2017-10-09 14:15:55 +02:00
Jane Tournois 00def95173 use the face_patch_map only when it is valid 
o.w. isotropic_remeshing "thinks" it is using a valid face_patch_map,
does not compute the connected components from constraints, and fails
remeshing properly next to constraints
 2017-10-09 11:32:12 +02:00
Simon Giraudot ee4e320264 Close all classification objets when hiding the widget 2017-10-06 14:47:17 +02:00
Maxime Gimeno 4fe5a6eb08 Restore cursor before the pop-up if nothing is found and make degenerated degenerate in UI text 2017-10-06 14:18:45 +02:00
Maxime Gimeno ef63fcb394 Apply collect_garbage() algorithm to the constrained_edges_map to keep the values correct. 2017-10-06 14:11:17 +02:00
Sébastien Loriot 6de3f7975b add a plugin using surface mesher to generate inset and offset of a polyhedron 2017-10-06 12:23:24 +02:00
Andreas Fabri 7be1a3d8c2 std::size_t -> int 2017-10-06 10:12:53 +01:00
Maxime Gimeno 5cc3e77b38 Fix warning 2017-10-05 16:02:10 +02:00
Simon Giraudot 90698d9398 Fix OpenCV include/cmake 2017-10-05 15:44:48 +02:00
Simon Giraudot 349a94eaa5 Better organisation of classification plugin 2017-10-05 15:44:40 +02:00
Maxime Gimeno 2d8a10197d BGLize Affine_transformation_plugin and associated item, add a target for the Surface_mesh case and unify the code. 2017-10-05 15:40:09 +02:00
Maxime Gimeno 56b0cd1e27 enhance fixed_plane : make it transparent 2017-10-05 15:26:10 +02:00
Maxime Gimeno 21879d28e9 Fix Control group 2017-10-05 14:33:00 +02:00
Maxime Gimeno 243e486ab6 Fix fP in instanced vertex shaders. 2017-10-05 14:22:03 +02:00
Maxime Gimeno bef79b45fb ResetColors removes ALL the colors, not jut patch_ids. 2017-10-04 17:04:52 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Simon Giraudot 0bdb531eb9 Write classification labels in point set comments 2017-10-04 10:30:01 +02:00
Simon Giraudot b15202f9d7 Add non-const method to get and edit comments 2017-10-04 10:29:43 +02:00
Maxime Gimeno 82bc8f8293 Add buttons to zoom to extrema faces. 2017-10-04 10:21:39 +02:00
Simon Giraudot 26563312fc Write PLY comments from point set item 2017-10-04 10:12:10 +02:00
Simon Giraudot 9d343fe324 Try to load label from PLY comments in classification plugin 2017-10-04 09:57:17 +02:00
Simon Giraudot c0d28f52b9 Save PLY comments in point set item 2017-10-04 09:43:22 +02:00
Simon Giraudot 717ab4ba5c Improve classification widget/plugin 2017-10-03 14:15:04 +02:00
Maxime Gimeno 4bf4813e7b Add missing reference. 2017-10-03 14:02:16 +02:00
Simon Giraudot 5cd3ab1240 Check if number of faces != 0 to load polygon soup 2017-10-02 08:57:33 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Laurent Rineau 0ddad74fe0 Change the API of the manifold criterion 2017-09-27 16:21:43 +02:00
Sebastien Loriot cd085f8880 Merge pull request #2369 from MaelRL/P2T2-Add_alpha_shapes-GF 
Periodic_2_triangulation_2: Add support for alpha shapes
 2017-09-27 15:49:13 +02:00
Laurent Rineau 54c5e36a0c Merge pull request #2429 from maxGimeno/Tetrahedron-color-GF 
Polyhedron demo: Fix polyhedron orientation errors
 2017-09-25 16:49:40 +02:00
Laurent Rineau 9cd5f6c333 Merge pull request #2434 from maxGimeno/Display_small_angles-GF 
Polyhedron demo: New widget for color computation
 2017-09-25 16:49:32 +02:00
Laurent Rineau e99087a83e Merge pull request #2442 from maxGimeno/Clipping_box_fix-GF 
Polyhedron demo: Fix the Clipping Box Plugin
 2017-09-25 16:49:24 +02:00
Sébastien Loriot c3e7ade8b4 fix warnings 2017-09-25 09:09:54 +02:00
Laurent Rineau d6adce1954 Merge pull request #2444 from afabri/Polyhedron_demo-fix_binary_ply-GF 
Polyhedron demo: bug fix for writing binary PLY
 2017-09-22 16:20:34 +02:00
Laurent Rineau f8c5efb9e3 Merge pull request #2373 from sgiraudot/Classification-GF 
Classification (new package)
 2017-09-22 15:18:52 +02:00
Maxime Gimeno 53829630ec Darken the intersection color and avoid the Z-fighting. 2017-09-22 15:12:02 +02:00
Maxime Gimeno f1d15c0e97 Fix segfault when canceling an item loading. 2017-09-22 12:55:09 +02:00
Maxime Gimeno f0af522767 remove keyword in shader. 2017-09-22 10:52:09 +02:00
Maxime Gimeno 2a8423587f Fix tets rendering on Windows 2017-09-21 15:45:32 +02:00
Maxime Gimeno 3973d5c8c5 Fix segfault by using selectionIndices.first instead of mainSelectionindex. 2017-09-21 13:45:17 +02:00
Maxime Gimeno 81c461bd58 Fix double/float warning 2017-09-20 15:36:23 +02:00
Sébastien Loriot 6bd3615f34 add action to collapse close border halfedges 2017-09-20 14:33:25 +02:00
Sébastien Loriot 0fbb7fbcae introduce a Repair submenu and reactivate deg faces removal in Experimental 2017-09-20 12:57:17 +02:00
Andreas Fabri 392c86e96f bug fix: for VC++ the stream must be opened in binary mode 2017-09-19 13:34:12 +01:00
Maxime Gimeno de7999ce09 Add clipbox management in flat_shader 2017-09-19 12:29:08 +02:00
Maxime Gimeno 5a6b713cf6 Fix abnormal time consumption, store results in property maps and change max angle value. 2017-09-19 12:05:33 +02:00
Laurent Rineau 7ea925128f Merge branch 'releases/CGAL-4.11-branch' 2017-09-18 16:28:42 +02:00
Maxime Gimeno 72d9349287 Fixes warnings about double 2017-09-18 16:03:06 +02:00
Maxime Gimeno 20198de4f8 Makes Smallest angles the default criterion and adds the missing call to replaceRamp() when the criterion is changed. 2017-09-18 15:44:30 +02:00
Laurent Rineau 1838f4b64e Remove Graph_with_descriptor_with_graph<SM> from the demo as well 2017-09-18 14:56:57 +02:00
Laurent Rineau 781806d79a Remove trivial default-constructor 
(@maxGimeno please stop adding trivial default constructors, when they
are the only constructors of a class.)
 2017-09-18 14:56:56 +02:00
Laurent Rineau 66465e72cf Merge pull request #2422 from sgiraudot/Polyhedron_demo-Reset_points_order_before_saving-GF 
Polyhedron demo: reset points order before saving
 2017-09-18 14:30:06 +02:00
Laurent Rineau 037cba3fae Merge pull request #2336 from maxGimeno/Detect_features-GF 
PMP: Detect features
 2017-09-18 14:29:55 +02:00
Maxime Gimeno e2e1cb5967 Fix float conversion at buffer filling 2017-09-18 13:46:13 +02:00
Maxime Gimeno c723e97e20 Add missing override in code and doc example. 2017-09-18 12:38:02 +02:00
Maxime Gimeno 05421fecd2 Fix orientation of facets in modern flat 2017-09-18 09:12:55 +02:00
Maxime Gimeno 4509f39802 Add dock widget and property scaled jacobian. 2017-09-15 16:48:40 +02:00
Laurent Rineau 149fa88b05 Merge pull request #2303 from maxGimeno/Shuffle_normals_for_SM-GF 
Polyhedron_demo: Shuffle_polygon_soup for Surface_mesh
 2017-09-15 16:32:30 +02:00
Laurent Rineau bf3e2275b1 Merge pull request #2428 from maxGimeno/Shrink_factor_in_c3t3_fix-GF 
Polyhedron demo: Fix shrinking in c3t3
 2017-09-15 16:32:21 +02:00
Laurent Rineau 539f5ff13f Merge pull request #2426 from maxGimeno/CC_plugin_fix-GF 
Polyhedron demo: Fix for Color Connected Components in polyhedron mode
 2017-09-15 16:32:06 +02:00
Laurent Rineau 28d1af3c72 Merge pull request #2424 from sloriot/Demo-generator_menu_names 
improving the object generator menu labels
 2017-09-15 16:31:57 +02:00
Laurent Rineau b2443b3b59 Merge pull request #2419 from lrineau/Polyhedron_demo-fix_c3t3_item-GF 
Polyhedron demo: c3t3_item, fix the color of balls of corners
 2017-09-15 16:31:49 +02:00
Laurent Rineau b33e211a69 Merge pull request #2392 from maxGimeno/Fix_SM_item_clone-GF 
Polyhedron_demo: fix Surface_mesh_item clone()
 2017-09-15 16:31:41 +02:00
Laurent Rineau db1f158296 Merge pull request #2412 from lrineau/Polyhedron_Demo-fix_CMakeLists.txt-GF 
Polyhedron demo: Fix CmakeLists.txt (cont.)
 2017-09-15 16:31:33 +02:00
Laurent Rineau 1d03f05d71 Merge pull request #2303 from maxGimeno/Shuffle_normals_for_SM-GF 
Polyhedron_demo: Shuffle_polygon_soup for Surface_mesh
 2017-09-15 16:26:37 +02:00
Laurent Rineau 577101d4be Merge pull request #2428 from maxGimeno/Shrink_factor_in_c3t3_fix-GF 
Polyhedron demo: Fix shrinking in c3t3
 2017-09-15 16:26:30 +02:00
Laurent Rineau c93b868a90 Merge pull request #2424 from sloriot/Demo-generator_menu_names 
improving the object generator menu labels
 2017-09-15 16:26:14 +02:00
Laurent Rineau 1083307462 Merge pull request #2419 from lrineau/Polyhedron_demo-fix_c3t3_item-GF 
Polyhedron demo: c3t3_item, fix the color of balls of corners
 2017-09-15 16:26:06 +02:00
Laurent Rineau 0aa4f7699d Merge pull request #2392 from maxGimeno/Fix_SM_item_clone-GF 
Polyhedron_demo: fix Surface_mesh_item clone()
 2017-09-15 16:25:58 +02:00
Maxime Gimeno 1221576f7f Add a plugin that colorizes facets according to their smallest angle. 2017-09-15 11:13:35 +02:00
Maxime Gimeno 7b14d9221e Set the shrinking cursor value after setting its maximum. 2017-09-14 11:04:06 +02:00
Maxime Gimeno f61bbcb4b1 Fix Polyhedron_item multicolor rendering 2017-09-14 10:50:29 +02:00
Sébastien Loriot fa192fe5dc try improving the menu names 2017-09-13 16:43:59 +02:00
Simon Giraudot 63909aeccf Reset points indices before saving 2017-09-13 10:50:33 +02:00
Simon Giraudot c117a5eedf Add method to reset indices without collecting garbage 2017-09-13 10:44:40 +02:00
Laurent Rineau 7d9bde4b5e fix the color of balls of corners 2017-09-12 18:58:11 +02:00
Laurent Rineau 97186f7d93 Fix CMakeLists.txt: remove a unused line 2017-09-11 18:16:01 +02:00
Simon Giraudot 38663431a1 Merge branch 'Classification-GF-old' into Classification-GF 2017-09-11 11:53:13 +02:00
Simon Giraudot 3bf3401c6f Disable boost 64/32b intergers warning on Windows 2017-09-11 11:38:17 +02:00
Maxime Gimeno 7bf5f07943 Call garbage_collect() after cloning 2017-09-11 09:16:09 +02:00
Laurent Rineau 73a8cdc898 Merge pull request #2405 from maxGimeno/Subdivisions_iteration-GF 
Polyhedron demo: Subdivisions_plugin
 2017-09-08 17:42:00 +02:00
Laurent Rineau 41e09fdcc5 Merge pull request #2405 from maxGimeno/Subdivisions_iteration-GF 
Polyhedron demo: Subdivisions_plugin
 2017-09-08 17:40:48 +02:00
Laurent Rineau 832820a410 Merge pull request #2398 from sloriot/Polyhedron_demo-subdivision-fix_info 
Fix incorrect labels
 2017-09-07 17:30:32 +02:00
Laurent Rineau 8e126632d1 Merge pull request #2398 from sloriot/Polyhedron_demo-subdivision-fix_info 
Fix incorrect labels
 2017-09-07 17:20:17 +02:00
Laurent Rineau ddd2f79692 Merge pull request #2396 from sgiraudot/Polyhedron_demo-Remove_pushbutton_from_selection_plugin-GF 
Polyhedron demo: remove pushButton from selection plugin
 2017-09-07 17:20:07 +02:00
Laurent Rineau 6f5f5af785 Merge pull request #2070 from maxGimeno/Polyhedron_demo-Use_modern_context-GF 
Polyhedron_demo: Use a recent OpenGL context if possible
 2017-09-07 17:19:58 +02:00
Laurent Rineau b8451e82cb Merge pull request #2388 from maxGimeno/Fix_cmakelists-GF 
Polyhedron_demo: Fix CmakeLists.txt
 2017-09-07 17:19:43 +02:00
Maxime Gimeno 14c65116b1 Add a dialog to choose the number of iterations in subdivisions_plugin 2017-09-07 16:37:45 +02:00
Sébastien Loriot d3aa8a7d47 fix copy-paste errors 2017-09-06 14:47:31 +02:00
Simon Giraudot 0e18e77e7f Remove pushButton from selection plugin 2017-09-06 13:49:12 +02:00
Maxime Gimeno d5ea0b6cbc Fix warnings and copy PMaps in detect_features.h 2017-09-05 12:03:35 +02:00
Maxime Gimeno 6372120ee9 Remove or rename problematic files in CMakeLists.txt 2017-09-04 15:52:14 +02:00
Laurent Rineau 25367b9141 Merge pull request #2235 from maxGimeno/Make_the_statistics_exportable-GF 
Polyhedron_demo: make the statistics exportable
 2017-09-04 15:20:55 +02:00
Laurent Rineau b6d834ba57 Merge pull request #2354 from sgiraudot/Polyhedron_demo-PLY_and_region_growing_fixes-GF 
Polyhedron demo: PLY and region growing fixes
 2017-09-04 15:09:52 +02:00
Laurent Rineau f002ab7d3c Merge pull request #2254 from maxGimeno/Output_surface_facets_to_facegraph-GF 
Surface_mesher: Output Surface Facets To Facegraph
 2017-09-04 15:09:44 +02:00
Laurent Rineau 4673e9620d Merge pull request #2381 from maxGimeno/Sort_splitted_polys_by_side-GF 
Polyhedron demo: Sort split_polyhedra output by increasing number of faces.
 2017-09-04 15:09:35 +02:00
Laurent Rineau 65683883e8 Merge pull request #2379 from maxGimeno/Fix_self_intersection_SM-GF 
Polyhedron_demo: Fix Self_intersection_plugin for SM
 2017-09-04 15:09:26 +02:00
Laurent Rineau f931c5e2ce Merge pull request #2378 from maxGimeno/Fix_c3t3_intersection_visibility-GF 
Polyhedron demo: Fix the c3t3 tets visibility.
 2017-09-04 15:09:17 +02:00
Laurent Rineau 4df1226955 Merge pull request #2371 from janetournois/Polyhedron_demo-surf_reader_minor_cleaning-GF 
Polyhedron demo - improve .surf reader
 2017-09-04 15:08:58 +02:00
Simon Giraudot a9777e9b50 Quiet find_package for OpenCV 2017-08-31 15:33:19 +02:00
Simon Giraudot c270da3dbd Fix demo warnings 2017-08-30 11:31:11 +02:00
Maxime Gimeno 689d364e80 Adapt viewer for libqglviewer 2.7. 2017-08-30 10:27:00 +02:00
Maxime Gimeno c95975f2c2 Fix after rebase 2017-08-30 10:27:00 +02:00
Maxime Gimeno 92814e8858 Rename recentFunctions; 2017-08-30 10:27:00 +02:00
Maxime Gimeno bca74e4a8e Rename isRecent into isOpenGL_4_3 2017-08-30 10:26:59 +02:00
Maxime Gimeno 71a8c1c178 Use GS in modern openGL for an optimal flat shading. 2017-08-30 10:26:58 +02:00
Maxime Gimeno 82b77f7f99 use GS to display right color in seg_img_items 2017-08-30 10:25:08 +02:00
Maxime Gimeno 6393d0bc3e Sets an OpenGL 4.3 format if possible and create a QOpenGLFunctions_4_3_Compatibility in that case. 2017-08-30 10:25:05 +02:00
Simon Giraudot 1fcced9103 Add classification plugin to demo test list 2017-08-29 11:03:10 +02:00
Maxime GIMENO 948f1ebe6b Merge branch 'master' into Make_the_statistics_exportable-GF 2017-08-29 09:24:04 +02:00
Maxime Gimeno c7bf24ab2d Sort split_polyhedra output by increasing number of faces. 2017-08-28 14:56:31 +02:00