Commit Graph

494 Commits

Author SHA1 Message Date
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 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 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
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
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
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
Aurelien Vialon 4c85bee791 Add of Apollonius_graph_2 demonstration of GraphicView and all GraphicView demonstrations works on Windows. 2014-07-17 13:03:23 +02:00
Aurélien Vialon 520e791a99 GraphicView demonstrations porting. 2014-07-09 16:31:29 +02:00
Laurent Rineau 59d3dd8793 Do not require GMP explicitly 2014-07-02 12:58:50 +02:00
Laurent Rineau 90936d8e30 Fix a warning
demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h:348: warning: passing `double' for converting 1 of `void QPainter::drawRect(int, int, int, int)'
2014-03-11 18:23:11 +01:00
Laurent Rineau 2c1f436ed4 Fix another compilation error 2014-03-11 18:18:55 +01:00
Laurent Rineau e50a1c6374 Fix a warning 2014-03-06 17:03:47 +01:00
Laurent Rineau 1910e7151e Fix a compilation error on Windows
The min/max macro issue.
2014-03-06 17:03:28 +01:00
Laurent Rineau aaa5e020d4 Rename Periodic_2_triangulation_2.cpp to the name of the target
Rename Periodic_2_triangulation_2.cpp
Periodic_2_Delaunay_triangulation_2.cpp so that is named like the CMake
target. The default cgal_test script requires that. Before that
renaming, the Periodic_2_Delaunay_triangulation_2 demo was not compiled
by testsuites.
2014-03-04 14:21:40 +01:00
Laurent Rineau 89ad21df97 Use a new CGAL logo 2014-02-25 18:11:31 +01: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
Laurent Rineau 73887c6927 Revert "Revert the merge of Periodic_2 into master. It was pushed by error."
This reverts commit b27c0a4efb.
2013-06-28 17:48:15 +02:00
Laurent Rineau b27c0a4efb Revert the merge of Periodic_2 into master. It was pushed by error.
Revert "Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal"

This reverts commit 5ac2c05249, reversing
changes made to 93b77ce529.
2013-06-24 12:50:27 +02:00
Nico Kruithof a9858ee784 Merge branch 'Periodic_2_triangulation_2-nkruithof' 2013-06-11 21:22:30 +02:00
Nico Kruithof 01778a2347 Merge branch 'master' into Periodic_2_triangulation_2-nkruithof 2013-04-01 06:41:20 +02:00
Nico Kruithof bb9a733bd1 Updated the P2T2 demo. 2013-03-31 19:50:37 +02:00
Nico Kruithof bc0a55ad1e Improved demo with Iterator_type-ed simplices 2013-03-31 14:58:49 +02:00
Nico Kruithof f5ba6b3ac0 Draw the bounding box around the middle cover if we have multiple covers 2013-03-26 15:07:44 +01:00
Nico Kruithof f26692677f Working on the demo, coloring the vertices of small triangulations 2013-03-24 09:19:52 +01:00
Andreas Fabri 0cbc8b0e40 remove unused parameters 2013-03-23 08:45:06 +01:00
Laurent Rineau 723b28d39f Fix warnings about incorrect type conversions 2013-03-05 12:44:11 +01:00
Andreas Fabri f09633f71d size_t -> int 2013-03-05 11:35:29 +01:00
Andreas Fabri cd45bc8126 std::size_t -> int 2013-03-04 12:02:53 +01:00
Andreas Fabri 6ac85b1b27 remove unused variable 2013-03-01 16:35:23 +01:00
Nico Kruithof 1442e12512 Fixing compiler warnings with strict CXXFLAGS 2013-03-01 08:06:59 +01:00
Nico Kruithof d1bb7d7bc8 remove debug log message 2013-02-28 20:40:36 +01:00
Andreas Fabri 84a7061b15 remove unused parameter name 2013-02-28 16:40:57 +01:00
Andreas Fabri a3eafddd16 virtual function of derived class must match the API of the base class 2013-02-26 07:35:51 +01:00
Nico Kruithof e940cf20e0 Merge branch 'master' into Periodic_2_triangulation_2-nkruithof
Conflicts:
	Documentation/doxyassist.xml
2013-02-05 14:25:56 +01:00
Nico Kruithof c97a1a1fbb Worked on the dual functions 2013-02-05 14:07:12 +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
Nico Kruithof b11bdb4513 moved circumcircle from triangulation to delaunay triangulation 2013-01-28 08:05:48 +01:00
Nico Kruithof 27b2fb7054 Locating a point within the periodic domain
Using a hint for the face handle to speed up point location
Making sure that the chance is big that the face handle still exists
2013-01-28 07:57:19 +01:00
Nico Kruithof b3e580c350 Implemented the Conflict zone in the demo 2013-01-26 22:08:54 +01:00
Nico Kruithof fa1b7493f0 Fixing locating points outside the periodic domain 2013-01-25 17:37:11 +01:00
Nico Kruithof b8babf5964 Adding conflict zone visuals to the single point insertion 2013-01-25 17:31:46 +01:00
Nico Kruithof 5487601ae1 Implemented the empty circumcircle button 2013-01-25 17:18:44 +01:00
Nico Kruithof ae5565d912 Working on the P2T2 demo 2013-01-24 21:16:54 +01:00
Nico Kruithof 05f7dbc322 Working on the demo, adding more icons to the toolbar 2013-01-24 20:21:01 +01:00
Nico Kruithof d23bb62118 Moved the Periodic demo to the graphicsview package. This makes it easier to find icons and other resources 2013-01-22 10:12:49 +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
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +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
Laurent Rineau a7a89c25b7 add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
2012-07-31 16:18:17 +00:00
Ophir Setter 005904363f Taking the multiplicity from base class. This caused all 64-bit programs to crash 2012-07-06 07:13:42 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +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 0d56ed88dc Fix for Windows 'min/max' bug 2012-01-19 08:11:02 +00:00
Andreas Fabri 560246e34b Fix for Windows 'min/max' bug 2012-01-19 08:07:40 +00:00
Andreas Fabri 0a89e16d86 Fix for Windows 'min/max' bug 2012-01-19 08:00:17 +00:00
Andreas Fabri 77f3648287 Fix for Windows 'min/max' bug 2012-01-18 12:02:15 +00:00
Andreas Fabri 26ec45fee9 Fix for Windows 'min/max' bug 2012-01-18 11:27:10 +00:00
Andreas Fabri 844e7869fa Fix for Windows 'min/max' bug 2012-01-18 11:25:40 +00:00
Andreas Fabri 10d334d4a5 Fix for Windows 'min/max' bug 2012-01-18 11:21:11 +00:00
Andreas Fabri 73a21e0f47 Fix for Windows 'min/max' bug 2012-01-18 11:17:08 +00:00
Andreas Fabri ae3244e596 Fix for Windows 'min/max' bug 2012-01-18 11:15:52 +00:00
Andreas Fabri f880735fbf Fix for Windows 'min/max' bug 2012-01-18 11:14:44 +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
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Olivier Devillers f5636aa2fa merge next 2011-11-04 12:57:12 +00:00
Laurent Rineau 6ed56d75b5 merge from next 2011-10-25 15:48:02 +00:00