Commit Graph

4068 Commits

Author SHA1 Message Date
Maxime Gimeno 2bd795b6be Use floats instead of doubles 2016-12-13 17:17:23 +01:00
Laurent Rineau 97f3d7146b Merge pull request #1733 from maxGimeno/Polyhedron_demo-enhance_split_polyhedra-GF
Polyhedron_demo : Enhance Split Polyhedra
2016-12-12 10:17:07 +01:00
Laurent Rineau 963c752c8d Merge pull request #1727 from maxGimeno/Polyhedron_demo-Enhance_hole_filling_plugin-GF
Polyhedron_demo : Enhance Hole_filling_plugin
2016-12-09 17:35:15 +01:00
Laurent Rineau 4a7db29277 Merge pull request #1740 from lrineau/Polyhedron-demo_various_fixes-lrineau
Add various fix to demo/Polyhedron
2016-12-09 17:34:49 +01:00
Laurent Rineau 3694c57a7c Add an action to split polylines 2016-12-09 17:11:06 +01:00
Laurent Rineau c94b2f3309 The loading of OBJ files can now create a Scene_polygon_soup_item
I have moved the code that loads OBJ files to `OFF_io_plugin`, to avoid
that the parsing of the file is done twice: once the file is parsed, if
it is a polygon mesh, creates a polygon item, otherwise creates a
polygon soup item.
2016-12-09 11:53:29 +01:00
Laurent Rineau 526bee6094 Allow to load OBJ files containing polygon soups 2016-12-09 11:24:23 +01:00
Sébastien Loriot fc54fd135a update the code after the update of the cmap package 2016-12-07 17:20:41 +01:00
Laurent Rineau fe4a731dc2 Followup to #1736
Add `--no-warn-unused-cli` to avoid warnings.
2016-12-06 13:47:12 +01:00
Sébastien Loriot 958dae95b4 rename barycentric coordinate to barycentric coordinates 2016-12-06 11:04:18 +01:00
Maxime Gimeno aa693dd95f Destroy the planes when the image_item is destroyed. 2016-12-06 10:16:27 +01:00
Maxime Gimeno e8cff6de1f Fix planes's manipulatedFrames and make it possible to select an existing image_item from a plane to track the right values. 2016-12-05 17:56:35 +01:00
Maxime Gimeno af49712614 install eventFilter. 2016-12-05 15:26:10 +01:00
Maxime Gimeno 68bd4eaa38 Fix warning 2016-12-05 14:38:53 +01:00
Sébastien Loriot c3e1309181 update from master branch 2016-12-05 14:37:29 +01:00
Maxime Gimeno 4edccfb024 Draw the spheres for the handles 2016-12-05 14:32:07 +01:00
Maxime Gimeno 5f321c431c Add colors to the planes and sliders. 2016-12-05 11:41:19 +01:00
Andreas Fabri f05bf5ba4f static_cast 2016-12-05 08:55:02 +01:00
Maxime Gimeno 5221a12688 Add a Selection_box mode to the point_set_selection_plugin 2016-12-02 16:31:58 +01:00
Laurent Rineau 847906e2e4 Extend --no-try-catch to catching of C++ exceptions in Qt scripts 2016-12-02 13:05:43 +01:00
Laurent Rineau fd355aaf06 Fix the function point(): do not used floats 2016-12-02 13:05:27 +01:00
Maxime Gimeno 79a2e4999d fix resetHeader() 2016-12-02 12:52:23 +01:00
Maxime Gimeno 9f2c850a73 Fix rebase error. 2016-12-02 12:06:42 +01:00
Maxime Gimeno 630dee9ecb Add offset support for the Edit_box_plugin and the Surface_mesh_item. 2016-12-02 12:04:34 +01:00
Maxime Gimeno 379a30b26b Fix item's context menu 2016-12-02 12:04:34 +01:00
Maxime Gimeno 31df2d8d45 Add offset support for splatting. 2016-12-02 12:04:34 +01:00
Maxime Gimeno 97708d227e Add offset to the centers of the polylines spheres. 2016-12-02 12:04:34 +01:00
Maxime Gimeno 00c9f7a8d0 Add offset support for the Point_set_selection_plugin 2016-12-02 12:04:34 +01:00
Maxime Gimeno 153f7a4e27 Add offset support for parameterization and shortest path 2016-12-02 12:04:34 +01:00
Maxime Gimeno e0ecf45143 Add offset support to the Edit_polyhedron plugin 2016-12-02 12:04:34 +01:00
Maxime Gimeno a0b176add1 Add offset support to the Implicit_function_io_plugion 2016-12-02 12:04:34 +01:00
Maxime Gimeno a2a091a0c8 Add offset support for Mesh_3_plugin 2016-12-02 12:04:34 +01:00
Maxime Gimeno 0d8178026f Add offset support to the Polyhedron_slicer_plugin 2016-12-02 12:04:33 +01:00
Maxime Gimeno 109c8569e4 Add offset support to the selection_plugin 2016-12-02 12:04:33 +01:00
Maxime Gimeno 0087d26885 Fix Clip_polyhedron_plugin and add offset support. 2016-12-02 12:04:33 +01:00
Maxime Gimeno 3425e21ae6 Add offset support to Nef_plugin and fix the nef_item
Fix scene Bbox calculation : Only add an item's bbox if the said item is visible.
2016-12-02 12:04:33 +01:00
Maxime Gimeno a199c12be2 Add offset support to the polygon_soup_item 2016-12-02 12:04:33 +01:00
Maxime Gimeno bc61c28028 Add offset support to the Affine_transformation_plugin and the Points_with_normal_item. 2016-12-02 12:04:33 +01:00
Maxime Gimeno 9d98ea8193 Add offset support to the corefinement_plugin 2016-12-02 12:04:33 +01:00
Maxime Gimeno 4a08b21e18 Add offset support to the Io_image_plugin and its items. 2016-12-02 12:04:33 +01:00
Maxime Gimeno 1face074bf Add offset support for the Cut_plugin 2016-12-02 12:03:46 +01:00
Maxime Gimeno faf7c4ae3f Add an offset support to the polyhedron_item 2016-12-02 12:03:46 +01:00
Maxime Gimeno ca5ea47e48 Add an offset vector to the viewer. 2016-12-02 12:03:46 +01:00
Laurent Rineau 3c30d51bb8 Merge pull request #1725 from afabri/Polyhedron_3-cleanup-GF
Polyhedron_3: Cosmetic fixes in the doc
2016-12-02 11:38:01 +01:00
Laurent Rineau 58f4fa08e5 Merge pull request #1702 from janetournois/Polyhedron_demo-fix_c3t3_io_with_far_points-GF
Polyhedron demo : fix c3t3_io_plugin in the parallel framework
2016-12-02 11:36:02 +01:00
Laurent Rineau 82786bf3c7 Merge pull request #1697 from gdamiand/Generalized_map-gdamiand
Generalized map
2016-12-02 11:35:20 +01:00
Laurent Rineau 78ae3414e4 Merge pull request #1693 from janetournois/PMP-fixes_for_isotropic_remeshing_4.9-jtournois
PMP : fixes for isotropic remeshing
2016-12-02 11:34:51 +01:00
Laurent Rineau 367ae78d1a Merge pull request #1672 from janetournois/Polyhedron_demo-fix_duplicate_plugin_loading-jtournois
Polyhedron demo : avoid loading twice the same plugin
2016-12-02 11:33:15 +01:00
Laurent Rineau 105418b66a Merge pull request #1620 from lrineau/Polyhedron-demo_various_fixes-lrineau
Enhancement of Qt Script in Polyhedron Demo

