Commit Graph

68441 Commits

Author SHA1 Message Date
Efi Fogel d50b3d61b0 Reflected changes to the 2D Minkowski Sumspackage 2016-06-04 09:52:22 +03:00
Efi Fogel ec2f3e5c3f Merge branch 'MS_2-decomposition_optimization-efif-old' into MS_2-decomposition_optimization-efif 2016-06-04 09:42:00 +03:00
Laurent Rineau e6a3b3ae18 updated crontab (automated commit) 2016-06-03 10:18:06 +02:00
Efi Fogel eed57c67a9 Used the explicit type Gps_segment_traits_2 to resolve ambiguity 2016-06-02 17:59:35 +03:00
Sebastien Loriot fef7827dfa Merge pull request #1129 from maxGimeno/Polyhedron_demo-Fix_contextMenu_of_children-GF
Polyhedron_demo : fix the context menu of the children of a group
2016-06-02 15:55:21 +02:00
Maxime Gimeno 6090b89123 Fixes the contextMenu. 2016-06-02 15:40:24 +02:00
Sebastien Loriot d68050237a Merge pull request #1125 from maxGimeno/Update_FindTBB_to_use_regex-GF
Update FindTBB
2016-06-02 15:21:34 +02:00
Sebastien Loriot ef6f7f8faa Merge pull request #1126 from maxGimeno/Polyhedron_demo-Fix_spheres_item_in_polylines-GF
Polyhedron_demo: Fix for the Spheres_item and the Scene_polyline_item
2016-06-02 15:19:25 +02:00
Sebastien Loriot 26081a2608 Merge pull request #1123 from maxGimeno/Polyhedron_demo-Fix_ChangeGroup-GF
polyhedron_demo : Fix ChangeGroup
2016-06-02 15:17:02 +02:00
Sebastien Loriot a9b177fe71 Merge pull request #1121 from maxGimeno/Polyhedron_demo-_display_distance_between_points-GF
Polyhedron_demo: Display distance between points
2016-06-02 15:16:13 +02:00
Sebastien Loriot f546d49366 Merge pull request #1117 from maxGimeno/Fix_selection_tool-GF
Fix selection tool
2016-06-02 15:15:11 +02:00
Sébastien Loriot 472980a478 Merge pull request #1075 from maxGimeno/Polyhedron_demo-Handle_gray_images-rebase-GF
Polyhedron demo : Handle gray images
2016-06-02 15:06:49 +02:00
Sébastien Loriot 1a2fa813db fix warnings when vtk is not here 2016-06-02 09:16:53 +02:00
Maxime Gimeno 60d18a01cd Fixes :
- It is possible again to change the radii of the spheres in a polyline
- Reloading a group from file won't cause the demo to crash anymore.
2016-06-01 12:40:23 +02:00
Maxime Gimeno d34d7d5591 Fix errors when VTK is not found. 2016-06-01 10:36:50 +02:00
Maxime Gimeno fc992ed0c3 Replace the string(REPLACE vc...) by a single string(REGEX REPLACE ...). 2016-06-01 09:59:27 +02:00
Sébastien Loriot 97e122ccb8 Merge pull request #1110 from maxGimeno/Mesh_3_use_split_graph_into_polylines-GF
Remove duplicated implementation in <CGAL/Mesh_3/polylines_to_protect.h>
2016-05-31 16:03:16 +02:00
Sebastien Loriot cf15f57a50 Merge pull request #1097 from lrineau/Mesh_3-improve_polylines_to_protect-GF
Mesh 3: add an example that protects features of a 3D image
2016-05-31 16:00:58 +02:00
Sébastien Loriot 82d613f963 remove height parameter to avoid bad looking result 2016-05-31 15:58:43 +02:00
Sebastien Loriot 0f04b4262a Merge pull request #1109 from lrineau/Mesh_3-change_default_for_edge_size-GF
Mesh_criteria_3: change the default for `edge_size` from 0 to +∞
2016-05-31 15:49:16 +02:00
Sébastien Loriot 40ff09bd43 Merge pull request #303 from lrineau/Mesh_3-add_remesh_polyhedral_surface-GF
Add an example that remeshes a polyhedral surface
2016-05-31 15:43:05 +02:00
Sebastien Loriot 5cd63d9236 Merge pull request #1122 from sloriot/Polyhedron_demo-fix_signals
Fix action connection
2016-05-31 15:29:31 +02:00
Sebastien Loriot bd7e02c766 Merge pull request #1102 from maxGimeno/SDF_ignore_degenerated_faces-GF
AABB_Tree ignores degenerated faces in SDF_Calculation
2016-05-31 15:28:57 +02:00
Maxime Gimeno 5899e3dd3c Fix
- Fixes the behaviour when removing from scene with no item selected, that could cause a segfault in some cases.
2016-05-31 14:42:24 +02:00
Maxime Gimeno 46e13ba697 Fix
- When D was not released, the text was not cleared.
- Set the distance line bold.
2016-05-31 10:39:25 +02:00
Sébastien Loriot d9a0ef25e3 change init order 2016-05-30 18:04:46 +02:00
Sébastien Loriot 3046912017 use CamelCase for all MainWindow actions 2016-05-30 17:21:58 +02:00
Sébastien Loriot 530aa85e56 fix action and slot names 2016-05-30 17:13:33 +02:00
Sébastien Loriot 0ded764e71 fix signal name to allow auto-connection 2016-05-30 17:08:28 +02:00
Maxime Gimeno 2e20e8804b Fix meshing of gray images. 2016-05-30 15:06:55 +02:00
Maxime Gimeno 5edc0f89d8 Reduce copy/pasted code 2016-05-30 12:23:43 +02:00
Maxime Gimeno d4dc2cbc53 fix segfault in default constructor of selection-items 2016-05-30 10:34:17 +02:00
Maxime Gimeno c62ce2da10 Fixes
- Make only the selected selection_item active.
- Fix for the segfaults in edition_mode with no selection_item
- Creates a selection_item even if there are more than one item in the scene

Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item_k_ring_selection.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2016-05-30 10:33:30 +02:00
Sébastien Loriot bb856cbd63 add missing typename 2016-05-27 17:25:17 +02:00
Maxime Gimeno 084662ea87 Print the information on screen. 2016-05-27 17:02:08 +02:00
Laurent Rineau 5770538719 Fix a warning
> warning: typedef ‘K’ locally defined but not used [-Wunused-local-typedefs]
2016-05-27 16:47:26 +02:00
Laurent Rineau cfd76f1b00 Avoid degenerated polylines 2016-05-27 16:46:28 +02:00
Jane Tournois 748f0ffded comment until it's implemented
I prefer not to remove it completely
2016-05-27 16:07:25 +02:00
Maxime Gimeno aa51101d29 Merge branch 'Polyhedron_demo-_display_distance_between_points-GF-old' into Polyhedron_demo-_display_distance_between_points-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Viewer.cpp
	Polyhedron/demo/Polyhedron/Viewer.h
