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 966 MiB
Commit Graph

3374 Commits

Author SHA1 Message Date
Laurent Rineau 7814cb20c7 Fix the c3t3 item 
- The `isEmpty()` function was wrong: if the domain contains 2D surfaces
  it cannot be considered as empty, even if the 3D volume is empty.

- The computation of the bbox was wrong too.
 2016-03-02 12:35:09 +01:00
Jane Tournois dc0090e9b8 remove duplicate function split_long_edges 
by exploiting the edge_is_constrained_map as read-write pmap
this is not documented, and only for demo purposes (at least for now)
 2016-03-01 16:28:06 +01:00
Jane Tournois 63884d0033 update the constraints property map after the end of remeshing 2016-03-01 15:30:52 +01:00
Maxime Gimeno 5403ae1f37 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-03-01 09:03:29 +01:00
Simon Giraudot 181b9325b1 Fix max precision for ofstream: digits10 + 2 instead of digits10 + 1 2016-02-29 17:46:25 +01:00
Simon Giraudot cc9890a308 Check if polygon soup is not empty before attempting bbox computation 2016-02-29 11:13:35 +01:00
Maxime Gimeno ac862e37a9 Fix a bug when reloadking an item 
the item was disappearing from the object list
 2016-02-29 11:11:57 +01:00
Maxime Gimeno d1e8741675 fix functions signature 2016-02-29 11:11:13 +01:00
Andreas Fabri 8663b3ccbe deal with isolated vertices when turning a polygon soup in a polyedral surface 2016-02-29 11:04:33 +01:00
Sebastien Loriot 7e48843690 Merge pull request #841 from afabri/patch-4 
Capitalize words
 2016-02-29 10:50:43 +01:00
Maxime Gimeno 67fa51de62 Fix for the polyhedorn_item's colors 
- The color calculation when the item is not monochrome was not done correctly.
 2016-02-29 10:23:59 +01:00
Sebastien Loriot cf3c372b57 Merge pull request #823 from sgiraudot/Polyhedron_demo-Increase_precision_ofstream-GF 
Polyhedron demo : Use maximum precision when writing files
 2016-02-29 10:15:26 +01:00
Sebastien Loriot e4dd2dd002 Merge pull request #816 from maxGimeno/Polyhedorn_demo-Fix_applicable-GF 
Polyhedron_demo : Fix applicable
 2016-02-29 10:14:21 +01:00
Maxime Gimeno 12a819bb79 Fix the waitcursor 
- Removed the waitcursor in the dialog for selecting the precision when loading an segmented image.
 2016-02-29 08:37:09 +01:00
Maxime Gimeno 91b7f7c3a7 Renaming the Mesh_3 plugin directory 2016-02-29 08:36:26 +01:00
Andreas Fabri 01a1deebd5 Capitalize words 2016-02-27 10:56:10 +01:00
Sébastien Loriot 542d6cf9fb fix applicable 2016-02-26 15:55:00 +01:00
Sebastien Loriot 27fe675b08 Merge pull request #812 from sloriot/Mesh_3-fix_default_behavior 
Mesh_3: do not enable manifold by default
 2016-02-26 15:41:59 +01:00
Sébastien Loriot 4e2ea7295a vtk plugin can now load segments 2016-02-26 15:39:55 +01:00
Sébastien Loriot e4f1f2f9b4 allow reading of unstructuredGrid from non-XML files 2016-02-26 13:22:33 +01:00
Sébastien Loriot 0f39879ced allow reading vtu 
simplify the conversion function as well
 2016-02-26 12:47:03 +01:00
Sébastien Loriot c574c78e66 plug error handler to the reader 2016-02-26 11:02:42 +01:00
Sebastien Loriot 80654639c2 Merge pull request #824 from afabri/Polyhedron-fix_drawing_of_non_triangle_face-GF 
Fix drawing a polyhedron with non-triangular faces
 2016-02-25 10:47:18 +01:00
Andreas Fabri b592865752 3 -> 2 2016-02-25 08:55:38 +01:00
Simon Giraudot 4728805f31 Use maximum precision when writing files to avoid loss of information 2016-02-25 08:47:12 +01:00
Sebastien Loriot cb650d896d Merge pull request #809 from afabri/Polyhedron-complete_basename-GF 
Use completeBaseName() as name of items (for some file name extensions)
 2016-02-24 18:39:47 +01:00
Maxime Gimeno bd5d1646d7 Fix applicable 
- For create_bbox
- For triangulate_facets
 2016-02-23 16:04:17 +01:00
Jane Tournois b6cd6ea5c1 activate protection of feature polylines in labeled images 
when needed or requested
 2016-02-23 16:00:06 +01:00
Laurent Rineau 154ad4c29f Do not enable manifold by default!! 
(cherry picked from commit 2a0b90cff1cd0abb5cde7182f7c57a21ee19a23b)
 2016-02-22 19:20:48 +01:00
Andreas Fabri 8982373981 Use completeBaseName() as name of items (for some file name extensions) 2016-02-22 15:19:37 +01:00
Sebastien Loriot c1b3b784a7 Merge pull request #777 from janetournois/Polyhedron_demo-polyhedron_item_for_quads-GF 
Polyhedron item : improve computation of normals
 2016-02-22 08:24:11 +01:00
Sebastien Loriot 95a03739c4 Merge pull request #798 from afabri/Polyhedron-Unify_capital_letters-GF 
Capitalize words in the menus
 2016-02-19 09:22:58 +01:00
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 7bb57e35f0 Displays selected points and distance over the scene. 
- Remaining : use the coming textRenderer to indicate the info about distance and points directly on screen.
 2015-12-17 16:10:10 +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
Sebastien Loriot 8d6a6a56bd Merge pull request #527 from sgiraudot/Polyhedron_demo-Bugfix_orient_opened_polyhedron-GF 
Bugfix: Only check orientation of polyhedron if it is closed
 2015-12-01 16:40:02 +01:00
Sebastien Loriot e1437eefaa Merge pull request #523 from maxGimeno/Polyhedron_demo-Controls_widget_visibility_fix-GF 
Volume_planes_plugin fix
 2015-12-01 16:29:33 +01:00
Maxime Gimeno e8c3dd0fe5 Moved add_item for edit_polyhedron 2015-12-01 13:15:06 +01:00
Jane Tournois 90a5dff1b4 move scene_segmented_image_item in Polyhedron demo root directory 2015-12-01 12:40:39 +01:00
Simon Giraudot 140a2c8eec Only check orientation of polyhedron if it is closed 2015-12-01 11:25:27 +01:00
Maxime Gimeno d5ff04f673 Error fix. 2015-11-30 11:07:45 +01:00
Maxime Gimeno 07e2680df9 Addition of a function closure() for all the plugins using a QDockWidget 2015-11-30 10:38:29 +01:00
Sebastien Loriot 79fb20650b Merge pull request #524 from maxGimeno/Polyhedron_Demo-Load_external_plugin_fix-GF 
External plugin loading fix
 2015-11-28 16:40:05 +01:00
Sebastien Loriot 515bfffee8 Merge pull request #520 from sgiraudot/Polyhedron_demo-Merge_normal_estimation_plugins-GF 
Polyhedron demo: Merge normal estimation plugins
 2015-11-27 16:34:21 +01:00
Maxime Gimeno 9f816040db WIP Updating the plugins 2015-11-27 15:31:49 +01:00
Maxime Gimeno a3ea006562 Fix for this plugin. All the others remaining, plus the doc. 2015-11-27 14:37:38 +01:00
Maxime Gimeno 977214a55d Actual fix 
- The precedent fix did nothing. This one does what the previous one was supposed to do.
 2015-11-27 13:04:34 +01:00
Maxime Gimeno ad89447c93 Fixes the error message when loading an external plugin. 2015-11-27 09:00:57 +01:00
Maxime Gimeno 778993db62 Hide the controls widget when created in the Volume_planes_plugin 2015-11-27 08:55:33 +01:00
Maxime Gimeno d74763579c Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
 2015-11-27 08:25:36 +01:00
Maxime Gimeno 713dabef77 Update of the API and of the doc 2015-11-26 16:06:45 +01:00
Simon Giraudot 858a9511ab Update cgal_test_with_cmake with new plugin 2015-11-26 15:09:36 +01:00
Simon Giraudot 3fd7d42555 Merge and reorganize normal estimation and VCM normal estimation plugins 2015-11-26 14:47:19 +01:00
Simon Giraudot 7b2120dd88 New normal estimation dialog 2015-11-26 14:35:50 +01:00
Sebastien Loriot 8e507866bc Merge pull request #480 from maxGimeno/Polyhedron_demo-C3t3_IO_plugin-GF 
I/O plugin for c3t3 meshes
 2015-11-26 14:34:19 +01:00
Simon Giraudot 1e4b275694 Reorganize normal estimation plugins 2015-11-26 14:30:18 +01:00
Sebastien Loriot 47694dec49 Merge pull request #500 from janetournois/PMP-length_of_border-GF 
PMP : add measure functions
 2015-11-26 14:17:49 +01:00
Sebastien Loriot bd1dfb70b4 Merge pull request #519 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Fix for the selection tool
 2015-11-26 14:10:43 +01:00
Sebastien Loriot 192fc73051 Merge pull request #517 from maxGimeno/Polyhedron_demo-ManipulatedFrame_fix-GF 
Polyhedron demo manipulated frame fix gf
 2015-11-26 14:10:02 +01:00
Sebastien Loriot bfa47214f3 Merge pull request #513 from maxGimeno/Polyhedron_demo-Selection_colors_fix-GF 
Selection tool : colors fix
 2015-11-26 14:09:08 +01:00
Sebastien Loriot acfa4bef0f Merge pull request #498 from sgiraudot/Polyhedron_demo-Bugfix_selected_points-GF 
Polyhedron demo: Fix point selection behavior
 2015-11-26 14:05:54 +01:00
Sebastien Loriot 36023eb977 Merge pull request #512 from sgiraudot/Polyhedron_demo-Surface_reco_add_param-GF 
Add parameters to surface reconstruction plugin
 2015-11-26 14:05:03 +01:00
