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

2841 Commits

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