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

5381 Commits

Author SHA1 Message Date
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
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é 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
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
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
Maxime Gimeno e2c68e557c Split plugin in 2 targets and use selection_item in both cases. 2017-08-28 13:59:00 +02:00
Maxime Gimeno 85c35e905f Add and use a special test for hiding the intersection while manipulating the frame, that does not interfere with the official visibility of the item. 2017-08-28 11:55:42 +02:00
Simon Giraudot 7a79bf6580 Remove useless modifications 2017-08-25 15:51:58 +02:00
Simon Giraudot 6c4b27c743 Merge branch 'Classification-GF-old' into Classification-GF 2017-08-25 14:28:10 +02:00
Jane Tournois 7f87b8d651 little cleaning and no need to increment index twice 2017-08-24 15:01:47 +02:00
Mael Rouxel-Labbé dba83ba5bf Fixed a few Alpha Shapes 2 headers 2017-08-23 16:40:55 +02:00