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

1397 Commits

Author SHA1 Message Date
Sébastien Loriot fb2052bf15 Polyhedron_shortest_path_default_traits -> Polyhedron_shortest_path_traits 2014-09-19 15:33:15 +02:00
Stephen Kiazyk 088774528a First round of Reference Manual revisions 2014-09-16 17:11:08 -04:00
Jocelyn MEYRON af3fd69dd1 divide the vcm_estimate_edges into a vcm_compute and construct_mst 2014-09-15 15:10:50 +02:00
Aurélien Vialon 68a8ad6607 Big improvement of Qt4or5 and findQt5. 
Now, when a switch is done by the user between Qt4 and Qt5, all the qt executables are refound, searching the proper version of them (Qt4 or Qt5)

A new bug, that wasn't noticed the first time, has been found and corrected into Mesh_3.
 2014-08-18 03:13:47 +02:00
Aurélien Vialon df9e315536 Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake. 2014-08-15 02:57:48 +02:00
Jocelyn MEYRON 663e41741b doc for vcm normals and feature edges estimation 2014-08-14 17:35:25 +02:00
Andreas Fabri a9d9b9834a Workaround for moc; Removal of typename in non template code 2014-08-13 16:14:39 +02:00
Andreas Fabri a7fe9fce76 Remove unneeded export 2014-08-13 16:14:38 +02:00
Stephen Kiazyk b541430aa7 Fixed AABB related methods and docs 
Changed 'fill_aabb_tree' -> 'build_aabb_tree'
Changed template parameter from AABB_tree type to AABBTraits type.
 2014-08-12 12:55:09 -04:00
Andreas Fabri d6053a3741 export gl_splat target if glew is here 
trivial bugfix for master
 2014-08-12 07:06:02 +02:00
Andreas Fabri bb2b50427c Add target_link_libraries for splatting 
trivial bug fix for master
 2014-08-11 18:03:32 +02:00
Sébastien Loriot 2e713e9324 macro prefixed with __ are no longer allowed with recent opengl 
trivial bugfix for master
 2014-08-10 15:52:59 +02:00
Laurent Rineau c42216e48b Fix for CMake 3.0 
Trivial fix for master.
 2014-08-06 17:05:41 +02:00
Aurélien Vialon 6df9530094 All GraphicView demonstrations ported to the new Qt inclusion way. 
Change of Qt4or5 variables names.

Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
     USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
     QT_VERSION_USED => number of Qt version wanted (4 or 5).
     QT4 => TRUE if Qt4 chosen.
     QT5 => TRUE if Qt5 chosen.
 2014-08-05 18:13:39 +02:00
Aurélien Vialon 9a1461442b Some bug correction for new Qt inclusion way. 
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
 2014-08-04 20:16:44 +02:00
Aurélien Vialon 0a457c4b03 Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support. 2014-08-02 14:59:49 -07:00
Aurélien Vialon 46c8926854 New way to chose Qt version for projects configuration. 
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).

Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.

Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)

During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)

Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
 2014-08-02 01:37:41 +02:00
Sébastien Loriot 1480755a86 mouse binding API change was done in QGLviewer 2.5.1 
trivial bugfix for master
 2014-08-01 16:45:29 +02:00
Stephen Kiazyk 0031d86d99 Add static locate methods. 2014-07-31 21:54:51 -04:00
Stephen Kiazyk 82c34d7cd9 Remove warnings. 2014-07-31 09:44:28 -04:00
Sébastien Loriot c802f0d52c draw points in green 2014-07-31 10:18:30 +02:00
Sébastien Loriot 805578922b rename shortest path item 2014-07-31 10:11:33 +02:00
Sébastien Loriot 52e318ade0 change color of shortest path 2014-07-31 10:11:16 +02:00
Sébastien Loriot e2b7700251 fix warnings 2014-07-31 10:01:55 +02:00
Jocelyn MEYRON 51c1236ad8 Add different methods for features estimation 2014-07-31 09:38:34 +02:00
Stephen Kiazyk 5b6410b273 Method renaming (per discussion with Sebastien) 2014-07-30 23:46:50 -04:00
Stephen Kiazyk b981ae8b23 Renamed compute_shortest_paths to construct_sequence_tree 
Also added a multi-source-vertex version of the method.
 2014-07-30 18:08:03 -04:00
Stephen Kiazyk 5983d498f6 Changed polyhedron shortest path point sequence to use an OutputIterator. 2014-07-30 15:16:22 -04:00
Stephen Kiazyk e5791f29fb Fix file mode on new files. 2014-07-30 10:04:50 -04:00
Stephen Kiazyk e0228a8cf3 Removes keyboard hotkeys from polyhedron shortest path item. 
Now that a UI is in place, these are no longer needed.  Also correctly
reports its rendering modes.
 2014-07-30 10:03:02 -04:00
Sébastien Loriot 06da6b80b9 Merge branch 'Polyhedron_demo-point_item_knows_if_it_has_normals-local' 
Tested in CGAL-4.5-Ic-106