Maxime Gimeno e35a69f576 WIP Modifying the API 2015-11-26 09:42:44 +01:00
Maxime Gimeno 0bc61e49c4 Clean-up 2015-11-25 16:24:33 +01:00
Maxime Gimeno ec9379685e WIP : Updating example to use group_items 2015-11-25 16:14:47 +01:00
Maxime Gimeno 9b4e2fbc0b Moved Scene_group_item.h to Three and updated the doc. 2015-11-25 15:45:03 +01:00
Maxime Gimeno dc7584cc9c Made the group_plugin a whole part of the demo. 2015-11-25 14:36:30 +01:00
Maxime Gimeno f57f6f88ec Clean up signals 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-11-25 14:12:45 +01:00
Maxime Gimeno be6dde05a9 Fix for the selection_plugin 
- At some point the poly_item was updated along with the selection_item, which caused it to be re-computed when it should not.

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-11-25 14:05:01 +01:00
Maxime Gimeno b7c6742620 Affine transformation color fix 2015-11-25 11:29:13 +01:00
Maxime Gimeno 8b7eed3398 Clean-up 2015-11-25 10:42:26 +01:00
Maxime Gimeno 8218a38c58 ManipulatedFrame issues : fix 
- The call to bbox() at each top of a manipulated frame made it verry slow to manipulate frames
  on a big item, because the bbox was computed at every call. The result is now kept in a
  member and updated only when invalidate_buffers is called.

- The color of the cutting plane is repaired.
 2015-11-25 09:43:56 +01:00
Laurent Rineau 5a508ce86e restore state of plugins' dockwidgets 
With this commit, restoreState is called after plugins have been
initialized. In case the `init()` functions of plugins create new dock
widgets, that allows to restore the state (position/size) of those
dockwidgets as well.
 2015-11-24 18:51:39 +01:00
Laurent Rineau 260af874d3 remove unused #include 2015-11-24 18:48:52 +01:00
Maxime Gimeno b5ad30e77b Merge branch 'Polyhedron_demo-Hierarchic_view-GF' of github.com:CGAL/cgal-dev into Polyhedron_demo-Hierarchic_view-GF 2015-11-24 10:31:57 +01:00
Maxime Gimeno 5d3c9a2525 WIP Documentation update 2015-11-24 09:42:25 +01:00
Maxime Gimeno eb7b0fa302 Merge branch 'Polyhedron_demo-Selection_colors_fix-GF-old' into Polyhedron_demo-Selection_colors_fix-GF 2015-11-24 08:36:54 +01:00
Simon Giraudot b4fa1fd208 Add parameters to surface reconstruction plugin 2015-11-23 19:18:47 +01:00
Jane Tournois a61fefc839 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-23 17:19:30 +01:00
Maxime Gimeno 9e2f611fee Segfault and warning fix 
- The segfault was caused by the absence of a call to unselect_all() after the creation of the point_set from
  a selection.
 2015-11-23 16:49:34 +01:00
Maxime Gimeno f40aca9950 Selection_tool bug color fix 2015-11-23 16:18:57 +01:00
Andreas Fabri 660944b397 fix dll linkage 2015-11-23 16:13:17 +01:00
Simon Giraudot fcbdd0bb86 Change behavior of point set selection: use number of selected points instead of iterator 2015-11-23 14:31:49 +01:00
Maxime Gimeno 4878859db1 Error fix 
- replaced 'or' by '||'
 2015-11-23 10:14:48 +01:00
Maxime Gimeno 3be30b993f Addition of the missing files 2015-11-23 10:06:12 +01:00
Maxime Gimeno 448bda4221 Moved the plugin in a sub-directory 2015-11-23 09:47:08 +01:00
Sebastien Loriot 059ec8cb81 Merge pull request #495 from janetournois/PMP-fix_isotropic_remeshing_bug-jtournois 
PMP : fix a bug in isotropic remeshing
 2015-11-23 09:44:22 +01:00
Maxime Gimeno 7ad45de6ef Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
 2015-11-23 09:32:20 +01:00
Maxime Gimeno ce3b4985b0 Segfault fix 
- The group selection has been restored.
 2015-11-23 09:10:50 +01:00
Maxime Gimeno e8ad030474 Freeze fix 
- The BBox calculation of a group was taking forever because
  it had to compute it for each of it children, which made everything
  freeze if there was a lot of sub-groups. Now a group has an empty BBox().
 2015-11-20 16:00:01 +01:00
Maxime Gimeno 0af72ecf93 Inopportune collapsing fix 
- The model used by scene view is proxyModel and not scene, so all the indexes I used
  were invalid.
 2015-11-20 14:50:34 +01:00
Sebastien Loriot 172f38e7d4 Merge pull request #487 from maxGimeno/Polyhedron_demo-fix_plugin_loading_msvc-GF 
Polyhedron demo fix plugin loading
 2015-11-20 14:46:52 +01:00
Jane Tournois c4bbdda0bd Merge branch 'Polyhedron_demo-fix_plugin_loading_msvc-GF' into PMP-fix_isotropic_remeshing_bug-jtournois 2015-11-19 17:32:49 +01:00
Jane Tournois f358594e92 complete the dump function and its use in the Polyhedron demo 2015-11-19 17:27:36 +01:00
Jane Tournois 20aae37049 use automoc for MainWindow 
Conflicts:
	Polyhedron/demo/Polyhedron/MainWindow.cpp
 2015-11-19 16:27:40 +01:00
Jane Tournois 9a5a9c23a4 fix link error on windows 
export "MainWindow" symbols

Conflicts:
	Polyhedron/demo/Polyhedron/MainWindow_config.h
 2015-11-19 16:25:41 +01:00
Jane Tournois 1fb2c58da6 remove useless include 2015-11-19 16:25:40 +01:00
Maxime Gimeno 9fd0dc69d4 Implementation 
- Addition of .mesh and .ma as save format.

- The Polyhedron_demo_io_plugin_interface now has a saveNameFilters and a loadNameFilters that both return
  nameFilters() by default, in case an IO_plugin have diffrent input and output formats.
 2015-11-19 15:22:53 +01:00
Maxime Gimeno 98ff3fd8e5 Bug linux fix 
- changed package_dir into package_dir_path
 2015-11-19 14:01:40 +01:00
Jane Tournois c9dd782764 fix load of plugins for windows 
needed because msvc creates the configuration (e.g. Debug) intermediate directory
For example, loader needs to find :
build/Plugins/IO/Debug/off_plugin.dll
build/Debug/demo_framework.dll
 2015-11-19 13:00:20 +01:00
Sébastien Loriot 961f3417b0 add missing buffer invalidation and item changed calls 
trivial bug-fix for master
 2015-11-19 10:21:01 +01:00
Maxime Gimeno b95bdff641 Merge branch 'Polyhedron_demo-C3t3_IO_plugin-GF-old' into Polyhedron_demo-C3t3_IO_plugin-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-11-19 08:57:56 +01:00
Maxime Gimeno 8df2be4c63 Addition of the I/O management of the ascii ".mesh" format. 
- This has been done partially in the scene_c3t3_item. The next step is to move this code in the plugin.
 2015-11-18 16:01:54 +01:00
Sébastien Loriot 65cda29122 Merge pull request #430 from maxGimeno/Polyhedron_demo-plugins_in_directories-GF 
Polyhedron demo: plugins in sub-directories
 2015-11-18 11:39:58 +01:00
Andreas Fabri 7bc5014254 Merge branch 'Polyhedron_demo-plugins_in_directories-GF' of github.com:CGAL/cgal-dev into Polyhedron_demo-plugins_in_directories-GF 2015-11-18 10:05:07 +01:00
Andreas Fabri f8ae3cf38b size_t -> int to avoid warning 2015-11-18 10:04:30 +01:00
Andreas Fabri 6f69743fa7 fix CMakeLists.txt 2015-11-18 09:58:56 +01:00
Sebastien Loriot 5f894e5598 Merge pull request #485 from janetournois/Polyhedron_demo-fix_remeshing_plugin-jtournois 
Polyhedron demo : fix the isotropic remeshing plugin
 2015-11-18 09:27:34 +01:00
Maxime Gimeno 88421f7467 Signals/slots fix 
- Most of the problems came from Scene_item that became CGAL::Three::Scene_item
 2015-11-18 08:42:24 +01:00
Jane Tournois a4c8f6627c remove unused parameter (triggers warning) 2015-11-17 17:07:37 +01:00
Jane Tournois 376b58b434 fix Isotropic_remeshing plugin 
border_halfedges internal implementation needs the face index map to be properly filled
with indices
 2015-11-17 16:59:31 +01:00
Jane Tournois 61f5743dbf fix double to float conversion warnings 2015-11-17 16:12:13 +01:00
Jane Tournois 265eb559c0 fix conversion warnings (for msvc) 2015-11-17 16:11:53 +01:00
Maxime Gimeno bbe9732171 Merge branch 'cgal-dev/Polyhedron_demo-plugins_in_directories-GF-old' into cgal-dev/Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
 2015-11-17 16:03:20 +01:00
Jane Tournois f80603cc9a remove extra return statement 2015-11-17 15:30:46 +01:00
Jane Tournois 625bc56c8a remove useless comments 2015-11-17 15:30:18 +01:00
Maxime Gimeno 08db015daf un-comment a function that shounldn't be commented. 2015-11-17 15:27:57 +01:00
Jane Tournois c86e52b37a Surface_patch_index is an integer for all mesh domains in the Polyhedron demo 2015-11-17 15:21:34 +01:00
Jane Tournois 5f284c032e add missing file 2015-11-17 14:42:00 +01:00
Jane Tournois 0fd8924196 avoid duplicating typedef 2015-11-17 14:36:19 +01:00
Sebastien Loriot 701519e48f Merge pull request #482 from maxGimeno/Polyhedron_demo-Mesh_3_warning_fix-GF 
Warning Fix
 2015-11-17 13:34:34 +01:00
Sebastien Loriot d605b6b95f Merge pull request #457 from janetournois/Polygon_mesh_processing-local_remeshing-GF 
Polygon mesh processing - add isotropic remeshing
 2015-11-17 13:25:45 +01:00
Sebastien Loriot 7d6d5b2072 Merge pull request #479 from maxGimeno/Polyhedorn_demo-Scene_c3t3_item_update-GF 
C3t3_item update
 2015-11-17 13:14:04 +01:00
Maxime Gimeno 62489af1b1 Addition of a new feature 
- If one or several items are selected when a new group is created, they are
  automatically added to the group.
- If all the selected items are in the same group at this time, the new group
  is created as a sub-group of this container group.
 2015-11-17 11:45:23 +01:00
Maxime Gimeno dfd3acb4ef Warning Fix 
- Initialized temp_item to 0 to silence a warning.
 2015-11-17 10:27:20 +01:00
