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

3374 Commits

Author SHA1 Message Date
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
Maxime Gimeno d9b7e74876 Fix the rebase 2016-05-20 15:46:42 +02:00
Maxime Gimeno 58152f22f4 Checks if the word_type of the image is right before trying to mesh with mesh_3_plugin. 
# Veuillez saisir le message de validation pour vos modifications. Les lignes
 2016-05-20 15:33:42 +02:00
Maxime Gimeno be7867eb02 o_image_plugin can load dcm images. 2016-05-20 15:33:42 +02:00
Maxime Gimeno 06c96fecde Add an action to load a directory (for the dcm images) 2016-05-20 15:33:42 +02:00
Maxime Gimeno 4493024990 Mesh_3plugin meshes the gray-level images 2016-05-20 15:33:42 +02:00
Sébastien Loriot ebf928f823 readd file removed by mistake (and the remove the that that should) 2016-05-20 15:33:42 +02:00
Maxime Gimeno a0cbd9f6a8 Fix the problem that occurs when a group is deleted but others remain 2016-05-20 15:32:27 +02:00
Maxime Gimeno 3697347f68 Update Bbox 2016-05-20 15:32:27 +02:00
Maxime Gimeno 5252a304b0 Some clean-up 2016-05-20 15:32:27 +02:00
Maxime Gimeno 91ae7bc478 Gray-level_image_item creation 
- Allows the creation of a scene_image_item when gray-level is selected, but that item doesn't draws anything but the item's bbox.
 2016-05-20 15:32:27 +02:00
Maxime Gimeno d1195a5371 Addition of the missing files 2016-05-20 15:32:26 +02:00
Maxime Gimeno d6cb2f2821 Creation of the planes for the Gray-level images 
- Fused Volume_plane_plugin and Io_image_plugin
- When an image is of type gray-level, planes are created instead of an image_item.
 2016-05-20 15:32:26 +02:00
Maxime Gimeno 47124f1a45 Addition of a type selection for the images 2016-05-20 15:32:26 +02:00
Maxime Gimeno 35ea290be7 Renaming 
- Scene_segmented_image is renamed in Scene_image
 2016-05-20 15:32:26 +02:00
Sébastien Loriot aaea058093 Merge pull request #1089 from maxGimeno/Fix_polylines-GF 
Fixes for Polyhedron_demo
 2016-05-20 14:59:16 +02:00
Sébastien Loriot 98f1cf923d Merge pull request #1085 from janetournois/Polyhedron_demo-fix_join_and_split_polyhedra-GF 
Polyhedron demo : auto-connect actions - missing plugin
 2016-05-20 14:58:47 +02:00
Maxime Gimeno 36f12a7466 Connects more actions 2016-05-18 15:46:25 +02:00
Maxime Gimeno 21d940d4e3 Fixes selection_changed for items in a group. 2016-05-18 15:20:13 +02:00
Maxime Gimeno 848fc89f81 Fixes the multi-selection for real. 2016-05-18 15:13:44 +02:00
Maxime Gimeno 7f29c83c3a Don't add items to a group when it is added to the scene. 2016-05-18 14:45:49 +02:00
Maxime Gimeno cae4f847da Re-connect the add point set action 2016-05-18 14:41:48 +02:00
Maxime Gimeno e3448e90dc Fix Bbox 2016-05-18 14:41:37 +02:00
Maxime Gimeno e83545084d re-connect the Add polyline action 2016-05-18 14:13:04 +02:00
Maxime Gimeno 3ae736acd6 Add the ability to select edges on a shortest path between two points 2016-05-18 10:13:05 +02:00
Jane Tournois 2d3d1249a1 derive from helper and auto-connect actions 2016-05-17 14:34:05 +02:00
Jane Tournois bf61a2e158 fix conversion warning 2016-05-13 16:15:00 +02:00
Maxime Gimeno 7fde6ef3a2 Fix plugins with disconnected actions. 2016-05-13 16:13:15 +02:00
Maxime Gimeno 72e491c3b6 Forgotten modifications 2016-05-13 08:43:40 +02:00
Sébastien Loriot 49533adc0b accomodate the update of Triangulation_2_filtered_traits_3.h 2016-05-12 17:32:45 +02:00
Sébastien Loriot 37935e32db remove non-needed include 2016-05-12 17:32:35 +02:00
Maxime Gimeno b4a9deb8af Fix error of conflict resolution 2016-05-12 17:28:07 +02:00
Maxime Gimeno 6cae0df31c Fix orient_polygon_soup_plugin misisng link 2016-05-12 17:11:29 +02:00
Maxime Gimeno 625b1072e0 Fix useless link in CMakeLists.txt 2016-05-12 17:11:29 +02:00
Maxime Gimeno b8ecd34eb5 Fix facet color reading 2016-05-12 17:11:28 +02:00
Maxime Gimeno c14c5b9129 Clean up 2016-05-12 17:11:27 +02:00
Maxime Gimeno f3de4dfe01 Clean up 2016-05-12 17:11:27 +02:00
Maxime Gimeno 827adf63b8 Small fixes 
- Fix the reload item
- Prints the warning about not oriented facets in the console, and explains how to convert a polygon_soup into a surface_mesh or a polyhedron.
 2016-05-12 17:11:27 +02:00
