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

3373 Commits

Author SHA1 Message Date
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
Maxime Gimeno bef8bd9d16 Fix the create_point_set_from_selection operation. 2016-06-14 11:26:34 +02:00
Maxime Gimeno db2d1f5cc7 Fix the applicable() function for the Trivial_plugin. 2016-06-14 11:19:03 +02:00
Maxime Gimeno 2341f8aa42 Fix Create_bbox_mesh_plugin 2016-06-14 11:15:17 +02:00
Maxime Gimeno 5b123c8097 Fix the trivial_plugin 2016-06-14 11:12:45 +02:00
Laurent Rineau bb5957791c Fix a CMake error 
Before this commit, it was only working with old CMake cache having the
old variable `CGAL_THREE_VIEWER_INTERFACE_H_PATH`. Sorry.
 2016-06-14 10:07:39 +02:00
Sébastien Loriot c94b1a5ba7 remove extra call to halfedge 2016-06-14 06:31:03 +02:00
Maxime Gimeno 9ec071e3fb Fix for Scene_surface_mesh_item 2016-06-13 16:33:29 +02:00
Maxime Gimeno dfe225b487 Fix for the polyhedron_item 2016-06-13 14:39:48 +02:00
Maxime Gimeno e460298ffe Fix 
- Add the connect() to the new_item_created() function so the loaded selection_items can work.
 2016-06-13 10:31:20 +02:00
Sébastien Loriot aad7d3996c Merge pull request #1131 from maxGimeno/Polyhedron_demo-Use_d_pointers-GF 
Polyhedron_demo: Items use d-pointers
 2016-06-13 09:37:33 +02:00
Laurent Rineau 0877d25f8a Stupid error 
I had not tested my code!
 2016-06-10 18:15:06 +02:00
Maxime Gimeno 76b94d5c2e More typename fix and STL_io_plugin template bug fix; 2016-06-10 09:30:54 +02:00
Guillaume Damiand a53f16edac Merge branch 'CGAL_headers_only_step1-gdamiand_cjamin-old' into CGAL_headers_only_step1-gdamiand_cjamin 2016-06-09 19:09:38 +02:00
Maxime Gimeno c2f02afee5 Enhancement 
- Moved the code to read an .obj file to OBJ_reader.h
- Made it compatible with not triangle objects.
 2016-06-09 16:16:18 +02:00
Laurent Rineau 964fdabb49 Do not store the variable in the cache at all 
Eventually, I prefer that the variable is not stored in the cache at all. Otherwise, that gives the user the fake impression that he/she can modify the variable value.

@afabri
 2016-06-09 11:17:16 +02:00
Andreas Fabri 37a55cf18d Do not cache CGAL_THREE_SCENE_ITEM_H_PATH ; Simplify CMakeLists.txt 2016-06-09 10:55:12 +02:00
Maxime Gimeno 3db5a1f6b2 Fix for the OBJ reading. 2016-06-09 09:52:54 +02:00
Maxime Gimeno 44591380f6 Change the ET typedef in kernel_plugin 2016-06-08 15:12:12 +02:00
Maxime Gimeno 508598793c fix typename error 2016-06-08 14:47:31 +02:00
Maxime Gimeno 72937d5db8 Fix Kernel_plugin 2016-06-08 14:43:33 +02:00
Sebastien Loriot 86cb16b77f Merge pull request #1137 from maxGimeno/Polyhedron_demo-Fix_viewer_update-GF 
Polyhedron_demo : Fix the update of the viewer
 2016-06-08 14:30:10 +02:00
Maxime Gimeno ed0511f6df Fix error 
- A function was declared twice in the .cpp
 2016-06-08 09:55:17 +02:00
Sebastien Loriot 1ebaebc6aa Merge pull request #1101 from maxGimeno/Enhance_triangulate_facets-GF 
Robustify triangulate facets
 2016-06-08 09:50:48 +02:00
