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

2841 Commits

Author SHA1 Message Date
Sebastien Loriot bc927b5af0 Merge pull request #792 from maxGimeno/Polyhedron_demo-Slicer_plugin-Fix_for_783-GF 
Polyhedron_demo : Fix for 783
 2016-02-19 09:10:54 +01:00
Andreas Fabri 9cc245d470 More capitalized 2016-02-18 17:20:44 +01:00
Sébastien Loriot bdb1848ab9 fix unused type warning 2016-02-18 17:03:42 +01:00
Andreas Fabri 9956c2963b More capitalization 2016-02-18 10:56:07 +01:00
Andreas Fabri 864a429d79 Select the affine transformation item 2016-02-18 10:05:00 +01:00
Andreas Fabri 69a1c5fe18 3D Mesh Generation --> Tetrahedral Mesh Generation 2016-02-18 10:03:55 +01:00
Andreas Fabri 8985711115 Capitalize words in the menus 2016-02-17 17:38:19 +01:00
Andreas Fabri 51920f6b86 Unify chapter names 2016-02-17 16:35:48 +01:00
Maxime Gimeno 4fcc58d954 Fix 
- Changed Scene_item into CGAL::Three::Scene_item to connect the item_about_to_be_destroyed signal correctly.
 2016-02-17 08:32:09 +01:00
Sébastien Loriot 0888f5ebeb update include directive 2016-02-16 17:12:31 +01:00
Sebastien Loriot b1b5bcd4f1 Merge pull request #772 from maxGimeno/Polyhedron_demo-Fix_for_770 
Polyhedron_demo : Fix for #770
 2016-02-16 16:30:48 +01:00
Maxime Gimeno 1adc45b2fc Makes the facets color editable. 2016-02-16 12:16:53 +01:00
Sébastien Loriot cf916bafb6 add missing call to invalidate OpenGL buffer after refinement and fairing 2016-02-15 13:27:50 +01:00
Sébastien Loriot 5d4725db39 rename plugin title and menu name 2016-02-15 11:29:01 +01:00
Jane Tournois a0f0ab84b2 replace unordered_map with flat_map 2016-02-12 16:34:45 +01:00
Jane Tournois 0661c21ac0 avoid computing twice the same CDT for non-triangle non-quad facets 
it is still possible to recompute only colors, and not all vectors
(positions and normals) by using the colors_only parameter introduced
in triangulate_facet
 2016-02-12 16:26:28 +01:00
Jane Tournois 1ff1f566a0 factorize the code when push_back is called for p.x(), p.y(), and p.z() 2016-02-12 15:21:48 +01:00
Maxime Gimeno a443cb4c06 clean-up 2016-02-12 15:07:18 +01:00
Maxime Gimeno 37b7a4a145 Fixed Scene_plane_item::setNormal 2016-02-12 14:54:23 +01:00
Jane Tournois a8d7c8fc5e add error observer to vtk Plugin 
as suggested here
http://www.vtk.org/Wiki/VTK/Examples/Cxx/Utilities/ObserveError

does not work yet
 2016-02-12 11:47:35 +01:00
Jane Tournois afc33545c8 introduce normals at vertices for Gouraud shading on non-triangulated polyhedra 2016-02-12 10:45:00 +01:00
Jane Tournois 6a3c0557d3 use the face_normals property map in triangulate_facet 2016-02-12 10:30:24 +01:00
Jane Tournois 9c238279f9 for quads, we use only one normal per face, not one normal per triangle 2016-02-11 19:21:02 +01:00
Jane Tournois 40c02113b5 use PMP::compute_normals to avoid computing normals multiple times 2016-02-11 19:08:51 +01:00
Jane Tournois 7b9589387d simplify code 2016-02-11 16:05:31 +01:00
Jane Tournois a43cdd8e8d avoid computing the same face normal for each vertex of a face 2016-02-11 15:40:45 +01:00
Laurent Rineau 0770e68485 Merge pull request #755 from maxGimeno/Polyhedron_demo-Fix_for_753-GF 
Polyhedron_demo : Fix for 753
 2016-02-11 15:11:33 +01:00
Jane Tournois 011b6cd473 save as vtkPolyData, consistently with load() function 2016-02-11 10:56:13 +01:00
Sebastien Loriot ed557b907d Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF 
Surface_mesher : Glu removal
 2016-02-10 10:40:51 +01:00
Sebastien Loriot ef10f19b41 Merge pull request #737 from maxGimeno/Polyhedron_demo-Volume_plane_fix-GF 
Polyhedron_demo Volume_plane fix
 2016-02-10 10:40:23 +01:00
Sebastien Loriot 1c6748be6c Merge pull request #757 from maxGimeno/Three-Fix_for_756-GF 
Three : Fix for 756
 2016-02-10 10:40:05 +01:00
Jane Tournois b456446e08 deal with xml and discriminate with a template parameter 2016-02-10 10:32:33 +01:00
Jane Tournois 906a88b2a4 VTK_io_plugin : first version of the "save" function 2016-02-09 16:58:46 +01:00
Maxime Gimeno e02ecbf884 Fix for the VAOs 2016-02-09 14:59:14 +01:00
Maxime Gimeno 01ed789c02 Fix for the 2nd bug 
- The feature edges are always drawn, only the color changes with the option.
 2016-02-09 09:31:30 +01:00
Maxime Gimeno 14810b078f Fix for the 1st bug 
- The checkboxes status updates everytime the menu is open, not only when it is created.
 2016-02-09 09:06:53 +01:00
Sébastien Loriot eb2ba8cefe rename Surface_modeling package to Surface_mesh_deformation for consistency 2016-02-08 12:25:49 +01:00
Maxime Gimeno b99c616c23 Re-implementation of opengl_check_errors 2016-02-05 08:36:54 +01:00
Sebastien Loriot f1572ac999 Merge pull request #720 from maxGimeno/Fix_for_539 
Fix for 539
 2016-02-04 16:46:14 +01:00