Approved by the release manager (interim)
 2014-07-28 09:15:17 +02:00
Sébastien Loriot 494f558a7a Merge branch 'BGL-fix_split_edge-local' 
Tested in CGAL-4.5-Ic-106

Approved by the release manager (interim)
 2014-07-28 09:13:49 +02:00
Sébastien Loriot 3afe426098 add a boolean to indicate if a point set has normals 
this allows better filtering of applicable plugins and avoid confusion
 2014-07-24 17:00:59 +02:00
Sébastien Loriot 8dac29f1d7 off_to_xyz computes the normals if the off is a valid polyhedron 2014-07-24 16:07:34 +02:00
Sébastien Loriot 62c1359c56 add a plugin to split a polyhedron into one item per connected component 2014-07-24 15:04:34 +02:00
Sébastien Loriot f7cad6db65 bug in the doc of Polyhedron_3::split_edge inducing a bug in Euler::split_edge 2014-07-24 13:26:36 +02:00
Sébastien Loriot 516c0e55ef using operator[] 2014-07-24 12:21:11 +02:00
Thijs van Lankveld 39c4a70396 scale-space item per shell 2014-07-24 12:11:02 +02:00
Jocelyn MEYRON a6adefb0c3 Finish documentation for vcm_estimate_normals + Add a variant with a number of neighbors. 2014-07-23 14:23:48 +02:00
Laurent Rineau 26861f733d Merge branch 'Polyhedron-fix_demo_feature_A_B-lrineau' 
Bug-fix for the polyhedron demo. The A/B selection was no longer working
for a while.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:02:24 +02:00
Laurent Rineau 156a4b3f9b Merge branch 'Mesh_3-compare_index-GF' 
Add determinism to the sequential version of Mesh_3.

Small feature:
  http://cgal.org/wiki/Features/Small_Features/Mesh_3_deterministic
Was pre-approved 14 May 2014.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:00:16 +02:00
Sébastien Loriot 3a202ce200 Merge branch 'Polyhedron_demo-fix_recenter_scene-local' 
Tested in CGAL-4.5-Ic-100
Approved by the release manager
 2014-07-21 08:24:05 +02:00
Sébastien Loriot 45f7298ce7 Merge branch 'Polyhedron_demo-import_splatting-GF' 
Tested in CGAL-4.5-Ic-100
Approved by the release manager

Conflicts:
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
 2014-07-21 08:23:36 +02:00
Laurent Rineau bea14d40cc Add the EOF 2014-07-21 08:21:16 +02:00
Stephen Kiazyk 32ac4d06fd Add missing ui file for Shortest paths plugin 2014-07-19 09:28:36 -04:00
Sébastien Loriot bd09fccc48 top and reset timer before starting it again 2014-07-19 10:50:07 +02:00
Stephen Kiazyk 2933d1c02f Created Qt Demo for Polyhedron_shortest_path 
A shortest paths object is created using 'Make Shortest Path' from the
menu on a polyhedron.
Source points are created by shift-clicking on the polyhedron.
Points can also be removed by selecting the appropriate option in the
combo box.  Point locations can be snapped to the nearest edge or vertex,
or placed anywhere on the face.  Choosing 'Shortest Path' from the combo
box and shift-clicking will create a polyline object representing the
shortest path from any of the source points to that destination.  Note
that computing the shortest paths tree may be slow on the first query.
 2014-07-18 19:45:25 -04:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Jocelyn MEYRON 0a0c31e6f9 Fix VCM normal estimation plugin + Add first (non working) version of VCM features estimation 2014-07-18 15:13:46 +02:00
Laurent Rineau a0da371e2a Fix a runtime bug 
The dynamic type of my `model` object is no longer a `Scene`, but that
it a proxy model for the scene!
 2014-07-17 19:53:12 +02:00
Laurent Rineau be31b7a334 Cosmetic change 
Use this-> instead of the name of the base class.
 2014-07-17 19:52:13 +02:00
Sébastien Loriot 788f8def91 add warning message 2014-07-17 16:54:38 +02:00
Sébastien Loriot 27d34d9e75 Merge branch 'Orient-Polyhedron_3-iyaz' into Polyhedron_demo-fix_orient_polygon_soup-local 
Conflicts:
	Operations_on_polyhedra/include/CGAL/triangulate_polyhedron.h
 2014-07-17 16:29:52 +02:00
Sébastien Loriot f02af68d48 recenter scene first update the bbox 2014-07-17 15:55:48 +02:00
Sébastien Loriot 9684d475ab naive way to check a point set has normals used to set valid rendering modes 2014-07-17 13:53:01 +02:00
Sébastien Loriot b819d5024f scene texture item does not support splatting rendering mode 2014-07-17 12:02:09 +02:00
Sébastien Loriot a5eb8dc1c2 fix color issue for the point set and the splatting 2014-07-17 11:31:06 +02:00
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot' 
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2014-07-16 20:19:21 +02:00
Sébastien Loriot 756f502914 introduce the splatting taken from the Point set demo 
glew.h needs to be included before gl.h, thus the change
  of some include directives

  There is still a lighting/color bug that I need to fix
 2014-07-16 08:32:22 +02:00