- CMake-3.1 is now required.
- demo/Polyhedron/ now requires C++11.
2016-12-02 11:19:18 +01:00
Maxime Gimeno 8d30e0bdbb Fixes 2016-12-02 09:42:54 +01:00
Maxime Gimeno f0470d5fc0 Fix the header of the sceneView. 2016-12-02 09:21:39 +01:00
Laurent Rineau 4c4b9a0fd8 Merge pull request #1663 from maxGimeno/Polyhedron_demo-Add_sep_images_support-GF
Polyhedron_demo : Add support for SEP images to the Io_image_plugin
2016-12-01 17:41:19 +01:00
Laurent Rineau 030292a279 Merge pull request #1674 from maxGimeno/Polyhedron_demo-Switch_orthographic_perspective_projection-GF
Polyhedron_demo: Make it possible to switch between projection modes
2016-12-01 17:39:17 +01:00
Laurent Rineau 0413af3deb Merge pull request #1675 from maxGimeno/Polyhedron_demo-Self_intersection_plugin_for_SM-GF
Polyhedron_demo : Self_intersection_plugin available for Scene_surface_mesh_item and works on all selected surfaces.
2016-12-01 17:38:34 +01:00
Laurent Rineau 38bcd090f0 Merge pull request #1613 from maxGimeno/Polyhedron_demo-Edit_box_plugin-GF
Polyhedron_demo:  Edit box plugin
2016-12-01 17:37:15 +01:00
Laurent Rineau 2255f14a3c Merge pull request #1669 from maxGimeno/Polyhedron_demo-Fix_picking-GF
Polyhedron_demo : Fix the picking
2016-12-01 17:36:50 +01:00
Laurent Rineau b82379cf4f Merge pull request #1670 from maxGimeno/Polyhedron_demo-fix_spheres_item-GF
Polyhedron_demo : Fix spheres item
2016-12-01 17:36:18 +01:00
Maxime Gimeno 0c73a697f9 Keep CC color and put CCs in a group. 2016-12-01 17:19:26 +01:00
Maxime Gimeno 508ae95fdc Add a way to fill a hole delimited by an edge selection. 2016-12-01 12:52:03 +01:00
Sébastien Loriot 1304f52a49 readd data removed c305e9a8 2016-12-01 09:36:10 +01:00
Guillaume Damiand 083fe3eac6 Define macro to use old cmap api and to remove deprecated warning in .cpp instead of in .h 2016-11-29 11:43:41 +01:00
Guillaume Damiand e7687061c3 Avoid to search in the map if we are on a border edge. 2016-11-29 11:43:40 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Andreas Fabri b0bbbe05f6 Add \pre 2016-11-28 11:23:48 +01:00
Andreas Fabri a54debd280 #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h> 2016-11-25 15:46:12 +01:00
Laurent Rineau 26dcfd9c44 Merge pull request #1647 from sgiraudot/Point_set_processing_3-Improve_outlier_removal_API-GF
Point set processing: improve outlier removal API
2016-11-25 14:57:06 +01:00
Laurent Rineau d3db3d462d Merge pull request #1710 from sgiraudot/Polyhedron_demo-Mesh_simplification_add_constraints-GF
Polyhedron demo: mesh simplification on selection
2016-11-25 14:56:52 +01:00
Laurent Rineau 897e1bdd3e Merge pull request #1691 from sgiraudot/Polyhedron_demo-Bugfix_duplicate_point_set-GF
Several bug fixes for point set in Polyhedron Demo
2016-11-25 14:56:39 +01:00
Jane Tournois 679d9f10ad fix warning (integer converted to bool)
the face_patch_map property map should have a valid value when built
with -1, as it is done in isotropic_remeshing (cf `check_normals` function)
2016-11-25 14:49:22 +01:00
Simon Giraudot 5cbd0a6d32 Possibility to open PLY with floating colors 2016-11-23 08:12:37 +01:00
Simon Giraudot 7bb1146368 Add option to perform mesh simplification on Polyhedron selection 2016-11-22 15:29:31 +01:00
Maxime Gimeno 13e546b7f3 Add a check for boost-filsesystem before compiling the Io_image_plugin 2016-11-22 14:14:44 +01:00
Maxime Gimeno 8471b7d1c6 Fix unwanted typename bug. 2016-11-22 12:55:14 +01:00
Simon Giraudot e31575e2ed Mesh simplification: add edge length stop predicate 2016-11-22 09:20:48 +01:00
Jane Tournois 2c2f52115f in_dimension() is -1 for "far points" used for parallelism
and this case was not handled, causing a crash
2016-11-18 17:18:01 +01:00
Maxime Gimeno 78b937e87b Change action's name. 2016-11-18 12:07:15 +01:00
Laurent Rineau dbcd52dcc0 Merge pull request #1668 from maxGimeno/Polyhedron_demo-Fix_point_set_selection-GF
Polyhedron_demo : Fix point set selection
2016-11-18 11:04:10 +01:00
Laurent Rineau 2d681229fd Merge pull request #1660 from maxGimeno/Polyhedron_demo-Fix_waitcursors_for_windows-GF
Polyhedron_demo : Fix waitcursor for windows in some plugins
2016-11-18 11:02:20 +01:00
Simon Giraudot 0470530a63 Bugfix: do not offer to display normals if they are not available 2016-11-16 12:19:55 +01:00
Simon Giraudot 6380a805f8 Bugfix: decrement first_selected() before swapping (avoid dereferencing end()) 2016-11-16 08:24:38 +01:00
Simon Giraudot 160f07b2cc Bugfix: add normal map before creating point set from vertices 2016-11-16 07:42:14 +01:00
Simon Giraudot 6b44f0cf71 Bugfix: copy point set when duplicating 2016-11-15 08:41:03 +01:00
Maxime Gimeno 9b1342ea47 enhancements:
- Only highlight if shift is pressed
- Use a special cursor when rotating the frame.
2016-11-14 12:01:24 +01:00
Maxime Gimeno e8002a71a4 Make the plugin able to process multiple selected items at once. 2016-11-10 11:27:23 +01:00
Maxime Gimeno 9ecb5d19bd Self_intersection_plugin is available for surface_mesh_items. In that case, the output item is anorther Surface_mesh_item instead of a Polyhedron_item. 2016-11-09 11:23:48 +01:00
Maxime Gimeno 366d1571c2 Add a switch in the View menu to make the Projection matrix Orthographic. 2016-11-09 09:40:20 +01:00
Jane Tournois 600ee9a140 avoid loading twice the same plugin 2016-11-08 17:38:55 +01:00
Maxime Gimeno 473edff485 Fix spheres problems :
- give squared radius to the CGAL::Spheres instead of radius.
- don't keep a list of Spheres but directly add the values to the buffers when a sphere is added to the item.
2016-11-08 15:52:01 +01:00
Maxime Gimeno 334414fa04 Fix the picking 2016-11-08 14:52:12 +01:00
Maxime Gimeno 023d565519 Use radius instead of squared radius. 2016-11-08 14:24:07 +01:00
Maxime Gimeno 35a5c3de41 Fix the CGAL_assertion when performing a free form selection. 2016-11-08 11:58:21 +01:00
Maxime Gimeno 65e6fcf2af Use QPainter API to draw the selection lines to avoid precision problems. 2016-11-08 11:41:48 +01:00
Maxime Gimeno b01999b634 Add support for SEP images to the Io_image_plugin 2016-11-07 14:05:06 +01:00
Jane Tournois 9187318744 Revert "convert weighted points to bare points when needed"
This reverts commits 19dadd6d58
and 137fe12b6b

