Maxime Gimeno
32c0064900
Use the same QSettings everytime to save 200ms everytime.
2018-10-05 15:56:42 +02:00
Maxime Gimeno
d6c1301e0a
Fix conflicts
2018-10-04 14:06:16 +02:00
Maxime Gimeno
49b88e533f
Move and split vtk_io.h to Mesh_2 and Mesh_3 to avoid license and dependencies problems. Also fix vtu writer of VTK_io_plugin for polygon meshes.
2018-10-03 11:15:37 +02:00
Maxime Gimeno
c3fab3df15
workaround for multiple linking under windows.
2018-10-03 09:16:27 +02:00
Maxime Gimeno
ab3ad395fc
RemoveViewer on context destroyed
2018-10-03 09:02:43 +02:00
Maxime Gimeno
6d54163bbd
Edit_sphere_item
2018-09-25 12:13:37 +02:00
Maxime Gimeno
9ca2833588
Fix conflicts, fix polygon_soup normals computation, change Extrude Item text.
2018-09-24 11:34:32 +02:00
Maxime Gimeno
665c25886a
Done textured_item and selection_item
2018-09-20 15:11:43 +02:00
Guillaume Damiand
865e6bf01e
Move operator << inside CGAL::qglviewer namespace.
2018-09-11 17:26:15 +02:00
Maxime Gimeno
fd27bd9c09
Share VBOs between viewers.
2018-09-11 13:06:02 +02:00
Guillaume Damiand
1db0bd0a79
Bugfix for operator<<
2018-09-11 11:46:26 +02:00
Guillaume Damiand
64c7a083ce
Bugfix in doc
2018-09-11 11:46:13 +02:00
Guillaume Damiand
243a12be43
Fix viewer in 2D for 2D data sets.
2018-09-10 12:20:10 +02:00
Guillaume Damiand
bf20b43ea5
Start to implement 2D mode for viewers; nyf.
2018-09-07 20:19:41 +02:00
Guillaume Damiand
fc6e3c6a5a
Improve the face end for non convex face to allow to draw faces with holes.
2018-09-07 19:19:40 +02:00
Guillaume Damiand
71555b18cf
Update namespace
2018-09-06 18:46:39 +02:00
Guillaume Damiand
2c8af2ebcc
Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program.
2018-09-06 18:43:32 +02:00
Maxime Gimeno
e5aaab93d5
Remove visibleBbox from scene. Working subviewer.
2018-09-04 10:35:46 +02:00
Maxime Gimeno
06ce5dddca
WIP : trying to figure out why the items are not drawn.
2018-09-03 10:51:01 +02:00
Maxime Gimeno
daac3e124d
WIP: integrate is_sharing in qglviewer
2018-09-03 09:21:09 +02:00
Maxime Gimeno
223fa687c2
Add function for CDT. and use it in Triangulation_2 demo. Missing Doc
2018-08-27 16:29:47 +02:00
Maxime Gimeno
805e4669e4
Avoid having the visual hints hidden by the mesh when zooming too much.
2018-08-21 09:32:29 +02:00
Maxime Gimeno
818e0d1f11
Clean-up
2018-07-06 12:33:52 +02:00
Maxime Gimeno
c8adcc3e86
Downgrade to GLSL 150 (OpenGL 3.3) because of some systems.
2018-07-05 15:35:30 +02:00
Maxime Gimeno
b68f63e508
Fix basic_viewer
2018-07-05 15:21:58 +02:00
Maxime Gimeno
4c58c214c3
make 2 versions of all shaders : 1 for --old and 1 for 4.3
2018-07-05 14:34:10 +02:00
Maxime Gimeno
640243a658
Remove calls to glLineWidth, as OpenGL ES 2.0 doesn't support higher than 1.
2018-07-05 10:37:41 +02:00
Maxime Gimeno
9a258d081f
Remove remaining calls to GL_LIGHT smth
2018-07-04 15:37:24 +02:00
Jane
bace15874b
to the app to force use 2.1 context.he commit.
2018-07-04 13:34:26 +01:00
Maxime Gimeno
73adc3e300
Fix edit_plugin
2018-07-04 13:58:01 +02:00
Jane
d72fd85053
context is correct.commit message for your changes. Lines starting
2018-07-04 12:52:27 +01:00
Maxime Gimeno
f80f318503
WIP Shader fixes
2018-07-03 13:53:57 +02:00
Maxime Gimeno
2dbbca18b3
Restore point size
2018-07-02 11:09:48 +02:00
Maxime Gimeno
54e0e16167
Restore 4.3 context
2018-07-02 10:04:40 +02:00
Jane
93d9e8e227
Remove problematic gl calls
2018-06-29 18:40:25 +02:00
Maxime Gimeno
301416c151
Pass to OpenGL_ES_2
2018-06-29 12:06:06 +02:00
Laurent Rineau
742dd907ed
Merge pull request #3074 from maxGimeno/Demo-Add_transparency-GF
...
Polyhedron demo: add Depth-peeling and Rendering Helpers
2018-06-28 16:04:12 +02:00
Laurent Rineau
b86fff3f90
Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF
...
Solver Interface: deprecate CGAL::Diagonalize_traits
2018-06-27 10:21:37 +02:00
Maxime Gimeno
8e3eebea0d
Fix Conflicts
2018-06-26 15:17:58 +02:00
Maxime Gimeno
2f4f22d236
Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF
2018-06-21 11:42:26 +02:00
Laurent Rineau
5ec1b841b7
Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
...
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Simon Giraudot
06c0835a3b
Add Eigen dependency in CMakeLists of demos that need it
2018-06-19 11:00:02 +02:00
Laurent Rineau
2b33f0690d
Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF
...
Polyhedron demo: add some OpenGL debugging information
2018-06-14 17:36:54 +02:00
Laurent Rineau
08043e442c
Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
...
Add basic viewers
2018-06-14 17:36:37 +02:00
Laurent Rineau
3a4121b207
Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF
...
Polyhedron demo:Fix_orthographic selection
# Conflicts:
# GraphicsView/include/CGAL/Qt/qglviewer_impl.h
2018-06-14 17:36:26 +02:00
Mael Rouxel-Labbé
6283291c8a
Moved CGAL::iterator to CGAL::cpp98
2018-06-13 15:58:19 +02:00
Maxime Gimeno
8e7fc0b852
Merge master to solve conflicts.
2018-06-13 09:40:56 +02:00
Laurent Rineau
a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace
2018-06-12 16:15:34 +00:00
Laurent Rineau
5c6eee6ac3
Merge branch 'master' into Demo-Fix_orthographic_projection-GF
2018-06-12 18:01:55 +02:00
Laurent Rineau
1df3c3e922
Merge branch 'master' into GraphicsView-no_using_namespace_std-GF
2018-06-12 17:37:15 +02:00
Guillaume Damiand
c08546276b
Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined.
2018-06-11 13:06:20 +02:00
Maxime Gimeno
87fb0cc39a
Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors.
2018-06-07 09:56:08 +02:00
Maxime Gimeno
1c6a96d1cf
Add qt gl debugging info.
2018-06-06 16:59:34 +02:00
Maxime Gimeno
c4b28fd000
Remove the using namespace from the impl files
2018-06-06 16:15:55 +02:00
Laurent Rineau
1f646405e8
Fix -Wconversion warnings (and a few others) in QGLViewer
2018-06-05 14:48:24 +02:00
Maxime Gimeno
39a645883b
add misisng namespace before EXIT_VIEWER
2018-06-05 09:45:40 +02:00
Maxime Gimeno
2e56820d8d
Fix after rebase
2018-06-04 12:00:22 +02:00
Maxime Gimeno
21359581c4
Add viewer's modifications to CGAL_Qt5
2018-06-04 12:00:22 +02:00
Maxime Gimeno
12ba1084ad
Add classes and functions to factorize and facilitate rendering an item.
...
Make Surface_mesh_item use them.
2018-06-04 12:00:21 +02:00
Maxime Gimeno
025968643b
Fix_orthographic selection
2018-06-04 11:44:56 +02:00
Andreas Fabri
1969ee9853
Fix the license header, as the dual licensing does not apply to pur fork
2018-05-31 10:05:46 +01:00
Andreas Fabri
f5b6ec67ef
Remove 'using namespace std;' from the qglviewer files
2018-05-31 09:44:49 +01:00
Maxime Gimeno
979bde1025
Fix Triangulation_3 viewer
2018-05-29 11:27:53 +02:00
Guillaume Damiand
4c5b0d31d4
Remove unused variable
2018-05-29 11:11:50 +02:00
Andreas Fabri
4b14990209
Fix warnings; Remove typename in non-template code
2018-05-29 11:11:50 +02:00
Guillaume Damiand
ed0c55df89
Bugfix in function that test if a face is convex.
2018-05-29 11:11:50 +02:00
Guillaume Damiand
21012cb0a3
Comment optimization done for convex facets for now, because there is a bug in the test code. Todo: solve the bug (maybe use a better test ?)
2018-05-29 11:11:50 +02:00
Guillaume Damiand
035dd7cd24
Add missing inline; to avoid a multiply defined function.
2018-05-29 11:11:50 +02:00
Guillaume Damiand
39de8ac459
Add licence includes
2018-05-29 11:11:49 +02:00
Guillaume Damiand
d8a62aa2c8
Update licence headers of new files.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
dba44f48a1
Harmonize the 5 basic viewers.
2018-05-29 11:11:49 +02:00
Guillaume Damiand
82e30832ed
Add a redraw method.
2018-05-29 11:04:57 +02:00
Guillaume Damiand
b5a4cd1e4a
One more bug fix in Buffer_for_vao.h
2018-05-29 11:04:57 +02:00
Guillaume Damiand
4f93b87634
Update is_facet_convex function; I think this is better now.
2018-05-29 11:04:57 +02:00
Guillaume Damiand
f1e9fc7ed8
Move class in CGAL namespace
2018-05-29 11:04:57 +02:00
Guillaume Damiand
49de2dee13
Bug fix in quadrangular smooth normals
2018-05-29 11:04:57 +02:00
Guillaume Damiand
e0aa99d798
Add the possibility to add weighted point 2 in basic viewer
2018-05-29 11:02:00 +02:00
Guillaume Damiand
62492150e0
Update Buffer_for_vao and Basic_viewer_qt
2018-05-29 11:02:00 +02:00
Guillaume Damiand
b22c9959f6
Update buffer for vao to allow the use of indexed points
2018-05-29 11:02:00 +02:00
Guillaume Damiand
9bde858140
update
2018-05-29 11:02:00 +02:00
Guillaume Damiand
a7b9656d52
Start to integrate version with indices
2018-05-29 11:02:00 +02:00
Guillaume Damiand
5b8e6d349b
Update Buffer_for_vao: byf
2018-05-29 11:02:00 +02:00
Guillaume Damiand
f70c6fed86
Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects.
2018-05-29 11:02:00 +02:00
Guillaume Damiand
0e6eded6b7
Update basic viewer.
2018-05-29 11:01:59 +02:00
Guillaume Damiand
cc3410a729
Bugfix in basic viewer.
2018-05-29 11:01:59 +02:00
Guillaume Damiand
374da8b55d
Update basic viewer.
2018-05-29 11:01:59 +02:00
Guillaume Damiand
9e4f2870b8
Work on generic display function.
2018-05-29 11:01:59 +02:00
Maxime Gimeno
d617e33253
Add possibly missing include QMouseEvent containing the Qt::NoButton enum.
2018-05-18 10:02:09 +02:00
Andreas Fabri
3804bf6983
Fix Triangulation_3 demo (CGAL_PI)
2018-05-18 08:01:26 +01:00
Andreas Fabri
13454d01c1
Replace M_PI with CGAL_PI
2018-05-17 10:26:08 +01:00
Maxime Gimeno
f7d0fc72cd
fix the <:: error
2018-05-17 10:20:57 +02:00
Maxime Gimeno
8bf7fcbfe1
Add missing license include
2018-05-17 10:20:57 +02:00
Maxime Gimeno
f94a50646f
Add license to new file
2018-05-17 10:20:57 +02:00
Maxime Gimeno
03aa69c039
Clean-up the code:
...
Remove deprecated functions
Remove useless file
2018-05-17 10:20:57 +02:00
Maxime Gimeno
f22c2864a0
Put qglviewer in the namespace CGAL
2018-05-17 10:20:56 +02:00
Laurent Rineau
8fbab5edde
Enfore singleton, using qApp->property
2018-05-17 10:20:56 +02:00
Jane Tournois
7d49e2fb17
make the copy-constructor private, and do not define it,
...
to make sure it will not be used.
and add missing include
2018-05-17 10:20:56 +02:00
Laurent Rineau
02d5c69066
typo: frok/fork
2018-05-17 10:20:56 +02:00
Maxime Gimeno
0d4c153da2
Fix ImageInterface UI management
2018-05-17 10:20:56 +02:00
Maxime Gimeno
1c8b2a02c9
use CGAL_QT_EXPORT
2018-05-17 10:20:56 +02:00
Maxime Gimeno
9c1c0b027a
Fix UI management
2018-05-17 10:20:56 +02:00
Maxime Gimeno
130e42569e
Fix snapshot for othographic view
2018-05-17 10:20:56 +02:00
Maxime Gimeno
55c3048a69
Remove GPL_EXCEPTION and add GeometryFactory 2018 copyrights
2018-05-17 10:20:56 +02:00
Maxime Gimeno
c570c7ea7d
Change text in licenzse headers tospecify this is a fork
2018-05-17 10:20:56 +02:00
Maxime Gimeno
f1162b9914
Add missing tags in license headers
2018-05-17 10:20:56 +02:00
Maxime Gimeno
cadee2cac1
force GPL 3.0 to test.
2018-05-17 10:20:56 +02:00
Maxime Gimeno
89882de039
Update licenses
2018-05-17 10:20:56 +02:00
Maxime Gimeno
2779034aa1
Fix Triangulation_2
2018-05-17 10:20:56 +02:00
Maxime Gimeno
f1700285de
Restore snapshot feature in P3T3 demo
2018-05-17 10:20:56 +02:00
Maxime Gimeno
495b087c6f
Finish snapshot implem
2018-05-17 10:20:56 +02:00
Maxime Gimeno
37c52e6bbc
WIP SnapShot and SPDX LICENSE update.
2018-05-17 10:20:56 +02:00
Maxime Gimeno
2077a84ea2
Update license file
2018-05-17 10:20:56 +02:00
Maxime Gimeno
fb10d4ac55
Fix errors.
2018-05-17 10:20:56 +02:00
Maxime Gimeno
18e38c2344
Fix license GPL 3+ into GPL 3
2018-05-17 10:20:56 +02:00
Maxime Gimeno
e7613f7841
restore erased file
2018-05-17 10:20:56 +02:00
Maxime Gimeno
8df643f390
update licenses
2018-05-17 10:20:56 +02:00
Maxime Gimeno
8c32592f83
Add missing file and fix interface for QGraphicsItem
2018-05-17 10:20:56 +02:00
Maxime Gimeno
4d13eb724f
Remove render video feature of loyd demo and fix drawvisualhnts in the qglviewer code.
2018-05-17 10:20:55 +02:00
Maxime Gimeno
0c74a68952
WIP Header_only
2018-05-17 10:20:55 +02:00
Maxime Gimeno
cbc0ce1130
remove snapsjot functions and files from qglviewer
2018-05-17 10:20:55 +02:00
Maxime Gimeno
50c471253a
Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer
2018-05-17 10:20:55 +02:00
Maxime Gimeno
4c6546a558
Clean-up the viewer
2018-05-17 10:20:55 +02:00
Maxime Gimeno
39a0b8a8d5
Restore pivot point drawing
2018-05-17 10:20:55 +02:00
Maxime Gimeno
3995c80524
fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer
...
Begin the implementation of the graphcal hints
2018-05-17 10:20:55 +02:00
Maxime Gimeno
6584abd90b
Use integrated qglviewer for 3D demos
2018-05-17 10:20:55 +02:00
Maxime Gimeno
c0c7bd095d
WIP: Include QGLViewer inside CGAL_qt5
2018-05-17 10:20:55 +02:00
Laurent Rineau
0bf465dee6
Fix indentation
2018-05-15 15:32:04 +00:00
Maxime Gimeno
76bd923003
Change expected extension for polygon type.
2018-05-15 10:04:24 +02:00
Maxime Gimeno
0d9f89cfbd
Reset fstreams with code that is valid even without c++11
2018-05-15 10:04:23 +02:00
Maxime Gimeno
df980abff6
Add WKT IO to 2D demos and add saving to stream_lines_2_demo
...
Also adds traits for Point_3 to be able to interract with weighted points through them.
2018-05-15 10:04:23 +02:00
Maxime Gimeno
6ec085ace0
Fix Triangulation icons and add a way to load wkt polygons in CDT demo
2018-05-15 10:04:23 +02:00
Maxime Gimeno
d7905547e9
final poly fixes
2018-05-15 10:00:47 +02:00
Maxime Gimeno
80c7ddd254
change fake poly format to .polygon.cgal
2018-05-15 10:00:47 +02:00
Maxime Gimeno
a4b2773879
add filter to spatial serching demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
0f1af8e92d
add a filter to the snap_rounding demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
d8b6cbd7af
Add filters to Polygon demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
ab29df058d
Add a filter for P2T2 demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
c86701de81
Add a filter for L1_voronoi_diagram_2 demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
2c424514dd
add a filter for bounding_volumes_demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
ad115d9628
Make a working IO for Apolonius_graph Demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
80eaf9a8dd
Add a filter for alpha shapes 2 demo
2018-05-15 10:00:47 +02:00
Maxime Gimeno
cf69391221
Make the IO of the Triangulation_2 demos coherent
2018-05-15 10:00:47 +02:00
Andreas Fabri
16e4cc5e4b
Fix 2D Constrained Delaunay demo. The hint was outdated after cdt.clear()
2018-05-11 14:42:30 +01:00
Sébastien Loriot
01af331c72
use https for all links to www.cgal.org and doc.cgal.org
2018-03-14 15:59:38 +01:00
Laurent Rineau
0a74393dcf
Commit all new dependencies files
2018-03-06 18:44:48 +01:00
Maxime Gimeno
2156017402
Remove native gl.h include and native gl code in Surface_mesher/archive
2018-02-28 10:36:26 +01:00
Laurent Rineau
85ce0157cf
Merge pull request #2839 from afabri/STL_extension-replace_std_iterator-GF
...
STL_extension: Introduce CGAL::iterator
2018-02-23 17:34:57 +01:00
Laurent Rineau
78e7060525
Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
...
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Andreas Fabri
52549b1145
STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator
2018-02-14 18:46:45 +00:00
Maxime Gimeno
688b5dd06e
Move dependencies creation to package_info and add dependencies to git
2018-02-02 12:08:05 +01:00
Maxime Gimeno
8bde832931
Fix METIS headers in BGL
2018-02-02 12:08:05 +01:00
Maxime Gimeno
a676d5a60e
Try to fix errors in classification checks
2018-02-02 12:08:05 +01:00
Maxime Gimeno
acd0a72edf
Modify travis script to test dependencies
2018-02-02 12:08:05 +01:00
Maxime Gimeno
ae36b452bc
Add dependencies of all packages
2018-02-02 12:08:05 +01:00
Andreas Fabri
cbf3a16471
libs compile without warning
2018-01-17 15:02:32 +00:00
Mael Rouxel-Labbé
1378280c79
Revert "Simplified typedef"
...
This reverts commit fecfaacbaf .
Although this typedef is still useless, it's useful to check the sanity of
the names of template parameters of the periodic traits classes. If some
template paremeters are named like typedefs of the kernel (which is valid code,
but not ideal) some compilers will bug and fail to compile.
See also commit cbde108708
2017-12-13 11:29:12 +01:00
Laurent Rineau
163a90b6c1
Fix `make install` in header-only
...
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +01:00
Laurent Rineau
3c6640bf59
Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
...
Renewal of CMake scripts: header-only, ctest, CMake>=3.1
# Conflicts:
# Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau
fefc79dc17
Fix a warning about CMP0071
2017-12-04 11:33:55 +01:00
Laurent Rineau
3466eb83f0
Polyhedron demo: do not use the OpenGL API directly
2017-11-28 17:54:38 +01:00
Laurent Rineau
19c5502ca8
Fix compilation of demos in non-header-only
...
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.
`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
Andreas Fabri
021b340509
Fix CGAL_Qt5
...
In non-header-only, the resources and MOC files are added directly to
the CGAL_Qt5 library.
2017-11-22 09:59:52 +00:00
Laurent Rineau
891a83840e
Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF
2017-11-17 15:03:57 +01:00
Laurent Rineau
25dffa1710
Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED
2017-11-17 12:54:13 +01:00
Laurent Rineau
21dabf1b1b
Add compilation tests for demos
2017-11-16 18:45:33 +01:00
Laurent Rineau
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
Laurent Rineau
a9365554c9
Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
...
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau
3ff09bc549
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Laurent Rineau
86fb40832a
Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
...
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau
c6068691fa
Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
...
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot
ff26773f7b
remove include directive for checking GPL compliance in LGPL headers
2017-11-12 10:21:35 +01:00
Sébastien Loriot
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
Sébastien Loriot
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
Laurent Rineau
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Michael Vetter
154c48e8e3
Include OpenGL ES for arm
...
If we compile CGAL with having Qt present on arm, Qt will use OpenGL ES
headers. But CGAL/gl.h includes specifically include <GL/gl.h> which are
the desktop headers. They cannot be mixed.
2017-09-27 15:59:28 +02:00
Mael Rouxel-Labbé
fecfaacbaf
Simplified typedef
2017-08-29 11:21:59 +02:00
Mael Rouxel-Labbé
b36154cb7c
Fixed P2DT2's traits class in demo
2017-08-24 15:08:28 +02:00
Mael Rouxel-Labbé
dba83ba5bf
Fixed a few Alpha Shapes 2 headers
2017-08-23 16:40:55 +02:00
Laurent Rineau
8dfa4f4dc8
Fix link error of demo/Polyhedron, in Debug and CGAL_HEADER_ONLY
2017-07-27 17:28:21 +02:00
Laurent Rineau
d878561809
Merge pull request #2102 from afabri/Kernel_Weighted_point_without_conversion-GF
...
Remove implicit conversions between points and weighted points
2017-07-03 12:08:57 +02:00
Mael Rouxel-Labbé
1fc2282350
Fixed regular triangulation capitalization across CGAL
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
16392c92d1
Fixed bare_point / weighted_point issue
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
07cefea41f
Generated random weights for random regular triangulations
...
building regular triangulations with non-uniform weights is slightly more
interesting
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
af6009f46a
Fixed point types
...
Not that since Weighted_point_2 does not have a constructor with 3 FT (since
it makes it confusing with the homogeneous kernel), the random generator
generates weightless points...
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
9fbf2720ce
Annihilated Regular_triangulation_euclidean_traits_23 across all packages
...
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-06-28 10:15:30 +02:00
Laurent Rineau
4b2b272404
Fix the -fvisibility=hidden issue
2017-06-22 16:17:13 +02:00
Maxime Gimeno
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02:00
Laurent Rineau
2daba815b3
New way to use the CGAL_Qt5 extra files
2017-03-27 17:23:27 +02:00
Laurent Rineau
fade4c0eb4
Fix CGAL_HEADER_ONLY
2017-03-27 17:23:27 +02:00
Laurent Rineau
e9db872747
Simplify the CMakeLists.txt API even further
2017-03-27 17:23:26 +02:00
Laurent Rineau
a3ddaa132f
Define and use a new CMake API for CGAL
...
For the moment, the new API is used only in:
- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
2017-03-27 17:23:26 +02:00
Laurent Rineau
429bfa4315
move the add_config_flag calls
2017-03-27 17:23:26 +02:00
Laurent Rineau
70e5a280f0
INSTALL use COMPONENT
2017-03-27 17:23:26 +02:00
Laurent Rineau
ff15d0e5fc
Simplify the CMakeLists.txt of our libraries
2017-03-27 17:23:26 +02:00
Sébastien Loriot
50510c05ea
add include directive for license of all GPL header files
...
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
grep -v Operations_on_polyhedra | \
grep -v Algebraic_kernel_for_circles | \
grep -v Algebraic_kernel_for_spheres | \
grep -v Polyhedron_IO`;
do
echo $i
python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Laurent Rineau
26c803b6af
Merge pull request #1574 from afabri/Filtered_kernel_init_double_to_avoid_warning-GF
...
Kernel_23: Initialize numbers in operator>>(istream&, Point/Vector/..)
2016-10-24 11:46:54 +02:00
Andreas Fabri
e2e2df90c5
We initialize a point to quiet GCC6, although the bool first
...
should guaranteee that the equality test is only done after that
the point got assigned a value.
2016-10-18 09:25:06 +02:00
Andreas Fabri
76d751be01
Use CGAL_FALLTHROUGH
2016-10-17 13:45:42 +02:00
Sébastien Loriot
ceba65b6c7
remove outdated file
2016-10-06 09:52:52 +02:00
Laurent Rineau
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Andreas Fabri
335a87df79
Fix package GraphicsView: include headers
2016-09-30 15:23:14 +02:00
Sébastien Loriot
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
Laurent Rineau
1cde972cdb
Remove whitespace at end of lines
2016-06-29 11:04:29 +02:00
Laurent Rineau
2a59492fa9
Fix a bug also present in master
2016-06-29 11:04:09 +02:00
Guillaume Damiand
71d9047b87
Move add_definition before collect cgal library (bugfix)
2016-06-28 12:46:22 +02:00
Guillaume Damiand
6820e1b5c4
Reorder the cmake directive to retreive the same original order
2016-06-28 11:30:18 +02:00
Guillaume Damiand
061ffa6806
Remove a double QUIET
2016-06-24 18:57:23 +02:00
Guillaume Damiand
f446cb9370
Remove some command unseless in header only
2016-06-24 14:37:38 +02:00
Guillaume Damiand
e115fc07a1
Use install(DIRECTORY instead of file(glob following by install(files
2016-06-21 19:05:38 +02:00
Guillaume Damiand
1f40288aa3
Update cmakes in order to deal with install version of CGAL in header only mode.
2016-06-21 11:20:28 +02:00
Guillaume Damiand
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
Laurent Rineau
a96ec65c54
Sort results of file(GLOB ...) to make build deterministic
...
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.
Fix #1048 .
2016-05-06 16:50:16 +02:00
Andreas Fabri
ab9d9255ae
Read .poly files
2016-03-11 14:31:35 +01:00
Laurent Rineau
0ffa350ad7
Header-only big bluff!
...
One can set dependencies even without searching for them.
2016-03-09 18:53:59 +01:00
Laurent Rineau
dd8d66ef96
Bug fix, fix a CMake error
2016-03-09 18:53:58 +01:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
Laurent Rineau
fd42bc1d15
Step 2
...
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
Laurent Rineau
26db90214a
Modification for CGAL_HEADERS_ONLY, step 1
2016-03-09 17:04:48 +01:00
Laurent Rineau
2bb72c7f26
Compatibility with QT_NO_KEYWORDS
2016-03-09 17:02:59 +01:00
Guillaume Damiand
c623442071
Bug fix in CGAL_Qt5/CMakeLists.txt
2016-03-09 14:25:03 +01:00
Clement Jamin
dd3ed5b07c
Remove the "S" from HEADERS_ONLY
2016-03-09 10:58:55 +01:00
Clement Jamin
35a11c0e13
Use CGAL_HEADERS_ONLY everywhere
2016-03-09 10:56:11 +01:00
Clement Jamin
c27ff9e85c
Rename some cmake variables
2016-03-09 10:42:46 +01:00
Guillaume Damiand
78cde742ce
Work on demo with qt5; ok for AABBtree (but need to be improved)
2016-03-09 10:35:22 +01:00
Guillaume Damiand
ed2956eec2
Do not use qt5 module in header only mode
2016-03-09 10:31:17 +01:00
Guillaume Damiand
6d55c3b140
Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode.
2016-03-09 10:22:43 +01:00
Maxime Gimeno
b9856fe1a7
- fix MESA
...
Restoring the memory leak in order to keep the demo running on Mesa.
2016-02-17 15:18:11 +01:00
Sebastien Loriot
69ba6238a3
Merge pull request #764 from maxGimeno/Fix_For_761
...
Fix for 761
2016-02-16 16:21:56 +01:00
Maxime Gimeno
507fdc9f58
Fix the MemoryLeak
2016-02-12 09:26:32 +01:00
Laurent Rineau
def3952e0e
Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
...
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller
0a04a3a48f
Use CGAL_DOC_VERSION
2016-02-11 15:37:54 +01:00
Laurent Rineau
8b22743b06
Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
...
Removal of the MSAA in LCC
Conflicts:
GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2016-02-11 15:13:18 +01:00
Maxime Gimeno
9da8afe1f1
Removal of the MSAA in LCC
2016-02-11 14:27:44 +01:00
Maxime Gimeno
0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f .
Conflicts:
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Sebastien Loriot
540a3700e7
Merge pull request #733 from maxGimeno/Graphics_view_demo-Pen_fix-GF
...
Graphics view demo pen fix
2016-02-10 10:41:19 +01:00
Sebastien Loriot
ed557b907d
Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF
...
Surface_mesher : Glu removal
2016-02-10 10:40:51 +01:00
Maxime Gimeno
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
Maxime Gimeno
453708380b
Fix for windows
2016-02-09 11:41:28 +01:00
Maxime Gimeno
49e5043f09
Replacing GL/gl.h by CGAL/gl.h
2016-02-08 08:53:45 +01:00
Maxime Gimeno
b99c616c23
Re-implementation of opengl_check_errors
2016-02-05 08:36:54 +01:00
Maxime Gimeno
380bfc4504
Fix for the QPen
2016-02-04 09:30:00 +01:00
Maxime Gimeno
e9e7ca0cf5
Fix for P2_T2
2016-02-03 16:03:11 +01:00
Sébastien Loriot
e211843b4f
Merge pull request #654 from maxGimeno/FixForMac-GF
...
Demo fix for OS X (fix for #437 )
2016-02-03 14:39:48 +01:00
Maxime Gimeno
9f9e127aaa
Addition of a QPen in SegmentGraphicsItem
2016-01-25 14:12:19 +01:00
Maxime Gimeno
eb867bb810
Addition of a specific function for the MSAA in LCC
2016-01-20 14:35:00 +01:00
Maxime Gimeno
517ff8321a
Fix for LCC_demo
...
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
2016-01-19 17:13:06 +01:00
Maxime Gimeno
0547f19d58
WIP A fix for mac
...
- repared the demo
- Disabled the splatting.
2016-01-19 10:28:05 +01:00
Sebastien Loriot
32a3972c33
Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
...
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
Andreas Fabri
9b8da55bbf
Remove lines with non-existing files
2015-12-31 17:27:27 +01:00
Philipp Möller
71b4e9c515
Use CGAL_FULL_VERSION in all Doxyfile.in
2015-12-17 16:33:28 +01:00
Philipp Möller
88c0db55ca
Empty example paths should not result in warnings
2015-12-10 17:00:26 +01:00
Philipp Möller
81a8f982dc
Handle the easy INPUT cases
...
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Guillaume Damiand
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
Sébastien Loriot
970105e31c
fix qt dependency text
2015-09-10 15:04:12 +02:00
Laurent Rineau
278a28016a
Merge branch 'CGAL-Qt5_support-GF'
...
Fixes #265 , fixes #254 .
2015-08-27 16:37:37 +02:00
Laurent Rineau
91bca286d3
Fix warnings with CGAL_USE
...
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
2015-08-19 17:37:46 +02:00
Maxime Gimeno
7d220d3da8
Context 3.3 Core changed into 2.1
2015-08-10 08:59:54 +02:00
Laurent Rineau
d8e475d2c0
Merge pull request #241 from bo0ts/GraphicsView-better_dependency_check-pmoeller
...
Provide a better dependency check in GraphicsView
2015-08-05 11:27:57 +02:00
Laurent Rineau
9fc31e6093
Merge pull request #238 from lrineau/GraphicsView-fix_segment_delaunay_graph_demos-GF
...
Graphics View demos: remove unwanted slots
2015-08-04 18:03:04 +02:00
Philipp Möller
986a7ae77b
Return early when missing dependencies
...
This saves parsing time, indentation depth, keeps messages local and
reduces code complexity.
2015-08-04 16:02:54 +02:00
Philipp Möller
57f97635c2
Report the exact missing dependencies
...
Build a variable with missing dependencies and use that to produce and
error message. Pretty printing could still be improved.
2015-08-04 16:01:35 +02:00
Laurent Rineau
21e6e8bcc1
Merge pull request #227 from lrineau/Testsuite-display_Qt5_version_in_results-GF
...
Display Qt5 version in testsuite result pages (partially tested).
2015-08-04 13:04:22 +02:00
Laurent Rineau
2a9c1c3843
Demote a slot, to a private function
...
Should fix #234
2015-08-03 17:43:02 +02:00
Laurent Rineau
39ab917ad8
Remove on_actionSaveConstraints_triggered
...
The action was:
- not implemented
- not connected to any slot.
2015-08-03 17:42:53 +02:00
Laurent Rineau
568179e8d6
Cleanup of c5940aab10
2015-08-03 16:41:43 +02:00
Laurent Rineau
93fb88b499
Display Qt5 version in testsuite result pages
2015-08-03 13:09:44 +02:00
Andreas Fabri
f864b0a8e8
fix line width in demos using GraphicsView
2015-07-28 15:46:11 +02:00
Maxime Gimeno
a571e1db8d
Clean-up
2015-07-16 08:26:41 +02:00
Laurent Rineau
bc0c30bbfd
Better display of the Qt5 configuration
2015-07-15 15:53:52 +02:00
Maxime Gimeno
c5940aab10
Use reserve to try to optimize the memory use
2015-07-15 13:53:13 +02:00
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
Laurent Rineau
ae6412fb96
Merge modifications made by Andreas to 'sdglinf-philaris' for Qt5
...
Merge remote-tracking branch 'cgal-dev/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:44 +02:00
Laurent Rineau
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +02:00
Laurent Rineau
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
Laurent Rineau
9550a41b67
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
There was also a conceptual conflict in:
Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
Andreas Fabri
2dfa5608c4
fix policy; remove button; fix about
2015-07-10 13:53:56 +02:00
Andreas Fabri
039860653a
the demo now compiles with QT5
2015-07-10 13:20:09 +02:00
Laurent Rineau
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Laurent Rineau
59f7b09fae
Fix remaining CMake warnings about CMP0043
2015-07-08 17:08:35 +02:00
Andreas Fabri
27024787be
QGraphicsItem is no longer an interface
2015-07-08 13:07:35 +02:00
Maxime Gimeno
278e9d9829
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
...
Conflicts:
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno
c29b3cb700
Inline function used to define an OpenGL context for openGL 3.3.
2015-07-08 12:18:15 +02:00
Sébastien Loriot
44d4005d8a
qt 4 -> qt 5
2015-07-08 09:49:46 +02:00
Sébastien Loriot
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
Sébastien Loriot
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
Sébastien Loriot
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
Sébastien Loriot
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
Andreas Fabri
ad4a0169fb
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 11:26:47 +02:00
Sébastien Loriot
84dfabf3b4
remove REQUIRED keyword for CGAL_Qt5 in demos
...
The handling should be with a status message
2015-07-07 11:23:46 +02:00
Andreas Fabri
c0149c727f
static_casts
2015-07-07 11:00:37 +02:00
Andreas Fabri
74913d5cd8
static_casts
2015-07-07 10:32:45 +02:00
Laurent Rineau
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Andreas Fabri
1a3e0e001b
add dependendency on svg
2015-07-06 16:31:56 +02:00
Sandeep Kumar Dey
134ca52fea
license header
2015-07-03 13:31:22 +02:00
Philipp Möller
33a1fdbcbc
Replace CGAL_LIBRARY with the actual CGAL target
...
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
Panagiotis Cheilaris
3e89ca702d
sdglinf demo avoid Site_2 warning
2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris
3d8cc0637f
sdglinf CMakeLists fixes from sdgl2
2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris
9d24a3e5c4
sdglinf demo Q_EMIT use etc.
2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris
4eabd4c09c
remove sdglinf painter, widget warnings
2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris
498fd2cec1
rename demo program for sdglinf
2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris
bdcf40c753
remove sdglinf hv from GUI demo
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:32:08 +02:00
Panagiotis Cheilaris
201de50a9b
SDG Linf demo correct types
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:56 +02:00
Panagiotis Cheilaris
8de904afd7
put CGAL_SDG_DEBUG definition in SDG Linf basic.h
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:55 +02:00
Panagiotis Cheilaris
0053b81513
show command line argument file name in status bar
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:49 +02:00
Panagiotis Cheilaris
c4c5e451ab
support input of one-point polygons in demo
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:25 +02:00
Panagiotis Cheilaris
591e821e01
print mouse input points and segments
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:16 +02:00
Panagiotis Cheilaris
507dc07909
set default to no verbose messages
...
Here is a way to activate verbose debug messages from command line:
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="-DCGAL_SDG_VERBOSE" .
To go back to no verbose messages, use:
cmake -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="" .
2015-06-30 10:31:02 +02:00
Panagiotis Cheilaris
d067815b89
new CMakeLists.txt includes for ipelets and demos
2015-06-30 10:31:01 +02:00
Panagiotis Cheilaris
b4236a0f1f
renames to be like formal CGAL repository
...
I have only kept in an include directory at the root
the change in arrangement point location.
This change also requires to use some special local
includes in CMakeLists.txt files. I will do it in a
subsequent commit.
2015-06-30 10:31:01 +02:00
Maxime Gimeno
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
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
Maxime Gimeno
1e058d3c85
missing include fix
2015-04-03 13:42:53 +02:00
Maxime Gimeno
65061d2c4a
Upgrade to Qt5
2015-04-01 14:54:24 +02:00
Laurent Rineau
6f075de186
AUTOMOC cannot be used for CGAL_Qt5
...
because of all_files.cpp
2015-03-31 11:50:06 +02:00
Laurent Rineau
4c4598f612
Add destructor for DemosMainWindow (virtual class)
2015-03-31 11:49:08 +02:00
Maxime Gimeno
fa430e5fc0
WORK IN PROGRESS
2015-03-31 11:05:17 +02:00
Maxime Gimeno
8b3cca50a0
Modifying to Qt5
2015-03-31 10:22:21 +02:00
Maxime Gimeno
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
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
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
Maxime Gimeno
040458d248
Update of all the CMakeList and .cmake files for Qt5
...
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
Guillaume Damiand
cca136c131
Wip
2015-03-16 18:06:53 +01:00
Clement Jamin
3b7bca1920
Missing function
2015-03-16 17:02:05 +01:00
Guillaume Damiand
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01: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