Jocelyn MEYRON e6b4c7664a VCM normal estimation plugin 2014-07-15 14:53:51 +02:00
Stephen Kiazyk 95f9340e0f Added shortest paths polyhedron demo 
Currently works only using the Selection scene object to do vertex-vertex
queries.
 2014-07-11 07:36:42 -04:00
Sébastien Loriot d5f7ba8ff3 fix a bug introduced in 31042b8d 
glDrawElements call expect unsigned int!

trivial bug-fix for master
 2014-07-10 00:22:08 +02:00
Aurélien Vialon 520e791a99 GraphicView demonstrations porting. 2014-07-09 16:31:29 +02:00
Sébastien Loriot 16441b0f6d Merge branch 'Surface_modeling-integration_with_BGL-GF' 
Introduces the Surface modeling package that allows
  to deform a triangulated surface mesh

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Installation/changes.html
 2014-07-08 19:53:36 +02:00
Sébastien Loriot 2aadba50d7 Merge branch 'BGL-redesign_final-GF' 
Introduces a redesign of the CGAL extension of the BGL API

Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager

Conflicts:
	Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
 2014-07-08 19:45:16 +02:00
Thijs van Lankveld bd237d67a8 Polyhedron demo plugin adapted for new scale-space API. 2014-07-08 14:56:24 +02:00
Aurélien Vialon f6b77e522a Polyhedron Qt4 backward compatibility bug fixed. 2014-07-08 12:40:02 +02:00
Aurélien Vialon 74b829ae08 Polyhedron demonstration ported. 2014-07-08 11:54:15 +02:00
Sébastien Loriot 86f2ed6b0b Allow to use segmentation and AABB-tree by including only Polyhedron_3.h 2014-07-04 17:24:07 +02:00
Sébastien Loriot 39c073948e when using HalfedgeGraph or FaceGraph API, graph_traits must be included 2014-07-04 17:24:07 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00
Sébastien Loriot b7edce623f Polyhedron should not include BGL specialization 2014-07-04 17:24:05 +02:00
Sébastien Loriot 0b353bb85b Merge remote-tracking branch 'origin/CGAL-use_leda-GF' 
Reintroduce the possibility to use CGAL without GMP
  (to use LEDA number types instead for example).
  The cmake option to set to switch off GMP when building
  the lib is CGAL_DISABLE_GMP.

Tested in CGAL-4.5-Ic-86
Approved by the release manager

ge is necessary,
 2014-07-04 12:02:37 +02:00
Sébastien Loriot 31042b8d81 fix warning in the Polyhedron demo edit plugin 2014-07-04 10:06:10 +02:00
Sébastien Loriot 073d0076f3 remove lapack handling in the demo 
anyway it was not looked for
 2014-07-03 14:37:52 +02:00
Sébastien Loriot 12512ccecb update Surface_modeling to use the new BGL HalfedgeGraph API 
* remove boost:: prefix for free functions
  * edges --> halfedges
  * num_edges --> 2 * num_edges
  * next_edge --> next
  * opposite_edge --> opposite
  * halfedge_graph_traits --> graph_traits
  * is_border pmap  --> free function is_border
 2014-07-03 09:56:03 +02:00
Sébastien Loriot d16f193a0d initialize to NULL the pointer member 2014-07-02 10:43:25 +02:00
Sébastien Loriot 7f95ce6906 Merge remote-tracking branch 'origin/Intersections-fix_do_intersect_Bbox_3_Triangle_3-GF' into BGL-redesign_final-GF 2014-07-01 16:48:50 +02:00
Sébastien Loriot 60a1cbc324 fix wrong reference type 2014-07-01 16:43:27 +02:00
Sébastien Loriot 41e50ed10d Merge branch 'BGL-redesign_final-GF' into Surface_modeling-integration_with_BGL-GF 
Conflicts:
	BGL/include/CGAL/boost/graph/properties_Polyhedron_3.h
 2014-06-30 09:59:27 +02:00
Sébastien Loriot dd76e00ddd Merge branch 'Polyhedron_demo-add_scene_polyhedron_selection_item-sloriot' 
Adding a selection mecanism for vertices, edges and facets
  in the polyhedron demo

Tested in CGAL-4.5-Ic-81
Approved by the RM
 2014-06-27 19:40:49 +02:00
Sébastien Loriot 33c1161ffe remove warnings about hiding an init method 2014-06-27 19:39:50 +02:00
Sébastien Loriot 7251e003fa Merge branch 'Demos-fix_for_qglviewer-sloriot' 
Handle API change in QGLViewer 2.5

Tested in 4.5-Ic-81
Approved by the RM
 2014-06-27 17:12:47 +02:00
