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

3373 Commits

Author SHA1 Message Date
Maxime Gimeno 31a493b670 H window update 2016-04-27 14:28:48 +02:00
Maxime Gimeno 4403dfbb6c Print of the Ids of all primitves and the selected one available 2016-04-27 14:28:48 +02:00
Maxime Gimeno 4572da6e7c WIP :Use the aabb_tree to choose which ids to display 2016-04-27 14:26:05 +02:00
Maxime Gimeno 540bc5dfcb Some clean-up 2016-04-27 14:19:02 +02:00
Maxime Gimeno 408402d1b5 Print selected primitive Id is done. 
- Uses the aabb_tree to find the selected facet
- iterate its vertices and halfedges and compute the distances between the Id spots and the selected point
- only prints the spot with the smallest distance.
 2016-04-27 14:18:03 +02:00
Maxime Gimeno 68e585d36b WIP : Use AABB_Tree to find the selected Id quicker 2016-04-27 14:15:50 +02:00
Maxime Gimeno d20a35d282 Selected id displayed one by one 
- Segfault when removing the item from the scene
 2016-04-27 14:15:50 +02:00
Maxime Gimeno cbdbc725aa Ids update : 
- Ids are all displayed where they should
- WIP : only print the ones that are not hidden by another item or facet
- TO DO: Change the API so that the destructor of an item can remove the textItems from the renderer.
 2016-04-27 14:12:22 +02:00
Maxime Gimeno f76ba833e3 Working text drawing on top of the scene. 2016-04-27 14:06:27 +02:00
Maxime Gimeno 13785ba783 WIP fixes 
- Repaired the drawText function for the polyhedron_items.
- Restored the white background.
- Still no text displayed.
 2016-04-27 14:06:27 +02:00
Maxime Gimeno c0d9f4f50e WIP QPainter problems 2016-04-27 14:06:27 +02:00
Maxime Gimeno dbb5c07709 Draw text done. WIP Blending 2016-04-27 14:02:27 +02:00
Maxime Gimeno 278b9b2614 Remove cells incident to far points 2016-04-26 14:31:45 +02:00
Maxime Gimeno 8c52d26622 fix busy waiting of the cut_plugin 2016-04-26 13:01:38 +02:00
Maxime Gimeno 4285d49d2d fix the busy waiting of the implicit functions 2016-04-26 12:47:10 +02:00
Maxime Gimeno 227b8f58dc Fix the busy-waiting of the scene_edit_polyhedron_item 2016-04-26 12:41:26 +02:00
Maxime Gimeno a31e225547 Fix busy-waiting for c3t3_item 2016-04-26 12:05:39 +02:00
Jane Tournois 6d580bfc83 fix vtk plugin rebase conflict/error 2016-04-26 11:23:59 +02:00
Maxime Gimeno 8f3f910fd8 Clean-up 2016-04-26 08:45:24 +02:00
Maxime Gimeno 6a87afbf66 WIP clean-up 2016-04-25 17:00:15 +02:00
Maxime Gimeno 9e7f9188aa Bug fix 
- Fixes the exported targets namespace and a bug in the example_plugin.
 2016-04-25 16:53:49 +02:00
Maxime Gimeno f73b30aa1d Plugin API made in CamelCase 2016-04-25 16:53:48 +02:00
Maxime Gimeno 0d8f9130b8 Clean-up the plugin helper 2016-04-25 16:40:03 +02:00
Maxime Gimeno fcd6e247ca Removes the hardcoded actions in Operations 2016-04-25 16:40:03 +02:00
Maxime Gimeno 1a9edb6fda WIP Removing plugin helper 2016-04-25 16:40:02 +02:00
Maxime Gimeno 2681d87eef Finished doc update and replaced BBox by CGAL::BBox_3 2016-04-25 16:39:56 +02:00
Maxime Gimeno 87b2b07956 WIP Correct the doc 2016-04-25 16:35:06 +02:00
Sebastien Loriot 5331ee42b5 Merge pull request #1009 from maxGimeno/Polyhedron_demo-Fix_menus-GF 
Polyhedron demo : clean up for plugin loader and fix for menus segfault
 2016-04-25 16:30:35 +02:00
Simon Giraudot 662efa2c8e Use CGAL_PI instead of M_PI 2016-04-25 11:01:40 +02:00
Laurent Rineau dc1d8e870d Merge pull request #1026 from maxGimeno/Polyhedron_demo-Fix_setColor-GF 
Fix for Scene_polyhedron_item::setColor.
 2016-04-22 15:19:13 +02:00
