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
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
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
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
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
Maxime Gimeno
7d220d3da8
Context 3.3 Core changed into 2.1
2015-08-10 08:59:54 +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
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +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
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
Sandeep Kumar Dey
134ca52fea
license header
2015-07-03 13:31:22 +02:00
Panagiotis Cheilaris
4eabd4c09c
remove sdglinf painter, widget warnings
2015-06-30 10:32:09 +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
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
Andreas Fabri
693db86912
Add typenames; reorder member initialization; add this->
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
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
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
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
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
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
6cc4ccc524
fix display of constrained Voronoi diagram
...
there is still a problem with voronoiPen
2014-11-24 14:46:27 +01:00
Jane Tournois
4b56a4abdd
remove useless cout
2014-11-24 12:16:29 +01:00
Jane Tournois
b40b37c760
paint seeds fixed
2014-11-24 12:03:13 +01:00
Jane Tournois
c97c1c844b
add a pen for seeds
2014-11-20 11:10:25 +01:00
Jane Tournois
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
Jane Tournois
56d4fe9732
insert seeds inside the demo
...
drawing those seeds does not work yet, but meshing takes them into account
2014-11-18 17:32:19 +01:00
Guillaume Damiand
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
Andreas Fabri
0f92048c4d
changes after Efi's review (and color changes in the demo)
2014-11-10 18:00:02 +01:00
Laurent Rineau
a35858a293
Move exportSVG to the DemosMainWindow base class
2014-11-07 16:57:04 +01:00
Jane Tournois
a4c3691763
add code to demo to display bad facets
2014-11-06 15:34:48 +01:00
Guillaume Damiand
a7d968f88e
Add missing impl files.
2014-10-31 19:31:37 +01:00
Guillaume Damiand
941824738e
Header files for GraphicsView
2014-10-31 19:20:18 +01:00
Jane Tournois
4cf43198e2
dual(v) returns an OutputIterator that collects rays and segments
...
to do so, use the Dispatch_output_iterator
- Constrained Voronoi diagram is now a class that has a pointer to a CDT
as member. We don't need an extra CDT anymore
- update examples
- also update the CDT 2 demo to see Voronoi cells, that are only valid when the
triangulation is Delaunay (constrained or not)
2014-10-07 15:03:41 +02:00
Aurélien Vialon
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
Aurélien Vialon
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
Aurelien Vialon
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
Aurélien Vialon
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
Aurélien Vialon
5f09ccde1a
Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3.
2014-06-01 22:46:14 +02:00
Laurent Rineau
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
Andreas Fabri
a3eafddd16
virtual function of derived class must match the API of the base class
2013-02-26 07:35:51 +01:00
Andreas Fabri
ee5b4683d0
deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3
2013-01-31 09:47:54 +01:00
Alex Tsui
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
Alex Tsui
09857e2e74
Used sfinae to use circular and non-circular kernels with Converter.
2012-07-30 21:03:25 +00:00
Alex Tsui
7ba8b08c4d
Implemented insertion and removal of segments to arrangements.
2012-06-15 05:28:38 +00:00
Laurent Rineau
79f41a6c2f
Add a license header
2012-01-16 10:54:58 +00:00
Laurent Rineau
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
Laurent Rineau
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
Sébastien Loriot
8ae6131f2e
opti
2011-12-30 15:11:21 +00:00
Sébastien Loriot
c564dfe82a
fix drawing of degenerate parabola segment (source, target and center are collinear)
2011-12-30 15:00:46 +00:00
Laurent Rineau
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
Laurent Rineau
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
Andreas Fabri
f15a4f9957
more export statements
2011-10-12 10:26:21 +00:00
Laurent Rineau
dfba14f23c
Rename <CGAL/$LIB/export.h> to <CGAL/export/$LIB.h>
2011-10-12 09:43:19 +00:00
Laurent Rineau
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
Laurent Rineau
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
Sébastien Loriot
91a5327fa8
change LGPLv2 -> LGPLv3
2011-10-10 13:48:25 +00:00
Laurent Rineau
b4bf4af75d
One must include <CGAL/config.h> to use the macro CGAL_BUILD_SHARED_LIB
2011-10-10 11:49:39 +00:00
Laurent Rineau
aa00f78883
Also support the compilation of CGAL libraries as static libs, with MSVC.
2011-10-06 16:01:16 +00:00
Andreas Fabri
ebc4f53646
Add declspecs for Visual C++ so that we can build dlls
2011-10-06 13:14:17 +00:00
Andreas Fabri
18f16c77ba
Add declspecs for Visual C++ so that we can build dlls
2011-10-06 12:20:14 +00:00
Laurent Rineau
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
Laurent Rineau
acc2ae58a6
If CGAL_Qt4 is not a DLL, declspec must not be used.
2011-06-14 10:13:51 +00:00
Laurent Rineau
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
Sébastien Loriot
ed73c849d1
remove unused variable warning
2011-06-09 10:16:29 +00:00
Sébastien Loriot
69b97b4ad2
remove unsed var warnings
2011-06-08 09:56:42 +00:00
Sébastien Loriot
75980ac1c0
remove unused var warnings
2011-06-08 09:53:06 +00:00
Sébastien Loriot
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
Sébastien Loriot
ae62b2ae4d
remove warnings
2011-02-24 16:36:04 +00:00
Andreas Fabri
7520c27371
ItemUsesExtendedStyleOption is available only starting from Qt 4.6
2010-12-13 19:28:34 +00:00
Laurent Rineau
f1549b69ba
PainterOstream can now paint bboxes
2010-11-09 09:12:58 +00:00
Andreas Fabri
caf090bfff
Conditional use of more recent Qt feature
2010-09-27 11:45:15 +00:00
Andreas Fabri
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
Andreas Fabri
2b8df41cdb
cleanup
2010-09-23 07:52:35 +00:00
Andreas Fabri
4306b967ee
cleanup
2010-09-23 07:32:53 +00:00