Sebastien Loriot 26066c543b Merge pull request #722 from maxGimeno/Polyhedron_demo-Fix_for_mesh_deformation-GF 
Polyhedron_demo : Fix for the mesh deformation
 2016-02-04 15:43:42 +01:00
Maxime Gimeno 73bd2025eb Fix 
- Moved the item creation out of the threads so that the context is valid when their VAOs and VBOs are created.
 2016-02-04 15:30:49 +01:00
Laurent Rineau c7367211d8 Better layout: follow the `sizeHint()` 2016-02-04 12:31:08 +01:00
Maxime Gimeno 94e6249969 Comment correction 2016-02-03 15:16:09 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF 
Demo fix for OS X (fix for #437)
 2016-02-03 14:39:48 +01:00
Maxime Gimeno 2f34704270 Fix for the frame plane 
- Added a function to updtae the plane's data, called when the plane constrained option is set,
  so that the plane is always where it should be.
 2016-02-03 13:00:52 +01:00
Maxime Gimeno 0181633bd5 Fix for 539 
- Adds the requested flags from the CMakeLists only if the compiler is CLang or gcc
 2016-02-03 12:05:39 +01:00
Sébastien Loriot 8cee2ef1dd Merge pull request #686 from afabri/Kernel_fix-warnings-GF 
Fix warnings concerning indentation and unused parameter
 2016-02-03 09:49:54 +01:00
Sebastien Loriot ebf66069c3 Merge pull request #706 from afabri/PMP_include_graph_traits-GF 
Deal with deprecated code
 2016-02-03 09:44:11 +01:00
Sebastien Loriot 5c53581d50 Merge pull request #694 from maxGimeno/Trivial_fixes-GF 
Trivial fixes
 2016-02-03 09:37:31 +01:00
Andreas Fabri 201e23a503 include graph_traits file 2016-02-01 17:16:45 +01:00
Sébastien Loriot aa94453c1e fix submenu name 2016-02-01 16:14:58 +01:00
Maxime Gimeno 9abf38bfce warning fix 
- replaced gluErrorString by its source code in Mesh_3
- replaced gluProject by its modified source code in P3T3
- deleted volume_planes files in Polyhedron/demo/Polyhedron, as the real ones are in Plugins/Mesh_3_plugin
 2016-02-01 09:02:36 +01:00
Sebastien Loriot 2a22135a95 Merge pull request #690 from lrineau/Polyhedron-demo_Create_bbox_mesh_plugin-lrineau 
Add the Create_bbox_mesh_plugin
 2016-01-28 14:20:57 +01:00
Laurent Rineau 2692410dfe add `create_bbox_mesh_plugin` in the list 2016-01-28 14:19:56 +01:00
Maxime Gimeno 5ffc01f1a1 indentation warnings fix 2016-01-28 14:17:11 +01:00
Sébastien Loriot 8da745534f fix indentation issues 2016-01-28 13:54:57 +01:00
Sebastien Loriot d702d31d95 Merge pull request #683 from maxGimeno/Hierarchy_fix-GF 
Fixes for the Polyhedron_demo
 2016-01-28 13:49:16 +01:00
Sebastien Loriot 14508b9d70 Merge pull request #685 from afabri/PSP-binary_read_ply-GF 
When opening a binary ply file  we have to use std::ios_base::binary
 2016-01-28 13:47:41 +01:00
Sebastien Loriot 21eaffd9e5 Merge pull request #691 from maxGimeno/Viewer_fixes-GF 
Viewer fixes gf
 2016-01-28 13:47:21 +01:00
Maxime Gimeno da8ca763b8 Removed the call to gluErrorString 2016-01-28 12:41:45 +01:00
Laurent Rineau b829e6b8ca Remove commented code 2016-01-27 14:41:31 +01:00
Maxime Gimeno d67ea21644 Fixes the QGLViewer warning for a deprecated function in version 2.6 2016-01-27 14:22:49 +01:00
Sébastien Loriot 80c30fb5e8 Revert "Merge pull request #658 from maxGimeno/Axis_enhancement-GF" 
This reverts commit 3024e4f913, reversing
changes made to a02ea7ad9b.
 2016-01-27 14:22:45 +01:00
Sébastien Loriot 75e98f0a08 Merge pull request #656 from maxGimeno/Clean_up_Functions-GF 
Clean up scene item API
 2016-01-27 13:45:15 +01:00
Sebastien Loriot 388d80d8df Merge pull request #670 from janetournois/Polyhedron_demo-minor_improvements-jtournois 
Polyhedron demo - statistics - do not compute angles for null_faces
 2016-01-27 13:39:36 +01:00
Laurent Rineau 1179371045 Add the Create_bbox_mesh_plugin 2016-01-27 10:46:52 +01:00
Andreas Fabri 4d605ff2e9 when opening a binary ply file we have to usestd::ios_base::binary 2016-01-26 15:57:44 +01:00
Maxime Gimeno b1d6a324a1 Fixes 
- Fixes the segfault occuring when destroying a selection_item's poly_item
- Fixes the recurseExpand behavior
- Fixes the Segfault occuring when adding a group to a selected group.
 2016-01-26 12:00:51 +01:00
Sébastien Loriot e3dc7183f8 rename function 2016-01-26 11:43:01 +01:00
Maxime Gimeno ce9aed08f5 Renaming invalidate_buffers in invalidate_OpenGLBuffers 2016-01-26 11:20:30 +01:00
Maxime Gimeno 271cc81413 contextual_changed removal + textured_polyhedron fix 2016-01-26 11:20:21 +01:00
Maxime Gimeno 33120d84ad Clean-up 2016-01-25 12:25:07 +01:00
Laurent Rineau 797c4a7395 Merge branch 'Polyhedron-demo_add_c3t3_item-lrineau' 
The only useful patch was:
> diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp
> index aae5f45..dfef492 100644
> --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp
> +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp
> @@ -1596,4 +1596,5 @@ void MainWindow::on_action_Look_at_triggered()
>  {
>    Show_point_dialog dialog(this);
> +  dialog.setWindowTitle(tr("Look at..."));
>    int i = dialog.exec();
>    if( i == QDialog::Accepted &&
>
 2016-01-25 10:27:40 +01:00
Jane Tournois d3d8ba6f83 Merge branch 'Polyhedron_demo-minor_improvements-jtournois' of github.com:janetournois/cgal into Polyhedron_demo-minor_improvements-jtournois 2016-01-25 10:11:49 +01:00
Jane Tournois 4f084c8a3c the dialog is not deleted anymore, so no need to restore its geometry 2016-01-25 10:06:11 +01:00
Sébastien Loriot 84ae1352e0 fix warnings 2016-01-25 08:23:55 +01:00
Sebastien Loriot 58e8b026a5 Merge pull request #673 from lrineau/Polyhedron-demo_add_load_obj-GF 
Polyhedron demo: add load_obj
 2016-01-25 08:16:56 +01:00
Sebastien Loriot be7e0388a3 Merge pull request #675 from lrineau/Polyhedron-demo_fix_clip_plugin-lrineau 
Polyhedron demo: fix clip plugin
 2016-01-25 08:14:14 +01:00
Sebastien Loriot 3024e4f913 Merge pull request #658 from maxGimeno/Axis_enhancement-GF 
Enhancement of the axis system of the viewer
 2016-01-22 17:14:22 +01:00
Jane Tournois fc3e2e91e0 remove useless function 2016-01-22 17:10:35 +01:00
Jane Tournois f89a8c87fc avoid successive delete and new of statistics_dialog 2016-01-22 17:08:44 +01:00
Jane Tournois 1fa1a07647 border edges need border to be normalized to be counted 2016-01-22 17:07:59 +01:00
Jane Tournois eece1f6d74 keep statistics dialog geometry (location and size) through the use of demo 2016-01-22 16:43:13 +01:00
Jane Tournois d3c04f9847 keep position and size after "update" 2016-01-22 16:29:31 +01:00
Jane Tournois 000c92cc9c fix namespace issues 2016-01-22 16:04:24 +01:00
Laurent Rineau 4b36a072b9 UI improvements 
- add a real title to the dock widget,
- add shortcuts to the checkbox and the buttons,
- and add a text explaining which side of the plane actually clip out.

Cc: @maxGimeno
 2016-01-22 15:52:09 +01:00
Laurent Rineau 2518e94f55 Create the clipping plugin at the center of the scene 
cc: @maxGimeno
 2016-01-22 15:52:09 +01:00
Jane Tournois 31c971d1a0 avoid multiple computing of statistics for polyhedron item 2016-01-22 15:35:34 +01:00
Jane Tournois 769f98c2a1 remove statistics code from rendering code 2016-01-22 14:56:53 +01:00
Laurent Rineau d7d5fe9f33 Better nameFilters 2016-01-22 14:34:22 +01:00
Andreas Fabri 58c4f45760 add the dispatching to the obj reading in the off-plugin 2016-01-22 14:34:22 +01:00
Andreas Fabri 0137af3845 Add the capability to read 2-manifolds in simplest .obj file format 2016-01-22 14:34:21 +01:00
Jane Tournois 2d1d21b84e remove useless vector 2016-01-22 14:26:12 +01:00
Jane Tournois e9c34c502b avoid duplicating code 2016-01-22 13:36:12 +01:00
Jane Tournois bb98d5a560 activate "wait" cursor while statistics are computed 2016-01-22 13:14:51 +01:00
Jane Tournois e653796029 do not compute angles for null_faces 2016-01-22 10:21:18 +01:00
Jane Tournois 878baa5fdf wrong polyhedron used! 
selection_item is NULL in this statement
 2016-01-21 12:47:31 +01:00
Sebastien Loriot efde6e3dc5 Merge pull request #606 from janetournois/PMP-improve_isotropic_remeshing-jtournois 
PMP - Improve isotropic remeshing
 2016-01-21 09:21:00 +01:00
Sébastien Loriot cf08261299 Merge pull request #652 from sloriot/BGL-document_selection_functions 
BGL: document selection functions
 2016-01-20 17:13:21 +01:00
Sebastien Loriot 901a4c17e4 Merge pull request #650 from sloriot/BGL-document_split_in_polylines 
BGL: document split in polylines
 2016-01-20 16:50:36 +01:00
Sebastien Loriot 0cadb193ed Merge pull request #647 from sloriot/Polyhedron_corefinement-self_intersection_checking-sloriot 
Polyhedron demo: robustify corefinement and intersection plugins
 2016-01-20 16:49:33 +01:00
Sebastien Loriot 6058f05cea Merge pull request #651 from maxGimeno/Move_Shortest_path_plugin 
Fix for #646
 2016-01-20 16:47:29 +01:00
Maxime Gimeno f08b34ff5b Enhancement of the axis system of the viewer 
- The axis system will no longer be clipped when dezooming, nor will it be hidden by an item, and the lighting of the axis will no longer change when moving the camera.
 2016-01-20 14:12:43 +01:00
Sébastien Loriot 533f7ec117 update after namespace change 2016-01-19 13:32:14 +01:00
Sebastien Loriot 13943432b5 Merge pull request #580 from sgiraudot/Advancing_front-Generalize_filter-GF 
Advancing front: generalize filter
 2016-01-19 11:39:49 +01:00
Sébastien Loriot c1459d3f20 rename dilate/erode function after review 2016-01-19 11:32:49 +01:00
Maxime Gimeno d01b4f75c1 Moved Shortest-path-plugin in Surface-mesh 2016-01-19 11:18:49 +01:00
Maxime Gimeno 8837f1a8ca This time it seems to work perfectly. 2016-01-19 10:28:11 +01:00
Maxime Gimeno 6fb63d4f74 The splatting works but there is still aa problem with the context when using th 
e dialog to load an item.
 2016-01-19 10:28:09 +01:00
Maxime Gimeno 0547f19d58 WIP A fix for mac 
- repared the demo
- Disabled the splatting.
 2016-01-19 10:28:05 +01:00
Sébastien Loriot d39abe5804 allow default construction of the map (needed by the named parameters) 2016-01-18 14:28:01 +01:00
Jane Tournois 130f0a927a use 1d smoothing in Polyhedron demo 2016-01-18 14:27:56 +01:00
Sébastien Loriot f6622786de intersection and corefinement plugin first check for self-intersections 2016-01-18 12:46:52 +01:00
Sebastien Loriot 8849ef54b9 Merge pull request #636 from janetournois/Polyhedron_demo-remesh_several_items-jtournois 
Polyhedron demo : isotropic remeshing of several items
 2016-01-18 09:51:16 +01:00
Sebastien Loriot dad9670647 Merge pull request #637 from maxGimeno/Polyhedron_statistics-GF 
Moving the self-intersecting test
 2016-01-18 09:50:50 +01:00
Jane Tournois fcdcd1268b add plugin for better testing 2016-01-15 15:25:23 +01:00
Sebastien Loriot 1df32a4bd2 Merge pull request #622 from sloriot/Operations_on_polyhedra-plane_clipping_with_corefinement-sloriot 
Polyhedron demo: Plugin to clip polyhedra using a plane
 2016-01-15 15:25:21 +01:00
Sebastien Loriot 6bf4ac1b61 Merge pull request #630 from lrineau/Polyhedron-demo_minor_improvements-lrineau 
Polyhedron demo: minor improvements
 2016-01-15 15:24:13 +01:00
Sebastien Loriot d1ce9be851 Merge pull request #632 from maxGimeno/Feature_edge_display_fix-GF 
Fix for #603
 2016-01-15 15:22:29 +01:00
Jane Tournois a060396d75 make sure statistics_dlg is "properly" initialized to NULL 
when MainWindow is created
 2016-01-15 15:05:50 +01:00
Jane Tournois 09701f2c98 make the use of "n/a" uniform 2016-01-15 14:57:05 +01:00
Jane Tournois 302fb86098 when area and volume are not computed, simply display "n/a" 2016-01-15 14:52:18 +01:00
Jane Tournois a02cf01275 does_self_intersect is not applicable to a non triangulated polyhedron 2016-01-15 14:33:04 +01:00
Jane Tournois 57b5883d59 avoid duplicate loop 2016-01-15 10:33:28 +01:00
Jane Tournois 3fa8f60025 fix "variable may be used uninitialized" warning 2016-01-15 10:21:00 +01:00
Jane Tournois 54b6d9e548 fix code when TBB is not available 2016-01-15 10:11:26 +01:00
Sébastien Loriot be486f321f Eigen 3.2 or later is required 2016-01-14 17:22:52 +01:00
Maxime Gimeno 2fb7b5955a Merge branch 'Polyhedron_statistics-GF' of github.com:CGAL/cgal-dev into Polyhedron_statistics-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
 2016-01-14 15:26:58 +01:00
Jane Tournois 6dfe36a0f9 avoid copy of QList 2016-01-14 15:23:12 +01:00
Jane Tournois 363120eb52 improve display of error message 2016-01-14 15:21:35 +01:00
Maxime Gimeno 2eb0c92f24 Merge branch 'Feature_edge_display_fix-GF-old' into Feature_edge_display_fix-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
 2016-01-14 15:14:43 +01:00
Jane Tournois 78d808e296 Merge branch 'Polyhedron_demo-remesh_several_items-jtournois-old' into Polyhedron_demo-remesh_several_items-jtournois 2016-01-14 15:05:56 +01:00
Jane Tournois 79b8a4d35e use parallel_for to run remeshing of several polyhedron items in parallel 2016-01-14 14:21:02 +01:00
Sébastien Loriot 9635dbeeb6 Merge pull request #586 from maxGimeno/Polyhedron_statistics-GF 
Polyhedron: add statistics
 2016-01-14 14:12:05 +01:00
Sebastien Loriot 7adbf4b5de Merge pull request #627 from sgiraudot/Polyhedron_demo-Bugfix_erasing_items_context_menu-GF 
Polyhedron demo: bugfix erasing items context menu
 2016-01-14 14:07:32 +01:00
Sebastien Loriot 734c1227c1 Merge pull request #628 from maxGimeno/Cut_plugin_fix-GF 
Fixes for the cut_plugin :
 2016-01-14 14:06:15 +01:00
Maxime Gimeno d458bbaa8f Merge branch 'Operations_on_polyhedra-plane_clipping_with_corefinement-sloriot' of github.com:CGAL/cgal-dev into Operations_on_polyhedra-plane_clipping_with_corefinement-sloriot 2016-01-14 12:34:38 +01:00
Maxime Gimeno 9ec087362d Segfault fix 2016-01-14 12:33:07 +01:00
Maxime Gimeno 11801c0692 Fix the dll error 2016-01-14 11:41:52 +01:00
Maxime Gimeno 4f94ddffaa Fix the display of the feature edges 
- Store the feature_edges vertices in a specific vector
- Use a specific VAO for the display
- Call invalidate_buffers from the Detect_sharp_edges plugin
 2016-01-14 10:37:02 +01:00
Laurent Rineau 8eb545904d Use the WaitCursor cursor while opening a file 
or while evaluating a script.
 2016-01-13 16:48:08 +01:00
Laurent Rineau f9cac3bbb5 Add Polyhedron_demo_config.h to define POLYHEDRON_DEMO_EXPORT 2016-01-13 16:46:30 +01:00
Maxime Gimeno 5f0f0b7b45 Fix for the size_t warning 2016-01-13 14:56:04 +01:00
Sebastien Loriot e3b4e78fe9 Merge pull request #623 from maxGimeno/CMakeLists_clean_up-GF 
CMakeLists clean up
 2016-01-13 14:52:01 +01:00
Sebastien Loriot f8c09c9c1e Merge pull request #619 from lrineau/Polyhedron-demo_fix_CMakeLists_when_Eigen_is_not_found-lrineau 
Polyhedron demo: fix PMP/CMakeLists.txt when Eigen is not found
 2016-01-13 14:48:59 +01:00
Sébastien Loriot 3bbe6e068b Merge pull request #607 from afabri/Mesh_3-avizo_output-GF 
Add output to Avizo file format
 2016-01-13 14:45:09 +01:00
Maxime Gimeno 9239f84f38 Fixes for the cut_plugin : 
- The AABB_Tree is displayed again
- The edges of the AABB_Tree and the cut_object are in the right color
- The Scene is not decentered by the creation of the cutting plane.
 2016-01-13 12:56:37 +01:00
Simon Giraudot 70a7ced73a Bugfix: getSelectedSceneItemIndex returns first one if several selected (instead of -1) 2016-01-13 10:58:50 +01:00
Simon Giraudot 0c2d2380af Bugfix: keep selected item instead of first one 2016-01-13 10:56:25 +01:00
Simon Giraudot 30c30309a1 Bugfix: keep current selected item instead of first one 2016-01-13 10:51:10 +01:00
Simon Giraudot 0b582e54ca Keep track of selected index when opening context menu 2016-01-13 10:50:53 +01:00
Andreas Fabri b02a7ed31a no need to funnel io routines through Mesh_complex_3_in_triangulation_3_base 2016-01-13 10:35:59 +01:00
Maxime Gimeno b30f06f225 Removed the commented parts in the CMakelists of the Polyhedron_demo 2016-01-13 10:32:17 +01:00
Maxime Gimeno bae76bc5d8 Renaming the dialog and associated function to remove "polyhedron" from the name 2016-01-13 08:34:10 +01:00
Sebastien Loriot 2a4d8e5c9f Merge pull request #590 from lrineau/Mesh_3-manifold_criterion-lrineau 
Mesh_3: add the manifold criterion
 2016-01-12 16:02:00 +01:00
Sebastien Loriot f9f86d75fe Merge pull request #613 from janetournois/PMP-improve_api_consistency-jtournois 
PMP : reorder variables for API consistency
 2016-01-12 15:55:44 +01:00
Sébastien Loriot 72850d1560 add plugin in test script 2016-01-12 15:47:51 +01:00
Maxime Gimeno 7c49ab9473 Some clean-up 
- Changed the color of the plane
- Aligned all the ui elements on the same row.
 2016-01-12 15:11:12 +01:00
Maxime Gimeno 63a4bdb252 Replace qDebug() with Message_interface. 2016-01-12 14:31:35 +01:00
Jane Tournois 9c5552ff48 add ability to remesh several polyhedron items at once 2016-01-12 14:12:09 +01:00
Maxime Gimeno 02517773ef WIP Option for closing a clipped polyhedron 
- There is a memory corruption that we need to find and eradicate before merging.
 2016-01-12 13:24:24 +01:00
Maxime Gimeno 73b94bbb5f The clipping plane has 2 different colors, one for each face 2016-01-12 12:30:53 +01:00
Laurent Rineau 1adfacfad2 Fix the fix 2016-01-12 10:38:53 +01:00
Andreas Fabri 9b6af96536 int -> std::size_t 2016-01-12 10:34:38 +01:00
Laurent Rineau dea74f6cc0 Fix a syntax error when Eigen3 is not found 2016-01-12 10:32:32 +01:00
Maxime Gimeno 97ba0f33f4 Fix for the header() function 
- I forgot half the work on that one.
 2016-01-12 10:30:06 +01:00
Maxime Gimeno fa895f3333 Clean-up, link fix and doc 2016-01-12 10:18:52 +01:00
Maxime Gimeno 8133cee925 Missing update added. 2016-01-12 09:23:45 +01:00
Jane Tournois 5f31573adb reorder parameters 2016-01-11 16:06:16 +01:00
Maxime Gimeno d64b9f9323 Addition of a plugin for plane_clipping polyhedra 2016-01-11 15:37:25 +01:00
Sebastien Loriot 81ca25b1df move ui files into the correct group 
This was breaking the parallel build of plugins because dependency were incorrectly encoded
 2016-01-11 14:52:19 +01:00
Jane Tournois ae1ea30d45 reorder parameters for consistency in PMP package 2016-01-11 12:20:45 +01:00
Jane Tournois 0ab047eb37 reorder variables for API consistency in PMP package 2016-01-11 12:12:59 +01:00
Sebastien Loriot 8245efd76b Merge pull request #601 from lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau 
Polyhedron, Mesh 3 plugin: add the meshing threads
 2016-01-11 11:20:26 +01:00
Sébastien Loriot 6f4bb73ee0 fix warning 
warning: 'Mesh_3_plugin::init' hides overloaded virtual function
 2016-01-11 11:19:24 +01:00
Sebastien Loriot f046d2cd11 Merge pull request #599 from afabri/Mesh_3-raw_image-GF 
Add reading a raw image to the io_image_plugin
 2016-01-11 11:04:12 +01:00
Jane Tournois 74355818b1 reorder parameters for border_halfedges() 2016-01-11 10:19:41 +01:00
Laurent Rineau 60189a3c98 Fix a compilation error 2016-01-08 18:31:31 +01:00
Laurent Rineau c97564a81a Fix a warning 
.. and a logic error!
 2016-01-08 18:29:21 +01:00
Laurent Rineau bd315dc0a5 Merge remote-tracking branch 'lrineau/Polyhedron-Mesh_3_plugin__add_Meshing_thread-lrineau' into Mesh_3-merge-manifold-meshing-thread 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
 2016-01-08 17:55:21 +01:00
Laurent Rineau 4638645a01 Merge PR #597 into Mesh_3-manifold_criterion-lrineau 
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
 2016-01-08 17:41:02 +01:00
Andreas Fabri 7fa7db80d4 Add output to Avizo file format 2016-01-08 16:30:07 +01:00
Laurent Rineau ccb31e40ff Re-enable the meshing thread 
The Mesh_3 plugin is also renamed to Mesh_3_plugin, like the same of its
file.
 2016-01-08 15:10:09 +01:00
Simon Giraudot 268f50d84a Merge point sets: keep track of the names 2016-01-08 15:03:17 +01:00
Simon Giraudot 204a294ba8 Merge only available if at least two point sets are selected 2016-01-08 14:59:35 +01:00
Laurent Rineau dd9af877c7 better use of 'using CGAL::Three' 2016-01-08 14:34:44 +01:00
Simon Giraudot 49d6311de3 New plugin for merging point sets 2016-01-08 14:31:54 +01:00
Maxime Gimeno 1c8d2d573f Some fixes 
- Put Nb null edges in the right place
- Made the dialog scrollable
- Made the dialog unique
- Replaced Nb. by # in the line titles
- Made the dialog a child of the main window so that it is closed along with the main window
 2016-01-08 11:22:10 +01:00
Andreas Fabri 8125915f62 Add reading a raw image to the io_image_plugin 2016-01-08 10:14:06 +01:00
Andreas Fabri 778d1acb14 no need for wrapper Mesh_domain_with_polyline_features_3 2016-01-07 17:28:41 +01:00
Andreas Fabri 96ab2e4181 enable protection of polylines from a polyline item for segmented image and polyhedral domains 2016-01-07 17:00:20 +01:00
Sebastien Loriot f3bc10ef81 Merge pull request #549 from afabri/Polyhedron-clipping_in_shader-GF 
Improve C3T3 item and meshing of a segmented image
 2016-01-07 13:49:16 +01:00
Sebastien Loriot 9fc1810ab7 Merge pull request #577 from maxGimeno/Selection_tool_fix-GF 
Selection tool fix
 2016-01-07 13:34:09 +01:00
Laurent Rineau dbbca6cfe8 Fix: the manifold criterion was activated when the checkbox was *not* checked! 2016-01-06 17:30:53 +01:00
Laurent Rineau 02d3248535 Fix permissions 2016-01-06 16:05:23 +01:00
Sebastien Loriot d782bc4da8 Merge pull request #556 from sgiraudot/Polyhedron_demo-Quick_moving_display-GF 
Polyhedron demo: quick moving display of point sets
 2016-01-06 14:55:32 +01:00
Sebastien Loriot e6308db001 Merge pull request #543 from sloriot/PMP-unify_weight 
Pmp unify weight
 2016-01-06 14:54:26 +01:00
Sebastien Loriot 0b306b6e02 Merge pull request #575 from maxGimeno/IO_Plugins_names_unification 
Unification of the names of the IO plugins
 2016-01-06 14:51:46 +01:00
Laurent Rineau 6dd9321fb0 Fix: do not remove CGAL::FACET_VERTICES_ON_SAME_SURFACE_PATCH 2016-01-06 14:35:50 +01:00
Laurent Rineau 5ca23a105a Add the manifold criterion to the Mesh_3 plugin 2016-01-06 13:54:44 +01:00
Laurent Rineau 1f9de830ae Improvement: do not depend on Scene_c3t3_item.h 
A declaration of `Scene_c3t3_item` is sufficient. That avoids that the
compilation of `Meshing_thread.cpp` involves the heavy headers of
Mesh_3.
 2016-01-06 13:50:19 +01:00
Andreas Fabri d3e610f188 harcode again that the image word type is unsigned char for a segmented image and perform static_cast 2016-01-06 13:06:51 +01:00
Maxime Gimeno 9b208f7fcc Clean-up and fix for problematic UI file 2016-01-06 12:50:05 +01:00
Maxime Gimeno a7dd8de958 Indentation 2016-01-06 11:53:30 +01:00
Maxime Gimeno c851c4fe3e Finalization 
- The holes are available again
- Every type of item can have their own statistics
- There is no more Scene_polyhedron_item in the MainWindow.
 2016-01-06 11:39:58 +01:00
Maxime Gimeno 53d13e079a Sorts items by type and create a table for each type 
- Remains : make a header for each type (or at least in polyhedron, but the API must allow
all item types to have a different one)
 2016-01-06 09:46:53 +01:00
Maxime Gimeno c17b31862c lean-up and binding fix 2016-01-06 09:13:01 +01:00
Simon Giraudot 475107d6a6 Change API of advancing front in Surface reconstruction plugin for Polyhedron demo 2016-01-05 17:13:24 +01:00
Andreas Fabri 56bfaa2746 merge 2016-01-05 17:06:04 +01:00
Andreas Fabri b116b8ed5b move polylines_to_protect.h into CGAL/Mesh_3/ 2016-01-05 16:42:07 +01:00
Maxime Gimeno 6c88da8323 Clean-up 2016-01-05 16:05:25 +01:00
Maxime Gimeno 570be297dc Statistics work with a selection of several polyheron_items. 
- Must remove the cast to Scene_polyhedron_item from the MainWindow.
 2016-01-05 15:44:29 +01:00
Maxime Gimeno d33ec35b97 Statistics is now an html table. 2016-01-05 14:01:12 +01:00
Maxime Gimeno aca6a0a161 Moved the polyhedron_item stats in the statistics dialog 2016-01-05 10:04:53 +01:00
Sébastien Loriot 460f416801 use reference as return type 2016-01-04 22:16:57 +01:00
Maxime Gimeno f147e4aebd Some clean-up. 2016-01-04 16:25:58 +01:00
Maxime Gimeno 64f8f4195c Addition of a test for the self_intersections 2016-01-04 14:38:53 +01:00
Maxime Gimeno d999f2e526 Addition of the number of holes to the statistics. 2016-01-04 14:05:50 +01:00
Maxime Gimeno 92aa19ecbf Statistics available for multiple selected polyhedra. 
- The median edge length is not available in this case for now because it would be far too long to compute.
 2016-01-04 10:08:16 +01:00
Maxime Gimeno 81b79ed751 Untriangulated polyhedrons do not specify degenerated facets for now. 2015-12-31 14:47:23 +01:00
Maxime Gimeno 1d0f79e249 Addition of the missing files 2015-12-31 12:19:40 +01:00
Maxime Gimeno beb7b59b61 WIP calculate degenerate facets in triangulation 2015-12-31 12:18:23 +01:00
Maxime Gimeno 687d0174a2 Number of degenerated faces added to toolTip 2015-12-31 11:42:08 +01:00
Maxime Gimeno eba188b5fb Re-re-renaming of the IO_plugins 2015-12-31 10:28:29 +01:00
Maxime Gimeno b5e63326b6 Adding info about edges statistics to the toolTip 2015-12-31 10:05:02 +01:00
Maxime Gimeno 019db00106 Adds the new item to the selected group when created 2015-12-30 15:59:51 +01:00
Maxime Gimeno a580d15129 Adds an easiest way of de-selecting primitives. 2015-12-30 12:05:37 +01:00
Maxime Gimeno 2207ec8409 Vtk fix 2015-12-30 10:12:35 +01:00
Maxime Gimeno f68d1db068 Double selection on clic fix 
- The eventFilter of the k_ring_selector was connected once to the viewer AND once
  to the main window, which resulted in pressevents called twice and with two different positions.
  I removed the connection to the main window.
 2015-12-30 08:54:21 +01:00
Simon Giraudot e8be5fe3ca Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2015-12-29 14:26:36 +01:00
Simon Giraudot 8e9f9dd3d6 Use inFastDrawing instead of quick_camera and provide direct access to fast drawing state 2015-12-29 11:40:19 +01:00
Maxime Gimeno 648cdce4ad Unification of the names of the IO plugins 
- They are all called xxxx_io_plugin now.
 2015-12-29 10:32:27 +01:00
Simon Giraudot e156ff1cf1 Remove useless calls to virtual functions of QGLViewer 2015-12-29 10:16:04 +01:00
Jane Tournois d212432a56 avoid hardcoding the Image_word_type 2015-12-22 16:53:26 +01:00
Sebastien Loriot e44adafd60 Merge pull request #553 from lrineau/Polyhedron_demo-fix_Scene_c3t3_item_display_of_spheres-GF 
Polyhedron demo: fix the display of protecting balls in Scene_c3t3_item
 2015-12-21 10:52:07 +01:00
Sébastien Loriot b4315f4232 Merge pull request #560 from maxGimeno/Polyhedron_demo-scroll_sceneview-GF 
Scrolls the sceneView when a picking is performed.
 2015-12-18 16:38:26 +01:00
Sebastien Loriot 4187dd1240 Merge pull request #564 from maxGimeno/Polyhedron_demo-moving_names_in_list-GF 
Moving items in the list
 2015-12-18 16:37:01 +01:00
Maxime Gimeno 3097134e28 Some clean-up 2015-12-18 15:16:34 +01:00
Maxime Gimeno ffca2c49b5 Items move even when they are in a group. 2015-12-17 10:01:52 +01:00
Maxime Gimeno f83fc58479 Items move but only when there is no hierarchy. 2015-12-16 15:43:33 +01:00
Maxime Gimeno 0167571c6e Scrolls the list of items when a picking is performed. 2015-12-16 12:58:53 +01:00
Simon Giraudot 53c3f40bdc Bugfix: shuffle selected and unselected points separately 2015-12-15 10:49:21 +01:00
Simon Giraudot c87de089ce Add option to activate or not the quick camera mode 2015-12-15 10:05:02 +01:00
Simon Giraudot 7a63e01295 Quick display of point sets: only display small subset when moving large point sets 2015-12-15 10:00:06 +01:00
Laurent Rineau 89bae417c4 Fix a bug of the c3t3 item 2015-12-14 15:51:06 +01:00
Maxime Gimeno ae6ad8aa88 The spheres are now affected by the plane 2015-12-14 15:07:25 +01:00
Laurent Rineau 0c917c5880 Merge pull request #554 from sgiraudot/Polyhedron_demo-Bugfix_point_inside_polyhedron_selection-GF 
Bugfix: correct point set selection handling for point_inside_polyhedron
 2015-12-14 14:40:11 +01:00
Maxime Gimeno 6cdfeb4518 Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:37:42 +01:00
Maxime Gimeno e98668e8c0 Color fix 2015-12-14 14:37:31 +01:00
Andreas Fabri 5aa49078c5 Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:28:13 +01:00
Andreas Fabri 294f9c9843 draw missing cells V2 2015-12-14 14:27:44 +01:00
Maxime Gimeno 2c90680a7d Merge branch 'Polyhedron-clipping_in_shader-GF' of github.com:CGAL/cgal-dev into Polyhedron-clipping_in_shader-GF 2015-12-14 14:16:56 +01:00
Maxime Gimeno b507542a64 Fragment shader fix 
- The test was performed on x instead of w.
 2015-12-14 14:16:10 +01:00
Andreas Fabri 03ac017665 draw missing cells 2015-12-14 14:15:47 +01:00
Simon Giraudot c09fae3736 Bugfix: correct point set selection handling for point_inside_polyhedron_plugin 2015-12-14 14:15:31 +01:00
Sebastien Loriot a7ce0cf3a6 Merge pull request #551 from maxGimeno/Polyhedron_demo-Point_inside_polyhedron_fix-GF 
Selection color fix
 2015-12-14 13:58:20 +01:00
Laurent Rineau f1ce747dc3 Try to improve the non-consistent indentation 2015-12-14 13:03:55 +01:00
Laurent Rineau 3b8d7a0dc8 Enhancement: display only non-degenerated spheres 
diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
index fbb848f..abe1721 100644
--- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
@@ -1025,6 +1025,8 @@ void Scene_c3t3_item::compute_elements() const
           end =  d->c3t3.triangulation().finite_vertices_end();
           vit != end; ++vit)
       {
+          if(vit->point().weight()==0) continue;
+
           typedef Tr::Vertex_handle Vertex_handle;
           std::vector<Vertex_handle> incident_vertices;
           d->c3t3.triangulation().incident_vertices(vit, std::back_inserter(incident_vertices));
 2015-12-14 13:03:55 +01:00
Laurent Rineau 78fe4f96ea Bug-fix: display all spheres, and not 1 out of 3 2015-12-14 13:03:55 +01:00
Maxime Gimeno 66815745b7 Selection color fix 2015-12-14 11:25:59 +01:00
Maxime Gimeno d1b3937a88 Edges management 
- The shader of the edges of the base item discards the edges when it should
- The facets of the cutplane have edges
- The grid is displayed in all the rendering modes
 2015-12-14 10:47:34 +01:00
Andreas Fabri d4dd0c1b28 merged branch that deals with 1D features on the sides of a cube 2015-12-13 11:07:12 +01:00
Maxime Gimeno a63bfd93c0 frame_plane fix 2015-12-11 21:23:54 +01:00
Jane Tournois 2e16f63689 add invalidate_buffers in discard changes to see that reset has been performed 2015-12-11 21:23:54 +01:00
Maxime Gimeno f4c7d71413 Fixed_plane_translation fix. 2015-12-11 21:23:54 +01:00
Maxime Gimeno bffd28f19a Color fix 2015-12-11 21:23:54 +01:00
Jane Tournois 9664d3702d isotropic_remeshing needs face_index map to be properly initialized 
this is needed by border_halfedges_impl
 2015-12-11 21:23:53 +01:00
Andreas Fabri 700359f675 write less facets into the AABB tree 2015-12-11 17:02:19 +01:00
Andreas Fabri 6143260202 Use the AABB Tree to find the facets intersected by the cutplane 2015-12-11 16:16:12 +01:00
Maxime Gimeno dc24228f64 Fix for selection_tool 
- Restored the emit newItem
 2015-12-11 13:20:55 +01:00
Maxime Gimeno d769fba4b8 Polylines in point_set_selection fix 2015-12-11 13:11:36 +01:00
Andreas Fabri 50cc9af2ad WIP: Add a VBO for the faces intersected by the cut plane. Still compute them brute force 2015-12-11 12:14:28 +01:00
Andreas Fabri 0f31dbeaf5 WIP: compute_values no longer computes the clipped faces 2015-12-11 11:09:55 +01:00
Andreas Fabri e7e5769e9c WIP: introduced a shader that does the clipping 2015-12-11 10:52:35 +01:00
Sebastien Loriot 60dbff189d Merge pull request #534 from afabri/Polyhedron_3-improve_mesh_3_plugin-GF 
Polyhedron 3 improve mesh 3 plugin gf
 2015-12-10 21:01:00 +01:00
Sebastien Loriot f613749ea7 Merge pull request #538 from maxGimeno/Polyhedron_demo-Mesh_3_plugin_color_fix-GF 
Polyhedron demo mesh 3 plugin fix and enhancement
 2015-12-10 20:59:49 +01:00
Andreas Fabri 46eec2d9f0 do not compute sidedness twice 2015-12-09 13:43:11 +01:00
Andreas Fabri fefa699a3d no need to compute a normal 2015-12-09 12:35:49 +01:00
Andreas Fabri c8bd785061 do not use the facet criteria 2015-12-09 12:35:18 +01:00
Andreas Fabri 056ea83fa1 move criteria 2015-12-09 10:04:20 +01:00
Andreas Fabri 18bbaede12 Integrate code for respecting polylines on an Image_3 2015-12-09 06:30:15 +01:00
Sebastien Loriot f9240945ae Merge pull request #529 from afabri/Mesh_3-params-GF 
Set BOOST_PARAMETER_MAX_ARITY only in the packages concerned
 2015-12-07 17:41:57 +01:00
Andreas Fabri 4829475ccb Merge remote-tracking branch 'cgal-dev/Polyhedron_demo-Mesh_3_plugin_color_fix-GF' into Polyhedron_3-improve_mesh_3_plugin-GF 2015-12-07 15:45:35 +01:00
Andreas Fabri 27dcff722d Merge branch 'Polyhedron_3-improve_mesh_3_plugin-GF' of github.com:CGAL/cgal-dev into Polyhedron_3-improve_mesh_3_plugin-GF 2015-12-07 15:44:38 +01:00
Andreas Fabri ce738d5426 typo 2015-12-07 15:41:54 +01:00
Jane Tournois 0523d04cf4 fix bbox computation in c3t3_item 2015-12-07 12:29:53 +01:00
Maxime Gimeno 3dd3fba020 Smooth cutting-plane moves 2015-12-07 12:06:04 +01:00
Maxime Gimeno c81ff58ee7 Restored the multicolor aspect of the c3t3_items 2015-12-07 11:43:04 +01:00
Andreas Fabri 5ec38ae0a8 cleanup 2015-12-04 18:06:35 +01:00
Andreas Fabri 312df7edc3 Avoid duplication of arrays - a std::vector stores an array 2015-12-04 17:56:07 +01:00
Andreas Fabri 9e1fe1be4d fix visualization of a parallel C3T3 2015-12-04 17:27:11 +01:00
Sebastien Loriot 623faf3af1 Merge pull request #531 from maxGimeno/Polyhedorn_demo-adjusting_znearcoefficient-GF 
Adjusting zNear with wheel and shift
 2015-12-04 17:25:25 +01:00
Sebastien Loriot 7d2e8842fa Merge pull request #522 from maxGimeno/Polyhedron_demo-Hierarchic_view-GF 
Polyhedron demo: hierarchic view of items
 2015-12-04 17:02:39 +01:00
Andreas Fabri 07833f55ac Enable activation of concurrent Mesh_3 2015-12-04 16:50:53 +01:00
Andreas Fabri dc81769c8e shift image by 1/2 a voxel 2015-12-04 16:39:19 +01:00
Andreas Fabri b6d77d5f06 move timer 2015-12-04 16:25:02 +01:00
Andreas Fabri bba935108e Make sure that Mesh_3/global_parameters.h gets included before Polyhedron_3.h 2015-12-03 10:13:03 +01:00
Maxime Gimeno 83581b29d2 clean-up 2015-12-03 08:56:54 +01:00
Sebastien Loriot 022c7b41e0 Merge pull request #528 from maxGimeno/Polyhedron_demo-fix_items_location-GF 
Polyhedron demo fix items location gf
 2015-12-02 16:49:52 +01:00
Maxime Gimeno 67ef328279 Using Shift+wheel adjusts the zNear plane in the Frustum 2015-12-02 13:09:28 +01:00