039860653a
the demo now compiles with QT5
2015-07-10 13:20:09 +02:00
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
59f7b09fae
Fix remaining CMake warnings about CMP0043
2015-07-08 17:08:35 +02:00
27024787be
QGraphicsItem is no longer an interface
2015-07-08 13:07:35 +02:00
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
c29b3cb700
Inline function used to define an OpenGL context for openGL 3.3.
2015-07-08 12:18:15 +02:00
44d4005d8a
qt 4 -> qt 5
2015-07-08 09:49:46 +02:00
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
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
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
c0149c727f
static_casts
2015-07-07 11:00:37 +02:00
74913d5cd8
static_casts
2015-07-07 10:32:45 +02:00
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
1a3e0e001b
add dependendency on svg
2015-07-06 16:31:56 +02:00
134ca52fea
license header
2015-07-03 13:31:22 +02:00
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
3e89ca702d
sdglinf demo avoid Site_2 warning
2015-06-30 10:32:10 +02:00
3d8cc0637f
sdglinf CMakeLists fixes from sdgl2
2015-06-30 10:32:10 +02:00
9d24a3e5c4
sdglinf demo Q_EMIT use etc.
2015-06-30 10:32:09 +02:00
4eabd4c09c
remove sdglinf painter, widget warnings
2015-06-30 10:32:09 +02:00
498fd2cec1
rename demo program for sdglinf
2015-06-30 10:32:09 +02:00
bdcf40c753
remove sdglinf hv from GUI demo
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:32:08 +02:00
201de50a9b
SDG Linf demo correct types
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:56 +02:00
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
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
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
591e821e01
print mouse input points and segments
...
Signed-off-by: Panagiotis Cheilaris <philaris@cs.ntua.gr>
2015-06-30 10:31:16 +02:00
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
d067815b89
new CMakeLists.txt includes for ipelets and demos
2015-06-30 10:31:01 +02:00
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
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
c4245df6cb
end of merge
2015-05-19 09:07:53 +02:00
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
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
693db86912
Add typenames; reorder member initialization; add this->
2015-05-19 09:04:27 +02:00
74c817fe7f
Add an include
2015-05-19 09:04:27 +02:00
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
df04359061
fix recenter when input changes
2015-05-19 08:54:36 +02:00
dbad20cbba
add message box to prevent delete mistakes
2015-05-19 08:54:35 +02:00
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
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
8e393c792c
Graphicsview demos
2015-05-06 17:11:04 +02:00
85e409f413
Polyline simplification demo
2015-05-06 16:06:33 +02:00
2f27db0234
changes such that the Mesh_3 demo works with -DQT_NO_KEYWORDS
2015-05-05 12:32:49 +02:00
1e058d3c85
missing include fix
2015-04-03 13:42:53 +02:00
65061d2c4a
Upgrade to Qt5
2015-04-01 14:54:24 +02:00
6f075de186
AUTOMOC cannot be used for CGAL_Qt5
...
because of all_files.cpp
2015-03-31 11:50:06 +02:00
4c4598f612
Add destructor for DemosMainWindow (virtual class)
2015-03-31 11:49:08 +02:00
fa430e5fc0
WORK IN PROGRESS
2015-03-31 11:05:17 +02:00
8b3cca50a0
Modifying to Qt5
2015-03-31 10:22:21 +02:00
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
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
cca136c131
Wip
2015-03-16 18:06:53 +01:00
3b7bca1920
Missing function
2015-03-16 17:02:05 +01:00
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
5f4a47e13b
fix links to Qt and escape some links
2015-02-23 13:20:05 +01:00
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
e270de4b67
remove warning
2015-01-06 16:53:48 +01:00
b5047c9bb8
try to fix some warnings
2015-01-06 16:53:48 +01:00
b3514854de
compatibility old version of boost
2015-01-06 16:53:48 +01:00
57d4dbbb2a
Add Traits, clean the code
2015-01-06 16:50:14 +01:00
03ef4e6789
modifications OutputIterator
2015-01-06 16:50:14 +01:00
616178e80f
name change, typos
2015-01-06 16:50:13 +01:00
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
1d82acee46
demo generator
2015-01-06 16:50:13 +01:00
150c52200a
add a menu to show/hide vertices
2014-11-28 13:06:44 +01:00
b5ace14604
fix the use of the cancel button
2014-11-28 12:57:42 +01:00
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
361fc6e3d0
fix clear function when show seeds is on
2014-11-28 10:26:44 +01:00
fbccaadd4f
add using namespace
2014-11-27 12:28:37 +01:00
6cc4ccc524
fix display of constrained Voronoi diagram
...
there is still a problem with voronoiPen
2014-11-24 14:46:27 +01:00
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
4b56a4abdd
remove useless cout
2014-11-24 12:16:29 +01:00
b40b37c760
paint seeds fixed
2014-11-24 12:03:13 +01:00
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
5f687bdc39
abort meshing when "cancel" button is hit
2014-11-20 16:23:25 +01:00
e4161ce685
handle seeds in lloyd_optimize_mesh_2
2014-11-20 16:13:46 +01:00
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
c97c1c844b
add a pen for seeds
2014-11-20 11:10:25 +01:00
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
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
4b71328474
change vertex base in demo to use my last commit
2014-11-14 13:40:30 +01:00
a4c39c813f
Inline for test_FPU_rounding_mode.cpp.
...
There is const static variable, transformed into a static variable of a global function. This is not a problem since this is only used in debug mode to test the rounding mode at the end of the program. Testing it several times is ok.
2014-11-14 10:45:42 +01:00
5e2fab9a51
add verbose stuff
2014-11-12 16:52:49 +01:00
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
f084954892
add input dialogs to demo to be able to set Delaunay refinement parameters
2014-11-12 16:16:03 +01:00
e02773efd1
move files about sizing, and change template parameter. Geom_traits is enough
2014-11-12 15:42:27 +01:00
e971112c1c
this file should remain in the demo folder
2014-11-12 13:07:02 +01:00
d071e71773
move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd
2014-11-12 12:51:09 +01:00
0f92048c4d
changes after Efi's review (and color changes in the demo)
2014-11-10 18:00:02 +01:00
5666a7db17
add code for Lloyd optimization, and in the demo
2014-11-07 17:07:14 +01:00
29904d2f56
Other example with the Polygon demo
2014-11-07 17:06:41 +01:00
9889f95768
Example of using of exportSVG
2014-11-07 16:57:28 +01:00
a35858a293
Move exportSVG to the DemosMainWindow base class
2014-11-07 16:57:04 +01:00
94803a6a96
Implement export to SVG for the CDT_2 demo
2014-11-07 16:09:09 +01:00
1e1d6b9004
add menu to tag blind faces
2014-11-06 16:03:41 +01:00
a4c3691763
add code to demo to display bad facets
2014-11-06 15:34:48 +01:00
Andreas Fabri
Laurent Rineau
Maxime Gimeno
Sébastien Loriot
Sandeep Kumar Dey
Philipp Möller
Panagiotis Cheilaris
Jane Tournois
Guillaume Damiand
Clement Jamin
Remy Thomasse