Jane Tournois 7fde6edb32 rename relaxation named parameters 2016-06-07 12:38:27 +02:00
Maxime Gimeno 5f8e8ca617 Optimisation of the volume planes. 
- Use of the singleShot trick to fluidify the Volume planes in the Image_io_plugin.
 2016-06-07 11:34:08 +02:00
Maxime Gimeno cbb36fec62 Fix compilation and link bugs. 2016-06-07 10:47:06 +02:00
Jane Tournois b4b505aa4b reorder tabs in remeshing dialog 2016-06-06 17:14:39 +02:00
Maxime Gimeno a34ce63fbc Fix Clip_polyhedron_plugin 
- Most of the private members were supposed to be protected.
 2016-06-06 16:56:48 +02:00
Maxime Gimeno a3ed36ee25 Externalize the triangulation code for the facets in items 
- Use an external class to triangulate the facets in Polyhedron_item, Surface_mesh_item, Polygon_soup_item and Polyhedron_selection_item.
 2016-06-06 16:12:18 +02:00
Maxime Gimeno eff2126be1 Fix the update of the viewer 
- replaces updateGL() calls by update() calls. Before the viewer used a painter, updateGL() was ok, because it was the QGLViewer that painted the scene. But a QPainter can only update its painting through a paintEvent() function, which is called by update() but not by updateGL().
- Fixes the bug that made the selection empty when an item was erased.
- Fixes the background color.
 2016-06-06 15:10:58 +02:00
Jane Tournois 4112b0295f add a named parameter to be able to run more than one laplacian iteration 
at each isotropic_remeshing iteration
 2016-06-06 13:58:54 +02:00
Maxime Gimeno 128f042c7a Robustifies the polyhedron_item display. 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
 2016-06-03 12:09:31 +02:00
Maxime Gimeno 16e9934a6b Use a simple CDT and not a CDT_plus in the Scene_polyhedron_item::triangulate_facet() 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
 2016-06-03 11:52:25 +02:00
Maxime Gimeno cd17bea9e1 Kernel plugin fixed but the item returned for a quadratic object crashed on triangulation. 2016-06-03 11:47:25 +02:00
Maxime Gimeno 552519e24d Fix the selection bug after an item deletion. 2016-06-03 11:44:52 +02:00
Maxime Gimeno 060377f231 Add a function to get the diagonal of an item's Bbox. 2016-06-03 11:16:11 +02:00
Maxime Gimeno 56a75095ad Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_image_item.cpp
	Polyhedron/demo/Polyhedron/Scene_image_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
 2016-06-03 10:38:05 +02:00
Maxime Gimeno 6090b89123 Fixes the contextMenu. 2016-06-02 15:40:24 +02:00
Sebastien Loriot ef6f7f8faa Merge pull request #1126 from maxGimeno/Polyhedron_demo-Fix_spheres_item_in_polylines-GF 
Polyhedron_demo: Fix for the Spheres_item and the Scene_polyline_item
 2016-06-02 15:19:25 +02:00
Sebastien Loriot 26081a2608 Merge pull request #1123 from maxGimeno/Polyhedron_demo-Fix_ChangeGroup-GF 
polyhedron_demo : Fix ChangeGroup
 2016-06-02 15:17:02 +02:00
Sebastien Loriot a9b177fe71 Merge pull request #1121 from maxGimeno/Polyhedron_demo-_display_distance_between_points-GF 
Polyhedron_demo: Display distance between points
 2016-06-02 15:16:13 +02:00
Sebastien Loriot f546d49366 Merge pull request #1117 from maxGimeno/Fix_selection_tool-GF 
Fix selection tool
 2016-06-02 15:15:11 +02:00
Sébastien Loriot 472980a478 Merge pull request #1075 from maxGimeno/Polyhedron_demo-Handle_gray_images-rebase-GF 
Polyhedron demo : Handle gray images
 2016-06-02 15:06:49 +02:00
Sébastien Loriot 1a2fa813db fix warnings when vtk is not here 2016-06-02 09:16:53 +02:00
Maxime Gimeno 60d18a01cd Fixes : 
- It is possible again to change the radii of the spheres in a polyline
- Reloading a group from file won't cause the demo to crash anymore.
 2016-06-01 12:40:23 +02:00