Maxime Gimeno 54b1e2c3f3 Pops a warning box when an item cannot be meshed instead of segfaulting. 2016-04-22 11:30:10 +02:00
Sébastien Loriot 576d4ca727 fix background of line-edit 2016-04-22 11:21:50 +02:00
Maxime Gimeno 63c0a1e9cc Modification of the way of naming 2016-04-22 11:21:41 +02:00
Jane Tournois 4206f4fe68 use face_patch_map also in parallel mode 2016-04-22 11:07:24 +02:00
Jane Tournois b27447d2c0 fix badly resolved rebase conflict 2016-04-22 11:05:36 +02:00
Jane Tournois eb5056069c fix error of the merge conflits during rebase 2016-04-22 10:34:14 +02:00
Jane Tournois 304e53ef1e collect border of the ROI to keep it valid after remeshing 
this commit also fixes a merge conflict badly resolved in the rebase process
 2016-04-22 10:29:05 +02:00
Simon Giraudot 21a631fa67 Bugfix: size is 0 if polyhedron is empty 2016-04-22 10:15:49 +02:00
Jane Tournois 8e574f355a color sub-connected components on a polyhedron using selected edges as frontiers 2016-04-21 15:32:15 +02:00
Jane Tournois a8a8a669b8 export items that are necessary for external plugins that use them 2016-04-21 15:31:05 +02:00
Jane Tournois 883a52cd4f when no facet is selected, remesh all 
this avoids selecting all facets to run isotropic remeshing

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

does not work yet
 2016-04-21 14:25:58 +02:00
Jane Tournois 84634a48ea deal with xml and discriminate with a template parameter 2016-04-21 14:21:29 +02:00
Maxime Gimeno 32f92f1445 Adding a spheres_item to the edit_polyhedron_item and fixing some problems 2016-04-21 10:40:04 +02:00
Maxime Gimeno f39865ce7c clean up 2016-04-21 08:34:52 +02:00
Maxime Gimeno c5cea064cb Fix for Scene_polyhedron_item::setColor, that corrupted the vector colors_. 2016-04-20 17:31:51 +02:00
Laurent Rineau 62d1cfecbe Fix compilation errors (in the Polyhedron Demo) 2016-04-20 15:26:49 +02:00
Maxime Gimeno 176770fa00 - Addition of a reference to the scene in the group_item so it can add its own children 
- Modification of the Scene_polylines_item to use a child spheres_item
- fixes about the groups
 2016-04-20 12:18:20 +02:00
Maxime Gimeno 0e66c54b27 Addition of a "lock" property in the groups API. 2016-04-19 15:48:53 +02:00
Maxime Gimeno e1eaa8307a fix the spheres from loaded c3t3 2016-04-19 15:02:31 +02:00
Maxime Gimeno 7b338f4e45 Fix the drawing of the children's group when their renderingMode isn't compatible. 2016-04-19 14:45:30 +02:00
Maxime Gimeno 22636f6a76 Fix the segfault when deleting the spheres_item 2016-04-19 12:55:52 +02:00
Maxime Gimeno 3ab7050205 Intermediary step: 
- Created a Scene_spheres_item
- Made the Scene_c3t3_item a group_item
- Changed the spheres management in the c3t3_item
- Fixed the has_group maintanance in group_items
 2016-04-19 12:17:45 +02:00
Jane Tournois 8be725fd07 check orientation has not failed 2016-04-19 11:19:26 +02:00
Maxime Gimeno b1337bd552 Removes the second "Number of isolated vertices" in the polyhedron's info; 2016-04-18 15:47:17 +02:00
Laurent Rineau 1391e2760e Fix compilation of Mesh_3 plugin 2016-04-18 14:43:53 +02:00
Laurent Rineau 4af747178a Merge pull request #917 from maxGimeno/Polyhedron_demo-Add_edges_to_self_intersect-GF 
Polyhedron_demo : adding edges to the self selection item
 2016-04-15 16:21:17 +02:00
Maxime Gimeno 6631a2c15a Allows the display of the cells that are not in the complex oin the c3t3_item. 2016-04-15 16:13:22 +02:00
Laurent Rineau 27f7954213 Merge pull request #1007 from maxGimeno/Polyhedron_demo-Fix-PS_Selection-GF 
(Merged from remote-tracking branch 'cgal/releases/CGAL-4.8-branch')
 2016-04-15 15:46:02 +02:00
