Commit Graph

3373 Commits

Author SHA1 Message Date
Maxime Gimeno 7e62849807 Rework of FileLoader UI 2016-06-30 14:37:59 +02:00
Maxime Gimeno 73d9b0abdc Rework of Deformation UI 2016-06-30 14:35:26 +02:00
Maxime Gimeno 55586279e2 Rework of Remeshing UI 2016-06-30 14:32:29 +02:00
Maxime Gimeno 195f7c62dd Rework of Mesh_segmentation UI 2016-06-30 14:31:22 +02:00
Maxime Gimeno cf432b11a7 Rework of Point_set_reconstruction UI 2016-06-30 14:29:36 +02:00
Maxime Gimeno b49bbfb1f0 Rework of Point_set_wlop UI 2016-06-30 14:21:41 +02:00
Maxime Gimeno 037fefba23 Rework of Point_set_upsampling UI 2016-06-30 14:21:01 +02:00
Maxime Gimeno 2a80c87715 Rework of Point_set_simplification UI 2016-06-30 14:19:18 +02:00
Maxime Gimeno fff122dded Rework of Point_set_shape_detection UI 2016-06-30 14:18:34 +02:00
Maxime Gimeno 1098e85d99 Rework of Point_set_simplification UI 2016-06-30 14:17:03 +02:00
Maxime Gimeno 8d951b5b62 Rework Bilateral smoothing UI 2016-06-30 14:14:38 +02:00
Maxime Gimeno cdcf9402a7 Rework Features_detection UI 2016-06-30 14:13:52 +02:00
Maxime Gimeno a614c5a260 Rework Isotropic_remeshing UI 2016-06-30 14:11:09 +02:00
Maxime Gimeno ce9fc9c45c Rework of the Local_optimizer_dialog 2016-06-30 13:58:26 +02:00
Maxime Gimeno 9854c48f29 Rework of the Smoother_dialog 2016-06-30 13:46:00 +02:00
Maxime Gimeno e94ba97fb9 Rework Mesh_3 UI 2016-06-30 13:12:05 +02:00
Maxime Gimeno dc58edfbe6 Rework Implicit_function UI. 2016-06-30 12:53:02 +02:00
Maxime Gimeno 5f88f74196 Rework Io_image_plugin UI. 2016-06-30 12:49:55 +02:00
Maxime Gimeno 297df827eb Rework Mesh_2 UI 2016-06-30 12:49:44 +02:00
Maxime Gimeno 7339db163a Fix isotropic_remeshing color bug. 2016-06-30 11:45:38 +02:00
Maxime Gimeno cb4b6650eb Implementation
- New plugin allowing to create noise in a point set.
2016-06-30 10:10:35 +02:00
Sebastien Loriot f3e5e81d79 Merge pull request #1219 from maxGimeno/Add_a_spacer-GF
Polyhedron_demo : Trivial UI change in Point_inside_polyhedron_plugin
2016-06-29 14:06:29 +02:00
Sebastien Loriot b3dc4a8595 Merge pull request #1221 from maxGimeno/Fix_Point_set_smoothing-GF
Polyhedron_demo: Fix Point_set_smoothing_plugin
2016-06-29 14:06:07 +02:00
Sebastien Loriot a414c0be61 Merge pull request #1212 from maxGimeno/Restore_snapshots-GF
Polyhedron_demo : Restore the Snapshot feature.
2016-06-29 14:00:48 +02:00
Sebastien Loriot 46980d547f Merge pull request #1207 from maxGimeno/Fix_implicit_function-GF
Polyhedron-demo : Fix display issue with Scene_implicit_function_item
2016-06-29 13:56:47 +02:00
Sebastien Loriot 997f5550db Merge pull request #1215 from maxGimeno/On_the_fly_selection_item-GF
Polyhedron_demo: On the fly selection_item
2016-06-29 13:52:58 +02:00
Sebastien Loriot 7148b3abcf Merge pull request #1213 from maxGimeno/Fix_bilateral_smoothing-GF
Polyhedron_demo: Fix bilateral_smoothing
2016-06-29 13:50:50 +02:00
Sebastien Loriot 9f0c23c4c9 Merge pull request #1209 from maxGimeno/keep_patch_ids_after_deformation-GF
Polyhedron_demo : Keeping colors after deformation
2016-06-29 13:49:25 +02:00
Sebastien Loriot 5f33306831 Merge pull request #1205 from maxGimeno/Add_mesh_info_in_c3t3_item-GF
Polyhedron_demo : Add the meshing parameters to the item's tooltip
2016-06-29 13:48:04 +02:00
Sebastien Loriot 198c1f71bf Merge pull request #1201 from maxGimeno/Fix_deformation-GF
Polyhedron_demo : Fix deformation
2016-06-29 13:46:51 +02:00
Maxime Gimeno 9c610f9cf9 Add a spacer. 2016-06-29 10:58:44 +02:00
Sebastien Loriot 5e08127cf8 Merge pull request #1223 from maxGimeno/Fix_selection_after_erase_item-GF
Polyhedron_demo: Fixes the selection after erasing items
2016-06-29 10:57:12 +02:00
Maxime Gimeno 5ea36f942e Fixes the selection after erasing items. 2016-06-29 10:48:49 +02:00
Maxime Gimeno 247ec7fd82 Fix the SEGFAULT 2016-06-29 10:13:39 +02:00
Laurent Rineau 1394b6e5fa Restore the richtext formatting 2016-06-28 19:00:38 +02:00
Maxime Gimeno af8bf047bb Factorize item creation. 2016-06-28 15:37:15 +02:00
Maxime Gimeno d76091195a Enhancement
- Creates a scene_polyhedron_selection_item for the currently selected scene_polyhedron_item if none exists and a button is clicked in the widget.
2016-06-28 15:26:22 +02:00
Maxime Gimeno ce55073dfb Initialize is_selected in Scene_item to avoid unjustified color changes. 2016-06-28 14:29:38 +02:00
Maxime Gimeno 5b72963f95 Triggers a warning if the selected point set has no normals. 2016-06-28 14:08:41 +02:00
Maxime Gimeno 615332b8ae Keep read-only property for the color_vector of the item. 2016-06-28 12:54:14 +02:00
Maxime Gimeno 5cb2823b3f Restore the Snapshot feature. 2016-06-28 10:13:14 +02:00
Sébastien Loriot 5404431ebd remove debug info 2016-06-27 19:36:50 +02:00
Maxime Gimeno b265d26a53 Save Colors_ vector when converting to edit_item and restore it when converting to poly_item. 2016-06-27 15:17:06 +02:00
Maxime Gimeno f2cea4d7a0 Fix the display
- The translation was done twice : once in the position and once in the frame matrix. The fix computes the position of the plane and the grid centered on O(0,0,0), so only the frame's transformation is kept.
2016-06-27 14:16:01 +02:00
Jane Tournois 46799a29fa selection type is "connected component", not "selected" 2016-06-27 13:08:37 +02:00
Maxime Gimeno 4bacb4bd3f Add the information to the item's tooltip. 2016-06-27 12:58:41 +02:00
Guillaume Damiand e02ac7f7f0 Remove link with zlib (that we introduced before but which are no more required) 2016-06-24 18:35:37 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Maxime Gimeno 58abbcc30a Fix
- Keep the contorl groups after remeshing.
2016-06-24 15:27:42 +02:00
Maxime Gimeno a04fc0f5e0 Fix
- Fix the group BBoxes
2016-06-24 11:11:22 +02:00
Maxime Gimeno 4c5e52be9d Fix
- Fixes the axis display while pivoting.
2016-06-24 09:49:51 +02:00
Maxime Gimeno 14ef8c274b Fix
- When a group is empty, delete it unless it is the last one.
2016-06-24 09:31:56 +02:00
Maxime Gimeno be0313430c fix propagation 2016-06-23 17:26:38 +02:00
Maxime Gimeno 7280513813 Fix item conversion. 2016-06-23 16:31:57 +02:00
Maxime Gimeno 3ada8d637a Fix show_ROI 2016-06-23 16:23:31 +02:00
Sebastien Loriot eed19486ef Merge pull request #1192 from maxGimeno/Euler_operations_improvements-GF
Polyhedron_demo : Selection tool improvements
2016-06-23 13:45:55 +02:00
Sebastien Loriot 60ce6420c1 Merge pull request #1196 from sloriot/Polyhedron_demo-deform_widget_with-tabs
use tabs to reduce the size of the deformation widget
2016-06-23 13:44:27 +02:00
Guillaume Damiand e21ef313c0 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 20:54:37 +02:00
Maxime Gimeno 90999805be Fix merge. 2016-06-22 17:40:02 +02:00
Sébastien Loriot a3d10e51f5 use tabs to reduce the size of the deformation widget 2016-06-22 16:52:43 +02:00
Sebastien Loriot 749e40fce9 Merge pull request #1115 from lrineau/Mesh_3-connected_components_for_images-GF
Mesh_3: connected components for 3D images
2016-06-22 14:52:10 +02:00
Maxime Gimeno c129c1329f Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:30:58 +02:00
Maxime Gimeno e3cd2143f2 Fixes facet display:
- Re-computes normal maps after an operation that changes the number of facets.
2016-06-22 14:28:47 +02:00
Maxime Gimeno 89cedf65cb Robustifies the highlighting 2016-06-22 14:28:38 +02:00
Maxime Gimeno e937c803a0 Removes the Hover events in edition mode. 2016-06-22 14:28:27 +02:00
Maxime Gimeno 67e6ac76f6 Fix the facets display
- Keeps the selected facets in front of the polyhedron's facets.
2016-06-22 14:28:17 +02:00
Maxime Gimeno 526473dca8 Keep the last selection mode in memory when erasing a scene_selection_item 2016-06-22 14:28:09 +02:00
Maxime Gimeno ccccfc03c1 Enhancement
- Addition of a feature to select all non triangle facets.
2016-06-22 14:27:55 +02:00
Maxime Gimeno a256f151f5 Makes the resulting point of collapse edge and join vertices the center of the original edge. 2016-06-22 14:27:45 +02:00
Maxime Gimeno 902bb2b8ce Merge branch 'Euler_operations_improvements-GF-old' into Euler_operations_improvements-GF 2016-06-22 14:27:33 +02:00
Maxime Gimeno 32fe11acee Clean-up and fix segfault 2016-06-22 14:15:03 +02:00
Maxime Gimeno cfa4796fa6 Fix for Move_vertex 2016-06-22 14:14:54 +02:00
Maxime Gimeno fcc2a94cbb Addition of doc pictures in the plugin 2016-06-22 14:13:52 +02:00
Maxime Gimeno 0d796d29f2 Addition of a tool to move a vertex in the edition_mode. 2016-06-22 14:04:17 +02:00
Maxime Gimeno 36c131b276 Fix for the singleshot in selection mode. 2016-06-22 14:03:09 +02:00
Maxime Gimeno b743c76bb1 change polygon_offset to display selected facets even with the camera in the default position. 2016-06-22 14:02:58 +02:00
Maxime Gimeno cc2e262d69 Cannot use singleshot for facet selection, somehow it discards the right event. 2016-06-22 14:02:47 +02:00
Maxime Gimeno adc43ed8ba Fluidifiy the selection 2016-06-22 14:02:32 +02:00
Maxime Gimeno 1013d4ff84 Addition of a highlighting system in the edit mode. 2016-06-22 13:59:28 +02:00
Sebastien Loriot e819e65f96 Merge pull request #1187 from maxGimeno/Fix_deformation-GF
Polyhedron_demo: Enhance deformation
2016-06-22 13:18:31 +02:00
Sébastien Loriot 79ad1b2dc6 Merge pull request #1141 from janetournois/PMP-isotropic_remeshing_smoothing_options-jtournois
PMP isotropic_remeshing : smoothing options
2016-06-22 11:46:05 +02:00
Guillaume Damiand a8af4dad62 Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-22 09:43:31 +02:00
Jane Tournois f4634b23cc don't remesh when roi_facets is empty 2016-06-21 12:23:28 +02:00
Jane Tournois 74d1f946dd display the target edge length to help reproduce 2016-06-21 11:26:11 +02:00
Jane Tournois cd616d73af this include does not need to be in the .h 2016-06-21 11:19:25 +02:00
Maxime Gimeno 13c5d7e51e Robustifies remeshing. 2016-06-20 17:22:59 +02:00
Maxime Gimeno 4f8b200f98 Fix segfault when trying to remesh a null_face(). 2016-06-20 14:45:38 +02:00
Maxime Gimeno 14ffea2872 Fix the freeze when opening the plugin with the option "Remesh after deformation" on. 2016-06-20 14:19:27 +02:00
Jane Tournois ef1b16e201 remove typename in excess
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
2016-06-20 14:19:27 +02:00
Maxime Gimeno e8204f617b Fix expand_or_reduce
- It won't convert existing roi to ctrl vertices anymore.
2016-06-20 14:19:27 +02:00
Maxime Gimeno 915ba72c05 Fix the control_points in remeshing. 2016-06-20 14:19:27 +02:00
Maxime Gimeno 4eed022c69 Implementation of the selection propagation. 2016-06-20 14:19:27 +02:00
Maxime Gimeno 8b69b6330a Save the control vertices when deforming. 2016-06-20 14:13:47 +02:00
Sebastien Loriot b02e5c6b7c Merge pull request #1184 from maxGimeno/Fix_images_issues_in_mesh_3_plugin-GF
Polyhedron_demo: Fix images issues in mesh 3 plugin
2016-06-20 09:40:53 +02:00
Jane Tournois 1d69642736 export_facets_in_complex hides the input c3t3 2016-06-17 17:05:10 +02:00
Jane Tournois d791c41879 skip implicit surfaces for surface meshing with Mesh_3 2016-06-17 17:05:10 +02:00
Jane Tournois 313a1522de rename actionMesh_3_remesh to actionMesh_3_surface to fit with image domains 2016-06-17 17:05:09 +02:00
Jane Tournois a3fb5acc96 rename action because it also works on images now 2016-06-17 17:05:09 +02:00
Jane Tournois 4e51b5d8d9 make volumeGroup visible for an image too
this was a mistake introduced by commit 888e61ded1
2016-06-17 17:05:09 +02:00
Sebastien Loriot 835ae551e1 Merge pull request #1181 from maxGimeno/Fix_bug_display-GF
Polyhedron_demo: Fix the display
2016-06-17 16:58:01 +02:00
Maxime Gimeno 5462b9401e Translate the WordTypes names. 2016-06-17 14:42:20 +02:00
Guillaume Damiand d0d90d2d7a Link with ZLIB_LIBRARY for scene_image_item 2016-06-17 10:58:23 +02:00
Sebastien Loriot d6688765f0 Merge pull request #1177 from maxGimeno/Enhance_shortest_path_plugin-GF
Polyhedron_Demo: Enhance Shortest Path Plugin
2016-06-16 16:18:10 +02:00
Laurent Rineau 14abbfeb3d initialization of connected components in the demo
For a 3D segmented image, this commit adds the possibility to scan the
image and initialize all connected components.
2016-06-16 15:10:49 +02:00
Maxime Gimeno f5e18a9e19 Fix typos 2016-06-16 14:00:24 +02:00
Maxime Gimeno 6b72d66ec1 If the image is gray, don't compute the image's data nor fill the buffers. 2016-06-16 11:34:08 +02:00
Maxime Gimeno f292e58579 Prints the right wordtype instead of "..." 2016-06-16 11:18:35 +02:00
Maxime Gimeno 549935e7b9 Adds a Bbox to the Volume_planes. 2016-06-16 10:31:48 +02:00
Maxime Gimeno e95f28a2f6 Add a waitcursor while the planes are being created. 2016-06-16 09:49:37 +02:00
Maxime Gimeno 62505b331e Fix the names in Io_image_plugin 2016-06-16 09:41:44 +02:00
Maxime Gimeno 0b655e6ca4 Fix after rebase. 2016-06-16 09:18:49 +02:00
Maxime Gimeno f549b62a6a Fix the are_buffers_filled
- Using d->are_buffers_filled made useless the initialization made in the Scene_item constructor.
 Instead of re-initializing it in the private structs, I decided to use the one from the item again, as the
 cleaning of the Scene_item seems to be put aside.