Maxime Gimeno 4cb4c56658 Fix for context_menu 2016-05-12 17:11:27 +02:00
Maxime Gimeno 1911aeb9d9 Change the actions of Orient_soup_plugin 
- The first one will create a polyhedorn
- The second one will create a Surface_mesh
 2016-05-12 17:11:26 +02:00
Maxime Gimeno a12b5b7bf1 Modification of orient_soup_plugin 
- If the soup_item has colors, a Surface_mesh_item is created instead of a polyhedron and the colors are passed to it
 2016-05-12 17:11:26 +02:00
Maxime Gimeno 30a12a8dca Fix for the smooth normals 2016-05-12 17:11:26 +02:00
Maxime Gimeno 128adc4c32 Addition of a color management of the not oriented OFF with colors 2016-05-12 17:11:26 +02:00
Maxime Gimeno 28cd4a8c23 Add a name to the loaded Surface_mesh_item 2016-05-12 17:09:45 +02:00
Maxime Gimeno 59790e6e3c Fix #if problem 2016-05-12 17:09:45 +02:00
Maxime Gimeno 48cfccf41c Adds a triangulation for the not-triangle not-quad facets. 2016-05-12 17:09:45 +02:00
Maxime Gimeno 5efb857c09 Add triangulation for quad faces. 2016-05-12 17:09:44 +02:00
Maxime Gimeno 3fdff7e831 Addition of the facet colors. 2016-05-12 17:09:44 +02:00
Maxime Gimeno f04a6f98ce Finished the management of the per-vertex color 2016-05-12 17:09:44 +02:00
Maxime Gimeno a1dbe23e7d Replaced color_index management by RGBcolor (float and int) management 2016-05-12 17:09:44 +02:00
Maxime Gimeno 3f5b9db863 Addition of the selection_color 2016-05-12 17:09:44 +02:00
Andreas Fabri 4b7373d301 u_char -> unsigned char ; Do not qualify get() with boost:: 2016-05-12 17:09:44 +02:00
Maxime Gimeno fe612feb9b Addition of a test colormap 2016-05-12 17:09:43 +02:00
Maxime Gimeno 775732dcf9 Surface_mesh_item drawing functions 2016-05-12 17:09:43 +02:00
Maxime Gimeno 442c6454e6 Addition of a Surface_mesh_item 2016-05-12 17:09:14 +02:00
Sebastien Loriot 20bd3d7f10 Merge pull request #1076 from maxGimeno/Polyhedron_demo-Group_items_fix-GF 
Polyhedron demo : Multiple bug fixes
 2016-05-12 16:53:56 +02:00
Sébastien Loriot 1015d1f191 remove non-needed keywords outside of a template 2016-05-12 09:16:03 +02:00
Sébastien Loriot 925d178865 reunse the face normal 2016-05-11 18:12:40 +02:00
Maxime Gimeno 5c2ce8fecb Fix after merge 2016-05-11 17:51:09 +02:00
Maxime Gimeno ff2cc2562e Merge branch 'Euler_operations-rebase-GF-old' into Euler_operations-rebase-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2016-05-11 17:41:07 +02:00
Maxime Gimeno 5ea3909c47 Fix Multiselection 
- The tag I changed was used since 2009, so I am expecting other problems, as I still don't know where the bug came from...
 2016-05-11 17:26:37 +02:00