Sébastien Loriot 9e91e05d1b make demos working without gmp 2014-06-27 16:34:41 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +02:00
Sébastien Loriot 5915daa572 drop Taucs from the demo and update error messages for the testsuite 2014-06-25 14:52:04 +02:00
Sébastien Loriot 1260511bc2 drop the support of SuperLU 2014-06-25 13:33:13 +02:00
Sébastien Loriot 7d9e96888d update release version 2014-06-25 13:20:21 +02:00
Sébastien Loriot e1c8270b14 remove incorrect use of the default point property map 2014-06-24 16:36:49 +02:00
Sébastien Loriot edec4ad54c remove warnings 2014-06-24 07:59:43 +02:00
Sébastien Loriot 39569173b7 when adding an item do not recenter the scene if the bbox is the same 2014-06-18 16:14:28 +02:00
Sébastien Loriot 4ff5aa5450 setRevolveAroundPoint has been renamed to setPivotPoint in libQGLViewer 2.5.2 2014-06-18 15:27:25 +02:00
Sébastien Loriot 15153eab84 use new overload of setMouseBinding 2014-06-18 15:20:43 +02:00
Laurent Rineau 1f1a20f56f Change bindings for QGLViewer >= 2.5 
(cherry picked from commit 5c61a754210642d502b96404b4ab3ad01965c054)
 2014-06-18 14:39:26 +02:00
Sébastien Loriot cb58227f62 Merge branch 'Polyhedron_demo-add_scene_polyhedron_selection_item-sloriot' into Surface_modeling-integration-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Travel_isolated_components.h
 2014-06-18 11:53:16 +02:00
Sébastien Loriot a20cd5b000 add missing targets in the testsuite + all to catch future update mistakes 2014-06-18 11:26:32 +02:00
Sébastien Loriot b53607c396 add the selection item in the polyhedron demo and global selection mechanisms 
the plugin convex hull is update to be usable from a selection
imported form the branch Polyhedron_HoleFilling-GF@be7b971
 2014-06-16 17:18:51 +02:00
Andreas Fabri 4e1911c4b6 source and target are not in namespace boost 2014-06-12 09:17:58 +02:00
Andreas Fabri 3d30938cb2 Use faces(G) instead of facets_begin/end 2014-06-11 10:38:30 +02:00
Sébastien Loriot d0dfac3caa facet_handle -> face_descriptor 2014-06-05 21:29:01 +02:00
Sébastien Loriot 8b88547955 fix compilation issues 2014-06-05 17:01:59 +02:00
Andreas Fabri 2c4c38809d switch internally to BGL API in mesh segmentation. We still have to deal with the point property maps 2014-06-05 12:05:54 +02:00
Laurent Rineau 8f59bbcced trivial bug-fix for master 
The displayed vertex is not the nearest.

(cherry picked from commit d80d6a4c288cb53c13279dab389b4266ddebe3d9)
 2014-06-03 16:18:40 +02:00
Sébastien Loriot 44542ff829 Merge branch 'Polyhedron-stitching_plugin_update-local' 
Update the stitching plugin of the polyhedron demo to be applied
  on all the selected items at once.

  Successfully tested in CGAL-4.5-Ic-57
 2014-06-02 07:54:18 +02:00
Andreas Fabri de34478f85 fix the mesh_simplification_plugin 2014-05-27 17:10:43 +02:00
Andreas Fabri 796c9a383b Merge branch 'BGL-redesign_final-GF-old' into BGL-redesign_final-GF 2014-05-26 14:55:52 +02:00
Andreas Fabri ceb1a76ec3 cleanup 2014-05-26 12:43:46 +02:00
Andreas Fabri e95c3d452c Switch to new BGL API in package AABB_tree 2014-05-24 08:55:43 +02:00
Sébastien Loriot a41ac02cc2 add a dialog box to set options 2014-05-23 22:38:39 +02:00
Sébastien Loriot 624b6389f3 add the first version of the scale space surface reconstruction plugin 2014-05-23 21:56:12 +02:00
Sébastien Loriot 7a08411dae add method to init the polygon soup and finalize it 
this allows to create an item from scratch
 2014-05-23 21:55:03 +02:00
Andreas Fabri 28546e94a2 Add function to access the underlying HDS 2014-05-22 11:19:53 +02:00
Laurent Rineau 0fa934baf1 Bug-fix in MainWindow.cpp 
The modification of all Scene_item menu() was not correctly implemented.

Trivial bug-fix for master.
 2014-05-22 11:00:35 +02:00
Sébastien Loriot 3fa09693a3 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
	Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp
 2014-05-21 18:24:17 +02:00
Laurent Rineau af005e81dc Bug-fix for Windows min/max issue 
Trivial bug-fix for master
 2014-05-21 13:00:15 +02:00
Laurent Rineau 212cd13929 Merge branch 'Polyhedron-demo_filter_selectView-GF' 2014-05-19 13:25:38 +02:00
Laurent Rineau fd38d02f86 Implement "Zoom to this object" 2014-05-16 18:02:45 +02:00
Laurent Rineau 588c529d86 Add "Save as..." to the objects context menu 2014-05-16 16:16:49 +02:00
Laurent Rineau da50729c11 One can filter the list of objects in the demo 
I use q QSortFilterProxyModel, to wrap our 'scene' model. All the
"index" and "selection" objects must be translated from/to the
unfiltered model.
 2014-05-16 14:32:18 +02:00
