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

156 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 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
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 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 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 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 9889f95768 Example of using of exportSVG 2014-11-07 16:57:28 +01:00
Laurent Rineau a35858a293 Move exportSVG to the DemosMainWindow base class 2014-11-07 16:57:04 +01:00
Laurent Rineau 94803a6a96 Implement export to SVG for the CDT_2 demo 2014-11-07 16:09:09 +01:00
Jane Tournois 1e1d6b9004 add menu to tag blind faces 2014-11-06 16:03:41 +01:00
Jane Tournois a4c3691763 add code to demo to display bad facets 2014-11-06 15:34:48 +01:00
Jane Tournois 4cf43198e2 dual(v) returns an OutputIterator that collects rays and segments 
to do so, use the Dispatch_output_iterator

- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
 2014-10-07 15:03:41 +02:00
Sébastien Loriot a64b317ba7 trivial bugfix in cdt2 demo 
mark faces in the domain also when reading a polygon from a file
 2014-02-17 08:48:02 +01:00
Andreas Fabri 61bb99e2f1 use types 2013-02-04 22:39:00 +01:00
Andreas Fabri ee5b4683d0 deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3 2013-01-31 09:47:54 +01:00
Andreas Fabri 1ae5df0172 When reading a file with 2D points, read the x and y, and ignore the rest of the line. This implies 1 point per line. 2013-01-08 10:31:41 +01:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Eric Berberich 463a030267 removed old verbose output 2012-06-11 22:23:28 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Andreas Fabri 792deb3819 Fix for Windows 'min/max' bug and remove superfluous #include 2012-01-19 08:43:49 +00:00
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +00:00
Sébastien Loriot a7456a2736 merge from next 2012-01-16 15:28:51 +00:00
Sébastien Loriot fca9a7bf54 *add operator>> for Constrained_triangulation_2 
*update demo
*add save CDT for demo

see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation.
 2012-01-16 13:32:05 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 4b355f0561 merge from next 2011-10-11 12:28:22 +00:00