Maxime Gimeno f68eee378c Fix for #46 
- Addition of an IO plugin for the c3t3 meshes. The function try_load_other_binary_format() has been
  commented because it generates a compilation error that I couldn't fix.
 2015-11-17 09:47:14 +01:00
Maxime Gimeno 693d4dd1ad C3t3_item update 
- The scene_c3t3_item now uses Enums for its VBOS and VAOs.
 2015-11-16 14:32:33 +01:00
Jane Tournois 021f042e7c use enums for new vaos[Frame_plane] 2015-11-16 14:20:14 +01:00
Jane Tournois 0a12beb5f9 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-11-16 13:06:03 +01:00
Maxime Gimeno 15d3e3c51a Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CGAL_demo/Scene_interface.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/MainWindow.h
	Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.h
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.cpp
 2015-11-16 12:32:56 +01:00
Maxime Gimeno 2722c76b3b Segfault fix 2015-11-16 11:52:43 +01:00
Maxime Gimeno f1c3a3f51d collapsing problems fix + clean-up 2015-11-16 11:20:02 +01:00
Maxime Gimeno 836e9c5d65 Segfault Fix and clean-up 2015-11-16 10:00:17 +01:00
Maxime Gimeno 5a45c419ae Saving the expanded state of the groups when modifying the view. 2015-11-13 10:46:44 +01:00
Jane Tournois 27bc02ebcf Revert "fix compilation of split_long_edges for Polyhedron" 
This reverts commit 213a280eef.

and propose another solution to deal with edges vs halfedges
 2015-11-12 15:55:35 +01:00
Jane Tournois 213a280eef fix compilation of split_long_edges for Polyhedron 
and use halfedges everywhere
 2015-11-12 14:53:47 +01:00
Maxime Gimeno 0015b40e9d Bugs fix 
- Manipulating items in sub_groups should work properly
- moving groups into other groups seems to work now
 2015-11-12 10:30:30 +01:00
Jane Tournois ef40621699 improve doc and rename function 2015-11-12 10:20:19 +01:00
Jane Tournois 07ae6235bf put mesh as last parameter of get_border, for consistency 
and return output iterator
 2015-11-12 09:33:22 +01:00
Maxime Gimeno 5b93155623 Renaming the directories 
- The directories and plugins have been renamed to shorten the paths.
- The CMakeLists now uses a FOREACH to add the subdirectories.
 2015-11-10 16:47:20 +01:00
Maxime Gimeno 66acddaebd End merge 2015-11-10 11:07:48 +01:00
Maxime Gimeno 1317d673b6 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Meshing_dialog.ui
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_dialog.ui
	Polyhedron/demo/Polyhedron/Polylines_io_plugin/Polyhedron_demo_polylines_io_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Xyz_plugin/Polyhedron_demo_xyz_plugin.cpp
	Three/doc/Three/Three.txt
	Three/include/CGAL/Three/Scene_item.h
 2015-11-09 16:04:37 +01:00
Jane Tournois 634f862de5 fix the use of use_DT *named* parameter 2015-11-09 13:21:46 +01:00
Simon Giraudot 9db8f461b1 Use functions of plane shape instead of Plane_3 2015-11-09 12:31:18 +01:00
Maxime Gimeno 4b6bd8b2ba Bug fix 
- The on the fly creation won't take '.' as a separator anymore.
 2015-11-09 12:17:10 +01:00
Sebastien Loriot 9ec1f4653d Merge pull request #463 from maxGimeno/Polyhedron_demo-merge_Mesh_3_demo-GF 
Polyhedron demo: merge Mesh_3 demo plugins
 2015-11-09 09:16:20 +01:00
Sebastien Loriot 4b50324410 Merge pull request #462 from maxGimeno/Polyhedron_demo-optimisation_vbos-gf 
Polyhedron demo: optimisation for VBOs/VBAs
 2015-11-09 09:10:22 +01:00
Simon Giraudot f93a21c082 Better naming of RANSAC primitives in plugin 2015-11-09 07:52:02 +01:00
Maxime Gimeno e1e5f9e09b Warnings fix and volume_plane action fix. 2015-11-06 15:50:17 +01:00
Maxime Gimeno da3edcc51a Addition of the enums for all the vaos and vbos. 2015-11-06 13:02:22 +01:00
Maxime Gimeno b632dce1bd Warning fix 2015-11-06 10:50:52 +01:00
Maxime Gimeno b11f27efce Warnings fix 2015-11-06 10:42:56 +01:00
Maxime Gimeno ac0de3ce3f Warning fix 2015-11-06 09:25:23 +01:00
Sébastien Loriot 679f918b70 fix warnings 2015-11-05 21:04:46 +01:00
Sébastien Loriot acb78238c7 avoid warning 2015-11-05 20:54:35 +01:00
Sébastien Loriot 38008be025 remove unused typedefs 2015-11-05 20:54:24 +01:00
Sébastien Loriot c63a5ab688 fix typos 2015-11-05 20:43:11 +01:00
Sébastien Loriot 0072b649e2 Merge branch 'old/Polygon_mesh_processing-local_remeshing-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 20:11:10 +01:00
Sébastien Loriot 8c30832247 update for Three framework 2015-11-05 20:09:16 +01:00
Jane Tournois f324340628 fix display of selected sharp edges in selection_item 2015-11-05 20:09:16 +01:00
Jane Tournois 30cf9ee153 fix display of edges 2015-11-05 20:09:16 +01:00
Jane Tournois 7eecc531af use Three framework 2015-11-05 20:09:16 +01:00
Jane Tournois 20b7f07132 fix compilation of remeshing 2015-11-05 20:09:15 +01:00
Jane Tournois 900dcb3862 fix compilation 2015-11-05 20:09:15 +01:00
Sébastien Loriot c6e649aa9b Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 
and adapt plugin to CGAL::Three
 2015-11-05 20:07:15 +01:00
Sébastien Loriot 811c64fe85 Merge branch 'Polyhedron_demo-add_statistics_plugin-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:50:18 +01:00
Jane Tournois 132e083c7d fix compilation 2015-11-05 19:49:59 +01:00
Sébastien Loriot 54ca52b538 Merge branch 'BGL-SurfaceMesh2SurfaceMesh-GF' into Polygon_mesh_processing-local_remeshing-GF 2015-11-05 19:25:00 +01:00
Sébastien Loriot 9124ba09be remove debug 2015-11-05 16:06:14 +01:00
Sébastien Loriot 8bebae2bc6 remove modif in ui 2015-11-05 16:06:14 +01:00
Maxime Gimeno 9e266d1fcf Move the features to plugins 
- On On the fly polylines creation is now part of polylines_io_plugin
- On On the fly point sets creation is now part of xyz_plugin
 2015-11-05 16:06:13 +01:00
Maxime Gimeno 9142fd76c2 Clean-up. 2015-11-05 16:05:48 +01:00
Maxime Gimeno c356913cdc QMetaObject name problems fix 2015-11-05 16:05:48 +01:00
Maxime Gimeno 391e5f579b Clean-up 2015-11-05 16:05:48 +01:00
Maxime Gimeno 35cd9f0e0a Corrections 
- Removed a separator in a menu
- The input format is now any non-word characters (works with space, cariage return, commas,etc.)
 2015-11-05 16:05:47 +01:00
Maxime Gimeno 9a26c9ea70 Addition of a point_set on the fly creation 
- Based on the polyline dialog, same feature but for point_sets.
 2015-11-05 16:05:47 +01:00
Sébastien Loriot 2ece404cc9 add missing layout 2015-11-05 16:05:47 +01:00
Maxime Gimeno 7b85e20538 Warning and size fix 
Veuillez saisir le message de validation pour vos modifications. Les lignes
 2015-11-05 16:05:47 +01:00
Sébastien Loriot 209e6deeac improve add polylines 2015-11-05 16:05:47 +01:00
Maxime Gimeno 7c1ac400e3 Details fix 
- Dialog title
- Error pop-up when coordinates not valid
- placeholder text
 2015-11-05 16:05:47 +01:00
Maxime Gimeno e195cd224a Addition of the misisng file 2015-11-05 16:05:47 +01:00
Maxime Gimeno 87fc85d7ca Addition of a feature to add polylines without a file 2015-11-05 16:05:47 +01:00
Sebastien Loriot d98a57c724 Merge pull request #458 from sgiraudot/Polyhedron_demo-Ransac_enhance_display-GF 
Polyhedron demo: Enhance RANSAC display
 2015-11-05 15:36:33 +01:00
Simon Giraudot 58f4a7b74f Correction of variable name and meaning 2015-11-04 15:08:59 +01:00
Laurent Rineau e99abf7a66 for master: parse options with QCommandLineParser 2015-11-04 14:52:51 +01:00
Laurent Rineau 9f75c6c39c cosmetic reindentation 2015-11-04 14:52:43 +01:00
Simon Giraudot c1e92807a3 Use same color for parallel planes 2015-11-04 14:11:59 +01:00
Laurent Rineau 75b463ee7e Fix: link libpolyhedron_demo with demo_framework and point_dialog 
On Windows, without that there was a linking error (undefined symbols).

On Linux we can emulate the Windows linker behavior with CMake
variables:

    CMAKE_MODULE_LINKER_FLAGS:STRING=-z defs
    CMAKE_SHARED_LINKER_FLAGS:STRING=-z defs

For good debugging of Windows linker errors, `-fvisibility=hidden` must
also be added to the CMake variable `CMAKE_CXX_FLAGS`.
 2015-11-04 13:34:20 +01:00
Maxime Gimeno 1ee2b905d4 Merge branch 'Polyhedron_demo-merge_Mesh_3_demo-GF-old' into Polyhedron_demo-merge_Mesh_3_demo-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/create_sphere.h
 2015-11-04 12:50:25 +01:00
Maxime Gimeno 8cdf6cc625 Merge branch 'Polyhedron_demo-optimisation_vbos-gf-old' into Polyhedron_demo-optimisation_vbos-gf 2015-11-04 12:16:33 +01:00
Simon Giraudot 627dd01478 Merge branch 'Polyhedron_demo-Ransac_enhance_display-GF' into Point_set_shape_detection_3-Plane_regularization-GF 2015-11-04 12:11:29 +01:00
Maxime Gimeno 7bd2b14429 Clean-up in Scene_implicit_function_item 2015-11-04 12:06:42 +01:00
Simon Giraudot 4b920d9d7b Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2015-11-04 12:05:43 +01:00
Maxime Gimeno 55f44c7318 Optimization of Edit_polyhedron 
- Suppressed 10 of the 19 vbos.
 2015-11-04 11:57:12 +01:00