2016-06-16 09:18:33 +02:00
Laurent Rineau 94841297ee Adjust the titles in the dialog 2016-06-15 18:10:15 +02:00
Laurent Rineau cf66e53503 Remove the useless height==40 for the spacer 2016-06-15 18:10:15 +02:00
Laurent Rineau d38226804f Add buddies and shortcuts 2016-06-15 18:10:15 +02:00
Sebastien Loriot d6aa47c07c Merge pull request #1164 from afabri/Surface_mesh-explicit-GF
Make constructor SM_Edge_index(SM_Halfedge_index) explicit
2016-06-15 17:37:13 +02:00
Sebastien Loriot 9f011f577f Merge pull request #1176 from maxGimeno/Temporary_remove_Remove_degenerate_faces-GF
Polyhedron_demo : Remove an action
2016-06-15 17:06:13 +02:00
Sebastien Loriot 07e38af4ab Merge pull request #1175 from maxGimeno/Add_a_warning_to_parameterization-GF
Polyhedron_demo : Enhancement of Parameterization_plugin
2016-06-15 17:05:39 +02:00
Sebastien Loriot 2347150b77 Merge pull request #1174 from maxGimeno/Fix_multicolor_items-GF
Polyhedron_demo : Fix the multicolor_items
2016-06-15 17:05:09 +02:00
Sebastien Loriot 25240cb054 Merge pull request #1173 from maxGimeno/Fix_bbox_plugins-GF
Polyhedron_demo : Fix bbox plugins
2016-06-15 17:04:46 +02:00
Sebastien Loriot 39f1af3d87 Merge pull request #1172 from maxGimeno/Fix_create_point_set_from_selection_item-GF
Polyhedron_demo : Fix the Create_point_set_from_selection operation
2016-06-15 17:04:26 +02:00
Sebastien Loriot c43bdc8d0f Merge pull request #1171 from maxGimeno/Deformation_use_selection_item-GF
Polyhedron_demo : Deformation use selection item
2016-06-15 17:03:53 +02:00
Sebastien Loriot 8ddc4ff7b6 Merge pull request #1170 from maxGimeno/Fix_gray_images_UI-GF
Polyhedron_demo : Fix gray images UI
2016-06-15 17:03:23 +02:00
Sébastien Loriot 078e5c2858 Merge pull request #1168 from maxGimeno/Fix_for_1113-GF
Polyhedron_demo : Makes `edge_size` an editable parameter in `Mesh_3_plugin`
2016-06-15 17:02:14 +02:00
Sebastien Loriot b23064f3fd Merge pull request #1165 from maxGimeno/Polyhedron_demo-Fix_triangulate_primitive-GF
Polyhedron_demo: Fix triangulate primitive
2016-06-15 17:00:56 +02:00
Sebastien Loriot c45c3494ba Merge pull request #1154 from janetournois/Polyhedron_demo-remesh_a_polyhedron_with_mesh_3-jtournois
Polyhedron demo : add remeshing of a Polyhedron with Mesh_3
2016-06-15 17:00:28 +02:00
Sebastien Loriot 8302225f5d Merge pull request #1153 from maxGimeno/Polyhedron_demo-connect_loaded_selection_item-GF
Polyhedron_demo: Fix Selection_io_plugin
2016-06-15 16:59:32 +02:00
Sebastien Loriot e96dccb5b6 Merge pull request #1147 from afabri/Polyhedron_3-simplify_CMakeLists-GF
Do not cache CGAL_THREE_SCENE_ITEM_H_PATH ; Simplify CMakeLists.txt
2016-06-15 16:59:11 +02:00
Maxime Gimeno de5ccc6552 Fix points color. 2016-06-15 10:56:34 +02:00
Maxime Gimeno a60000cecb Enhancement :
- Put the items in a group
- Change the GUI to be more explicit
2016-06-15 10:53:01 +02:00
Jane Tournois 910b20300d avoid duplicating vertices in polygon soup 2016-06-14 17:15:29 +02:00
Maxime Gimeno afc760f1ac Updates the Doc about the new signal. 2016-06-14 15:28:58 +02:00
Sébastien Loriot 6f325b46e4 force the export in the lib of a template intanciation 2016-06-14 15:28:35 +02:00
Jane Tournois 93ccbeda02 export_facets_in_complex now uses code from PMP 2016-06-14 15:27:48 +02:00
Jane Tournois 4278898b9d save c3t3 surface as off 2016-06-14 15:27:42 +02:00
Jane Tournois 563ba9cb76 disable perturb and exude when the c3t3 has no cell 2016-06-14 15:27:36 +02:00
Jane Tournois 888e61ded1 remesh a polyhedral surface using Mesh_3 in the Polyhedron demo
about sharp features : when the checkbox is unchecked, neither sharp edges
nor boundaries are protected
2016-06-14 15:27:31 +02:00
Maxime Gimeno 9eb1ff7ad9 Remove an action.
- Remove the action Remove_degenerate_faces from the Repair_polyhedron_plugin.
The code is still here, so we won't have to rewrite it when the function is finished and documented.
2016-06-14 15:09:57 +02:00
Maxime Gimeno 92247918e1 Use a const ref in compute_diag_bbox(). 2016-06-14 14:48:29 +02:00
Maxime Gimeno 9a454ebfee Fix the camera bug when Shift+D+click 2016-06-14 14:37:00 +02:00
Maxime Gimeno 861a78e308 Enhancement
- The Edit_polyhedron_plugin can now import a selection from a Scene_polyhedron_selection_item.
2016-06-14 14:36:59 +02:00
Maxime Gimeno c7b61b7caf Fix the picking 2016-06-14 14:32:24 +02:00
Maxime Gimeno b44896d915 Fix
- Addition of a destructor for the Volume_plane_intersection.
2016-06-14 14:32:24 +02:00
Maxime Gimeno f02b69bcb3 Fixes
- Renames the Control widget.
- When a control is not connected to a plane, it is entirely hidden instead of only its slider.
- Fixes the reconnection of the controls when a group_plane is erased. (Needed a new signal from the Scene)
2016-06-14 14:32:22 +02:00
Maxime Gimeno 371e3008b8 Enhancement
- Adds a warning when the Parameterization_plugin is used on a polyhedron without borders.
2016-06-14 14:26:58 +02:00
Jane Tournois ef5b1847ea complete verbosity for this parameter 2016-06-14 14:25:43 +02:00
Jane Tournois 80a4d71fcb cosmetic layout improvement 2016-06-14 14:25:43 +02:00
Maxime Gimeno eb45b889f1 Makes the edge size editable by the user. 2016-06-14 14:25:43 +02:00
Maxime Gimeno d8f3154dca Fix the Mesh_segmentation_plugin 2016-06-14 14:02:50 +02:00
Maxime Gimeno b3f7d8011d Fix the computeElements() of multicolor polyhedron_items. 2016-06-14 12:03:47 +02:00