Laurent Rineau 74ae3531ba Merge pull request #1003 from maxGimeno/Mesh_3_demo-Remove_GLU_from_dependencies-GF 
Mesh_3 Demo : Removes GLU from the CMakeLists.txt
 2016-04-15 15:36:45 +02:00
Maxime Gimeno 167752e631 Makes the last point_set made from BBox the default point_set if none is selected. 2016-04-15 12:29:05 +02:00
Laurent Rineau 8e9f1af10e Revert modifications 2016-04-14 15:26:47 +02:00
Laurent Rineau 5efb63bddd Merge pull request #998 from sloriot/Polyhedron_demo-enhance_intersection_plugin 
Only create a polyline item if the intersection is not empty
 2016-04-14 15:18:11 +02:00
Laurent Rineau 26af71e126 Merge pull request #883 from lrineau/Three-Scene_group_can_draw-GF 
Change the semantic of the Scene_group_item
 2016-04-14 15:17:07 +02:00
Laurent Rineau 481088f299 Merge pull request #989 from lrineau/Polyhedron-demo_speed_up_loading_of_c3t3_items-GF 
Polyhedron demo: speed up loading of c3t3 items
 2016-04-14 15:11:46 +02:00
Maxime Gimeno 524a8da107 Remove glu from all the CMakeLists 2016-04-14 09:29:50 +02:00
Maxime Gimeno d084cccd6b Removes GLU from the CMakeLists.txt 2016-04-14 08:38:39 +02:00
Maxime Gimeno b9dd2f314c Fix the point_set selection polylines. 2016-04-13 16:44:31 +02:00
Laurent Rineau 63dc460f42 Merge commit 'refs/pull/990/head' into Three-Scene_group_can_draw-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene.h
	Three/include/CGAL/Three/Scene_draw_interface.h
 2016-04-13 11:52:57 +02:00
Laurent Rineau 9cbae0394d Merge pull request #934 from maxGimeno/Polyhedron_demo-Clipping_polyhedron_plugin_enhancement-GF 
Polyhedron_demo: Clip_polyhedron_plugin enhancement
 2016-04-13 11:19:38 +02:00
Laurent Rineau 1e4d22549c Fix the text: remove empty lines 2016-04-13 11:04:48 +02:00
Laurent Rineau 202d2c2cf0 Merge pull request #893 from sgiraudot/Polyhedron_demo-Unify_off_io_plugins-GF 
Polyhedron demo: unify OFF io plugins
 2016-04-13 10:46:29 +02:00
Laurent Rineau cf961c3a2d Merge pull request #877 from maxGimeno/Polyhedron-demo-Trivial_fixes-GF 
Polyhedron_demo:  Trivial fixes
 2016-04-13 10:36:42 +02:00
Laurent Rineau 555f46e850 Merge pull request #928 from janetournois/Polyhedron_demo-fix_colors-GF 
Polyhedron item : fix access in color map
 2016-04-13 10:33:40 +02:00
Laurent Rineau 897085b418 Merge pull request #936 from maxGimeno/Polyhedron_demo-Selection_tool_enhancement-GF 
Polyhedron_demo : selection tool enhancement
 2016-04-13 10:32:29 +02:00
Sébastien Loriot 853006afb0 only create a polyline item if the intersection is not empty 2016-04-12 09:20:11 +02:00
Simon Giraudot 3dc74359ea Create point set from vertices of polygon soup 2016-04-11 15:56:30 +02:00
Simon Giraudot c579dd3e65 Add dependency to polygon soup in CMakeLists 2016-04-11 15:56:10 +02:00
Simon Giraudot 6d38c89203 Add method to access points of polygon soup 2016-04-11 15:55:49 +02:00
Laurent Rineau f8aabdcc36 Merge pull request #990 from maxGimeno/Polyhedorn_demo-New_picking-GF 
Polyhedron_demo : New picking
 2016-04-11 11:58:35 +02:00
Laurent Rineau e83bf2dc43 Merge pull request #977 from lrineau/Polyhedron-demo_fix_c3t3_item_again-GF 
Polyhedron demo: fix c3t3 item, again
 2016-04-11 11:45:49 +02:00
Laurent Rineau 9b49b2ff0b Merge pull request #982 from maxGimeno/P_Demo-Fix_for_Ctrl_Space-GF 
Polyhedron_demo : Fix for the Ctrl+space shortcut
 2016-04-08 15:16:30 +02:00
