Commit Graph

5023 Commits

Author SHA1 Message Date
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
Sebastien Loriot 1dd68bcbe8 Merge pull request #2180 from maxGimeno/Clipping_box_plugin-GF
Polyhedron_demo: Clipping box plugin
2017-08-22 10:11:32 +02:00
Simon Giraudot a9ff8c4f17 Remove not needed typenames 2017-08-22 09:05:38 +02:00
Simon Giraudot b6c59ff261 Fix typename Windows errors 2017-08-21 08:06:03 +02:00
Sebastien Loriot 97b8782a27 Merge branch 'master' into Detect_features-GF 2017-08-18 16:34:29 +02:00
Sébastien Loriot d5bca02dbe Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch' 2017-08-18 16:30:16 +02:00
Sebastien Loriot 74409b2b3c Merge pull request #2239 from sgiraudot/Shape_detection-Region_growing-GF
Region Growing (Shape Detection)
2017-08-18 16:27:19 +02:00
Jane Tournois e2e5b1ed05 edge_is_feature_map is not an optional parameter
see reviews in the small feature
2017-08-18 10:51:25 +02:00
Simon Giraudot b0593e5332 Fix warning conversion int/std::size_t 2017-08-17 09:52:06 +02:00
konstantinos katrioplas 11ac8a648a accumulate areas fix 2017-08-16 20:35:46 +03:00
Simon Giraudot 335abd45dd Fix warnings 2017-08-14 09:58:33 +02:00
Maxime Gimeno 43ff0d092c Implementation review Jane and sebastien 2017-08-11 15:30:03 +02:00
Simon Giraudot 6d277cffcb Fix unhandled shapes assertion error in plugin 2017-08-11 09:18:11 +02:00
Maxime Gimeno 723492def1 Use existing named_parameters and vertex_incident_patches becomes lvaluepmap, 2017-08-10 15:16:27 +02:00
Sebastien Loriot 621ddac41f Merge pull request #2249 from sgiraudot/Read_PLY_polygon_soup-GF
Read PLY polygon soup
2017-08-10 13:47:50 +02:00
Sébastien Loriot 2de42e8f92 Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch' 2017-08-09 12:50:17 +02:00
Sebastien Loriot 1bcb92c749 Merge pull request #2339 from maxGimeno/Fix_selection_io-GF
Polyhedron_demo: Fix selection_io_plugin
2017-08-09 12:47:04 +02:00
Maxime Gimeno 088934730b changes in the doc. 2017-08-09 10:31:04 +02:00
Maxime Gimeno dcef69a61e Fix function call in surface_reconstruction_plugin 2017-08-09 10:31:04 +02:00
Maxime Gimeno f670ffe4e2 detect_surface_patches uses connected_components 2017-08-09 10:24:48 +02:00
Simon Giraudot 2ebc55e9c3 Use signed integer for label indices (better handling of unlabeled -1 case) 2017-08-09 09:57:15 +02:00
Sebastien Loriot 4f63bff108 Merge pull request #2207 from janetournois/Mesh_3-use_Side_of_triangle_mesh-GF
Mesh_3 : use PMP::Side_of_triangle_mesh
2017-08-08 16:41:38 +02:00
Sebastien Loriot 0e031b47cc Merge pull request #2312 from maxGimeno/Add_color_to_statusbar-GF
Polyhedron_demo: Add visibility to the status messages
2017-08-08 16:40:08 +02:00
Sebastien Loriot 0963d6da4d Merge pull request #2335 from maxGimeno/Add_decimals_to_outliers_distance-GF
Polyhedron_demo: Add decimals for smaller distance in outliers plugin
2017-08-08 16:32:36 +02:00
Sebastien Loriot 1707d92bdb Merge pull request #2332 from maxGimeno/Fix_point_items_display-GF
Polyhedron_demo: Fix selected points display
2017-08-08 16:30:44 +02:00
Sebastien Loriot d1786cd303 Merge pull request #2328 from maxGimeno/Robustify_mcf_plugin-GF
Polyhedron_demo: Robustify Mean_curvature_flow_skeleton_plugin
2017-08-08 16:30:13 +02:00
Sebastien Loriot 9ebf53e44f Merge pull request #2310 from maxGimeno/Remove_shift_for_edit_box_manip-GF
Polyhedron_demo: No shift for Edit_box
2017-08-08 16:28:38 +02:00
Sebastien Loriot 84fe1571a7 Merge pull request #2178 from maxGimeno/Degenerated_faces_plugin-GF
Polyhedron_demo: Degenerated_faces_plugin
2017-08-08 16:28:15 +02:00
Sébastien Loriot 6a451b86e5 capitalize 2017-08-08 16:27:26 +02:00
Sébastien Loriot 0e173d331b be more precise with what is selected exactly 2017-08-08 16:27:12 +02:00
Maxime Gimeno 423f1904d9 Change namefilters so it won't mess with the regexp. 2017-08-08 09:58:43 +02:00
Maxime Gimeno 3965b18e6d Fix item config 2017-08-07 15:35:12 +02:00
Maxime Gimeno d59dce7909 fix Help button 2017-08-07 13:41:30 +02:00
Maxime Gimeno 1bad0e7202 Use edges instead of halfedges for edge_is_feature_t and map 2017-08-07 11:39:07 +02:00
Sebastien Loriot b2adb59846 Merge pull request #2167 from maxGimeno/Point_set_to_mesh_distance_plugin-GF
Polyhedron_demo: Point set to mesh distance plugin
2017-08-07 10:09:52 +02:00
Maxime Gimeno 9dddca1d25 Move help to a dialog triggered by a button. 2017-08-04 16:56:22 +02:00
Maxime Gimeno 82c4ae45e1 Disable the speed tradeoff if is_medially_centerd is not toggled. 2017-08-04 16:46:52 +02:00
Maxime Gimeno 3374eaa4fa Fix connection at destruction. 2017-08-04 16:36:32 +02:00
Maxime Gimeno d588c55bbb Make functions free functions and wright doc 2017-08-04 15:06:41 +02:00
Sébastien Loriot fd8b1e7366 Merge remote-tracking branch 'cgal/releases/CGAL-4.11-branch' 2017-08-04 13:38:41 +02:00
Sébastien Loriot 9bb2d4433f Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-08-04 13:37:58 +02:00
Sébastien Loriot d1d61258a0 update help 2017-08-04 11:04:10 +02:00
Sébastien Loriot 09b8a86a21 always hide the input mesh when doing an operation 2017-08-04 10:36:53 +02:00
Sébastien Loriot 039224f449 do not generate the skeleton during one iteration 2017-08-04 10:22:01 +02:00
Simon Giraudot d703ae34cc Bugfix: revert method mistakingly erased during rebasing 2017-08-04 09:47:43 +02:00
Jane Tournois d486006393 remove the use of Triangle_accessor_3, not needed anymore 2017-08-03 16:09:52 +02:00
Maxime Gimeno e3091584a6 Add decimals for smaller distance. 2017-08-03 15:19:17 +02:00
Maxime Gimeno cacf53745a Externalize item. 2017-08-03 11:18:54 +02:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Maxime Gimeno e1427409c4 fix applicable 2017-08-03 09:06:01 +02:00
Maxime Gimeno 95dfae314b Rename file 2017-08-02 16:26:53 +02:00
Maxime Gimeno 2f45a46f7c Fix and enhance detect_feature 2017-08-02 16:08:33 +02:00
Maxime Gimeno d4e7b9f622 Fix fwd and plugin 2017-08-02 14:49:18 +02:00
Maxime Gimeno aa36342cf0 Fix for the selected points that are not displayed if the current item is not the first in the list. 2017-08-02 14:14:56 +02:00
Simon Giraudot 0e440ff989 Colored mesh in PLY IO plugin 2017-08-02 14:10:44 +02:00
Simon Giraudot 8fec628dce Add method to load polygon soup item with colors 2017-08-02 14:10:44 +02:00
Simon Giraudot 091cbe61d9 Add options to load surface mesh and to save surface mesh and polyhedron in plugin 2017-08-02 14:10:43 +02:00