Laurent Rineau 9f4884490d Protect features in the Polyhedron demo Mesh_3 plugin 
The UI is the same dialog as in demo/Mesh_3/. There is a checkbox to
chose to protect sharp edges or not.
 2014-05-15 12:57:59 +02:00
Laurent Rineau 4bcbc85cf5 The recent files list stores absolute names 
Trivial bug-fix for master

(cherry picked from commit f53238b57910a8a96fd9cb45042e1e4193772a4d)
 2014-05-13 16:32:50 +02:00
Sébastien Loriot 276f2ce4e7 trivial bug-fix for master to export link targets for an external plugin 2014-04-30 15:18:11 +02:00
Laurent Rineau 75919c2ebb Fix timestamp implementation for Polyhedron in the demo 2014-04-16 15:00:28 +02:00
Jane Tournois fcb5a6b81a add time stamps to polyhedron primitives for polyhedron demo 
note they are not initialized in this branch, because
features are not detected in this version of the demo
 2014-04-15 15:50:36 +02:00
Sébastien Loriot cecf4648f5 Merge branch 'Polyhedron-join_plugin-sloriot' 
add a plugin in the polyhedron demo to join polyhedra
without no check for auto-intersection

Tested in CGAL-4.5-Ic-6
 2014-04-10 17:48:07 +02:00
Sébastien Loriot 90a4c1c989 update path to include file 2014-04-08 14:49:03 +02:00
Sébastien Loriot 2892c2fb4e Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF 
Conflicts:
	Documentation/biblio/geom.bib
	Documentation/doxyassist.xml
 2014-04-08 14:41:09 +02:00
Laurent Rineau 6f20e044cc Fix compilation errors with recent libQGLViewer 2014-03-04 18:20:47 +01:00
Sébastien Loriot dcc0053135 update function name after change in the main class 2014-03-04 15:13:04 +01:00
Sébastien Loriot ceb9015194 apply the stitching plugin to all selected polyhedra 2014-02-18 22:32:29 +01:00
Sébastien Loriot db7cf0d798 add a plugin to join polyhedra into a polyhedron 
naively no check for duplicated points
 2014-02-18 22:23:28 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb 
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
 2014-02-10 14:54:23 +01:00
Sébastien Loriot 4707e13d2a bugfix when checking for duplicated indices of a new facet 2014-01-23 09:18:30 +01:00
Sébastien Loriot a72ee0c2a0 Merge branch 'Surface_mesh_segmentation-sloriot' 
Introduces the Triangulated Surface Mesh Segmentation Package
See also wiki/Features/Surface_mesh_segmentation
Tested in 4.4-Ic-84

Approved by the release manager

Conflicts:
	Documentation/biblio/how_to_cite.html
	Documentation/biblio/manual-4.3.bib
	Manual/doc_tex/Manual/geom.bib
 2014-01-10 00:15:18 +01:00
Sébastien Loriot 3c8f1ee532 fix last warning in the demo 2013-12-23 16:49:48 +01:00
Sébastien Loriot 98f0bc2d86 add timer in the demo 2013-12-23 16:49:47 +01:00
Sébastien Loriot c4a1ac227a int -> size_t in benchmark and demo 2013-12-23 16:49:47 +01:00
Sébastien Loriot b1bf39b318 fix include filename 2013-12-23 16:49:47 +01:00
Sébastien Loriot 0a9ea00685 update include directives 2013-12-23 16:49:46 +01:00
Sébastien Loriot 61c91a1971 turn int to std::size_t when it is possible 2013-12-23 16:49:46 +01:00
Sébastien Loriot 172c6d4592 forgot to rename functions in the demo after the review 2013-12-23 16:49:45 +01:00
Sébastien Loriot 8736af5190 add segmentation plugin to the polyhedron demo testsuite 2013-12-23 16:49:43 +01:00
iyaz aaef01e6d0 update default lambda in demo ui to be consistent with default in API 2013-12-23 16:49:38 +01:00
Sébastien Loriot 8f579d8069 fix a bug when appending facets to a polyhedron using the incremental builder 2013-12-18 12:35:26 +01:00
Sébastien Loriot f959e22291 add an example showing a bug in the incremental builder. 2013-12-18 12:24:50 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Sébastien Loriot f75f156f44 Merge branch 'Polyhedron_demo-stitching_plugin-sloriot' 
Add a plugin in the polyhedron demo to stitch the boundaries of a polyhedron.
  The plugin also allows to visualize the boundaries of a polyhedron

  Approved by the release manager
  Tested in CGAL-4.4-Ic-43
 2013-11-29 14:36:16 +01:00