Sebastien Loriot c3d1602b7d Merge pull request #1040 from maxGimeno/Three_doc_for_review_rebase-GF 
Update and correction of the Three API
 2016-05-11 17:07:01 +02:00
Sébastien Loriot c988360a3b remove a warning 2016-05-11 17:02:14 +02:00
Maxime Gimeno c780651945 Fix bug with contextMenu 2016-05-11 16:41:18 +02:00
Maxime Gimeno fa1f052707 More clean-up 2016-05-11 09:51:03 +02:00
Maxime Gimeno 473c92c00c Remove the init() function without Messages_interface from the plugins API 2016-05-10 17:10:59 +02:00
Maxime Gimeno 7bfeb5fccb Simplifies the AABB_Tree requests. 2016-05-10 16:29:12 +02:00
Maxime Gimeno f39632021a Clean-up 2016-05-10 15:50:04 +02:00
Maxime Gimeno d7fd2f6dbc D-pointer for the c3t3_item 2016-05-10 12:46:16 +02:00
Maxime Gimeno 7eb1ecbfee Fix deprecated header 2016-05-10 12:28:36 +02:00
Maxime Gimeno d02415f180 Checks sooner if the facet is valid for the split face operation 2016-05-10 12:28:36 +02:00
Maxime Gimeno 68d7063dda Clears temp-selection when changing the edition mode. 2016-05-10 12:28:36 +02:00
Maxime Gimeno f076595e38 Fixes and enhancement 2016-05-10 12:28:36 +02:00
Maxime Gimeno 3bb8b21730 fix scene_edit_polyhedron_item 2016-05-10 12:28:34 +02:00
Maxime Gimeno 46c27fdf85 fix for segfaults after reload from itefix for segfaults after reload from itemm 2016-05-10 12:28:12 +02:00
Maxime Gimeno 31f31db234 Fix for the UI file. 2016-05-10 12:28:11 +02:00
Maxime Gimeno 165b01fc75 fix for add_face_to_border and add_vertex_and_face_to_border 2016-05-10 12:28:11 +02:00
Maxime Gimeno dddaad9670 fix split-vertex 2016-05-10 12:28:11 +02:00
Maxime Gimeno 33bf89e075 Re-writing an instruction for the Split-face operation 2016-05-10 12:28:11 +02:00
Maxime Gimeno db10b961a5 Parrallelogram prevision for the add vertex to border 2016-05-10 12:28:11 +02:00
Maxime Gimeno 99345f9d1a Fix for the triangulation assertion fail about the intersecting constraints 
- Using the Exact_predicates_tag is longer than the No_intersection_tag, but as it is only used on facets that are neither triangles nor quads, we estimated it is a rare case enough to use it.
 2016-05-10 12:27:27 +02:00
Maxime Gimeno a5d0c335bd Fix for undefined mainwindow 2016-05-10 12:26:49 +02:00
Maxime Gimeno b27f5e0926 Fix for undefined mainwindow 2016-05-10 11:51:39 +02:00
Maxime Gimeno fc153cebdd Multiple event fix 2016-05-10 11:51:31 +02:00
Maxime Gimeno b5bb9ff2ba Factorisation and fix for connected components. 2016-05-10 11:51:25 +02:00
Maxime Gimeno 5443dff5b2 Selection after clic in the dock_widget fixed 2016-05-10 11:51:20 +02:00
Maxime Gimeno 9d2fcd8dbc Small fixes 
- Doesn't use FOREACH in the edition mode anymore
- zhen an item is created, the selection type corresponds to the one in the combo box.
 2016-05-10 11:51:15 +02:00