Maxime Gimeno 0ef8191fb7 Allow picking for edges and points. 2016-04-07 15:32:20 +02:00
Laurent Rineau dca86376bf Follow-up to "Do not depend on `Viewer.h`" 
That commit was not complete:
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date:   Fri Apr 1 16:11:52 2016 +0200
>
>     Do not depend on `Viewer.h`
>
>     Only `Viewer_interface.h` is needed.

Once `Viewer.h` is removed from a few `.h` file, then
`Viewer_interface.h` must be included in `.cpp` files that use the
`Viewer_interface` API.
 2016-04-07 14:49:43 +02:00
Maxime Gimeno 24b16b4710 New picking finished. Far more efficient. 2016-04-07 10:13:20 +02:00
Laurent Rineau b9ea69e5c3 Do no always compute the AABB tree 
- The c3t3 item has an option "Show tetrahedra".

- The AABB tree is built lazily, when needed.

- The AABB tree data member is moved in `Scene_c3t3_item_priv`.
 2016-04-06 16:20:25 +02:00
Laurent Rineau 0cd5d8a6c4 Fix the look-at function 2016-04-06 16:06:46 +02:00
Laurent Rineau 535c5bb5b2 Speed-up Triangulation_3::read_cells... 
... by a factor 5 for big triangulations! The old code was using:

    std::map<size_t, Vertex_handle> V;
    std::map<size_t, Cell_handle> C;

whereas the indices are contiguous: from 0 to n. `std::vector` is a lot
better for that use case!
 2016-04-06 16:03:55 +02:00
Maxime Gimeno bc6d5aa574 Fix for the waitCursor 2016-04-05 15:10:44 +02:00
Maxime Gimeno 1aa34e060a Fix for missing combo-box 2016-04-05 11:36:26 +02:00
Jane Tournois f9fdd779f4 a bit more reorganization of the UI 2016-04-05 10:34:38 +02:00
Maxime Gimeno 386995bbdc Final fix for itemChanged calls 2016-04-04 16:53:17 +02:00
Laurent Rineau 6164c91227 Merge changes to PMP from branch 'releases/CGAL-4.8-branch' 
Merges:
> 621e16ed Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois
> 4d1ac46 Merge pull request #974 from janetournois/PMP-complete_remeshing_test-jtournois
 2016-04-04 11:22:09 +02:00
Laurent Rineau 621e16ed41 Merge pull request #973 from janetournois/Polyhedron_demo-fix_isotropic_remeshing_plugin-jtournois 
PMP : fix isotropic_remeshing plugin
 2016-04-04 11:19:52 +02:00
Maxime Gimeno dfc2143b28 Fix for emit itemChanged() 2016-04-04 11:18:29 +02:00
Jane Tournois f0261b6a3c minor reorganization of the UI 2016-04-04 10:35:26 +02:00
Maxime Gimeno 56486dbadd Fix for the ctrl+space shortcut 2016-04-04 10:13:21 +02:00
Laurent Rineau 77a688530b Fix memory leak 2016-04-01 16:16:17 +02:00
Laurent Rineau f267cfb960 Do not depend on `Viewer.h` 
Only `Viewer_interface.h` is needed.
 2016-04-01 16:11:52 +02:00
Laurent Rineau 910f17cd51 Allow to pop the context menu with `Key_Menu` 
As the item selection is rather slow, for the moment, that is a lot
faster than `Shift+Rightbutton`.
 2016-04-01 16:10:58 +02:00
Laurent Rineau 5a9d82ebc7 Improve c3t3 loading and display 
Followup to PR #962:

 - the display of spheres was no longer correct,
 - allow loading of c3t3 without any facets and cells (only vertices
   with weights),
 - fix the display of spheres, with better shaders,
 - `Scene_c3t3_item`: do not draw edges, in FlatPlusEdges, during a
   `drawWithNames()`, to optimize speed,
 - `Viewer`: do not use anti-aliasing during `drawWithNames()`
 2016-04-01 16:07:56 +02:00
Laurent Rineau 4f599d5310 Merge pull request #959 from janetournois/PMP-isotropic_remeshing_made_verbose-jtournois 
Polyhedron demo : add verbosity to isotropic_remeshing plugin
 2016-04-01 11:17:49 +02:00
