301416c151
Pass to OpenGL_ES_2
2018-06-29 12:06:06 +02:00
2f4f22d236
Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF
2018-06-21 11:42:26 +02:00
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
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
08043e442c
Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
...
Add basic viewers
2018-06-14 17:36:37 +02:00
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
6283291c8a
Moved CGAL::iterator to CGAL::cpp98
2018-06-13 15:58:19 +02:00
8e7fc0b852
Merge master to solve conflicts.
2018-06-13 09:40:56 +02:00
a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace
2018-06-12 16:15:34 +00:00
5c6eee6ac3
Merge branch 'master' into Demo-Fix_orthographic_projection-GF
2018-06-12 18:01:55 +02:00
1df3c3e922
Merge branch 'master' into GraphicsView-no_using_namespace_std-GF
2018-06-12 17:37:15 +02:00
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
87fb0cc39a
Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors.
2018-06-07 09:56:08 +02:00
1c6a96d1cf
Add qt gl debugging info.
2018-06-06 16:59:34 +02:00
c4b28fd000
Remove the using namespace from the impl files
2018-06-06 16:15:55 +02:00
1f646405e8
Fix -Wconversion warnings (and a few others) in QGLViewer
2018-06-05 14:48:24 +02:00
39a645883b
add misisng namespace before EXIT_VIEWER
2018-06-05 09:45:40 +02:00
2e56820d8d
Fix after rebase
2018-06-04 12:00:22 +02:00
21359581c4
Add viewer's modifications to CGAL_Qt5
2018-06-04 12:00:22 +02:00
025968643b
Fix_orthographic selection
2018-06-04 11:44:56 +02:00
1969ee9853
Fix the license header, as the dual licensing does not apply to pur fork
2018-05-31 10:05:46 +01:00
f5b6ec67ef
Remove 'using namespace std;' from the qglviewer files
2018-05-31 09:44:49 +01:00
979bde1025
Fix Triangulation_3 viewer
2018-05-29 11:27:53 +02:00
4c5b0d31d4
Remove unused variable
2018-05-29 11:11:50 +02:00
4b14990209
Fix warnings; Remove typename in non-template code
2018-05-29 11:11:50 +02:00
39de8ac459
Add licence includes
2018-05-29 11:11:49 +02:00
d8a62aa2c8
Update licence headers of new files.
2018-05-29 11:11:49 +02:00
dba44f48a1
Harmonize the 5 basic viewers.
2018-05-29 11:11:49 +02:00
82e30832ed
Add a redraw method.
2018-05-29 11:04:57 +02:00
f1e9fc7ed8
Move class in CGAL namespace
2018-05-29 11:04:57 +02:00
62492150e0
Update Buffer_for_vao and Basic_viewer_qt
2018-05-29 11:02:00 +02:00
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
0e6eded6b7
Update basic viewer.
2018-05-29 11:01:59 +02:00
cc3410a729
Bugfix in basic viewer.
2018-05-29 11:01:59 +02:00
374da8b55d
Update basic viewer.
2018-05-29 11:01:59 +02:00
9e4f2870b8
Work on generic display function.
2018-05-29 11:01:59 +02:00
d617e33253
Add possibly missing include QMouseEvent containing the Qt::NoButton enum.
2018-05-18 10:02:09 +02:00
3804bf6983
Fix Triangulation_3 demo (CGAL_PI)
2018-05-18 08:01:26 +01:00
13454d01c1
Replace M_PI with CGAL_PI
2018-05-17 10:26:08 +01:00
f7d0fc72cd
fix the <:: error
2018-05-17 10:20:57 +02:00
8bf7fcbfe1
Add missing license include
2018-05-17 10:20:57 +02:00
f94a50646f
Add license to new file
2018-05-17 10:20:57 +02:00
03aa69c039
Clean-up the code:
...
Remove deprecated functions
Remove useless file
2018-05-17 10:20:57 +02:00
f22c2864a0
Put qglviewer in the namespace CGAL
2018-05-17 10:20:56 +02:00
8fbab5edde
Enfore singleton, using qApp->property
2018-05-17 10:20:56 +02:00
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
02d5c69066
typo: frok/fork
2018-05-17 10:20:56 +02:00
0d4c153da2
Fix ImageInterface UI management
2018-05-17 10:20:56 +02:00
1c8b2a02c9
use CGAL_QT_EXPORT
2018-05-17 10:20:56 +02:00
9c1c0b027a
Fix UI management
2018-05-17 10:20:56 +02:00
130e42569e
Fix snapshot for othographic view
2018-05-17 10:20:56 +02:00
55c3048a69
Remove GPL_EXCEPTION and add GeometryFactory 2018 copyrights
2018-05-17 10:20:56 +02:00
c570c7ea7d
Change text in licenzse headers tospecify this is a fork
2018-05-17 10:20:56 +02:00
f1162b9914
Add missing tags in license headers
2018-05-17 10:20:56 +02:00
cadee2cac1
force GPL 3.0 to test.
2018-05-17 10:20:56 +02:00
89882de039
Update licenses
2018-05-17 10:20:56 +02:00
f1700285de
Restore snapshot feature in P3T3 demo
2018-05-17 10:20:56 +02:00
495b087c6f
Finish snapshot implem
2018-05-17 10:20:56 +02:00
37c52e6bbc
WIP SnapShot and SPDX LICENSE update.
2018-05-17 10:20:56 +02:00
fb10d4ac55
Fix errors.
2018-05-17 10:20:56 +02:00
18e38c2344
Fix license GPL 3+ into GPL 3
2018-05-17 10:20:56 +02:00
e7613f7841
restore erased file
2018-05-17 10:20:56 +02:00
8df643f390
update licenses
2018-05-17 10:20:56 +02:00
8c32592f83
Add missing file and fix interface for QGraphicsItem
2018-05-17 10:20:56 +02:00
4d13eb724f
Remove render video feature of loyd demo and fix drawvisualhnts in the qglviewer code.
2018-05-17 10:20:55 +02:00
0c74a68952
WIP Header_only
2018-05-17 10:20:55 +02:00
cbc0ce1130
remove snapsjot functions and files from qglviewer
2018-05-17 10:20:55 +02:00
50c471253a
Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer
2018-05-17 10:20:55 +02:00
39a0b8a8d5
Restore pivot point drawing
2018-05-17 10:20:55 +02:00
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
6584abd90b
Use integrated qglviewer for 3D demos
2018-05-17 10:20:55 +02:00
c0c7bd095d
WIP: Include QGLViewer inside CGAL_qt5
2018-05-17 10:20:55 +02:00
2156017402
Remove native gl.h include and native gl code in Surface_mesher/archive
2018-02-28 10:36:26 +01:00
52549b1145
STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator
2018-02-14 18:46:45 +00:00
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
3466eb83f0
Polyhedron demo: do not use the OpenGL API directly
2017-11-28 17:54:38 +01:00
ff26773f7b
remove include directive for checking GPL compliance in LGPL headers
2017-11-12 10:21:35 +01:00
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
0698f79aff
add SPDX identifier for files under the LGPL-3+ license
2017-11-12 10:17:50 +01:00
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
16392c92d1
Fixed bare_point / weighted_point issue
2017-06-28 10:15:30 +02:00
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
76d751be01
Use CGAL_FALLTHROUGH
2016-10-17 13:45:42 +02:00
335a87df79
Fix package GraphicsView: include headers
2016-09-30 15:23:14 +02:00
2bb72c7f26
Compatibility with QT_NO_KEYWORDS
2016-03-09 17:02:59 +01:00
b9856fe1a7
- fix MESA
...
Restoring the memory leak in order to keep the demo running on Mesa.
2016-02-17 15:18:11 +01:00
69ba6238a3
Merge pull request #764 from maxGimeno/Fix_For_761
...
Fix for 761
2016-02-16 16:21:56 +01:00
507fdc9f58
Fix the MemoryLeak
2016-02-12 09:26:32 +01:00
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
9da8afe1f1
Removal of the MSAA in LCC
2016-02-11 14:27:44 +01:00
0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f
2016-02-11 14:16:04 +01:00
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
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
453708380b
Fix for windows
2016-02-09 11:41:28 +01:00
49e5043f09
Replacing GL/gl.h by CGAL/gl.h
2016-02-08 08:53:45 +01:00
b99c616c23
Re-implementation of opengl_check_errors
2016-02-05 08:36:54 +01:00
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
9f9e127aaa
Addition of a QPen in SegmentGraphicsItem
2016-01-25 14:12:19 +01:00
eb867bb810
Addition of a specific function for the MSAA in LCC
2016-01-20 14:35:00 +01:00
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
0547f19d58
WIP A fix for mac
...
- repared the demo
- Disabled the splatting.
2016-01-19 10:28:05 +01:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
7d220d3da8
Context 3.3 Core changed into 2.1
2015-08-10 08:59:54 +02:00
f864b0a8e8
fix line width in demos using GraphicsView
2015-07-28 15:46:11 +02:00
a571e1db8d
Clean-up
2015-07-16 08:26:41 +02:00
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +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
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
134ca52fea
license header
2015-07-03 13:31:22 +02:00
4eabd4c09c
remove sdglinf painter, widget warnings
2015-06-30 10:32:09 +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
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
693db86912
Add typenames; reorder member initialization; add this->
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
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
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
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
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
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
6cc4ccc524
fix display of constrained Voronoi diagram
...
there is still a problem with voronoiPen
2014-11-24 14:46:27 +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
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
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
0f92048c4d
changes after Efi's review (and color changes in the demo)
2014-11-10 18:00:02 +01:00
a35858a293
Move exportSVG to the DemosMainWindow base class
2014-11-07 16:57:04 +01:00
a4c3691763
add code to demo to display bad facets
2014-11-06 15:34:48 +01:00
a7d968f88e
Add missing impl files.
2014-10-31 19:31:37 +01:00
941824738e
Header files for GraphicsView
2014-10-31 19:20:18 +01:00
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
46c8926854
New way to chose Qt version for projects configuration.
...
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).
Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.
Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)
During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)
Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
c3aaf0bffe
Some modification of CGAL Graphic view to a better compatibility of Windows with the Qt5 version of CGAL (especially about dll import and export stuff).
2014-07-17 01:55:07 +02:00
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
685dffc636
Fix PolylinesGraphicsItem
...
Bug reported on cgal-discuss:
From: Bernhard Kornberger
To: cgal-discuss@inria.fr
Date: 2014/03/25 Tue 11:30
2014-04-01 16:30:37 +02:00
a3eafddd16
virtual function of derived class must match the API of the base class
2013-02-26 07:35:51 +01:00
ee5b4683d0
deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3
2013-01-31 09:47:54 +01:00
f27e1c2c7f
Circular_arc_traits example compiles and runs, but just barely.
...
* Currently errors out on attempting to insert intersecting arcs.
2012-08-02 21:00:08 +00:00
09857e2e74
Used sfinae to use circular and non-circular kernels with Converter.
2012-07-30 21:03:25 +00:00
7ba8b08c4d
Implemented insertion and removal of segments to arrangements.
2012-06-15 05:28:38 +00:00
79f41a6c2f
Add a license header
2012-01-16 10:54:58 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
8ae6131f2e
opti
2011-12-30 15:11:21 +00:00
c564dfe82a
fix drawing of degenerate parabola segment (source, target and center are collinear)
2011-12-30 15:00:46 +00:00
98eccea610
Patch so that Qt's MOC can parse our headers, with Boost-1.48
...
UPDATE: fix the previous commit. I applied the patch stupidly.
| The patch is adapted from this bug report:
|
| From: Mark Brand < mabrand@mabrand.nl>
| To: cgal-discuss@lists-sop.inria.fr
| Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN
|
| See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
2011-11-21 17:06:17 +00:00
f5ec3f260c
Patch so that Qt's MOC can parse our headers, with Boost-1.48
...
The patch is adapted from this bug report:
From: Mark Brand < mabrand@mabrand.nl>
To: cgal-discuss@lists-sop.inria.fr
Subject: [cgal-discuss] [PATCH] prevent Qt's moc from choking on BOOST_JOIN
See https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html
2011-11-21 16:42:18 +00:00
f15a4f9957
more export statements
2011-10-12 10:26:21 +00:00
dfba14f23c
Rename <CGAL/$LIB/export.h> to <CGAL/export/$LIB.h>
2011-10-12 09:43:19 +00:00
87148361ff
Rename CGAL_BUILD_SHARED_LIB to CGAL_BUILD_SHARED_LIBS
...
Better name, and more coherent with CMake variable name:
BUILD_SHARED_LIBS
2011-10-11 13:52:25 +00:00
88ef561715
Fix the call to Q_INIT_RESOURCE
...
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
91a5327fa8
change LGPLv2 -> LGPLv3
2011-10-10 13:48:25 +00:00
b4bf4af75d
One must include <CGAL/config.h> to use the macro CGAL_BUILD_SHARED_LIB
2011-10-10 11:49:39 +00:00
aa00f78883
Also support the compilation of CGAL libraries as static libs, with MSVC.
2011-10-06 16:01:16 +00:00
ebc4f53646
Add declspecs for Visual C++ so that we can build dlls
2011-10-06 13:14:17 +00:00
18f16c77ba
Add declspecs for Visual C++ so that we can build dlls
2011-10-06 12:20:14 +00:00
369498d1e5
Cancel revision 64607. There had been a problem with the branch.
...
| ------------------------------------------------------------------------
| r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
|
| Merged feature-branch Aos_2-new_functors-tau into next
| ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
acc2ae58a6
If CGAL_Qt4 is not a DLL, declspec must not be used.
2011-06-14 10:13:51 +00:00
28bc7ca5c0
Add some decl spec (import|export) to CGAL_Qt4
...
That allows to build libCGAL_Qt4 and the Polyhedron demo with
-fvisibility-ms-compat on Linux.
That may allow to build CGAL_Qt4 as a DLL on Windows, one day.
2011-06-10 17:14:27 +00:00
ed73c849d1
remove unused variable warning
2011-06-09 10:16:29 +00:00
69b97b4ad2
remove unsed var warnings
2011-06-08 09:56:42 +00:00
75980ac1c0
remove unused var warnings
2011-06-08 09:53:06 +00:00
4fdb182b99
BUGFIX: Even if a polyline is closed, it needs at least 3 points to be a polygon.
2011-06-08 09:31:44 +00:00
ae62b2ae4d
remove warnings
2011-02-24 16:36:04 +00:00
7520c27371
ItemUsesExtendedStyleOption is available only starting from Qt 4.6
2010-12-13 19:28:34 +00:00
f1549b69ba
PainterOstream can now paint bboxes
2010-11-09 09:12:58 +00:00
caf090bfff
Conditional use of more recent Qt feature
2010-09-27 11:45:15 +00:00
8ecb2bd1f2
Draw points on the fly in an output iterator without first collecting them into a container
2010-09-23 11:35:09 +00:00
2b8df41cdb
cleanup
2010-09-23 07:52:35 +00:00
4306b967ee
cleanup
2010-09-23 07:32:53 +00:00
476713ca97
Add a graphics item for a point set in a kd-tree
2010-09-22 20:22:58 +00:00
e42710f1d2
cleanup
2010-09-22 20:22:00 +00:00
569850f2f3
Access value type of iterator of container instead of value type of container
2010-09-22 14:34:35 +00:00
17fca99269
Set a pen
2010-09-22 06:16:09 +00:00
b7f4ea49b6
Add typename
2010-09-22 06:15:46 +00:00
5a4f57be05
Add #include file
2010-09-22 06:15:29 +00:00
2d9beb8ef3
Add function to resive the grid
2010-09-21 13:26:25 +00:00
106fe433e0
the item must not itself decide to hide or show
2010-09-21 10:43:22 +00:00
e7003b45ca
intial version of Qt4 based Snaprounding demo
2010-09-20 20:24:27 +00:00
d1ea6a8cb7
Rename vector field graphics item
2010-09-20 12:19:14 +00:00
e04ca077c1
Add a GraphicsItem for the vector field
2010-09-17 20:57:27 +00:00
4d58757564
Fix name of file protection variable
2010-09-17 14:20:59 +00:00
c1ede1357a
Change site and edge color
2010-09-07 11:28:32 +00:00
1a7b49eca6
weight is the radius
2010-09-07 10:14:16 +00:00
3a9132778d
Qt4 based streamlines demo
2010-09-03 14:20:48 +00:00
6208b71aaf
Towards a Qt4 based Apollonius_graph_2 demo
2010-08-25 15:04:34 +00:00
49c71b30ac
Merge CGAL-3.7-branch:
...
| ------------------------------------------------------------------------
| r58172 | lrineau | 2010-08-20 11:21:30 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
|
| Fix buggy CMake logic: the GMP_arithmetic_kernel.cpp must me configured
| only once.
|
| ------------------------------------------------------------------------
| r58173 | lrineau | 2010-08-20 11:25:35 +0200 (Fri, 20 Aug 2010) | 2 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/dual.cpp
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/primal.cpp
|
| Fix warning about deprecated included headers.
|
| ------------------------------------------------------------------------
| r58174 | lrineau | 2010-08-20 11:39:25 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
|
| Modify the test file so that the check function do not display warnings
| that result in a 'w' in the testsuite.
|
| ------------------------------------------------------------------------
| r58175 | lrineau | 2010-08-20 11:45:26 +0200 (Fri, 20 Aug 2010) | 9 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
|
| Fix warnings:
|
| test/Bounding_volumes_Demo/Bounding_volumes.cpp: In constructor `MainWindow::MainWindow()':
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:71: warning: `MainWindow::P' will be initialized after
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning: base `CGAL::Qt::DemosMainWindow'
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning: when initialized here
| test/Bounding_volumes_Demo/Bounding_volumes.cpp: In member function `void MainWindow::update()':
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:247: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58177 | lrineau | 2010-08-20 11:47:06 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
|
| Fix warning:
| include/CGAL/Min_circle_2.h:197: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58178 | lrineau | 2010-08-20 11:49:09 +0200 (Fri, 20 Aug 2010) | 4 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/STL_Extension/include/CGAL/assertions.h
|
| Avoid a warning if NDEBUG and CGAL_NDEBUG are both defined:
|
| include/CGAL/assertions.h:59:1: warning: "CGAL_NDEBUG" redefined
|
| ------------------------------------------------------------------------
| r58179 | lrineau | 2010-08-20 11:50:54 +0200 (Fri, 20 Aug 2010) | 8 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/GraphicsView/include/CGAL/Qt/GraphicsViewCircularArcInput.h
|
| Fix a warning:
|
| include/CGAL/Qt/GraphicsViewCircularArcInput.h: In constructor 'CGAL::Qt::GraphicsViewCircularArcInput<K>::GraphicsViewCircularArcInput(QObject*, QGraphicsScene*) [with K = CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > >]':
| cmake/platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1/test/Circular_kernel_2_Demo/Circular_kernel_2.cpp:107: instantiated from here
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:73: warning: 'CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::scene_' will be initialized after
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:68: warning: 'int CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::count'
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:79: warning: when initialized here
|
| ------------------------------------------------------------------------
| r58180 | lrineau | 2010-08-20 11:56:19 +0200 (Fri, 20 Aug 2010) | 21 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Convex_hull_d/include/CGAL/Delaunay_d.h
|
| Fix warnings:
|
| include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74: instantiated from here
| include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162: instantiated from here
| include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
| include/CGAL/Delaunay_d.h:575: instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74: instantiated from here
| include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
| include/CGAL/Delaunay_d.h:575: instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162: instantiated from here
| include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
|
| ------------------------------------------------------------------------
| r58181 | lrineau | 2010-08-20 12:11:35 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Installation/test/Installation/link_to_CGAL_Qt4.cpp
|
| Fix a warning:
| test/Installation/link_to_CGAL_Qt4.cpp:11: warning: the address of 'f' will never be NULL
|
| ------------------------------------------------------------------------
| r58182 | lrineau | 2010-08-20 12:15:14 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h
|
| Fix a warning:
| include/CGAL/Monge_via_jet_fitting.h:425: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58183 | lrineau | 2010-08-20 12:19:36 +0200 (Fri, 20 Aug 2010) | 4 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
| M /branches/CGAL-3.7-branch/Min_circle_2/test/Min_circle_2/test_Min_circle.cpp
|
| Fix warnings:
| "comparison between signed and unsigned integer expressions"
| and "unsigned is always >= 0"
|
| ------------------------------------------------------------------------
| r58184 | lrineau | 2010-08-20 12:22:35 +0200 (Fri, 20 Aug 2010) | 2 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
|
| Fix warnings about comparison between signed and unsigned.
|
| ------------------------------------------------------------------------
2010-08-20 12:57:32 +00:00
a9f1752243
Add the AlphaShapeGraphicsItem
2010-08-14 14:17:40 +00:00
bedfdf33d8
Move event dropping into DemosMainWindow
2010-08-13 14:38:51 +00:00
622eb3ce67
A GraphicsItem should not call itself show() and hide()
2010-08-12 13:46:50 +00:00
6b5efe3b9f
Throw QRectF::normalized() in as I don't understand what top left and bottom right means for Qt
2010-06-30 12:54:40 +00:00
d1b7a574a8
Added missing typename
2010-06-20 21:10:04 +00:00
0603ea69f7
Add PointsGraphicsItem
2010-06-17 06:29:45 +00:00
24d6b58c5d
Add a Qt4 based demo for the Generator package
2010-06-16 09:47:31 +00:00
de80f0e8e5
Add a pen
2010-05-11 09:11:59 +00:00
f5190693c1
Add 'this->' for ansi-compliance
2010-05-10 07:06:42 +00:00
d11e6ea40a
Constify
2010-04-17 20:37:10 +00:00
d856411edf
Fix an error (typo) of the following revision:
...
| ------------------------------------------------------------------------
| r55430 | nicokruithof | 2010-04-12 22:32:11 +0200 (Mon, 12 Apr 2010) | 3 lines
|
| Changed CGAL::Type<K> to K::Type to get derived kernels compiling.
| Exception: Didn't change Circular_arc_point_2 as it is not defined by the default kernel.
|
| ------------------------------------------------------------------------
2010-04-17 20:33:57 +00:00
6b9ecd54d8
Changed more typedefs from CGAL::Type<K> to K::Type
2010-04-13 09:47:42 +00:00
e87c43c1da
Changed CGAL::Type<K> to K::Type to get derived kernels compiling.
...
Exception: Didn't change Circular_arc_point_2 as it is not defined by the default kernel.
2010-04-12 20:32:11 +00:00
9ea4b02db5
Curious typo!
2010-03-19 20:20:23 +00:00
85dc12f2a7
Remove empty lines at beginning and end of files
...
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
6de5b28f28
Revert the part of r53095 that were commited by error.
2009-11-18 15:19:18 +00:00
23131c40b5
Merge change 53094 from branches/unsorted-branches/eric/CMAKE/GraphicsView
2009-11-18 15:17:14 +00:00
421e9db098
Add missing include
2009-11-16 08:30:17 +00:00
5fda817f95
Remove a few "warning: extra ';'" with g++ -pedantic.
2009-11-14 11:49:52 +00:00
aafcf5c74b
Qt4 based demo for Segment Delaunay Graph
2009-11-12 16:05:30 +00:00
2949137f8a
Patch for Qt-4.6
2009-11-02 20:48:11 +00:00
fd94723cb1
Typo.
...
Anyway, that class Qt::GraphicsViewLineInput<K> is never used in CGAL: not
documented, not tested.
2009-10-07 13:35:12 +00:00
17e6fbfae2
Fixed a couple of compiler errors
2009-07-31 18:40:19 +00:00
c4052f224b
Add a virtual function for drawing a vertex instead of a point (associated to a vertex)
2009-02-06 09:44:15 +00:00
a8e9a6954d
Add input tool for polygon with holes
2009-01-26 10:39:57 +00:00
df8bf7d3e3
Add slot processInput(..)
2009-01-26 10:38:57 +00:00
a9a4f4c0bf
Make the eventFilter(..) public
2009-01-26 10:38:23 +00:00
30b834fd21
Embryonic version for bounded linear polygons with holes only
2009-01-23 21:08:30 +00:00
fbd55f6da0
Remove svn:executable property on *.h files
2009-01-03 13:33:23 +00:00
353b5d4c1b
Remove debug output
2008-12-05 16:33:34 +00:00
26a94ae897
Reorder member initialization
2008-11-28 08:01:56 +00:00
17002f641f
Fix auto-linking.
2008-11-26 13:08:15 +00:00
37d13c151a
Reorder member initialization
2008-11-26 09:07:41 +00:00
9a8936c392
Reorder member initialization
2008-11-26 09:03:57 +00:00
07653abffc
reorder member initialization
2008-11-25 18:44:19 +00:00
39d715d75f
fix bounding rect
2008-10-17 17:13:06 +00:00
e0e9dcff18
A GraphicsItem for CGAL::Line_2
2008-10-15 15:00:17 +00:00
988e6d0429
Add writeState()/readState() to CGAL::Qt::DemosMainWindow, so that one can
...
save and restore the state of a main window: size, position, and position
of sub-widgets (toolbars and dock widgets, mainly).
2008-10-14 20:51:49 +00:00
df58898190
Add support to draw parabolic arcs with CGAL::Qt::PainterOStream.
2008-10-14 10:43:45 +00:00
718c1a9f00
Fix MSVCisms: missing typenames.
2008-10-01 13:45:08 +00:00
9e5cf615dc
Do not delete qline and qcarc because the scene "owns" them and will delete
2008-10-01 13:10:39 +00:00
4f36fa9cad
Use global class templates CGAL::Type<K>, instead of K::Type.
2008-10-01 13:09:56 +00:00
91b3bd47ad
Add circular arc
2008-10-01 11:12:58 +00:00
88a2e2dc44
Add graphics item for power diagram
2008-10-01 09:20:37 +00:00
4901e9b973
No input with modifiers and cleanup
2008-10-01 09:19:53 +00:00
52ce566fc9
2D regular triangulation demo
2008-09-30 16:31:59 +00:00
e2de7ab0f3
No input if Shift is pressed
2008-09-30 16:28:44 +00:00
8a2a1f9902
- New icons for the two Triangulation_2 demos (Andreas: remember that we demo
...
about regular).
- Constrained_Delaunay_triangulation_2 can now optionnaly show the mesh
domain.
2008-09-29 17:42:10 +00:00
21be621000
Fix typo.
2008-09-29 17:26:00 +00:00
a2c1d435eb
Fix: make setVisibleEdges() work again.
2008-09-29 16:42:23 +00:00
49a57069fd
Fix a MSVCism: in a class template, when one use a member data from a base
...
class, one need to use this->...
2008-09-24 13:24:24 +00:00
5081742ee6
many fixes concerning the circular arcs
2008-09-23 13:11:22 +00:00
6b15cdb91e
New header <CGAL/Qt/utility.h> that contains miscellaneous global
...
functions.
2008-09-23 12:16:00 +00:00
8291bffe10
Handle el and Esc key
2008-09-23 09:35:45 +00:00
f3c0ffc206
fix emit of circular arc input tool
2008-09-23 09:05:29 +00:00
f870cb8d38
fix IO for circular arcs
2008-09-23 09:03:13 +00:00
c9e3b3416f
disable drawing of circular arc as it breaks linear kernel demos
2008-09-22 14:30:39 +00:00
15ad06b081
Add (buggy) IO for circular arcs
2008-09-22 13:59:26 +00:00
7bc12af8e9
added parent to the input tools and fixed typos
2008-09-09 12:21:32 +00:00
a3d016def5
Added license header
2008-09-09 11:56:57 +00:00
1c56306968
Add input tool for iso-rectangles
2008-09-09 11:48:15 +00:00
b2525f2256
Add auto-link to libCGALQt4 files.
2008-09-05 15:34:53 +00:00
e613317c65
Fix VCisms.
2008-09-01 14:01:19 +00:00
b073a2356b
Incorporated reviewers remarks
2008-09-01 13:50:09 +00:00
2e7ab87ab7
Incorporated reviewers remarks
2008-09-01 12:42:20 +00:00
f6e9a54bb1
Incorporated reviewers remarks
2008-09-01 12:35:14 +00:00
53f5c9679b
Add a using directive "using std::array" in namespace CGAL to import either:
...
- C++0x's std:array from <array>
- TR1's std::tr1::array from <tr1/array>
- boost::array from <boost/array.hpp>
Motivation : GCC's std::array is faster than boost::array.
Move CGALi:make_array to namespace CGAL.
Document CGAL::array.
2008-08-26 13:08:16 +00:00
cd3614b441
Add support for recent files in CGAL::Qt::DemosMainWindow
2008-07-30 18:01:51 +00:00
4094ca645b
When the polyline is closed we duplicate the first point
2008-07-29 20:47:43 +00:00
b9fa91e06a
make_array is in CGALi...
2008-07-28 14:27:05 +00:00
8939e4d897
Use boost::array (and <CGAL/array.h> instead of CGAL::Triple
...
That code is currently not tested!
2008-07-28 14:11:50 +00:00
fb894e0f08
Add signal modelChanged for inout handlers that modify a model
2008-07-09 15:02:52 +00:00
e165edec50
Add Polygon Demo
2008-07-08 21:44:43 +00:00
9f2384e77d
- Remove demo/icons/Logos.qrc, replaced by demo/resources/CGAL.qrc, that
...
also contains :/cgal/help/about_CGAL.html
- Add include/CGAL/Qt/debug.h and src/CGALQt/debug.cpp, that will contain
debug tools/functions. For the moment, they just define:
void traverse_resources(const QString& name);
that must be used like that:
CGAL::Qt:traverse_resources(":/cgal"); // view CGAL resources
or
CGAL::Qt:traverse_resources(":"); // view all resources
and displays the resources tree on std::cerr.
2008-07-04 13:10:02 +00:00
5ddfd30c93
In src/CGALQt4:
...
- add the class CGAL::Qt::DemosMainWindow in libCGALQt4,
- compile moc generated files separately
In demo/
- new sub-directory demo/resources/ that contains, for now,
about_CGAL.html
- move the two triangulation demos from demo/GraphicsView to
demo/Triangulation_2 (to prepare the inclusion in CGAL internal release).
- For each demo, merge all .h and .cpp files. Each demo now has a ui
file, a cpp file and a qrc file (and a html file for the "About demo..."
menu entry).
- rename the demos to Delaunay_triangulation_2(.exe) and
Constrained_Delaunay_triangulation_2(.exe)
2008-07-01 13:18:39 +00:00
4d6d9b314c
Fix compilation error in VoronoiGraphicsItem<DT>.
2008-06-27 10:42:50 +00:00
b731d74096
CGAL::Qt::GraphicsViewNavigation is no longer constructed from a
...
QGraphicsView*. It is now able to handle several graphics view at the same
time (just install several event filters).
New class CGAL::Qt::DemosMainWindow. That class has several protected
methods:
void setupStatusBar();
void addNavigation(QGraphicsView*);
void setupOptionsMenu(QMenu* menu = NULL);
void addAboutCGAL(QMenu* menu = NULL);
void addAboutDemo(QString htmlResourceName, QMenu* menu = NULL);
setupStatusBar() adds a label in the statusBar(), that is connected to the
navigation class, and shows the position of the mouse.
addNavigation(QGraphicsView* v) adds a navigation class to the view v.
setupOptionsMenu(QMenu* m = NULL) adds two options "Use OpenGL" and
"Use antialiasing" to the menu m. If m==0, a menu named "Options" is searched
for, or created if it does not exists.
addAboutCGAL(QMenu* m = NULL) adds an entry "About CGAL..." to the menu
m. If m==0, a "Help" menu is searched for or created.
addAboutDemo(QString htmlResourceName, QMenu* m = NULL) adds an entre
"About the demo...", to the menu m. If m==0, a "Help" menu is searched for
or created. If the entry is clicked, a popup dialog shows the content of
the resource/file whose name is in htmlResourceName.
Example:
addAboutDemo(":/cgal/help/about_triangulation.html")
2008-06-26 15:19:44 +00:00
a42a3d4cb3
Use T::Geom_traits instead of K
2008-06-26 13:07:40 +00:00
834ca71ffa
more low level conversion and drawing
2008-06-26 12:46:19 +00:00
bbaa078d3f
Fix compilation errors.
2008-06-26 11:52:39 +00:00
13d8e38b82
Fix some compilations errors.
2008-06-26 10:28:21 +00:00
993092d7b2
Put the clipping in the Converter
2008-06-26 10:18:11 +00:00
48b005732f
Put the clipping in the Converter
2008-06-26 10:17:51 +00:00
dd5c5074a0
Added pen
2008-06-26 08:39:36 +00:00
e54fcaa58c
Reorganize classes in a namespace and directory called Qt
2008-06-26 08:07:36 +00:00
132153d513
after presentation at Inria
2008-06-25 19:41:13 +00:00
08847b08b0
after presentation at Inria
2008-06-25 19:24:33 +00:00
Maxime Gimeno
Laurent Rineau
Mael Rouxel-Labbé
Guillaume Damiand
Andreas Fabri
Jane Tournois
Sébastien Loriot
Michael Vetter
Sebastien Loriot
Sandeep Kumar Dey
Panagiotis Cheilaris
Clement Jamin
Aurélien Vialon
Alex Tsui
Laurent Rineau
Nico Kruithof
Sylvain Pion
Fernando Cacciola