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

2906 Commits

Author SHA1 Message Date
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 57a5a91ccf Clean-up 2016-05-09 15:15:05 +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 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
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
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 278b9b2614 Remove cells incident to far points 2016-04-26 14:31:45 +02:00
Maxime Gimeno 8c52d26622 fix busy waiting of the cut_plugin 2016-04-26 13:01:38 +02:00
Maxime Gimeno 4285d49d2d fix the busy waiting of the implicit functions 2016-04-26 12:47:10 +02:00
Maxime Gimeno 227b8f58dc Fix the busy-waiting of the scene_edit_polyhedron_item 2016-04-26 12:41:26 +02:00
Maxime Gimeno a31e225547 Fix busy-waiting for c3t3_item 2016-04-26 12:05:39 +02:00
Jane Tournois 6d580bfc83 fix vtk plugin rebase conflict/error 2016-04-26 11:23:59 +02:00
Maxime Gimeno 8f3f910fd8 Clean-up 2016-04-26 08:45:24 +02:00
Maxime Gimeno 6a87afbf66 WIP clean-up 2016-04-25 17:00:15 +02:00
Maxime Gimeno 9e7f9188aa Bug fix 
- Fixes the exported targets namespace and a bug in the example_plugin.
 2016-04-25 16:53:49 +02:00
Maxime Gimeno f73b30aa1d Plugin API made in CamelCase 2016-04-25 16:53:48 +02:00
Maxime Gimeno 0d8f9130b8 Clean-up the plugin helper 2016-04-25 16:40:03 +02:00
Maxime Gimeno fcd6e247ca Removes the hardcoded actions in Operations 2016-04-25 16:40:03 +02:00
Maxime Gimeno 1a9edb6fda WIP Removing plugin helper 2016-04-25 16:40:02 +02:00
Maxime Gimeno 2681d87eef Finished doc update and replaced BBox by CGAL::BBox_3 2016-04-25 16:39:56 +02:00
Maxime Gimeno 87b2b07956 WIP Correct the doc 2016-04-25 16:35:06 +02:00
Sebastien Loriot 5331ee42b5 Merge pull request #1009 from maxGimeno/Polyhedron_demo-Fix_menus-GF 
Polyhedron demo : clean up for plugin loader and fix for menus segfault
 2016-04-25 16:30:35 +02:00
Simon Giraudot 662efa2c8e Use CGAL_PI instead of M_PI 2016-04-25 11:01:40 +02:00
Laurent Rineau dc1d8e870d Merge pull request #1026 from maxGimeno/Polyhedron_demo-Fix_setColor-GF 
Fix for Scene_polyhedron_item::setColor.
 2016-04-22 15:19:13 +02:00
Maxime Gimeno 54b1e2c3f3 Pops a warning box when an item cannot be meshed instead of segfaulting. 2016-04-22 11:30:10 +02:00
Sébastien Loriot 576d4ca727 fix background of line-edit 2016-04-22 11:21:50 +02:00
Maxime Gimeno 63c0a1e9cc Modification of the way of naming 2016-04-22 11:21:41 +02:00
Jane Tournois 4206f4fe68 use face_patch_map also in parallel mode 2016-04-22 11:07:24 +02:00
Jane Tournois b27447d2c0 fix badly resolved rebase conflict 2016-04-22 11:05:36 +02:00
Jane Tournois eb5056069c fix error of the merge conflits during rebase 2016-04-22 10:34:14 +02:00
Jane Tournois 304e53ef1e collect border of the ROI to keep it valid after remeshing 
this commit also fixes a merge conflict badly resolved in the rebase process
 2016-04-22 10:29:05 +02:00
Simon Giraudot 21a631fa67 Bugfix: size is 0 if polyhedron is empty 2016-04-22 10:15:49 +02:00
Jane Tournois 8e574f355a color sub-connected components on a polyhedron using selected edges as frontiers 2016-04-21 15:32:15 +02:00
Jane Tournois a8a8a669b8 export items that are necessary for external plugins that use them 2016-04-21 15:31:05 +02:00
Jane Tournois 883a52cd4f when no facet is selected, remesh all 
this avoids selecting all facets to run isotropic remeshing

If no facet is selected, and as soon as one edge or one vertex is selected,
the whole polyhedron is remeshed, taking into account constrained vertices
and constrained edges
 2016-04-21 15:31:04 +02:00
Jane Tournois 0a45c59bdd fix return type! 2016-04-21 15:31:02 +02:00
Jane Tournois fdb663685a fix mesh deformation plugin 
now the ROI vertices are properly re-selected after remeshing
 2016-04-21 15:29:52 +02:00
Maxime Gimeno 9be465aad9 Adds the possibility to choose the name of the point_sets and polylines created on the fly, but keeps the same counter. 2016-04-21 15:28:58 +02:00
Jane Tournois a391f5eb36 use face_patch_map also when remeshing the whole polyhedron 2016-04-21 15:28:32 +02:00
Jane Tournois 51d3b22e69 set polyhedron_item multicolor 2016-04-21 15:26:56 +02:00
Jane Tournois c1e5d67f7c use face_patch_map in isotropic remeshing 2016-04-21 15:26:54 +02:00
Jane Tournois 14e906d51b add default constructor 2016-04-21 15:26:52 +02:00
Jane Tournois ee89276102 isotropic remeshing : introduce surface_patch ids as an input read write pmap 2016-04-21 15:23:20 +02:00
Jane Tournois c522c6a2a8 restore ROI after deformation 2016-04-21 15:17:24 +02:00
Maxime Gimeno c7894cb680 Changed the c3t3_item to use an intersection_item 2016-04-21 15:03:57 +02:00
Maxime Gimeno de524bfecf Addition of a call to c3t3_changed() in the end of the loading function, so the c3t3 is updated before the computation of the colors. 2016-04-21 14:46:57 +02:00
Maxime Gimeno 3c388c94a6 Fix for the polyhedorn_item's colors 
- The color calculation when the item is not monochrome was not done correctly.
 2016-04-21 14:45:29 +02:00
Sébastien Loriot cbd27d6793 allow reading of unstructuredGrid from non-XML files 2016-04-21 14:34:36 +02:00
Sébastien Loriot 7bf1db3f39 plug error handler to the reader 2016-04-21 14:32:21 +02:00
Jane Tournois 205e3afe0a add error observer to vtk Plugin 
as suggested here
http://www.vtk.org/Wiki/VTK/Examples/Cxx/Utilities/ObserveError

does not work yet
 2016-04-21 14:25:58 +02:00
Jane Tournois 84634a48ea deal with xml and discriminate with a template parameter 2016-04-21 14:21:29 +02:00
Maxime Gimeno 32f92f1445 Adding a spheres_item to the edit_polyhedron_item and fixing some problems 2016-04-21 10:40:04 +02:00
Maxime Gimeno f39865ce7c clean up 2016-04-21 08:34:52 +02:00
Maxime Gimeno c5cea064cb Fix for Scene_polyhedron_item::setColor, that corrupted the vector colors_. 2016-04-20 17:31:51 +02:00
Laurent Rineau 62d1cfecbe Fix compilation errors (in the Polyhedron Demo) 2016-04-20 15:26:49 +02:00