Maxime Gimeno 2ea3b847f7 Fix in triangulation 
- triangulates only non-triangle facets
- if normals are not valid, discard the associated facet instead of crashing and
  displays a warning.
 2015-11-04 10:57:40 +01:00
Laurent Rineau 4e61a640d7 add libpolyhedron_demo 2015-11-03 19:12:27 +01:00
Laurent Rineau 28962ae54d new class Polyhedron_demo 
Conflicts:
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
 2015-11-03 19:12:15 +01:00
Laurent Rineau f72186c1cd add option --no-try-catch 2015-11-03 19:11:37 +01:00
Jane Tournois 3448f7cd57 Merge branch 'PMP-length_of_border-GF-old' into PMP-length_of_border-GF 2015-11-03 15:34:45 +01:00
Maxime Gimeno d31bff7161 Reducing the numbers of VAOs from 6 to 3 and the VBOs from 11 to 6. 2015-11-03 13:54:29 +01:00
Simon Giraudot 505469936c Distinguish names of alpha shapes 2015-11-03 12:07:26 +01:00
Simon Giraudot 95fdf5b7b9 Use polyhedron instead of polygon soups for alpha shapes 2015-11-03 12:01:26 +01:00
Simon Giraudot 32f5f10015 Dialog options (generate or not alphashapes/point subsets) 2015-11-03 11:44:42 +01:00
Simon Giraudot 094418a8a9 RANSAC plugin: display alpha shapes of detected planar primitives 2015-11-03 11:24:15 +01:00
Maxime Gimeno 44eacde69c Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.cpp
	Three/include/CGAL/Three/Scene_item.h
 2015-11-03 11:03:39 +01:00
Maxime Gimeno c0229bbadc Addition of the protection balls 
- The scene_c3t3_item now possess an option in the context menu to display
  the protection balls on a polyhedron mesh.
 2015-11-03 10:39:59 +01:00
Maxime Gimeno 97d2c0990f Optimization for segmented images and implicit function fix. 
- The optimization plugin works for all 3 types of objects.
- All c3t3_items appeara in flat+edges by default, so the plane is not invisible.
- The IO_image_plugin filter has no All filter anymore, so it is not an option when opening an OFF
 2015-11-02 11:32:33 +01:00
Simon Giraudot f6b49d3cae Include regularization in RANSAC plugin of Polyhedron demo 2015-11-02 11:17:50 +01:00
Simon Giraudot 15e7cb563c Bugfix: unselect all points when reading PLY files 2015-11-02 10:45:59 +01:00
Sebastien Loriot 97eb06bf48 Merge pull request #446 from lrineau/master 
Three: Improvements to Scene_item/Viewer
 2015-11-02 09:01:07 +01:00
Jane Tournois 792130854b uncheck protection features checkbox when unavailable 2015-10-30 16:44:45 +01:00
Jane Tournois 2eda84fbd1 properly set the default surface patch value 2015-10-30 16:23:05 +01:00
Sebastien Loriot a3a0c40916 Merge pull request #448 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Left click fix
 2015-10-30 16:09:36 +01:00
Jane Tournois 06441cd00d when features protection is not available, disable checkbox 2015-10-30 16:05:32 +01:00
Jane Tournois 1148873cfb this file expects the mesh_3 config file 2015-10-30 16:04:56 +01:00
Jane Tournois f1cb0f182b change actions names 2015-10-30 15:59:08 +01:00
Maxime Gimeno 3f728e61d4 Left click fix 
- No more need to move the mouse to select a facet
- shift + right click doesn't block the shift_pressed state anymore.
 2015-10-30 15:55:36 +01:00
Jane Tournois 90cc72151e remove useless and costly output_to_medit 2015-10-30 13:16:49 +01:00
Maxime Gimeno 13b990b2b8 Cmake error fix 2015-10-30 13:16:04 +01:00
Jane Tournois 21be30d456 set newly created item to be selected automatically 2015-10-30 13:12:30 +01:00
Jane Tournois aab984cb5e add changed() 2015-10-30 13:01:42 +01:00
Maxime Gimeno 54e0147772 Merge branch 'Polyhedron_demo-plugins_in_directories-GF-old' into Polyhedron_demo-plugins_in_directories-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.cpp
	Polyhedron/demo/Polyhedron/Advancing_front_plugin/Polyhedron_demo_advancing_front_plugin.ui
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Mesh_3_plugin/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Off_to_xyz_plugin/Polyhedron_demo_off_to_xyz_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.cpp
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin.ui
	Polyhedron/demo/Polyhedron/Poisson_plugin/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_poisson_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_surface_reconstruction_plugin_impl.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.cpp
	Polyhedron/demo/Polyhedron/Scale_space_reconstruction_plugin/Polyhedron_demo_scale_space_reconstruction_plugin.ui
 2015-10-30 12:55:19 +01:00
Jane Tournois 20c85c74e5 fix conversion between indices 2015-10-30 12:35:48 +01:00
Maxime Gimeno 7cd607686a Some clean-up 2015-10-30 12:02:51 +01:00
Maxime Gimeno c00e87da2d Inclusion of the Io_segmented_image_plugin 2015-10-30 11:59:11 +01:00
Maxime Gimeno fd99da8f87 Compilation errors fix 2015-10-30 10:57:15 +01:00
Laurent Rineau f108a22534 minor improvement to Scene_polylines_item 
Reduce the number of data members
 2015-10-29 18:51:28 +01:00
Laurent Rineau b73d1662e0 move attrib_buffers and getShaderProgram to Viewer 2015-10-29 18:51:10 +01:00
Laurent Rineau 34e469bbdc improve Scene_item 
Use an enum instead of macros.
 2015-10-29 18:50:46 +01:00
Laurent Rineau 33059e1eb1 fix comments 2015-10-29 18:50:23 +01:00
Laurent Rineau cb063ca170 remove <CGAL/gl_render.h> 2015-10-29 18:49:10 +01:00
Jane Tournois 33b687d225 change classification of operations 2015-10-29 16:10:41 +01:00
Sebastien Loriot 4292e3b700 Merge pull request #434 from sgiraudot/Polyhedron_demo-Meta_reconstruction_plugin-GF 
Polyhedron demo - Meta reconstruction plugin
 2015-10-29 16:08:59 +01:00
Jane Tournois ac0fa0b22e rename ui 2015-10-29 15:57:36 +01:00
Jane Tournois b0d59347e6 don't use perturbation nor exudation in the mesh_3_plugin 
keep this for mesh_3_optimization_plugin
 2015-10-29 15:50:50 +01:00
Jane Tournois 52df6b72cf remove useless include 2015-10-29 15:41:56 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois 8ad83f7597 add meshing of implicit functions 2015-10-29 14:15:49 +01:00
Simon Giraudot 3d125b461c Remove useless includes in xyz_plugin 2015-10-29 13:34:01 +01:00
Simon Giraudot c9a661b27b Move inclusion of UI file from H to CPP for statistcis on polyhedron 2015-10-29 13:33:10 +01:00
Maxime Gimeno 796f6eca3f Addition of the new files 2015-10-29 10:10:57 +01:00
Simon Giraudot fa0cfae043 Correction of names of variable and displayed QAction 2015-10-29 09:26:40 +01:00
Maxime Gimeno a0aa8aea05 Addition of elements 
- Scene_c3t3_item cleaned
- Segfault for optimizer corrected (another one appeared, see he comment SEGFAULT)
- Scene_segmented_image_item added
- Volume_planes_plugin added
 2015-10-28 13:46:18 +01:00
Jane Tournois b12c895a64 add config file for Mesh_3 2015-10-27 16:34:15 +01:00
Jane Tournois 6ddcb9a306 introduce Meshing_thread 2015-10-27 16:23:38 +01:00
Jane Tournois 9257075883 introduce Mesh_3 optimizers 2015-10-27 16:15:44 +01:00
Jane Tournois 14ac8f542a add concurrency config file 2015-10-27 14:57:14 +01:00
Jane Tournois 89159249bb extract Scene_c3t3_item from mesh_3_plugin, and create C3t3_type.h 2015-10-27 14:53:41 +01:00
Jane Tournois 827e94e2d3 fix the use of template parameters 2015-10-27 13:02:53 +01:00
Sebastien Loriot 38d1c08853 Merge pull request #429 from janetournois/Polyhedron_demo-sort_operations_by_package-GF 
Polyhedron demo : sort operations by package
 2015-10-27 10:19:30 +01:00
Sebastien Loriot 38558c5af5 Merge pull request #433 from maxGimeno/Polyhedron_demo-Splat_fix_for_mac-GF 
Compilation error fix
 2015-10-26 09:16:25 +01:00
Simon Giraudot cef08091f6 Fix testsuite errors: misplaced typename and concurrency tag 2015-10-26 07:25:29 +01:00
Sebastien Loriot a6b985c0c3 Merge pull request #432 from maxGimeno/Polyhedron_demo-Mesh_edition_fix-GF 
Mesh edition fix
 2015-10-23 15:46:50 +02:00
Sebastien Loriot ea8ece44cf Merge pull request #431 from maxGimeno/Polyhedron_demo-Multiple_bug_fixes-GF 
Polyhedron demo multiple bug fixes gf
 2015-10-23 15:45:12 +02:00
Simon Giraudot 37e1b09da7 Update surface reconstruction meta plugin with Three API 2015-10-23 15:39:13 +02:00
Maxime Gimeno c81a149718 Compilation error fix 
- Addition of a typedef for glFramebufferTexture2D.
 2015-10-23 15:31:14 +02:00
Simon Giraudot 82e7ddf5d5 Merge branch 'Polyhedron_demo-Meta_reconstruction_plugin-GF-old' into Polyhedron_demo-Meta_reconstruction_plugin-GF 2015-10-23 15:20:43 +02:00
Sébastien Loriot 258ef34006 vtk version 6 and greater are supported by surface_mesher and polyhedron demos 
vtk is strict and only the patch version can differ
(that is 6.1 is not compatible with 6.0)
 2015-10-22 16:38:21 +02:00