Laurent Rineau 7700b73176 Merge branch 'releases/CGAL-4.8-branch' 
Merges:
> d53efdd - Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF
 2016-04-01 11:00:57 +02:00
Laurent Rineau d53efddbd8 Merge pull request #964 from afabri/Mesh_2-BOOST_PARAMETER_MAX_ARITY-GF 
#define BOOST_PARAMETER_MAX_ARITY early enough
 2016-04-01 11:00:06 +02:00
Jane Tournois 52b09a1e44 do not forget to reset face indices properly before remeshing 2016-03-31 15:43:07 +02:00
Jane Tournois 964e824750 make "preserve duplicates" not available on a selection_item 2016-03-31 15:17:14 +02:00
Jane Tournois 0804847e64 when remeshing a selection_item, use it instead of poly_item 2016-03-31 15:16:55 +02:00
Laurent Rineau ae33af9222 Merge branch 'releases/CGAL-4.8-branch' 
Merges the following fixes:
> 4025913 Merge pull request #949 from janetournois/BGL-fix_conversion_of_boundary_halfedges-jtournois
> 9c62628 Merge pull request #948 from janetournois/PMP-fix_assertion_isotropic_remeshing-jtournois
> f61402d Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates

See also:

* https://github.com/CGAL/cgal/pull/949
* https://github.com/CGAL/cgal/pull/948
* https://github.com/CGAL/cgal/pull/929
 2016-03-31 10:55:12 +02:00
Laurent Rineau f61402d1d4 Merge pull request #929 from sloriot/Polyhedron_demo-Isotropic_remeshing_preserve_duplicates 
Polyhedron demo: isotropic remeshing preserves duplicated edges
 2016-03-31 10:53:12 +02:00
Laurent Rineau 0e68aca4ed Merge branch 'releases/CGAL-4.8-branch' 
Merges:
  - a change of the release date of CGAL-4.8
  - a fix of a typo in `Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp`
 2016-03-30 17:11:36 +02:00
Andreas Fabri 920f1dba60 #define the arity, as some other file sets it too low 2016-03-30 12:22:13 +02:00
Laurent Rineau aff611cb3e Merge pull request #952 from lrineau/Mesh_3-better_binary_IO-lrineau 
Fix issues in I/O of Mesh_complex_3_in_triangulation_3
 2016-03-30 10:11:21 +02:00
Laurent Rineau c52758d590 Improve the draw of the intersection 
I have tweaked the vertex and fragment shaders, to avoid the curious
color interpolation for triangles of the intersection with the cutting
plane.

The component `color.w` is set to the signed distance to the cutting
plane (no longer any conditional in the vertex shader).

Then in the fragment shader, the drawing color is composed as such:

    if(color.w<0)
    {
      vec4 my_color = vec4(color.xzy, 1.);
      // [...]
    }
    else
      discard;
 2016-03-29 18:38:20 +02:00
Laurent Rineau 1439796bf6 Do not draw the intersection while the plane is manipulated 
... plus a fix in `draw_edges()`: missing call to
`compute_intersections()`, if the item was drawn in wireframe-only.
 2016-03-29 18:37:18 +02:00
Laurent Rineau 3c7a5dd7b1 Fix a critical performance issue 
As decided by `MainWindow`, the `Scene_c3t3_item::toolTip()` method is
called by `MainWindow::updateInfo()` for each `modified()` event of the
manipulated frame. While the frame is manipulated, that generates a lot
of events, and a lot of calls to `toolTip()`.

Before this commit, the call to `Scene_c3t3_item::toolTip()`
was `O(n)`. After this commit it is `O(1)`.

That speeds up a lot the drawing of the item while the frame is
manipulated!
 2016-03-29 18:33:59 +02:00
Sébastien Loriot dfd943c8e2 fix typo 2016-03-29 17:08:51 +02:00
Jane Tournois dc3c2f9a8d add verbosity to isotropic_remeshing 
when it's called on several polyhedra, possibly in parallel
 2016-03-29 14:57:48 +02:00
Laurent Rineau 216b298652 Fix issues in I/O of Mesh_complex_3_in_triangulation_3 
And restore the possibility for the Polyhedron demo to load two types of
C3t3 (with `Patch_id` being `int` or `std::pair<int, int>`).
 2016-03-25 15:45:28 +01:00