Maxime Gimeno d34d7d5591 Fix errors when VTK is not found. 2016-06-01 10:36:50 +02:00
Sebastien Loriot cf15f57a50 Merge pull request #1097 from lrineau/Mesh_3-improve_polylines_to_protect-GF 
Mesh 3: add an example that protects features of a 3D image
 2016-05-31 16:00:58 +02:00
Maxime Gimeno 5899e3dd3c Fix 
- Fixes the behaviour when removing from scene with no item selected, that could cause a segfault in some cases.
 2016-05-31 14:42:24 +02:00
Maxime Gimeno f56677f3e4 Volume_plane_intersection use a d-pointer. 2016-05-31 12:38:27 +02:00
Maxime Gimeno b5ef4c2938 Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
 2016-05-31 11:51:59 +02:00
Maxime Gimeno e3d7732d85 Add enums to the selection_item. 2016-05-31 11:24:40 +02:00
Maxime Gimeno 46e13ba697 Fix 
- When D was not released, the text was not cleared.
- Set the distance line bold.
 2016-05-31 10:39:25 +02:00
Sébastien Loriot 3046912017 use CamelCase for all MainWindow actions 2016-05-30 17:21:58 +02:00
Sébastien Loriot 530aa85e56 fix action and slot names 2016-05-30 17:13:33 +02:00
Sébastien Loriot 0ded764e71 fix signal name to allow auto-connection 2016-05-30 17:08:28 +02:00
Maxime Gimeno 2e20e8804b Fix meshing of gray images. 2016-05-30 15:06:55 +02:00
Maxime Gimeno 5edc0f89d8 Reduce copy/pasted code 2016-05-30 12:23:43 +02:00
Maxime Gimeno d4dc2cbc53 fix segfault in default constructor of selection-items 2016-05-30 10:34:17 +02:00
Maxime Gimeno c62ce2da10 Fixes 
- Make only the selected selection_item active.
- Fix for the segfaults in edition_mode with no selection_item
- Creates a selection_item even if there are more than one item in the scene

Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item_k_ring_selection.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2016-05-30 10:33:30 +02:00
Maxime Gimeno 084662ea87 Print the information on screen. 2016-05-27 17:02:08 +02:00
Jane Tournois 748f0ffded comment until it's implemented 
I prefer not to remove it completely
 2016-05-27 16:07:25 +02:00
Maxime Gimeno aa51101d29 Merge branch 'Polyhedron_demo-_display_distance_between_points-GF-old' into Polyhedron_demo-_display_distance_between_points-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Viewer.cpp
	Polyhedron/demo/Polyhedron/Viewer.h
 2016-05-27 16:06:48 +02:00
Jane Tournois 63d2a2a4dc remove default values and rename variable 2016-05-27 15:49:50 +02:00
Maxime Gimeno 9f7decae9f Selection_item uses d-pointers 2016-05-27 15:38:43 +02:00
Maxime Gimeno cd4c24b4ad Warning fix 2016-05-27 15:17:06 +02:00
Maxime Gimeno f3f44a4dda Reduce pasted code. 2016-05-27 15:04:45 +02:00
Maxime Gimeno f29107e578 use vector::data instead of the address of the first element. 2016-05-27 13:00:16 +02:00
Maxime Gimeno 28f7ae212a Fix Compilation Errors in case VTK is not found. 2016-05-27 12:30:34 +02:00
Jane Tournois 4e2593d911 Merge branch 'Polyhedron_demo-Handle_gray_images-rebase-GF' of github.com:maxGimeno/cgal into Polyhedron_demo-Handle_gray_images-rebase-GF 2016-05-27 11:13:36 +02:00
Jane Tournois 4cd78c0fa7 add a warning message 2016-05-27 11:08:29 +02:00
Jane Tournois 05c1224b95 rename group and shorten code 2016-05-27 10:49:59 +02:00
Jane Tournois 6acdbfbc6f use variable features_protection_available 
to make ui.protect checkbox available or not
 2016-05-27 10:43:08 +02:00