Sébastien Loriot c54bcbb47c request version of VTK 2015-10-22 12:08:06 +02:00
Maxime Gimeno 453bee4c04 Nef fix 
- Boolean operation convert to nef wasn't working because of a invalidate_buffers problem.
 2015-10-22 11:19:30 +02:00
Maxime Gimeno 58ad496b6e Removed the last traces of GLEW in Polyhedron_demo 2015-10-22 11:19:30 +02:00
Maxime Gimeno c4f24f7045 Multiple fixes 
- Overloaded virtual functions warnings fixed by making compute_elements not virtual.
- Spheres in polylines display fixed (mesh and wireframe)
- ply_to_xyz plugin fixed
 2015-10-22 11:19:30 +02:00
Sébastien Loriot aff4c2839a Adapt the ply plugin to the API of Three 2015-10-22 11:15:36 +02:00
Sebastien Loriot 1dbac9df32 Merge pull request #400 from sgiraudot/Point_set_processing_3-IO_ply-GF 
Read and write PLY point clouds
 2015-10-22 08:56:10 +02:00
Sébastien Loriot 87a20886b0 Merge pull request #424 from janetournois/Polyhedron_demo-add_vtk_plugin-GF 
Polyhedron demo : add vtk_plugin
 2015-10-21 15:36:03 +02:00
Sebastien Loriot d7cdff56f5 Merge pull request #410 from sgiraudot/Polyhedron_demo-Enhance_selected_points-GF 
Polyhedron demo - Enhance selected points
 2015-10-21 15:31:42 +02:00
Sebastien Loriot e54db4580f Merge pull request #405 from janetournois/Polyhedron_demo-add_statistics_plugin-GF 
Polyhedron demo : new "statistics" context menu
 2015-10-21 15:30:20 +02:00
Sebastien Loriot bfe374cf60 Merge pull request #426 from maxGimeno/Polyhedron_demo-Tetrahedral_mesh_fix-GF 
Tetrahedral mesh fix
 2015-10-21 15:28:46 +02:00
Sébastien Loriot 873a7f858f comment unused parameter 2015-10-21 15:25:23 +02:00
Sébastien Loriot 582a0393de remove unused typedef 2015-10-21 15:21:31 +02:00
Maxime Gimeno 07f4ea68b5 Addition of an example 
- Added the example about how to create an external plugin
 2015-10-21 15:00:21 +02:00
Maxime Gimeno 69135cb753 Addition of some doc about the plugin creation 2015-10-21 12:39:10 +02:00
Maxime Gimeno 2eb7e7713c Addition of an option to manually add a plugin 2015-10-21 12:18:55 +02:00
Maxime Gimeno 7e78dc9efd Warning fix 2015-10-21 10:40:56 +02:00
Maxime Gimeno c93ae38b95 Merge branch 'CGAL_Polyhedron_Doxygen_GF' into Polyhedron_demo-plugins_in_directories-GF 2015-10-21 10:36:32 +02:00
Sebastien Loriot 69f56ea6d1 Merge pull request #428 from maxGimeno/Polyhedron_demo-context_Operation_Menu 
Contextual menu changed
 2015-10-20 13:00:59 +02:00
Jane Tournois 9ae8dbbdfa sort actionCreateCutPlane 2015-10-20 12:46:34 +02:00
Jane Tournois d5e32479a1 first sorting of actions into directories corresponding to CGAL packages 2015-10-20 12:38:25 +02:00
Maxime Gimeno c0fe5533b5 Contextual menu changed 
- Operations is now part of the item menu, so the first menu does not exists anymore.
  It is quicker to get to an action.
 2015-10-20 11:30:49 +02:00
Maxime Gimeno 4b2f12467e Color optimization 
- The color of the c3t3 item don't use buffers anymore.
 2015-10-20 10:57:30 +02:00
Maxime Gimeno 6ceaa4fb68 Creation of an external plugin 
- Triangle plugin is now external.
 2015-10-20 10:22:21 +02:00
Jane Tournois a00245a443 add missing typenames 2015-10-20 09:56:20 +02:00
Maxime Gimeno b708d6a8fd Scene_item moved 
- Scene-item.h moved to Three.
 2015-10-20 09:00:26 +02:00
Laurent Rineau 1a20952261 Adapt the new vtk_plugin to the API of Three 2015-10-19 16:10:00 +02:00
Simon Giraudot ed6d09ffea Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-19 16:00:29 +02:00
Jane Tournois c617fc6519 move statistics to the contextMenu of Scene_polyhedron_item 2015-10-19 15:40:30 +02:00
Laurent Rineau 74342e11f8 Merge pull request #417 from maxGimeno/Polyhedron_demo-Viewer_fix-GF 
Warning fix
 2015-10-19 15:14:37 +02:00
Laurent Rineau d0105297d1 Merge pull request #423 from maxGimeno/Polyhedron_demo-Selection_tool_edges_fix-GF 
Selection tool edges fix
 2015-10-19 14:57:51 +02:00
Jane Tournois 2d4cea70a9 precise type of files handled 2015-10-19 11:02:06 +02:00
Maxime Gimeno 953a34a877 Tetrahedral mesh 
- Displays the item after its creation without having to move the manipulated frame.

- Enhances the performance when moving the manipulated frame.
 2015-10-19 09:42:52 +02:00
Jane Tournois 7fc8ba2012 fix double to float conversion warnings 2015-10-16 16:44:01 +02:00
Jane Tournois ee331d0741 make list of VTK dependencies short 2015-10-16 16:07:48 +02:00
Laurent Rineau 8588d8dd12 Fix the generation of Viewer_interface_moc.cpp (2nd) 
2nd try: during a testsuite implemented with our Docker container, the
position of Viewer_interface.h is different. Now I use the CMake command
`find_path`, with `PATHs ${CGAL_INCLUDE_DIRS}`.
 2015-10-16 11:43:02 +02:00
Maxime Gimeno 0b7b3c60de Fix 
- Forgot to remove the commentend lines.
 2015-10-16 11:04:48 +02:00
Jane Tournois 959daca125 add vtk_plugin to load .vtk and .vtp files in a Scene_polyhedron_item 2015-10-16 10:44:08 +02:00
Maxime Gimeno 54d51089d3 Selection tool edges fix 
- When hitting the "select all" button with "edges" selected, nothing happened.
  I fixed it by adding a call to invalidate_buffers and viewer->update.
 2015-10-16 08:57:26 +02:00
Maxime Gimeno 3707151474 Warnings fix 2015-10-15 16:21:44 +02:00
Simon Giraudot 9085c7d52b Reorder code of surface reconstruction plugin (simplify and remove duplicate) 2015-10-15 14:51:23 +02:00
Simon Giraudot 680cfdf8ac Rename complete reconstruction plugin and update cmake / cgal_test 2015-10-15 14:51:22 +02:00
Simon Giraudot 7043dde8c0 Remove reconstruction plugins 2015-10-15 14:51:22 +02:00
Simon Giraudot 0cfeb7d90b Include all reconstruction methods in one plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot 8f5a2c91b8 Fix missing concurrency_tag and badly handled normal vectors 2015-10-15 14:51:22 +02:00
Simon Giraudot 040f05ba1e Parameters tuning 2015-10-15 14:51:22 +02:00
Simon Giraudot f9d8f4eee5 Poisson reconstruction in meta plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot f47bcff975 Advancing front in meta plugin 2015-10-15 14:51:22 +02:00
Simon Giraudot 4e53ad517e Scale space reconstruction in meta plugin 2015-10-15 14:50:58 +02:00
Simon Giraudot 1709c3e0d3 Better handling of new item + smoothing 2015-10-15 14:50:11 +02:00
Simon Giraudot bac4183933 Size of grid simplification selection + saving of preprocessed point set 2015-10-15 14:50:11 +02:00
Simon Giraudot 2d59ba82d4 Anisotropy and noise detection + simplification 2015-10-15 14:50:11 +02:00
Simon Giraudot df813ccd7d Automatic noise scale detection 2015-10-15 14:50:10 +02:00
Simon Giraudot fbca854720 More on structure of meta reconstruction plugin 2015-10-15 14:50:10 +02:00
Simon Giraudot 2d398d83f1 Structure of meta reconstruction plugin 2015-10-15 14:50:10 +02:00
Simon Giraudot d1eec93ff1 Add option to Poisson reconstruction plugin to remove far away facets (for open shapes) 2015-10-15 14:50:10 +02:00
Simon Giraudot 99d4fc84bd Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-15 14:27:57 +02:00
Laurent Rineau c829753d33 Fix the generation of Viewer_interface_moc.cpp 2015-10-15 11:53:39 +02:00
Maxime Gimeno 1685b13f4a Mesh edition fix 
- When validating an edition of mesh, all the items of the scene became invisible.
  This came from a setVisible(false) in the scene_polyhedron_edit_item's destructor
  that was put there to fix a segfault taht has disappeared since.

- When validating an edition, the modifications were not displayed on the
  polyhedron_item. This was because an invalidate_buffers() that was lacking.
 2015-10-14 15:11:54 +02:00
Maxime Gimeno 38dca64157 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
 2015-10-14 12:46:48 +02:00
Laurent Rineau 18cac48bae Merge pull request #367 from sgiraudot/Point_set_processing-hierarchical_clustering-sgiraudot 
New point set processing algorithm: Hierarchical clustering
 2015-10-14 10:54:37 +02:00
Laurent Rineau 1cc6f47099 Merge pull request #401 from maxGimeno/Polyhedron_demo-Selection_tool_fix-GF 
Mouse binding modification
 2015-10-14 10:32:04 +02:00
Laurent Rineau cdeb629691 Merge pull request #402 from maxGimeno/Polyhedron_demo-OFF_loading_fix-GF 
OFF loading fix

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
 2015-10-14 10:28:54 +02:00
Laurent Rineau fc7f11d6ba Merge pull request #411 from maxGimeno/Polyhedron_demo-BBox_Modifications-GF 
Default BBox returning changed for someitems
 2015-10-13 17:38:28 +02:00
Laurent Rineau da76927016 Merge pull request #396 from maxGimeno/Polyhedron_demo-Camera_positions_set-GF 
Polyhedron demo: fix camera presets
 2015-10-13 17:37:55 +02:00
Laurent Rineau b37e5fe417 Merge pull request #409 from maxGimeno/Polyhedron_demo-Axis_fix-GF 
Polyhedron demo: fix the display of axis
 2015-10-13 17:36:42 +02:00
Laurent Rineau 330a0e75a2 Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin 
CGAL headers only, step 0
 2015-10-13 16:37:38 +02:00