2016-05-27 16:06:48 +02:00
Jane Tournois 63d2a2a4dc remove default values and rename variable 2016-05-27 15:49:50 +02:00
Sebastien Loriot 9c02d3607a Merge pull request #1114 from afabri/BGL-Dual_example-GF
Add a subsection for the Dual<FaceGraph>
2016-05-27 15:19:26 +02:00
Maxime Gimeno cd4c24b4ad Warning fix 2016-05-27 15:17:06 +02:00
Maxime Gimeno f3f44a4dda Reduce pasted code. 2016-05-27 15:04:45 +02:00
Maxime Gimeno f29107e578 use vector::data instead of the address of the first element. 2016-05-27 13:00:16 +02:00
Maxime Gimeno 28f7ae212a Fix Compilation Errors in case VTK is not found. 2016-05-27 12:30:34 +02:00
Maxime Gimeno 90f04ba221 Fix runtime errors induced by insert(Primitive()) 2016-05-27 12:14:38 +02:00
Andreas Fabri c7585f05ed Add a subsection for the Dual<FaceGraph> 2016-05-27 11:36:43 +02:00
Jane Tournois 4e2593d911 Merge branch 'Polyhedron_demo-Handle_gray_images-rebase-GF' of github.com:maxGimeno/cgal into Polyhedron_demo-Handle_gray_images-rebase-GF 2016-05-27 11:13:36 +02:00
Jane Tournois 4cd78c0fa7 add a warning message 2016-05-27 11:08:29 +02:00
Jane Tournois 05c1224b95 rename group and shorten code 2016-05-27 10:49:59 +02:00