Maxime Gimeno 127b1bbeb4 Instructions design changed. 2016-05-10 11:51:09 +02:00
Maxime Gimeno f4c5df9616 Fix Ctrl+Z 2016-05-10 11:51:04 +02:00
Maxime Gimeno 0485017bac Removed add_edge 2016-05-10 11:50:58 +02:00
Maxime Gimeno 656fa17e7b Operations secured 2016-05-10 11:50:53 +02:00
Maxime Gimeno c4538fbb99 Enables edition_groupBox only in edition mode 2016-05-10 11:50:47 +02:00
Maxime Gimeno 4136f5b2e8 Fixes 2016-05-10 11:50:42 +02:00
Maxime Gimeno 612a20145d Fix for add vertex and face to border 2016-05-10 11:50:36 +02:00
Maxime Gimeno 8ea6109c4d Fix split face 2016-05-10 11:50:31 +02:00
Maxime Gimeno fa64cef3e9 Add center vertex secured 2016-05-10 11:50:26 +02:00
Maxime Gimeno 39f2f2d806 Split face secured 2016-05-10 11:50:20 +02:00
Maxime Gimeno 0282b6c361 Remove_center_vertex secured 2016-05-10 11:50:10 +02:00
Maxime Gimeno 4d0da0715e Join vertex secured 2016-05-10 11:49:54 +02:00
Maxime Gimeno c9b9d5b017 Collapse edge secured 2016-05-10 11:49:46 +02:00
Maxime Gimeno dbb001427d Add facet to border secured 2016-05-10 11:49:25 +02:00
Maxime Gimeno baa4eb86b7 Split vertex secured 2016-05-10 11:49:17 +02:00
Maxime Gimeno d938fb7158 WIP Implementation of Euler operations 2016-05-10 11:49:05 +02:00
Maxime Gimeno 05a5f2ef85 Split_face implemented 2016-05-10 11:48:58 +02:00
Maxime Gimeno 8f3efbbc22 join_face implemented 2016-05-10 11:48:53 +02:00
Maxime Gimeno 01a1d59ac1 Split edge implemented 2016-05-10 11:48:47 +02:00
Maxime Gimeno d30dc15e46 Implementation of split_vertex 2016-05-10 11:48:39 +02:00
Maxime Gimeno 6e23f9df7a Keep the handleType in selection mode in memory when the mode changes and put it back when the mode becomes selection again. 2016-05-10 11:48:31 +02:00
Maxime Gimeno 876301c043 Join vertex implemented 2016-05-10 11:48:25 +02:00
Maxime Gimeno cb7fc9b957 Fix selection tool 
- Triangulates the facets so they can be fully diplsayed
 2016-05-10 11:48:18 +02:00
Maxime Gimeno fbf8d1f5f7 WIP : Fix for the selection Tool 
- Alteration of the Primitive type for the AABB_Tree in Scene_item, so that the selection tool is able to manage non-triangulated items.
 2016-05-10 11:48:11 +02:00
Maxime Gimeno f6cbe19331 WIP : implementing join_vertex 2016-05-10 11:48:03 +02:00
Maxime Gimeno 5b65873f1d Interface finished. 2016-05-10 11:47:55 +02:00
Maxime Gimeno 6b1340fc3b Regroup operations in a comboBox instead of numerous buttons 2016-05-10 11:47:47 +02:00
Maxime Gimeno 52008ab5b7 WIP 2016-05-10 09:43:17 +02:00
Maxime Gimeno 0bf6b0324c D-pointer for polylines 2016-05-09 15:41:59 +02:00
Maxime Gimeno 57a5a91ccf Clean-up 2016-05-09 15:15:05 +02:00
Maxime Gimeno 00b834b7d8 D-pointer for Scene_edit_polyhedron_item 2016-05-09 15:07:50 +02:00
Maxime Gimeno cdcd5626e7 d-pointe rfor textured_polyhedron_item 2016-05-09 13:06:30 +02:00
Maxime Gimeno f961669922 d-pointer for Spheres_item 2016-05-09 12:40:38 +02:00
Maxime Gimeno a60a023cca D-pointer for Scene_segmented_image_item 2016-05-09 11:49:33 +02:00
Maxime Gimeno 8f3dc6ff2a D-pointer for polygon_soup_item 2016-05-09 11:18:36 +02:00
Maxime Gimeno f7e1c2bd66 D-pointer for the Scene_points_with_normal_item 2016-05-09 09:54:15 +02:00
Sébastien Loriot d892ef1a89 Merge pull request #1030 from janetournois/PMP-remeshing_with_patch_ids-jtournois 
PMP : new features for isotropic_remeshing
 2016-05-09 09:43:08 +02:00