Maxime Gimeno 7eace89c48 Warning fix 
- made compute_elements const to fix the overloaded virtual function warning.
 2015-10-13 15:35:38 +02:00
Maxime Gimeno 57a1e269ca Warning fix 
- addition of casts to silence warnings in Viewer.
 2015-10-13 15:02:29 +02:00
Maxime Gimeno 221c78f370 typo fix 2015-10-13 14:29:48 +02:00
Simon Giraudot fcd24c4321 Bugfix: self-assignment of variable 2015-10-13 14:23:27 +02:00
Maxime Gimeno e263abec99 Optimisation 
- in the scene's addItem function, when checking the new BBox,
  isFinite and isEmpty are tested first.
 2015-10-12 09:16:59 +02:00
Maxime Gimeno b07069e20e Error fix 
- added functions to the viewer_interface so that SELECT being protected does not cause errors.
 2015-10-12 09:12:28 +02:00
Maxime Gimeno 6d81c34d8a Bbox fix 
- Added a test on isFinite and isEmpty for the scene bbox change and one
  on item->visible() in the computation of the scene bbox.
 2015-10-09 16:29:41 +02:00
Maxime Gimeno be90e95e42 Default BBox returning changed for someitems 
- Using tools like the selection tool creates items that make the scene
  re-center, and this can be annoying. To avoid that, I changed the default BBox
  of those items from BBox(), which is (0,0,0,1,1,1) to scene->bbox() for
  most of the cases. This way the scene bbox does not change and you don't
  lose your position when they are added.
 2015-10-09 15:50:41 +02:00
Maxime Gimeno ab4237cf8e Multiple selection handling implementation 
- the drag and drop now supports multiple selection
 2015-10-09 14:32:10 +02:00
Maxime Gimeno 59aa6cba1e Fix for the fix 
- The precedent fix must have brought a lot of similar warnings that are supposed to be
   fixed here # Veuillez saisir le message de validation pour vos modifications. Les lignes
 2015-10-09 14:08:23 +02:00
Maxime Gimeno 1c0c2c8858 Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Camera_positions_list.cpp
	Polyhedron/demo/Polyhedron/MainWindow.cpp
	Polyhedron/demo/Polyhedron/MainWindow.h
	Polyhedron/demo/Polyhedron/Polyhedron_demo_camera_positions_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_off_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_average_spacing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_bilateral_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_smoothing_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_upsampling_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyhedron/demo/Polyhedron/Viewer.h
 2015-10-09 13:59:33 +02:00
Maxime Gimeno 266be4d597 Warning fix 
- Supposed to fix the warning about hidden overloaded virtual functions.
 2015-10-09 13:48:52 +02:00
Laurent Rineau fc81e2ca00 Add tooltips to the buttons 2015-10-09 11:43:08 +02:00
Simon Giraudot 45c25daf12 Simplify computation of normals (no need for 2 separate loops) 2015-10-09 11:42:32 +02:00
Simon Giraudot 45ddbeaab8 Bugfix: loading point set from OFF polyhedron (+ indentation correction) 2015-10-09 11:42:32 +02:00
Simon Giraudot 08a256f44f Bugfix: default copy constructor did not work anymore 2015-10-09 11:42:32 +02:00
Simon Giraudot cccf5e004a Use vector instead of deque and remove useless attribute m_nb_selected_points 2015-10-09 11:42:31 +02:00
Simon Giraudot f239c0d798 Update plugins with new selection behavior 2015-10-09 11:42:31 +02:00
Simon Giraudot 4bd6909c40 Correct invert_selection and remove useless select(begin,end) 2015-10-09 11:42:31 +02:00
Simon Giraudot 9fcd0120c7 Update simplification and selection plugins with new selection behavior 2015-10-09 11:42:31 +02:00
Simon Giraudot b266666934 Update point set item with new selection behavior 2015-10-09 11:42:30 +02:00
Simon Giraudot 24895c83a0 Replace selection behavior using a single iterator instead of N booleans 2015-10-09 11:42:30 +02:00
Simon Giraudot e9bb16a961 Remove 'selected' boolean 2015-10-09 11:42:30 +02:00
Maxime Gimeno ff0a41ffd2 Addition of a ui file for the example plugin 2015-10-09 11:37:23 +02:00
Maxime Gimeno de95dc1fef Axis fix 
- The axis system was representing the rotation of the camera, which was not
  very clear. It now represents the mvp matrix, without the translation part
  which is less disturbing.
 2015-10-09 11:10:02 +02:00
Jane Tournois eea2481cd6 fix unused variable warning 2015-10-09 10:37:38 +02:00
Sébastien Loriot cc8ecc491a fix a warning of clang 2015-10-08 17:53:56 +02:00
Sébastien Loriot fb0687dfb7 Merge branch 'Polyhedron_demo-fix_windows_warnings-sloriot' 2015-10-08 17:13:19 +02:00
Sebastien Loriot 1910311dd8 Merge pull request #395 from maxGimeno/Polyhedron_demo-hole_filling_fix-GF 
Hole_filling fix
 2015-10-08 17:05:35 +02:00
Jane Tournois 3d1ab593a6 add statistics on polyhedron 
todo : add possibilities to get statistics on other types of data,
and more statistics
 2015-10-08 15:08:49 +02:00
Maxime Gimeno e9b5e0c135 OFF loading fix 
- Some items called compute_normals_and_vertices several times in a row.
 2015-10-08 11:39:49 +02:00
Maxime Gimeno 4ac6066360 Mouse binding modification 
- When a selection item is selected, shift+left click does not call information requests
  for the selected point anymore. It makes the selection tool faster by far.
 2015-10-08 11:12:33 +02:00
Maxime Gimeno 2f4660fd7f Addition of a drag&drop feature 2015-10-08 09:48:36 +02:00
Simon Giraudot 79ca962159 Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-08 08:48:39 +02:00
Simon Giraudot 9bee520744 Enable possibility to save point sets in off format (polyhedron demo) 2015-10-08 08:32:40 +02:00
Simon Giraudot bf3fb02373 Enable possibility to save point sets in ply format (polyhedron demo) 2015-10-08 07:15:00 +02:00
Laurent Rineau c1b555b64b Fix Scene_polyhedron_item::show_only_feature_edges 
(cherry picked from commit 19046611a8613dedeeb8d93bc368aa182df778d8)
 2015-10-07 16:21:44 +02:00
Simon Giraudot e161dab5df Improve GUI of point set simplification plugin in Polyhedron demo 2015-10-07 16:00:54 +02:00
Simon Giraudot 70502ca75a Integrate hierarchy simplification in reworked simplification plugin 2015-10-07 16:00:53 +02:00
Simon Giraudot a02dabb4b0 Hierarchical clustering plugin for Polyhedron demo 2015-10-07 16:00:52 +02:00
Sebastien Loriot 069eb65d70 Merge pull request #392 from maxGimeno/Polyhedron_demo-nef_item_fix-GF 
Polyhedron demo: fix nef item
 2015-10-07 15:48:27 +02:00
Simon Giraudot 414f04068e Write PLY in polyhedron scene point set item 2015-10-07 15:34:23 +02:00
Sébastien Loriot dc536257c8 fix warnings on windows 2015-10-07 14:53:32 +02:00
Simon Giraudot 674bcb5d91 Check if point set has normals when reading PLY 2015-10-07 14:13:55 +02:00
Simon Giraudot c2e38b72a6 Merge branch 'Point_set_processing_3-IO_ply-GF-old' into Point_set_processing_3-IO_ply-GF 2015-10-07 13:52:06 +02:00
Simon Giraudot fddcb24197 Polyhedron demo ply_to_xyz reader 2015-10-07 13:50:57 +02:00
Simon Giraudot 93c52c605c New test for ply reader 2015-10-07 13:50:41 +02:00
Maxime Gimeno 83537667f1 Camera preset fix 
- The preset camera positions are now centered on the revolveAroundPoint of
  the camera, which makes it right when the item is not centered in the scene.
 2015-10-07 11:45:34 +02:00
Maxime Gimeno 057a51d4f3 Hole_filling fix 
- The polyline item was not computed. I passed the computing function const to
  call it the same way initialize_buffers is called, from draw.
 2015-10-07 10:52:02 +02:00
Maxime Gimeno e88a7f6da7 Doc about dock widgets done. 2015-10-07 10:10:13 +02:00
Sébastien Loriot ba881bf70e Merge pull request #359 from maxGimeno/Polyhedron_demo-Adding_information_about_item-GF 
Addition of some informations about the items
 2015-10-06 17:54:51 +02:00
Sébastien Loriot 82a8d03d79 fix a std::size_t -> int warning 2015-10-06 17:51:43 +02:00
Sébastien Loriot 72fa3d9d81 Merge pull request #357 from maxGimeno/Polyhedron_demo-Axis_system-GF 
Polyhedron demo : Addition of a small axis system in a corner
 2015-10-06 17:47:50 +02:00
Maxime Gimeno de44689648 Warning fix 
- Supposed to fix the warning about double and float.
 2015-10-06 17:46:21 +02:00
Sébastien Loriot dfbba8ad06 Merge pull request #327 from sgiraudot/Point_set_processing_3-TBB-GF 
Point set processing parallelized with TBB
 2015-10-06 17:39:35 +02:00
Sébastien Loriot 76fa1cfb5c Merge branch 'releases/CGAL-4.7-branch' 2015-10-06 17:31:31 +02:00
Sébastien Loriot c21377297a Merge remote-tracking branch 'maxGimeno/Polyhedron_demo-Splatting_fix_mesa-GF' into releases/CGAL-4.7-branch 2015-10-06 17:30:58 +02:00
Sebastien Loriot aa76ae8ea7 Merge pull request #358 from maxGimeno/Polyhedron_demo-context_Operation_Menu 
Polyhedron demo : Menu operation is accessible with a context menu
 2015-10-06 17:27:06 +02:00
Sebastien Loriot 03344a36f7 Merge pull request #360 from maxGimeno/Polyhedron_demo-Camera_positions_set-GF 
Polyhedron demo: Addition of a preset of  camera positions
 2015-10-06 17:26:34 +02:00
Maxime Gimeno 56b31b7971 Color fix 
- The nef item has random facets with their normal reversed. In CGAL-4.6, it
  was dealt with by forcing "draw two side" to true. So it is what I did.
 2015-10-06 14:38:29 +02:00
