Commit Graph

762 Commits

Author SHA1 Message Date
Jane Tournois c4245df6cb end of merge 2015-05-19 09:07:53 +02:00
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
2015-05-19 09:07:08 +02:00
Jane Tournois 8e61cfdd49 new attempt to fix unused variables warning from boost with clang
and add namespace CGAL for Lloyd 2D parameters
2015-05-19 09:04:28 +02:00
Andreas Fabri 693db86912 Add typenames; reorder member initialization; add this-> 2015-05-19 09:04:27 +02:00
Andreas Fabri 74c817fe7f Add an include 2015-05-19 09:04:27 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Jane Tournois df04359061 fix recenter when input changes 2015-05-19 08:54:36 +02:00
Jane Tournois dbad20cbba add message box to prevent delete mistakes 2015-05-19 08:54:35 +02:00
Jane Tournois 717e795c1a make the specification of DelaunayMeshFaceBase_2 complete
+ change access functions names to make them conform to CGAL
+ add preconditions in the code
2015-05-19 08:54:33 +02:00
Jane Tournois 4cf8655c00 move all the cdt.dual(v) code from Triangulation_2 to Mesh_2
we do not change the API of Triangulation_2 for now
maybe later, and this version should be easy to keep backward compatible
2015-05-19 08:54:33 +02:00
Andreas Fabri 8e393c792c Graphicsview demos 2015-05-06 17:11:04 +02:00
Andreas Fabri 85e409f413 Polyline simplification demo 2015-05-06 16:06:33 +02:00
Andreas Fabri 2f27db0234 changes such that the Mesh_3 demo works with -DQT_NO_KEYWORDS 2015-05-05 12:32:49 +02:00
Andreas Fabri 5f4a47e13b fix links to Qt and escape some links 2015-02-23 13:20:05 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Sébastien Loriot e270de4b67 remove warning 2015-01-06 16:53:48 +01:00
Remy Thomasse b5047c9bb8 try to fix some warnings 2015-01-06 16:53:48 +01:00
Remy Thomasse b3514854de compatibility old version of boost 2015-01-06 16:53:48 +01:00
Remy Thomasse 57d4dbbb2a Add Traits, clean the code 2015-01-06 16:50:14 +01:00
Remy Thomasse 03ef4e6789 modifications OutputIterator 2015-01-06 16:50:14 +01:00
Remy Thomasse 616178e80f name change, typos 2015-01-06 16:50:13 +01:00
Remy Thomasse 86cf507775 add size_t, FT instead of long and double, ifndef Q_MOC_RUN trick to compile the demo without trouble (pb with boost headers and Qt) 2015-01-06 16:50:13 +01:00
Remy Thomasse 1d82acee46 demo generator 2015-01-06 16:50:13 +01:00
Jane Tournois 150c52200a add a menu to show/hide vertices 2014-11-28 13:06:44 +01:00
Jane Tournois b5ace14604 fix the use of the cancel button 2014-11-28 12:57:42 +01:00
Jane Tournois a8440d8eaa Add a submenu to view only inside edges
the edges that triangulate the convex hull outside of the
domain "pollute" the image
2014-11-28 11:36:06 +01:00
Jane Tournois 361fc6e3d0 fix clear function when show seeds is on 2014-11-28 10:26:44 +01:00
Jane Tournois fbccaadd4f add using namespace 2014-11-27 12:28:37 +01:00
Jane Tournois 6cc4ccc524 fix display of constrained Voronoi diagram
there is still a problem with voronoiPen
2014-11-24 14:46:27 +01:00
Jane Tournois 45f96a803c fix display of seeds
when "display seeds" is active, seeds are displayed right away
when a new seed is inserted
2014-11-24 14:24:09 +01:00
Jane Tournois 4b56a4abdd remove useless cout 2014-11-24 12:16:29 +01:00
Jane Tournois b40b37c760 paint seeds fixed 2014-11-24 12:03:13 +01:00
Jane Tournois 600a9bb192 handling of in_domain changed
the parity of the number of constraints crossed is not used anymore.
The infinite component is tagged outside.
About finite components, inside/outside status is only based on seeds,
 that should be inserted manually.
2014-11-21 13:10:47 +01:00
Jane Tournois 5f687bdc39 abort meshing when "cancel" button is hit 2014-11-20 16:23:25 +01:00
Jane Tournois e4161ce685 handle seeds in lloyd_optimize_mesh_2 2014-11-20 16:13:46 +01:00
Jane Tournois 6897360695 handle the insertion of seeds inside the demo
note after Lloyd, they are not taken into account yet to update
 the "inside" markers
2014-11-20 14:57:17 +01:00
Jane Tournois c97c1c844b add a pen for seeds 2014-11-20 11:10:25 +01:00
Jane Tournois d463490202 drawing seeds works but points are too small
todo : do not color faces corresponding to seeded zones
2014-11-18 17:38:09 +01:00
Jane Tournois 56d4fe9732 insert seeds inside the demo
drawing those seeds does not work yet, but meshing takes them into account
2014-11-18 17:32:19 +01:00
Jane Tournois 4b71328474 change vertex base in demo to use my last commit 2014-11-14 13:40:30 +01:00
Jane Tournois 5e2fab9a51 add verbose stuff 2014-11-12 16:52:49 +01:00
Jane Tournois 76c8e95389 add input dialogs to demo to be able to set Delaunay refinement parameters
k-Lipschitz case
2014-11-12 16:26:44 +01:00
Jane Tournois f084954892 add input dialogs to demo to be able to set Delaunay refinement parameters 2014-11-12 16:16:03 +01:00
Jane Tournois e02773efd1 move files about sizing, and change template parameter. Geom_traits is enough 2014-11-12 15:42:27 +01:00
Jane Tournois e971112c1c this file should remain in the demo folder 2014-11-12 13:07:02 +01:00
Jane Tournois d071e71773 move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd 2014-11-12 12:51:09 +01:00
Andreas Fabri 0f92048c4d changes after Efi's review (and color changes in the demo) 2014-11-10 18:00:02 +01:00
Jane Tournois 5666a7db17 add code for Lloyd optimization, and in the demo 2014-11-07 17:07:14 +01:00
Laurent Rineau 29904d2f56 Other example with the Polygon demo 2014-11-07 17:06:41 +01:00
Laurent Rineau 9889f95768 Example of using of exportSVG 2014-11-07 16:57:28 +01:00