Maxime Gimeno 8637d1eaba Fix AABB_Tree displaying in Cut_plugin 2016-05-09 09:28:03 +02:00
Maxime Gimeno 7900079127 D-pointer for the nef_polyhedron_item and the Scene_plane_item 2016-05-09 09:19:11 +02:00
Maxime Gimeno ce279e9cda Merge branch 'Three_doc_for_review_rebase-GF' into Polyhedron_demo-Use_d_pointers-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_polyhedron_transform_item.cpp
	Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Three/include/CGAL/Three/Scene_item.h
 2016-05-06 16:03:30 +02:00
Maxime Gimeno ffbb76c680 D-pointer for the implicit_function_item 2016-05-06 15:27:16 +02:00
Maxime Gimeno 7fce02a36e D-pointer for the shortest_path_item 2016-05-06 14:07:50 +02:00
Maxime Gimeno 6486abd0a6 Merge branch 'Three_doc_for_review_rebase-GF' of github.com:maxGimeno/cgal into Three_doc_for_review_rebase-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
	Polyhedron/demo/Polyhedron/Scene_c3t3_item.h
	Polyhedron/demo/Polyhedron/Scene_group_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Three/include/CGAL/Three/Scene_group_item.h
 2016-05-06 13:41:36 +02:00
Maxime Gimeno 96c9d2eb70 Fix the rebase 2016-05-06 12:15:04 +02:00
Maxime Gimeno 7983ad4298 Clean-up 2016-05-06 11:12:54 +02:00
Maxime Gimeno 92e86c50a8 WIP clean-up 2016-05-06 11:12:10 +02:00
Maxime Gimeno caed1cd153 Bug fix 
- Fixes the exported targets namespace and a bug in the example_plugin.
 2016-05-06 11:12:10 +02:00
Maxime Gimeno 3f0f27a5ac Plugin API made in CamelCase 2016-05-06 11:12:09 +02:00
Maxime Gimeno 4dadba77c4 Clean-up the plugin helper 2016-05-06 10:51:59 +02:00
Maxime Gimeno b4229241ba Removes the hardcoded actions in Operations 2016-05-06 10:51:58 +02:00
Maxime Gimeno f8a602814e WIP Removing plugin helper 2016-05-06 10:50:50 +02:00
Maxime Gimeno 542ee48ddb Finished doc update and replaced BBox by CGAL::BBox_3 2016-05-06 10:50:50 +02:00
Maxime Gimeno 21f5c82990 WIP Correct the doc 2016-05-06 10:46:21 +02:00
Sébastien Loriot e869ebcb33 if the color vector was manually set, do not translate color ids 2016-05-06 10:08:59 +02:00
Sebastien Loriot 1ad076e14b Merge pull request #1010 from lrineau/Mesh_3-improve_images-GF 
Mesh 3: improve domains based on images
 2016-05-05 14:56:56 +02:00
Sebastien Loriot 7630d2a6fc Merge pull request #875 from sloriot/Triangulation_2_and_PMP-fix_Triangulation_2_projection_traits_3 
PMP: make triangulate_faces works with non filtered kernels
 2016-05-05 14:55:11 +02:00
Sebastien Loriot 88403c1324 Merge pull request #1055 from afabri/Polyhedron-fix_Selection_IO-GF 
Store the indices of source and target of a selected edge
 2016-05-05 14:50:09 +02:00
Maxime Gimeno 54c8ce5b8b d-pointer for Transform_polyhedron_item 2016-05-04 16:29:27 +02:00
Maxime Gimeno a920342253 d-pointer for Scene_combinatorial_map 2016-05-04 15:32:12 +02:00
Sébastien Loriot 3c8871f8a9 Merge pull request #739 from bo0ts/Pmp-poly_soup_poly_mesh-pmoeller 
Add PMP function is_polygon_soup_a_polygon_mesh
 2016-05-04 15:01:25 +02:00
Sébastien Loriot bdfae8cbe7 Merge pull request #815 from maxGimeno/Polyhedron_demo_Volume_planes-Fix_for_775-GF 
Volume_planes in Polyhedron_demo : Fix for 775
 2016-05-04 14:45:54 +02:00
Sébastien Loriot 830348fd4e Merge pull request #1060 from janetournois/Polyhedron_demo-fix_plane_edit_polyhedron_plugin-GF 
Polyhedron demo : fix the display of the fixed plane for the deformation plugin
 2016-05-04 14:45:07 +02:00