Jane Tournois 16f737a178 avoid selection list to move when value changes 2016-05-27 10:37:17 +02:00
Sébastien Loriot ed5e06f341 pass the value to the base class 2016-05-26 18:02:12 +02:00
Jane Tournois cad7413a77 fix typo and add tooltips 2016-05-26 17:30:23 +02:00
Jane Tournois 576a30ac35 re-indent 2016-05-26 17:25:05 +02:00
Sébastien Loriot 11b8eb428b Merge pull request #558 from maxGimeno/Polyhedron_demo-display_indices_of_primitives-GF 
Display indices of Polyhedron_item primitives in Polyhedron_demo
 2016-05-26 17:09:23 +02:00
Maxime Gimeno 761d256cd3 Edit Surface_mesh_item to use d-pointers 2016-05-26 12:34:04 +02:00
Maxime Gimeno 84a32d2685 Merge branch 'Polyhedron_demo-Use_d_pointers-GF-old' into Polyhedron_demo-Use_d_pointers-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Three/include/CGAL/Three/Scene_group_item.h
 2016-05-26 10:42:23 +02:00
Maxime Gimeno 39a4ad8534 Makes the parameters for the meshing of gray images editable by the user. 2016-05-26 09:41:00 +02:00
Sébastien Loriot 06e553ccff remove warning 2016-05-25 17:56:57 +02:00
Maxime Gimeno 9abe59c917 Fix the bug of single textItems on multiple scene_items. 2016-05-25 17:02:26 +02:00
Guillaume Damiand 3b6bcc10e4 Fix export (same commit than e14f49950c) 2016-05-25 16:22:16 +02:00
Guillaume Damiand adfe06b21d Add link to gl_splat 2016-05-25 15:43:11 +02:00
Guillaume Damiand a7506fb156 Reintroduce lost code during merge 2016-05-25 14:38:16 +02:00
Guillaume Damiand 5c2c2b2b2c Lib removed in polyhedron demo 2016-05-25 11:37:34 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Sébastien Loriot 5f0a9dcbf3 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-05-24 16:54:58 +02:00
Maxime Gimeno 56caa543f0 Fixes the Splatting draw code which fixes the picking problem. 2016-05-24 16:20:46 +02:00
Maxime Gimeno d694903fc9 Adds a warning message in the plugin if all the facets were not triangulated. 2016-05-23 17:01:27 +02:00
Jane Tournois caae6db52b deal with boundaries 2016-05-23 16:15:22 +02:00
Jane Tournois a500441784 delete selected edges before it's too late 
when erase_selected_facets is called, the selected edges that are in the
middle of the selected area should be deleted before they get invalidated
by the face removal
 2016-05-23 15:38:00 +02:00
Sébastien Loriot bc02ce7fdf no need to connect twice 2016-05-23 12:17:00 +02:00
Sébastien Loriot 7ca9320dc5 fix conversion warnings 2016-05-23 11:57:31 +02:00
Sébastien Loriot b25178f30f use CGAL header to cope with different boost versions 2016-05-23 11:43:45 +02:00
Sebastien Loriot 1127725c11 Merge pull request #1013 from maxGimeno/Polyhedron_demo-OFF_with_color-GF 
Polyhedron demo : OFF with colors
 2016-05-23 11:28:19 +02:00
Sébastien Loriot 5b826d5a2b clean up 2016-05-23 11:26:04 +02:00
Maxime Gimeno be1ac690b5 Add the modal messageBox when the planes of a gray-image are created. 2016-05-20 16:56:33 +02:00
Laurent Rineau 4d38c931ce Improve the API of <CGAL/Mesh_3/polylines_to_protect.h> 
Now the word type and the null functor are passed as parameters.
 2016-05-20 16:52:35 +02:00
Maxime Gimeno e8bf84efb3 Fix segfault. 
- Removed the problematic piece of code, as it was useless after all.
 2016-05-20 16:41:22 +02:00