Sébastien Loriot dc7aca42ce trivial doc enhancement 2013-11-28 17:29:41 +01:00
Sébastien Loriot 05bff9cf8f add a function to stitch boundary edges in a polyhedron 
also brings:
  a demo plugin that also display boundary edges
  a testsuite with examples
 2013-11-27 16:19:42 +01:00
Guillaume Damiand b69a02e291 Move CGAL_CMAP_DEPRECATED in .h 2013-11-14 13:39:07 +01:00
Guillaume Damiand 61d6236b60 Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Sébastien Loriot bb938d6914 move compute_normal.h from the demo include path to the internal of CGAL 2013-10-01 14:48:15 +02:00
Andreas Fabri 9ed4f837c3 Merge branch 'CGAL-compilable_headers-GF' 
The conflict was about whitesapce
Approved by the release manager

Conflicts:
	Polyhedron/include/CGAL/Polyhedron_copy_3.h
 2013-09-23 14:50:17 +02:00
Andreas Fabri ca13d36c2b remove whitespace 2013-09-23 12:44:07 +02:00
Sébastien Loriot e72b56d6ad add missing template parameter 
demo bugfix that was 45c60e51 that has been tested in CGAL-4.3-Ic-176
 2013-09-20 09:29:48 +02:00
Laurent Rineau 4e5734b222 Improve doc of concepts Vertex and Face of HDSItems and PolyhedronItems 2013-09-16 15:04:19 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Sébastien Loriot 9010b1f0ab new behavior for the reset function (now it's an undo function) 2013-09-13 08:54:17 +02:00
Sébastien Loriot 23e7a96606 using a range for the vertices of the roi 2013-09-13 08:26:21 +02:00
Sébastien Loriot a4012b256b replace handle by control vertex in the demo 2013-09-12 17:57:53 +02:00
Sébastien Loriot 74ec167c8a rename erase_roi to erase_roi_vertex 2013-09-12 17:05:22 +02:00
Sébastien Loriot 12add714f1 rename erase_control to erase_control_vertex 2013-09-12 17:03:46 +02:00
Sébastien Loriot c6d083048d add function for clearing the roi and the set of control vertices 2013-09-12 16:57:20 +02:00
Sébastien Loriot 5e5523466d rename assign to set_target_position 2013-09-12 14:25:39 +02:00
Sébastien Loriot 2501af773a rename is_control 2013-09-12 12:39:25 +02:00
Sébastien Loriot 1ee47e8d5e rename is_roi 2013-09-12 12:38:14 +02:00
Sébastien Loriot 8b7b06f246 rename insert_roi 2013-09-12 12:34:15 +02:00
Sébastien Loriot 5ec0ea279b rename insert_control 2013-09-12 12:27:05 +02:00
Sébastien Loriot e48b358b6a rename iterator 2013-09-12 12:17:01 +02:00
Laurent Rineau c9474ed207 Merge remote-tracking branch 'origin/CGAL-Use_Simple_cartesian-GF' 
Successfully tested in CGAL-4.3-Ic-168

Approved by the Release Manager.
 2013-09-12 11:28:44 +02:00
Sébastien Loriot 799a1fc1d1 bug-fix: correctly color surface patches having index 0 
trivial bug-fix locally tested affecting only a demo
 2013-09-06 13:24:51 +02:00
Sébastien Loriot 9156b45607 fix typo 2013-09-06 09:11:54 +02:00
iyaz 6e52f99252 give possibility to emit itemAboutToBeDestroyed inside replaceItem 2013-09-06 09:06:40 +02:00
iyaz 5044cb4be5 update text and min value for num of cluster spinbox 2013-09-06 03:34:02 +03:00
Sébastien Loriot 5126247d26 bug-fix: the item cannot be deleted now as its context menu is still in use 
issue detected on windows using debug mode
 2013-09-05 19:51:09 +02:00
Sébastien Loriot b6640a9d3c Merge branch 'gsoc2012-segmentation-iyaz-old' into gsoc2012-segmentation-iyaz 2013-09-04 08:05:28 +02:00
iyaz 71b2a6b16b remove custom_manipulated_frame (I don't think there will be any need in the future) 2013-09-02 17:13:24 +03:00
iyaz 2ed14db17a Merge branch 'Surface_modeling-new_package-GF' of ssh://scm.cgal.org/var/git/cgal into Surface_modeling-new_package-GF 2013-09-02 17:08:10 +03:00
Sébastien Loriot 2997c4fa6a fixes for gcc 2013-09-02 15:51:32 +02:00
iyaz 0178cb5448 convert widget to dock_widget 2013-08-28 17:18:18 +03:00
Laurent Rineau 2286ad89ab Remove the executable bit of .h and .cpp files 2013-08-27 14:58:04 +02:00
Andreas Fabri ca18c33778 Switching to Simple_cartesian gives better performance" 2013-08-26 15:52:09 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
iyaz 5dae1f205f remove unnecessary includes 2013-08-15 14:46:35 +03:00
iyaz 44b837a538 Separate brush size for ROI and handles 2013-08-15 14:43:59 +03:00
iyaz fc6c05b00e Create new handle if there is no empty handle 2013-08-15 13:56:28 +03:00
iyaz c071cdd704 use selection facilities in edit_demo 2013-08-14 19:59:35 +03:00
iyaz d679958ae9 selection facilities from hole-filling (this commit going to be removed) 2013-08-14 19:11:19 +03:00
iyaz 1ba401ffff handle -> control (header, examples, tests, and demo) 2013-08-11 18:45:28 +03:00
iyaz 2c4ece7e57 remove handle_group (header, examples, tests, and demo) 2013-08-11 17:29:27 +03:00
iyaz a963a03c05 add extract_segment as a param to demo, rearrange window layout 2013-08-08 23:54:53 +03:00
iyaz f0459afc47 handle painting not normalized SDF values (which is the case min == max) 2013-08-08 02:37:43 +03:00
Sébastien Loriot 9c2f35ed1a using cgalHeading instead of h3 2013-08-07 10:06:49 +02:00
iyaz e73f83558c Simplify and format demo code 2013-08-06 19:50:57 +03:00
Sébastien Loriot b352ca7410 Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF 2013-08-06 16:34:47 +02:00
iyaz 720bc697a0 do not dynamically allocate ui_widget 2013-08-06 15:23:57 +03:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite 
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
 2013-08-05 18:25:26 +02:00
Sébastien Loriot d49ca3003c Merge branch 'Misc-glisse' 
fix c++11 issue reported by clang with libc++ stdlib:
  ostream no longer has a implicit conversion operator to void*

This behavior is detected using the boost macros
BOOST_NO_EXPLICIT_CONVERSION_OPERATORS (up to 1.50) and
BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS (from 1.51)

Successfully tested in CGAL-4.3-Ic-108 and CGAL-4.3-Ic-106
Approved by the interim release manager
 2013-08-01 07:20:54 +02:00
Sébastien Loriot 7dbf5b3525 typo 2013-07-29 09:43:09 +02:00
Sébastien Loriot 201ae12b66 C++11 stream conversion to bool/void* changes. 2013-07-29 08:11:58 +02:00
Sébastien Loriot 1c2b0dfe4f constructor does not take a stream as parameter 2013-07-29 08:07:45 +02:00
Sébastien Loriot 60bf4de956 C++11 stream conversion to bool/void* changes. 2013-07-29 08:07:20 +02:00
Sébastien Loriot 441186c65b Merge branch 'Polyhedron_demo-fix-save_issue-local' 
Successfully tested in CGAL-4.3-Ic-103
Approved by the interim release manager
 2013-07-29 07:54:26 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local' 
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
 2013-07-26 17:50:07 +02:00
Sébastien Loriot deeb6569a1 try to use a IO-plugin for saving only if filename matches the files handled 2013-07-26 15:07:53 +02:00
Sébastien Loriot 485e14927d extract the code that tells if an IO plugin can handle a given file 2013-07-26 15:04:50 +02:00
Sébastien Loriot 3121bcfd32 Merge branch 'gsoc2012-segmentation-iyaz-old' into gsoc2012-segmentation-iyaz 
Conflicts:
	Documentation/doc/General.txt
	Documentation/doxyassist.xml
	Point_set_processing_3/include/CGAL/IO/write_off_points.h
	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
	Point_set_processing_3/include/CGAL/Point_with_normal_3.h
	Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
	Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/pca_estimate_normals.h
	Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_3.h
	Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_d.h
	Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/edge_collapse.h
 2013-07-26 11:52:16 +02:00
Marc Glisse 474d8bfbf6 Same fix for the 2 other copies of Scene_polyhedron_item.cpp. 2013-07-26 09:10:21 +02:00
Sébastien Loriot ed76911e06 Merge branch 'AABB_tree-fix_non_conventional_names-local' 
Successfully tested in CGAL-4.3-Ic-101
Approved by the interim release manager

This merge fixes documentation bugs and rename classes with names
non conform to CGAL conventions
 2013-07-25 18:56:17 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env 
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
 2013-07-25 14:58:53 +02:00
Sébastien Loriot 143a2181b3 add latex format for \imagei doxygen command 
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
 2013-07-25 11:50:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Sébastien Loriot 519b301130 remove gif files from doxygen doc include path 2013-07-25 11:14:16 +02:00
Sébastien Loriot 4389b0bac8 remove the usage of gif in the doxygen doc as pdflatex does handle them 
replace the files with png
 2013-07-25 11:06:13 +02:00
Sébastien Loriot 9c0808cad1 fix name of classes that do not respect CGAL naming conventions 
AABB_HalfedgeGraph_segment_primitive -> AABB_halfedge_graph_segment_primitive
AABB_FaceGraph_triangle_primitive -> AABB_face_graph_triangle_primitive
 2013-07-23 17:46:50 +02:00
Sébastien Loriot 1917bb8070 add an action to select duplicated points 2013-07-18 13:35:03 +02:00
Sébastien Loriot 33bf170c18 clean compute_normal and update plugins to use the updated functions 
also remove the file from the demo include directory.
 2013-07-16 16:37:35 +02:00
Sébastien Loriot 32f1e53b41 allow the polyhedron copy to also append into an existing polyhedron 
trivial fix on a non-documented class (not included by any file in CGAL)
 2013-07-16 12:54:31 +02:00
iyaz 993346eced [Demo] check oriented soup also has correct consistent orientation 2013-07-10 17:59:22 +03:00
Sébastien Loriot 6735255fd0 The vertex point property map can be external for non-CGAL graph implementation 
This is a bugfix of the API
 2013-07-03 12:51:09 +02:00
Sébastien Loriot 53bb2bf5a4 bugfix: do not dereference an iterator that can be past-the-end 2013-07-03 07:48:29 +02:00
Sébastien Loriot 4978619e1b set name of QDialog to avoid runtime warning 
demo trivial bugfix
 2013-07-02 10:01:18 +02:00
iyaz 0c54dea4ee Fix rendering 
- For now just supporting Smooth shading with edges.
Add "Get minimum" feature for selecting isolated components
 2013-06-28 19:52:14 +03:00
Sébastien Loriot abae9100f0 enhance the conditional build of the edit plugin 2013-06-27 10:35:20 +02:00
Sébastien Loriot a72ba8fac3 Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF 2013-06-27 09:06:42 +02:00
Sébastien Loriot d9cf655db1 Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF 
Conflicts:
	Documentation/doxyassist.xml
	Documentation/header_package.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2013-06-27 08:55:59 +02:00
iyaz c69a046429 Move adapter functions from Deform_mesh.h to the files which use Deform_mesh.h 
Fix test code which is broken (by the change of not using Deform_mesh::Vector)
 2013-06-24 21:45:23 +03:00
iyaz 0fdaa5995a Remove unused includes 2013-06-24 20:09:51 +03:00
iyaz f1b4738eaa forgotten assignment from previous commit leads crash- fixed 2013-06-24 20:01:06 +03:00
Sébastien Loriot 7dcfef5a53 Merge branch 'Polyhedron-demo_header_cleanup_and_new_plugins-sloriot' 
Successfully tested in CGAL-4.3-Ic-68
approved by the Release Manager
 2013-06-24 12:30:25 +02:00
Sébastien Loriot 08052711cd Revert "use Polyhedron API" 
This reverts commit b0f7a8e1bf.
 2013-06-24 12:09:40 +02:00
Sébastien Loriot b0f7a8e1bf use Polyhedron API 2013-06-24 11:34:03 +02:00
Sébastien Loriot ce2254a670 use the polyhedron API to iterate over vertices 2013-06-24 10:24:13 +02:00
Sébastien Loriot 376e99312e Merge branch 'AABB_tree-one_primitive_per_object-sloriot' 
Successfully tested in CGAL-4.3-Ic-68
implements what is described in Small_Features/aabb_tree_more_primitives
 2013-06-24 08:11:05 +02:00
Sébastien Loriot b49dbe358e move surface mesh polyhedron oracle to operations on polyhedra 2013-06-21 11:42:28 +02:00
Sébastien Loriot a762131d50 rename header file 2013-06-21 11:30:39 +02:00
Sébastien Loriot 0e19f01ba7 remove duplicated file that is in Operations_on_polyhedra 2013-06-21 10:15:26 +02:00
Sébastien Loriot 47fa1269cb make get function friend functions of the property maps 
This change was needed to workaround a bug observed with g++ (Debian 4.7.3-4)
while compiling Scene_polyhedron_item, just including
CGAL/Polyhedron_3_property_map.h
 2013-06-21 09:07:15 +02:00
Sébastien Loriot a106f21298 update remaning plugins with new primitives 2013-06-21 09:06:24 +02:00
Sébastien Loriot 204e8a6ae0 fix constness issue for HalfedgeGraph property maps 2013-06-20 19:45:26 +02:00
Sébastien Loriot 7185573274 use the new primitive 2013-06-20 19:19:48 +02:00
Sébastien Loriot d5194d9fce remove non needed include directive 2013-06-20 19:18:58 +02:00
Sébastien Loriot 8c72a3d046 use point type of the polyhedron to deduce the kernel with Kernel_traits 2013-06-20 19:10:58 +02:00
Sébastien Loriot a1b9c5b36d rename plugin 2013-06-20 18:04:48 +02:00
Sébastien Loriot 0c34e9e2ee move example 2013-06-20 17:34:54 +02:00
Sébastien Loriot 3e5ce261f4 remove debug flags 2013-06-20 17:34:54 +02:00
Sébastien Loriot b5aa981404 move corefinement to operations on polyhedra 2013-06-20 16:47:26 +02:00
Sébastien Loriot ca9636bf1e move polyhedron slicer 2013-06-20 16:45:17 +02:00
Sébastien Loriot 3d23a59a73 Merge branch 'inside_polyhedron_test-GF' 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2013-06-20 16:34:02 +02:00