Sébastien Loriot 41eace839a Merge pull request #1059 from sgiraudot/Polyhedron_demo-Fix_select_one_point-GF 
Polyhedron demo: fix select one point
 2016-05-04 14:45:01 +02:00
Sébastien Loriot 80da43d3aa Merge pull request #1058 from sloriot/Polyhedron_demo-fix_hole_filling_removal 
Call erase only if the hole visulizer exists
 2016-05-04 14:44:57 +02:00
Sébastien Loriot 2f81909171 Merge pull request #1057 from maxGimeno/Polyhedron_demo-Fix_for_edit_plugin-GF 
Polyhedron_demo : edit_polyhedron_plugin improvement
 2016-05-04 14:44:50 +02:00
Sébastien Loriot a4d58ce7e7 Merge pull request #1056 from afabri/Polyhedron-write_obj-GF 
At least allow to write polyhedral surfaces into .obj files
 2016-05-04 14:44:19 +02:00
Sébastien Loriot d5399df43e Merge pull request #1051 from maxGimeno/Add_warning_when_save_fails-GF 
Polyhedron_demo : Warning when save fails
 2016-05-04 14:44:08 +02:00
Sébastien Loriot e94733243f Merge pull request #1012 from maxGimeno/Display_cells_not_in_complex-GF 
Polyhedron demo : display all cells in c3t3_item
 2016-05-04 14:43:59 +02:00
Sébastien Loriot c66467c87a Merge pull request #1043 from maxGimeno/Polyhedron_demo-Fix_busy_waiting-GF 
Polyhedron demo : Fix for busy waiting
 2016-05-04 14:43:39 +02:00
Sébastien Loriot 5ea6cc63b6 Merge pull request #1028 from maxGimeno/Polyhedron_demo-Spheres_item-GF 
Polyhedron demo : Create new items for the spheres and the intersection of the c3t3_item
 2016-05-04 14:41:07 +02:00
Maxime Gimeno 58f1f9b894 Moved the last private members of Scene_polyhedron_item in the struct 2016-05-04 14:00:50 +02:00
Jane Tournois b43581373e fix the display of the fixed plane for the deformation plugin 2016-05-03 11:56:21 +02:00
Simon Giraudot 99b5602675 Bugfix: missing brackets 2016-05-03 11:21:16 +02:00
Simon Giraudot 574bd21acf Bugfix: decrement first before swaping for selection 2016-05-03 11:20:57 +02:00
Maxime Gimeno a33fb76d84 Warning fix 2016-05-03 08:55:59 +02:00
Maxime Gimeno a1439ade4b Modifies the way the plugin is applied. 2016-05-03 08:33:14 +02:00
Sébastien Loriot 4cee2ecb23 call erase only if the hole visulizer exists 2016-05-02 19:08:05 +02:00
Maxime Gimeno 10542b0e3f Add a warningbox when the user forgets to put an extension when saving a file. 2016-05-02 17:53:53 +02:00
Andreas Fabri 94a09dc4c1 At least allow to write polyhedral surfaces into .obj files 2016-05-02 16:48:56 +02:00
Maxime Gimeno 201524325a Clean-up 2016-05-02 16:25:06 +02:00
Andreas Fabri 13259e8626 Store the indices of source and target of a selected edge. 2016-05-02 16:13:56 +02:00
Jane Tournois 412e0f8846 cleaning includes 2016-05-02 13:51:50 +02:00
Jane Tournois bb06af9d77 fix export error in scene_spheres_item 
it should be part of the scene_basic_objects target if there is
only one export configuration procedure
 2016-05-02 13:50:42 +02:00
Sébastien Loriot 3005774b84 remove unused type 2016-04-29 14:13:32 +02:00
Sebastien Loriot 54b244c430 Merge pull request #914 from sgiraudot/Point_set_shape_detection_3-Plane_regularization-GF 
Point set shape detection: Plane regularization
 2016-04-29 13:08:44 +02:00
Sebastien Loriot b822ed05ae Merge pull request #1034 from maxGimeno/Fix_meshing-GFwq 
Polyhedron_demo : Fix for the mesh_3 plugin
 2016-04-29 13:04:47 +02:00