Maxime Gimeno 8b361c957a Fix the bbox and clean-up 2016-03-25 12:39:55 +01:00
Sébastien Loriot f7848d686a remove unused type 2016-03-25 10:16:21 +01:00
Maxime Gimeno d6ea729758 Addition of a position memory for the planes 
- When the user switch from an item to another, the planes are still in the same position as when he left.
- Addition of a label to indicate that the planes are connected to the selected image
- Fix for a segfault occuring when a plane was destroyed and the imag was selected afterwards.
 2016-03-25 09:59:09 +01:00
Maxime Gimeno 52babc058f Addition of a dialog during the planes creation. 2016-03-25 09:59:07 +01:00
Maxime Gimeno 7e422d484f Adapt the controls 
- When there are several segmented images with planes, the sliders adapt to the last selected one.
 2016-03-25 09:59:02 +01:00
Maxime Gimeno 94f4b42bc6 Adds all planes + intersection in a group. 2016-03-25 09:58:59 +01:00
Sébastien Loriot 9e82d734c2 remove unused typedef and variable 2016-03-24 17:26:19 +01:00
Maxime Gimeno d106d60471 Segfault Fix 
- When deleting the selection_item AND it's associated item, there is no more segfault.
 2016-03-23 13:52:28 +01:00
Maxime Gimeno cae48d8147 Fix shrinking UI 2016-03-22 10:52:27 +01:00
Maxime Gimeno ba86f7ac69 Addition of a feature to inverse the current selection 2016-03-22 10:31:20 +01:00
Maxime Gimeno e174d9373d Addition of a clear_all_button 2016-03-22 10:01:12 +01:00
Maxime Gimeno c173419d61 Addition of a button to flip the plane and a selection color for the plane. 2016-03-22 09:17:11 +01:00
Maxime Gimeno 32a43ad3e0 Addition of a split feature 2016-03-21 15:59:30 +01:00
Jane Tournois fd98e1c5bd init() can't be fully done in the constructor with no parameter 2016-03-21 10:58:36 +01:00
Simon Giraudot bf8e8325d0 Bugfix: update shape detection plugin with new plane regularization API 2016-03-21 10:50:05 +01:00
Sébastien Loriot 7d1b315fab reduce the size of the color map of a polyhedron scene item ... 
...  to  (max patch id - min patch id+1)

# Conflicts:
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
#	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
#	Polyhedron/demo/Polyhedron/include/CGAL/gl_render.h
 2016-03-21 10:06:48 +01:00
Sébastien Loriot f2b3a4dd24 remeshing with duplicated constraints now splits the constrained edges 
this ensures the remeshing will always work
 2016-03-18 18:25:10 +01:00
Jane Tournois e4006a5499 fix access in color map, in case we have a single patch with index > 0 2016-03-18 17:44:48 +01:00
Sébastien Loriot 315a2e9184 connect constraining of duplicated edge to the protection of constraints 2016-03-17 17:57:34 +01:00
Laurent Rineau dee4739ecd Merge pull request #915 from janetournois/Polyhedron_demo-fix_deformation_plugin-jtournois 
Polyhedron demo : fix deformation plugin
 2016-03-17 16:46:10 +01:00
Andreas Fabri 716e1ea9a6 Detect duplicates also for a single connected component or a selection 2016-03-17 14:51:48 +01:00
Sébastien Loriot b64d0ee265 do not remesh in pivoting mode 2016-03-17 13:20:27 +01:00
Sébastien Loriot e5a5cdc3c8 do not update the roi after the remeshing 
this also allows to compute border halfedges only when needed,
that is when estimating the target edge length
 2016-03-17 13:17:11 +01:00
Sébastien Loriot 275e16d2e8 the region remesh was using the one-ring of the roi 2016-03-17 10:36:36 +01:00
Sébastien Loriot 6823336c17 add an option to constrain duplicated edges 2016-03-17 09:54:50 +01:00
Andreas Fabri 2468889c51 Also deal with TBB 2016-03-17 09:41:45 +01:00
Andreas Fabri 53d4328d36 Improve wording in UI 2016-03-17 08:29:28 +01:00
Andreas Fabri a4cb1c2a97 Add protection of identical edges in different polyhedra. WIP: with an #undef and std::cerr 2016-03-16 18:09:55 +01:00
Laurent Rineau 4fd24b6487 Merge pull request #913 from sloriot/Polyhedron_demo-rename_mesh_2_plugin_dir 
Polyhedron demo: rename plugin directory
 2016-03-16 15:01:03 +01:00