We now use Kernel functors instead of Construct_point_3 converters,
because they work with both Point_3 and Weighted_point_3
2016-11-04 15:41:00 +01:00
Maxime Gimeno 8c0ce90300 Fix
On windows, the modal dialogs mess with the application of the Waitcursor. This commit adds a call to processEvents() after the waitcursor where it is needed to fix that.
2016-11-04 15:37:49 +01:00
Jane Tournois 9405829e13 fix compilation of mesh_3 plugin
in the demo, the word type is hardcoded either to float or unsigned char
2016-11-04 12:52:27 +01:00
Jane Tournois 19dadd6d58 convert weighted points to bare points when needed 2016-11-04 12:27:56 +01:00
Laurent Rineau 24c7f1b72a Better test files
The "good" test now check that the exception is actually caught, and not
silently ignored.
2016-11-04 12:10:12 +01:00
Maxime Gimeno 7814689e48 Fix warnings and MSVC bug 2016-11-03 14:16:45 +01:00
Laurent Rineau c0ae994d14 Fix Mesh_3 plugin, from the polyhedron demo 2016-11-03 13:10:00 +01:00
Laurent Rineau 8bf598df52 Merge pull request #1630 from sgiraudot/Polyhedron_demo-Fixes_point_set_3-GF
Polyhedron demo: fixes point set 3
2016-11-03 11:03:41 +01:00
Sébastien Loriot 823e02222e set the name of the item 2016-11-02 17:17:44 +01:00
Simon Giraudot db30ed1a82 Update with remarks from code review 2016-10-31 12:38:18 +01:00
Simon Giraudot 2c05020f64 Update outlier removal plugin 2016-10-31 09:07:16 +01:00
Simon Giraudot f3ca83228e Fix surface reconstruction plugin with structuring 2016-10-31 07:45:07 +01:00
Laurent Rineau 0fab84ea85 Fix the include() function
and improve the testsuite (check the message of caught assertions).
2016-10-28 17:58:03 +02:00
Simon Giraudot 5b32096d84 Fix shape detection plugin with structuring 2016-10-28 15:31:39 +02:00
Simon Giraudot 321e728012 Merge branch 'Polyhedron_demo-Fixes_point_set_3-GF' into Point_set_processing_3-Point_set_structuring-GF 2016-10-28 15:05:41 +02:00
Simon Giraudot f65db046b1 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-10-28 15:02:48 +02:00
Simon Giraudot 13b0026989 Use max precision for stringstream 2016-10-28 14:48:11 +02:00
Simon Giraudot 8add96f055 Bugfix: points must have normal map before assigning normals 2016-10-28 14:47:18 +02:00
Maxime Gimeno 2ac90fc5d3 Add the missing file 2016-10-28 14:34:03 +02:00
Laurent Rineau f6bb6c8c8e Do not try to compile the demo without C++11 2016-10-28 11:18:10 +02:00
Laurent Rineau 3a45eb2212 Better test files 2016-10-28 11:17:59 +02:00
Laurent Rineau f1a09f70d7 Handle exception across includes 2016-10-27 18:14:00 +02:00
Laurent Rineau 54dbab9d3c fixup! Better exception handling (with Qt Script) 2016-10-27 18:11:33 +02:00
Laurent Rineau ed2eae8879 Add a Qt Script lib
- and start with the addition of `include(<filename>)`.
2016-10-26 18:39:22 +02:00
Laurent Rineau e5d0b29c40 Display scripts outputs to the std::cout 2016-10-26 18:39:21 +02:00
Laurent Rineau c6b9c4a349 Use Q_DECL_OVERRIDE in Scene
and harcode, for Qt Script reason, that `Scene::Item_id` is `int`.
2016-10-26 18:39:15 +02:00
Laurent Rineau b0091d066a MainWindow is a QScriptable
- and catch exception from `loadItem`
2016-10-26 18:39:14 +02:00
Laurent Rineau fdb64eb59c Fix the Qt Script debugger 2016-10-26 18:39:14 +02:00
Laurent Rineau 418fbdef69 Better exception handling (with Qt Script)
- Uncaught Qt Script exception are now converted to a C++ exception of
  type `CGAL::Three::Script_exception`.