Sebastien Loriot b600f9b30a Merge pull request #1029 from maxGimeno/Add_name_to_PS_and_Polylines-GF 
Polyline demo : names for items created on the fly
 2016-04-29 13:02:21 +02:00
Sébastien Loriot 874505c341 Merge pull request #1037 from maxGimeno/Improvements_for_Points_inside_poly-GF 
Polyhedron_demo : Improvements for Points_set_inside_polyhedron
 2016-04-29 12:58:14 +02:00
Jane Tournois 54d946d39c remove debug output 2016-04-28 10:49:29 +02:00
Maxime Gimeno 1bf3af124a Removes is_monochrome from Scene_item and put it in the Scene_polyhedron_item's d-pointer. 2016-04-28 09:57:32 +02:00
Maxime Gimeno 877462690b Use a d-pointer on Scene_polyhedron_item 2016-04-27 17:15:30 +02:00
Maxime Gimeno 9fb5702610 debugging the rebase and externalizing the TextRender 
- Avoids the #include "Viewer.h" in Scene_polyhedron_item.h"
 2016-04-27 15:17:27 +02:00
Maxime Gimeno 81cc6992e7 Clean-up 2016-04-27 14:32:51 +02:00
Maxime Gimeno b5659954b7 Renamed the interface 2016-04-27 14:32:51 +02:00
Maxime Gimeno 2ca49b729c Clean-up 2016-04-27 14:32:50 +02:00
Maxime Gimeno 8a155b4f5d The scene performs a check on the item to insure it is able to display its primitive IDs. 2016-04-27 14:32:50 +02:00
Maxime Gimeno 4a7fe6ddda Fixes memoryleak 2016-04-27 14:32:49 +02:00
Maxime Gimeno 9d183d2e6e User can set the max 
- Addition of an action in the View menu to set the max_text_items.
 2016-04-27 14:32:49 +02:00
Maxime Gimeno 3561497d71 New stuff 
- Addition of a maximum number of TextItems that can be displayed at the same time
- The viewer now prints text via the TextRenderer and not via the QGLWidget::renderText() function.
 2016-04-27 14:32:49 +02:00
Maxime Gimeno 89156854e2 WIP Restoring the messages displaying 
- The viewer only draws text (with QGLWidget::renderText() ) if the painter draws at least one character (space doesn't count).
 2016-04-27 14:32:49 +02:00
Maxime Gimeno bfa65c2d78 Fixes 
- Adds a security for the printing when no item is selected
- Adds a missing call to removeTextItem in the polyhedron_item's destructor
 2016-04-27 14:32:48 +02:00
Maxime Gimeno eb7ee3697d Typo 2016-04-27 14:32:48 +02:00
Maxime Gimeno 5edb90a7a0 Moved the viewer's QPainter to the Viewer_impl. 2016-04-27 14:32:48 +02:00
Maxime Gimeno 9b18443688 Fix a memory leak 2016-04-27 14:32:22 +02:00
Maxime Gimeno 80afed00c3 Clean-up 2016-04-27 14:32:22 +02:00
Maxime Gimeno 923ddab5fc More clean-up 2016-04-27 14:32:22 +02:00
Maxime Gimeno 6048e6721d Clean-up and documentation for TextRenderer 2016-04-27 14:32:22 +02:00
Maxime Gimeno 6519196423 Fix 
- The viewer was disappearing when the selection changed.
 2016-04-27 14:31:21 +02:00
Sébastien Loriot aebb033c03 CGALize code 2016-04-27 14:31:21 +02:00
Sébastien Loriot f6f832130e do not use deprecated Object_and_primitive_id in the AABB-tree 2016-04-27 14:31:21 +02:00
Maxime Gimeno 09501f6282 Clean-up 2016-04-27 14:31:21 +02:00
Maxime Gimeno 8950ccc5e7 Clean-up 2016-04-27 14:31:21 +02:00
Maxime GIMENO 9a7c42db76 Windows Fix + conditionnal textItems creation 
- It seems that overloading the paintEvent was sufficient to get rid of
  the "black screen" bug, and initializing targeted_id to NULL fixed the
  segfault occuring when loading an item.

- The textItems containing the ids are only computed when ctrl+I are
  pressed. There could be an optimization here, so that it is computed
  only once, and not every time the ids are displayed.
 2016-04-27 14:31:21 +02:00