Maxime Gimeno 17061cd064 Adds edges to the self_selection item. 2016-03-15 12:46:43 +01:00
Maxime Gimeno 612e9ac411 Fixes 
- Moved the shared code between loadPlugins and on_actionLoad_plugin_triggered in a separate function
- Fixed the segfault when menus and submenus have the same name
 2016-03-15 11:38:57 +01:00
Jane Tournois b6f37a16ed add default constructor to ROI_border_pmap 
and fix the list of roi_border edges collected before deformation
 2016-03-15 11:30:33 +01:00
Simon Giraudot 7276c06c36 Merge branch 'Point_set_shape_detection_3-Plane_regularization-GF-old' into Point_set_shape_detection_3-Plane_regularization-GF 2016-03-15 10:37:02 +01:00
Sébastien Loriot c0b39954bf rename Mesh_2 plugin directory for consistency 2016-03-14 20:12:10 +01:00
Maxime Gimeno 6779574a2c Fix the scene bbox 
- The Scene Bbox does not depend on the visibility of the items anymore.
 2016-03-14 16:58:24 +01:00
Clement Jamin cee602c34c Clear CGAL_THREE_VIEWER_INTERFACE_H_PATH & co from the cache before find_path 
Otherwise, if CGAL_DIR was changed between two "configurations", the old path
is not updated.
 2016-03-11 22:09:06 +01:00
Clement Jamin 3525ac3e53 Fix error message 2016-03-11 19:27:24 +01:00
Clement Jamin e14f49950c Fix export 2016-03-11 09:50:12 +01:00
Guillaume Damiand 6dd3bdfce6 Modif of CMakeLists.txt in polyhedron demo to solve link problems in header only (nyf) 2016-03-11 07:53:32 +01:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +01:00
Simon Giraudot 5852b1134f Remove OFF_to_xyz plugin 2016-03-09 11:21:45 +01:00
Simon Giraudot e009926859 New plugin to create point set from polyhedron vertices (to replace OFF_to_xyz plugin) 2016-03-09 11:21:10 +01:00
Simon Giraudot 8bbf01f9af OFF_io_plugin now saves point sets too 2016-03-09 10:03:38 +01:00
Simon Giraudot f6bb959bc4 OFF_io_plugin now also reads OFF point sets 2016-03-09 09:58:10 +01:00
Simon Giraudot 73617d0704 Remove OFF_to_xyz plugin from CMakeLists 2016-03-09 09:57:54 +01:00
Laurent Rineau 80d7a738e4 Change the semantic of the Scene_group_item 
New feature: an object of class `Scene_group_item`, or derived, is
responsible for drawing its children items. That is the first
approximation of a scene graph.

For that goal, several steps were needed.

- Remove the overload of `Scene::draw()` and `Scene::drawWithNames()`
  that does not have the viewer as parameter. Remove then from
  `Scene_draw_interface` as well.

- Add `Viewer::inDrawWithNames()` so that items, including the
  `Scene_group_item`, can now if a draw function is called for the
  picking or not.

- Add the draw function in `Scene_group_item`:
```
  virtual void draw(CGAL::Three::Viewer_interface*) const;
  virtual void draw_edges(CGAL::Three::Viewer_interface*) const;
  virtual void draw_points(CGAL::Three::Viewer_interface*) const;
  virtual void draw_splats(CGAL::Three::Viewer_interface*) const;
```
  Those draw functions actually call the draw functions of all the
  visible children, depending on their rendering mode. If
  `viewer->inDrawWithNames()`, draw nothing, and let the children be
  drawn with their own names. Another solution could be that the draw
  functions of `Scene_group_item` use `glPushName/glPopName`. That API
  seems to be usable with a scene graph.

- Add in `Scene_item` two functions:
```
  void moveToGroup(Scene_group_item* group);
  Scene_group_item* parentGroup() const;
```
  That is one first step to allow the `has_group` data member to become
  a private member, instead a public one (ugly!!).

Then the big change is in the scene:

- The scene will not call the draw function of items with a parent
  group, if the group itself is visible. If the group is not visible but
  the children are set to visible, then they are drawn anyway. That
  means that a group can "steal" the drawing of its children when it is
  visible. That behavior is really convenient for the use case I have in
  mind, but it may be strange.

- In the picking, in `drawWithName()`, the draw function of all items
  are called, even if they have a parent group.

Cosmetic:

  - Move the definition of the constructor `Scene_item::Scene_item` in
    the cpp file.
 2016-03-04 14:37:53 +01:00