- With `<CGAL/Three/exceptions.h>` and the use of `QScriptable` and
  `CGAL::Three::wrap_a_call_to_cpp`, if a C++ exception is thrown by a C++
  piece of code that was called from a script, then a Javascript
  exception is thrown, so that a script can have a chance to catch it.

- Add a method `throw_exception()` in the `trivial_plugin`, as well as
  test scripts in `javascript/tests/`, to test that new set of features
  in C++/QtScript exceptions handling.
2016-10-26 18:39:06 +02:00
Laurent Rineau 9bab9a151d Use C++14 for this demo 2016-10-26 18:39:05 +02:00
Maxime Gimeno aa79b95559 Clean-up. 2016-10-24 16:53:35 +02:00
Maxime Gimeno 70f95d11eb Add transparency for the faces. 2016-10-24 16:44:42 +02:00
Maxime Gimeno 16b48bf5d4 Add the highlighting. 2016-10-24 15:22:01 +02:00
Simon Giraudot eff6cf9ed2 Remove duplicate files from Polyhedron demo "enhanced point set" branch 2016-10-24 15:17:41 +02:00
Laurent Rineau c546c9476d Merge pull request #1597 from maxGimeno/Polyhedorn_demo-can_load_empty_off-GF
Polyhedron_demo : Load empty OFF files
2016-10-24 11:47:11 +02:00
Maxime Gimeno c6627aa05f Smooth the transformations and factorize the code. 2016-10-24 11:17:05 +02:00
Maxime Gimeno 76fc3b23de computes the right Bbox for the item 2016-10-21 16:04:09 +02:00
Maxime Gimeno ffda7192a9 Force the volume of the box to stay positive 2016-10-21 15:23:41 +02:00
Maxime Gimeno f7792308d5 Fix rotation problems 2016-10-21 14:49:19 +02:00
Simon Giraudot 9592dd2017 Update file with latest review of Point_set_3 2016-10-21 14:40:22 +02:00
Simon Giraudot 245473d0b5 Bugfix: read_xyz_point_set takes care of normal map 2016-10-21 10:28:41 +02:00
Simon Giraudot f46a4a1c06 Bugfix: write PLY content of point (not pointer) 2016-10-21 10:28:41 +02:00
Simon Giraudot 78cb9ce216 Bugfix: do not define the prototype of Push_property_map beforehand 2016-10-21 10:28:41 +02:00
Simon Giraudot 2a8cd6b466 Fix boost demangle 2016-10-21 10:28:41 +02:00
Simon Giraudot 03ab2219bc Fix warnings/errors from testsuite 2016-10-21 10:28:40 +02:00
Simon Giraudot 739ba1d41d Bugfix: update outdated method name 2016-10-21 10:28:40 +02:00
Simon Giraudot ca932ff5d5 Setting normals is not needed anymore (off by default) 2016-10-21 10:28:40 +02:00
Simon Giraudot 89d88369d7 Add notes that files will be removed in the future 2016-10-21 10:28:40 +02:00
Simon Giraudot caede8baa3 Add include files of Point_set_3 in Polyhedron demo 2016-10-21 10:28:40 +02:00
Simon Giraudot 577988cc28 Update polyhedron demo plugins with new Point_set_3 API 2016-10-21 10:28:34 +02:00
Sébastien Loriot 114495a7be build empty point set if OFF has no vertices and no faces 2016-10-20 18:52:22 +02:00
Maxime Gimeno 71feaa34be WIP editable box 2016-10-20 17:51:55 +02:00
Laurent Rineau 8209e3982c Merge pull request #1567 from maxGimeno/Polyhedron_demo-Polylines_upgrades-GF
Polyhedron_demo : Polylines upgrades
2016-10-20 09:48:12 +02:00
Laurent Rineau 73bbf6e7d1 Merge pull request #1565 from maxGimeno/Polyhedron_demo-Transform_item_enhancement-GF
Polyhedron_demo: Transform item enhancement
2016-10-20 09:48:08 +02:00
Laurent Rineau c6cf01c7f6 Merge pull request #1562 from afabri/Kernel_Compute_dihedral_angle-GF
Add doc of functor class and concept corresponding to dihedral_angle()
2016-10-20 09:48:05 +02:00
Laurent Rineau e7b2920315 Merge pull request #1579 from maxGimeno/Polyhedron_demo-save_c3t3_state_when_reload-GF
Polyhedron_demo : Keep the c3t3_item's state when reloading
2016-10-20 09:47:32 +02:00
Maxime Gimeno 50b93ce2dc Add the visualization and the export to polyhedorn features 2016-10-19 16:17:51 +02:00