Maxime Gimeno dc2955c16f Selection Fix 
- The selection was still calling invalidate_buffers.
 2015-10-06 14:38:28 +02:00
Maxime Gimeno 77a6f4af46 Remove item fix + group selection 
- Removing an item does not kill the hirarchy anymore, thanks to recursivity
  in several functions.
- Selecting a group now adds all its children to the selected_items_list.
 2015-10-05 15:58:38 +02:00
Maxime Gimeno 3bda315695 WIP Adding dock about QDockWidget 2015-10-05 13:03:27 +02:00
Maxime Gimeno 08535f2625 Windows Error Fix : 
- Replaced M_PI and M_PI_2 by CGAL_PI and CGAL_PI/2.
 2015-10-05 09:26:32 +02:00
Maxime Gimeno 7b7b61e289 WIP Adding doc about plugin using ui files 2015-10-05 09:01:29 +02:00
Maxime Gimeno c7c6772dfd Segfault fix 2015-10-02 15:58:39 +02:00
Maxime Gimeno 372865722b Merged in master 2015-10-02 11:43:17 +02:00
Maxime Gimeno e6765a68d3 Merge branch 'Polyhedron_demo-Hierarchic_view-GF-old' into Polyhedron_demo-Hierarchic_view-GF 2015-10-02 11:22:41 +02:00
Maxime Gimeno 5616734f26 Addition of removing features 2015-10-02 10:37:06 +02:00
Maxime Gimeno ab74566f82 If condition fixed 
- If ratio was equal to exactly one, nothing was displayed.
 2015-10-01 14:27:18 +02:00
Maxime Gimeno 26e89282a4 Typo 2015-10-01 14:27:18 +02:00
Maxime Gimeno acc51c83ec Ratio fix 
- When the ratio was < 1, the system was out of the window.
 2015-10-01 14:27:17 +02:00
Maxime Gimeno 82defd7dd6 Making the axis a 'right-hand axis' so it fits the actual scene. 2015-10-01 14:27:17 +02:00
Maxime Gimeno cceb479d4f Toggling the axis system 
- Addition of a toggle system with the A key, instead of the QGLViewer axis system.
 2015-10-01 14:27:17 +02:00
Maxime Gimeno b274a3f8e3 Added a permanent axis system in the top right corner of the screen. 2015-10-01 14:27:17 +02:00
Maxime Gimeno c668c2b987 (WIP)Inserting axis system in a corner. 2015-10-01 14:27:16 +02:00
Sébastien Loriot 9b8b98c4d0 Merge branch 'Polyhedron_demo-Menu_organization-GF' 2015-10-01 11:59:13 +02:00
Sébastien Loriot e0e50010ab use suited overload 
this also fix an issue with clang and virtual overload hidding
 2015-10-01 11:55:59 +02:00
Sebastien Loriot 7500bb03aa Merge pull request #361 from maxGimeno/Polyhedron_demo-color_management-GF 
Optimazing color handling
 2015-10-01 11:08:45 +02:00
Maxime Gimeno 887b6c5322 Groups drawing done 
- The hierarchy display seems to be over.
- Remaining : group modifications management.
 2015-10-01 09:21:40 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Maxime Gimeno 977c709f58 Integration of the operation context menu to the classic context menu. 
- The context menu (Shift + Right-click) now shows to sub-menus : the
  one from before AND the operation menu.
 2015-09-30 11:40:41 +02:00
Maxime Gimeno d11d6d78c0 Moving items fix 
- addition of conditions when moving a camera position in the list, so that it
  won't disappear when trying to move it up when it is at the first position
  or trying to move it down when it is at the last position.
 2015-09-30 11:16:45 +02:00
Maxime Gimeno 335514b7af Upgrade 
- The number of isolated points is displayed only when the item is
of type Polyhedron or of type polygon soup, or if this number is more than 0.
 2015-09-30 10:12:48 +02:00
Maxime Gimeno 2dbfc6b8a5 More warning fixes 2015-09-29 16:37:57 +02:00
Maxime Gimeno 7ea5f71c60 Warning suppression 2015-09-29 15:40:18 +02:00
Maxime Gimeno fee42307f7 (WIP) Addition of .h files 2015-09-29 14:06:11 +02:00
Simon Giraudot ac591cf257 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-29 13:50:17 +02:00
Sebastien Loriot 0100e321a3 Merge pull request #267 from sgiraudot/Scale_space_reconstruction_3-handle_non_manifold-sgiraudot 
Scale space reconstruction 3 handle non manifold sgiraudot
 2015-09-29 13:27:17 +02:00
Maxime Gimeno 06e885da4c Handling of the remove function 2015-09-28 12:47:34 +02:00
Maxime Gimeno 250520c80a Example, MainWindow and Scene Item added to the doc. 2015-09-28 08:39:28 +02:00
Sebastien Loriot 81d65c9aa1 Merge pull request #349 from sgiraudot/Surface_mesh_parametrisation-OpenNL_Eigen-GF 
Surface mesh parametrisation - Replace OpenNL by Eigen as default
 2015-09-26 15:37:04 +02:00
Sebastien Loriot 778dfb92ca Merge pull request #354 from lrineau/Polyhedron-fix_demo_CMakeLists-lrineau 
Polyhedron demo: cleanup the CMakeLists.txt
 2015-09-26 09:58:36 +02:00
Maxime Gimeno 0b810bc19d Delegate fix 2015-09-25 15:52:38 +02:00
Simon Giraudot 4b825deb29 Bugfix: removed forgotten conflict lines (HEAD, etc.) and deleted finalize_polygon_soup 2015-09-25 14:43:46 +02:00
Maxime Gimeno cc88c67983 Hierarchy operational. 
- Must adapt the model so that data() returns the right value.
 2015-09-25 10:08:20 +02:00
Maxime Gimeno 6395258afd Class List added 2015-09-24 12:49:15 +02:00
Simon Giraudot 9cc6982656 Merge branch 'Scale_space_reconstruction_3-handle_non_manifold-sgiraudot-old' into Scale_space_reconstruction_3-handle_non_manifold-sgiraudot 2015-09-24 12:48:15 +02:00
Simon Giraudot 13e4a76cd8 Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-24 12:45:58 +02:00
Maxime Gimeno d264b882f5 Package Three creation 
- Creatio of a new package containing the base class for the plugin API.
 2015-09-23 13:40:30 +02:00
Laurent Rineau 252cc0ec81 Merge branch 'releases/CGAL-4.7-branch' 
Conflicts:
	Maintenance/release_building/public_release_name

This merges the pull request #340 from
maxGimeno/Polyhedron_demo-WaitCursor_Fix-GF:

    Polyhedron demo: WaitCursor fix in the OFF plugin.
 2015-09-23 12:23:58 +02:00
Laurent Rineau a4016ed4b4 Merge pull request #340 from maxGimeno/Polyhedron_demo-WaitCursor_Fix-GF 
Polyhedron demo: WaitCursor fix in the OFF plugin.
 2015-09-23 12:20:38 +02:00
Maxime Gimeno d3336372b7 editorEvent Fix 
- I accidently changed the QAbstractItemModel of the argmument of the function
  into a QStandardItemModel.
 2015-09-22 10:11:23 +02:00
Sébastien Loriot b970fc80ef Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF 2015-09-22 09:54:18 +02:00
Maxime Gimeno 4d5962a284 WIP Using a hierarchical view 
- Replaced the Abstract list model by a standardItem model, that is able
  to handle hierarchy.
- editorEvent are not caught.
 2015-09-22 09:38:55 +02:00
Laurent Rineau 5c9a3a9954 Polyhedron demo: cleanup the CMakeLists.txt 
That CMakeLists.txt was still using the old API of FindQt4.cmake. Since
then, we have switched to CMake>=2.8.11 and Qt5. Thus:

  - Remove the uses of variables `QT_USE_QTXML` and similar.

  - Remove the uses of `target_link_libraries(... ${QT_QTGUI_LIBRARY})`,
    that is replaced by the function `qt5_use_modules`.

  - Remove last occurrences of GLEW.

  - The Qt5 ScriptTools module is an optional
    component (`OPTIONAL_COMPONENTS`). And it is used only if the option
    `POLYHEDRON_QTSCRIPT_DEBUGGER` is enabled.
 2015-09-21 15:40:38 +02:00
Maxime Gimeno f4a9f93898 Splat Fix for mesa 
- Moved an extension declaration at the beginning of the shader, before the
  #define are added. The problem is that it enables the extension for splatting
  shaders that don't require it, but I don't think it is really bad.
 2015-09-18 14:52:46 +02:00
Maxime Gimeno c21a66f25d Optimazing color handling 
- Corrected a bug in edit polyhedron with the Spheres that were not displayed.
- Added a boolean member to scene_item determining if the color should be handled by
  a single value, which avoids having to re-compute the color of each vertex when
  the color is changed through the UI, or by the buffers (only for certain plugins).
 2015-09-18 12:20:08 +02:00
Simon Giraudot 587ff6414e Revert useless change in MainWindow of Polyhedron demo 2015-09-18 10:43:40 +02:00
Simon Giraudot 6bff21d2e4 Remove useless inclusion of OpenMP 2015-09-18 10:32:31 +02:00
Simon Giraudot b9bbadf631 Merge branch 'Surface_mesh_parametrisation-OpenNL_Eigen-GF-old' into Surface_mesh_parametrisation-OpenNL_Eigen-GF 2015-09-18 10:06:13 +02:00
Maxime Gimeno 69b13c9a0b Clean-up 2015-09-17 16:33:55 +02:00
Maxime Gimeno 46083ca54e Merge branch 'CGAL_Polyhedron_Doxygen_GF-old' into CGAL_Polyhedron_Doxygen_GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CGAL_demo/Viewer_interface.h
	Polyhedron/demo/Polyhedron/Scene_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2015-09-17 16:27:48 +02:00
Maxime Gimeno 7516a77173 Rename doxygen_config in Doxyfile 2015-09-17 15:48:49 +02:00
Maxime Gimeno 5e054a140a Update of the mainPage 2015-09-17 15:45:27 +02:00
Maxime Gimeno 4416bec460 Update the ToolTip doc and the toolType function in the example plugin. 2015-09-17 15:41:43 +02:00
Maxime Gimeno c9f8fcb081 Addition of buttons for the camera positions 
- The buttons are connected to the positions
- The list is cleared, the pre-set positions are not in it anymore
- The buttons up and Down are replaced by arrow icons to gain space.
 2015-09-17 14:07:58 +02:00