Sébastien Loriot 96c4dc60de Merge pull request #879 from maxGimeno/Polyhedron_demo-c3t3_color_fix-GF 
Polyhedron demo : c3t3 color fix
 2016-03-04 13:31:00 +01:00
Sebastien Loriot 60c29f4b8f Merge pull request #882 from janetournois/Polyhedron_demo-fix_colors_only-jtournois 
Polyhedron_item : fix "colors_only'
 2016-03-04 13:26:16 +01:00
Sebastien Loriot 8e6c92b738 Merge pull request #859 from sloriot/Polyhedron_demo-add_cdt2_mesher 
Polyhedron demo: add cdt2 mesher
 2016-03-04 13:08:52 +01:00
Sebastien Loriot 717ec22664 Merge pull request #874 from janetournois/PMP-isotropic_remeshing_improvements-jtournois 
PMP::isotropic_remeshing() - improve management of constraints
 2016-03-03 17:00:34 +01:00
Sebastien Loriot 26c17db3e8 Merge pull request #865 from lrineau/Polyhedron-demo_fix_c3t3_item-lrineau 
Fix the c3t3 item
 2016-03-03 16:56:35 +01:00
Sébastien Loriot 81d1603ce7 Merge pull request #844 from maxGimeno/Polyhedron_demo-Mesh_3-Fixes-GF 
Polyhedron demo: Fixes for Mesh_3 plugin
 2016-03-03 14:31:22 +01:00
Sebastien Loriot 8a55728cae Merge pull request #787 from maxGimeno/Polyhedron_demo-Fix_for_773-GF 
Polyhedron_demo : Fix for 773
 2016-03-03 14:19:44 +01:00
Jane Tournois 2536c17655 fix "colors_only' 
when colors_only is false, it does not mean that colors are not computed!

this commit fixes commit 0661c21ac0
 2016-03-03 12:57:24 +01:00
Maxime Gimeno cc5f50605e Fix for the intersection that wasn't cleared when the color changed. 2016-03-03 11:38:20 +01:00
Maxime Gimeno 892dee0a99 Fix for the colors 2016-03-03 10:41:24 +01:00
Maxime Gimeno fe20de7ef3 Statistics fix 
- An item must overload has_stats to return true if it has statistics, or else the action will not be displayed in the menu.
 2016-03-03 09:19:04 +01:00
Sébastien Loriot d7e9261d58 hide the filtered projection traits behind the projection traits 
the selection of the base class is done using Kernel::Has_filtered_predicates
 2016-03-02 21:57:54 +01:00
Sébastien Loriot 03f86b3673 handle seeds and other domain definition options 2016-03-02 20:46:15 +01:00
Sébastien Loriot a045576b45 add a plugin to run mesh_2 on polylines in the xy, yz or xz plane 2016-03-02 20:46:15 +01:00
Sebastien Loriot 6c85bc17d0 Merge pull request #845 from maxGimeno/Polyhedron_demo-Fix_reload_item-GF 
Polyhedron demo :  Fix reload item
 2016-03-02 20:20:44 +01:00
Sebastien Loriot 823a65a4ae Merge pull request #848 from maxGimeno/Polyhedron_demo-Fix_segmentation_plugin-GF 
Polyhedron_demo : Fix for the polyhedron_item's colors
 2016-03-02 20:20:07 +01:00
Sebastien Loriot 9fa7cc3d00 Merge pull request #763 from janetournois/Polyhedron_demo-improve_vtk_plugin-GF 
Polyhedron demo : vtk_io_plugin can save
 2016-03-02 17:20:29 +01:00
Sebastien Loriot d51b9cbb27 Merge pull request #840 from afabri/Polyhedon-isolated-vertices-GF 
Deal with isolated vertices when turning a polygon soup in a polyedral surface
 2016-03-02 17:19:22 +01:00
Sebastien Loriot 3019854153 Merge pull request #850 from sgiraudot/Polyhedron_demo-Bugfix_polygon_soup_segfault-GF 
Bugfix: check if polygon soup is not empty before attempting BBox computation
 2016-03-02 17:16:31 +01:00
Jane Tournois bf63963830 add constrained vertices to isotropic remeshing 
those vertices cannot be modified
 2016-03-02 17:08:38 +01:00
Jane Tournois 906f6360ea restore ROI after deformation 2016-03-02 13:24:12 +01:00
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