Maxime Gimeno 0c4137dbca (WIP) Addition of buttons for basic positions 2015-09-17 12:40:41 +02:00
Maxime Gimeno 4492f6baf1 Addition of a set of camera positions 2015-09-17 12:34:38 +02:00
Maxime Gimeno e96e859277 (WIP) addition of camera positions 2015-09-17 12:31:56 +02:00
Sebastien Loriot 685fccb489 Merge pull request #337 from maxGimeno/Polyhedron_demo-changed_function_enhancement-GF 
Polyhedron demo: changed() function enhancement
 2015-09-17 10:57:32 +02:00
Sebastien Loriot 25a052da94 Merge pull request #338 from afabri/Polyhedron-conversion_warnings-GF 
fix issue #333
 2015-09-17 10:40:43 +02:00
Maxime Gimeno 8443337d9a Addition of some informations about the items 
- Addition of the extremities of the bounding box and the
  number of isolated vertices.
 2015-09-17 10:38:40 +02:00
Maxime Gimeno d5f041dd36 Addition of a context menu for Operations 
- Makes the operations menu appear on the cursor when Ctrl+Shift+Right click
  are pressed.
 2015-09-17 10:22:01 +02:00
Maxime Gimeno 60b2d9e70f (WIP) Addition of a context menu for operations 2015-09-17 10:13:47 +02:00
Sébastien Loriot 04b9cd986d fix conversion from 'size_t' to 'int' warning 2015-09-17 09:13:20 +02:00
Sébastien Loriot c83d9a5035 fix a unused variable warning 2015-09-15 09:15:07 +02:00
Maxime Gimeno 4b401e3794 WaitCursor fix in off plugin. 
- Makes the WaitCursor disappear when the message "isolated vertices ignored" pops up,
  so  that the user doesn't think something is still loading when it's not.
 2015-09-14 11:52:31 +02:00
Sébastien Loriot f1aa5e15f2 remove an automatic invalidate_buffers and replace them by manually placed ones 2015-09-11 21:29:33 +02:00
Sébastien Loriot 30831d27ac explicitly call invalidate_buffers when needed 2015-09-11 17:14:33 +02:00
Sébastien Loriot 7098c2394b remove changed() 2015-09-11 17:08:49 +02:00
Sébastien Loriot e07c9ccb62 hide input 2015-09-11 17:05:59 +02:00
Maxime Gimeno 96fdf120a3 Removed some invalidate_buffers() 2015-09-11 16:12:35 +02:00
Maxime Gimeno 9a4d526012 ModelView fix 
- When choosing the modelview in the context menu, the viewer did not get updated and
  nothing happended before moving the camera. Using a new signal in the scene, it
  now is.
 2015-09-11 16:12:35 +02:00
Maxime Gimeno b1be4dbe5d No more cals to invalidate_buffers when changing rendering mode 
- Everything is calculated when invalidate_buffers is called, including the
  normals for the Flat and the Gouraud mode, so there is no more need to
  call invalidate_buffer when changing the rendering mode, which makes it
  instant.
 2015-09-11 16:12:34 +02:00
Maxime Gimeno f48d6db53c Renaming the function changed() 
-changed() is now called invalidate_buffers() to avoid confusion with itemChanged();
 2015-09-11 16:12:34 +02:00
Sebastien Loriot b7bc31146e Merge pull request #334 from maxGimeno/CGAL_Polygon_soup_fix 
Fix polygon_soup and optimize loading time
 2015-09-11 16:06:43 +02:00
Andreas Fabri 5ce59e470c fix issue #333 2015-09-11 15:30:16 +02:00
Sébastien Loriot c41e558f66 use a float for initialization to avoid a warning 2015-09-11 09:34:06 +02:00
Sébastien Loriot 90c9e4664d fill non-manifold edges once 2015-09-10 17:36:23 +02:00
Sébastien Loriot 96616a9e97 avoid a duplicated call to changed 2015-09-10 17:34:03 +02:00
Maxime Gimeno c99b79bfc9 Fix polygon_soup and optimize loading time 
- fill_edges was called in a loop on the edges, which made the loading of big items extremely slow.
- fill_edges is now only called in compute_normals, when it was called several times when creating or converting a polygon_soup
- compute_normals_and_vertices is now const and called with initialized_buffers in the draw functions, which allows to reduce
  the number of times it is called, in Scene_polygon_soup_item and in Scene_polyhedron_item.
 2015-09-10 14:35:41 +02:00
Maxime Gimeno 6974972477 Add doc for loadPlugins 2015-09-10 10:30:11 +02:00
Maxime Gimeno abe25faf96 Added documentation for sumenus 2015-09-10 10:23:25 +02:00
Maxime Gimeno ff99290200 Making the submenus creation recursive 2015-09-10 10:08:25 +02:00
Laurent Rineau 66e84fe833 Merge pull request #309 from maxGimeno/CGAL_RAM_Eco_GF 
Polyhedron demo: save memory by clearing the vectors after they are sent to OpenGL

Conflicts:
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
 2015-09-10 09:43:52 +02:00
Laurent Rineau a0cc815736 Merge pull request #315 from maxGimeno/CGAL_non_manifold_edges_fix_GF 
Polyhedron demo: fix display of non-manifold edges in polygon soup items
 2015-09-10 09:42:54 +02:00
Laurent Rineau 96515dfe42 Merge pull request #306 from maxGimeno/CGAL-Qt5_support-Splatting-Perf-GF 
Restore the splatting feature of the Polyhedron demo
 2015-09-10 09:40:53 +02:00
Maxime Gimeno b442f34875 Menu re-organization 2015-09-09 15:27:19 +02:00
Maxime Gimeno cd5312a5ad ::gl error fix and CGALColor warning fix 2015-09-08 15:53:38 +02:00
Maxime Gimeno 33a2aafcfa Organizing operations menu 2015-09-08 15:42:34 +02:00
Simon Giraudot 8be703a0c8 Update newest Polyhedron demo plugin with parallelized PSP algorithm versions 2015-09-08 11:23:54 +02:00
Simon Giraudot 935956a10f Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF 2015-09-08 11:11:07 +02:00
Simon Giraudot 59552881a7 Update calls of parallelized PSP function in other packages 2015-09-08 11:01:09 +02:00
Maxime Gimeno 2e2cfe8edf Merge branch 'CGAL_texture_fix_GF' into CGAL_Polyhedron_Doxygen_GF 2015-09-07 15:47:06 +02:00
Maxime Gimeno 795cf24649 Doxygen Documentation 2015-09-07 15:44:29 +02:00
Sébastien Loriot 37b9b8e7bf force update of the display 
mimic what is done for load(istream)

Trivial bug fix for demo
 2015-09-07 15:12:21 +02:00
Jane Tournois 24976853dd use volume function in polyhedron demo 2015-09-07 15:11:29 +02:00
Maxime Gimeno ea54208be1 Function Error Fix 
- Added viewer-> before all the gl functions calls.
 2015-09-07 11:01:08 +02:00
Maxime Gimeno 04d948c34e Doxygen documentation 2015-09-07 10:46:58 +02:00
Simon Giraudot d9d94f082e Update files with new package name (Poisson_surface_reconstruction_3) 2015-09-04 18:18:52 +02:00
Jane Tournois 6a2a218da2 use new area(tmesh) function 2015-09-04 17:42:21 +02:00
Maxime Gimeno d2038e57b2 Doxygen doc 2015-09-04 16:03:56 +02:00
Maxime Gimeno e07b95e7ee Non manifold edges fix 
- The test to detect the non manifold edges was wrong. It had an unnecessary condition.
- The function that fills the list of non manifold edges was not called anymore. It is
  now called in compute_normals_and_vertices().
- I added the necessary code to display the non manifold edges.
 2015-09-04 14:43:25 +02:00
Maxime Gimeno f12ff0ca55 Doxygen documentation 2015-09-04 12:28:01 +02:00
Laurent Rineau 1eab366954 Merge pull request #312 from sloriot/Polyhedron_demo-stl_io_plugin_safer-sloriot 
Polyhedron demo: first check that the STL file is a polygon mesh before loading it

Conflicts:
	Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
 2015-09-04 11:36:13 +02:00
Maxime Gimeno c3de07dfc9 OpenGL calls fix 
- Replaced ::gl... by viewer->gl...
- Removed the useless calls to CGALglcolor
- Replaced the CGALglcolor call in the splatting draw by a viewer->glColor4d, which fixed a color bug in splatting.
 2015-09-04 08:39:52 +02:00
Maxime Gimeno ca12416e30 Merge branch 'CGAL-Qt5_support-Splatting-Perf-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-Splatting-Perf-GF 2015-09-04 08:24:45 +02:00
Maxime Gimeno 73307a3f1c Warning fix 
- there was a semi-column after an 'if' statement.
 2015-09-04 08:23:09 +02:00
Maxime Gimeno 3948587004 Indentation fix 2015-09-04 08:14:51 +02:00
Maxime Gimeno eeab98ab32 Doxygen doc 
- Adding doxygen comments to document the API
 2015-09-04 08:11:21 +02:00
Laurent Rineau 9bae0c0e63 Merge pull request #270 from sgiraudot/Polyhedron_demo-WLOP_plugin-sgiraudot 
Polyhedron demo point set processing plugins
 2015-09-03 17:22:54 +02:00
Sébastien Loriot 4931c8c889 first check that the stl file is a polygon mesh before loading it 2015-09-03 15:17:14 +02:00
Laurent Rineau cf74c64c46 Merge pull request #307 from CGAL/Polyhedron_demo-fix_reset_color-sloriot 
be more permissive for color reset
 2015-09-03 12:50:16 +02:00
Jane Tournois ce54198aa7 Merge branch 'Polygon_mesh_processing-local_remeshing-GF-old' into Polygon_mesh_processing-local_remeshing-GF 2015-09-02 15:57:23 +02:00
Laurent Rineau e061633d85 Remove a warning (unused variable) 2015-09-02 14:22:05 +02:00
Maxime Gimeno 1533deff99 Textures Fix 
- Use texture2D instead of texture in the shaders to have it in gglsl 1.2 and not 1.3.
 2015-09-02 12:14:37 +02:00
Maxime Gimeno 41853ed427 RAM consumption enhancement 
- Use of the swap trick to clear the memory once the buffers have been filled.
 2015-09-02 11:41:52 +02:00