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
Jane Tournois
45f96a803c
fix display of seeds
...
when "display seeds" is active, seeds are displayed right away
when a new seed is inserted
2014-11-24 14:24:09 +01:00
Jane Tournois
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
600a9bb192
handling of in_domain changed
...
the parity of the number of constraints crossed is not used anymore.
The infinite component is tagged outside.
About finite components, inside/outside status is only based on seeds,
that should be inserted manually.
2014-11-21 13:10:47 +01:00
Jane Tournois
5f687bdc39
abort meshing when "cancel" button is hit
2014-11-20 16:23:25 +01:00
Jane Tournois
e4161ce685
handle seeds in lloyd_optimize_mesh_2
2014-11-20 16:13:46 +01:00
Jane Tournois
6897360695
handle the insertion of seeds inside the demo
...
note after Lloyd, they are not taken into account yet to update
the "inside" markers
2014-11-20 14:57:17 +01:00
Jane Tournois
c97c1c844b
add a pen for seeds
2014-11-20 11:10:25 +01:00
Jane Tournois
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
Jane Tournois
4b71328474
change vertex base in demo to use my last commit
2014-11-14 13:40:30 +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
Jane Tournois
5e2fab9a51
add verbose stuff
2014-11-12 16:52:49 +01:00
Jane Tournois
76c8e95389
add input dialogs to demo to be able to set Delaunay refinement parameters
...
k-Lipschitz case
2014-11-12 16:26:44 +01:00
Jane Tournois
f084954892
add input dialogs to demo to be able to set Delaunay refinement parameters
2014-11-12 16:16:03 +01:00
Jane Tournois
e02773efd1
move files about sizing, and change template parameter. Geom_traits is enough
2014-11-12 15:42:27 +01:00
Jane Tournois
e971112c1c
this file should remain in the demo folder
2014-11-12 13:07:02 +01:00
Jane Tournois
d071e71773
move demo "include" code to Mesh_2 "include" code. These files are needed for Lloyd
2014-11-12 12:51:09 +01:00
Andreas Fabri
0f92048c4d
changes after Efi's review (and color changes in the demo)
2014-11-10 18:00:02 +01:00
Jane Tournois
5666a7db17
add code for Lloyd optimization, and in the demo
2014-11-07 17:07:14 +01:00
Laurent Rineau
29904d2f56
Other example with the Polygon demo
2014-11-07 17:06:41 +01:00
Laurent Rineau
9889f95768
Example of using of exportSVG
2014-11-07 16:57:28 +01:00
Laurent Rineau
a35858a293
Move exportSVG to the DemosMainWindow base class
2014-11-07 16:57:04 +01:00
Laurent Rineau
94803a6a96
Implement export to SVG for the CDT_2 demo
2014-11-07 16:09:09 +01:00
Jane Tournois
1e1d6b9004
add menu to tag blind faces
2014-11-06 16:03:41 +01:00
Jane Tournois
a4c3691763
add code to demo to display bad facets
2014-11-06 15:34:48 +01:00
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
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
Aurélien Vialon
7a0e8f545d
Bugs correction about STREQUAL into findQt5.
2014-08-05 10:05:15 -07:00
Aurélien Vialon
6df9530094
All GraphicView demonstrations ported to the new Qt inclusion way.
...
Change of Qt4or5 variables names.
Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
QT_VERSION_USED => number of Qt version wanted (4 or 5).
QT4 => TRUE if Qt4 chosen.
QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
Aurélien Vialon
0a457c4b03
Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support.
2014-08-02 14:59:49 -07: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
548bba0637
Mesh_3_export_plugin Windows modification.
2014-07-17 19:16:18 +02:00
Aurelien Vialon
4c85bee791
Add of Apollonius_graph_2 demonstration of GraphicView and all GraphicView demonstrations works on Windows.
2014-07-17 13:03:23 +02:00
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
520e791a99
GraphicView demonstrations porting.
2014-07-09 16:31:29 +02:00
Laurent Rineau
59d3dd8793
Do not require GMP explicitly
2014-07-02 12:58:50 +02:00
Aurélien Vialon
aee9e4eb24
Commit of new demonstrations porting.
2014-06-26 14:38:23 +02:00
Aurélien Vialon
08685b683e
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
...
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
GraphicsView/src/CGAL_Qt5/resources.cpp
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-02 00:55:05 +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
Aurélien Vialon
1f669ad498
Update Support for Qt5 project.
2014-05-29 12:07:42 +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
Laurent Rineau
90936d8e30
Fix a warning
...
demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h:348: warning: passing `double' for converting 1 of `void QPainter::drawRect(int, int, int, int)'
2014-03-11 18:23:11 +01:00
Laurent Rineau
2c1f436ed4
Fix another compilation error
2014-03-11 18:18:55 +01:00
Laurent Rineau
e50a1c6374
Fix a warning
2014-03-06 17:03:47 +01:00
Laurent Rineau
1910e7151e
Fix a compilation error on Windows
...
The min/max macro issue.
2014-03-06 17:03:28 +01:00
Laurent Rineau
aaa5e020d4
Rename Periodic_2_triangulation_2.cpp to the name of the target
...
Rename Periodic_2_triangulation_2.cpp
Periodic_2_Delaunay_triangulation_2.cpp so that is named like the CMake
target. The default cgal_test script requires that. Before that
renaming, the Periodic_2_Delaunay_triangulation_2 demo was not compiled
by testsuites.
2014-03-04 14:21:40 +01:00
Laurent Rineau
89ad21df97
Use a new CGAL logo
2014-02-25 18:11:31 +01:00
Sébastien Loriot
a64b317ba7
trivial bugfix in cdt2 demo
...
mark faces in the domain also when reading a polygon from a file
2014-02-17 08:48:02 +01:00
Sébastien Loriot
9114db9085
restore figure source files removed in 0fa2cacb
...
| commit 0fa2cacb60
| Author: Sébastien Loriot <sebastien.loriot@cgal.org>
| Date: Tue Dec 3 17:27:02 2013 +0100
|
| remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Sébastien Loriot
0fa2cacb60
remove doc_tex documentation (including developer manual) and old manual tools
2013-12-03 17:27:02 +01:00
Laurent Rineau
bc03aaf30b
Put doc/ in the global dont_submit file
2013-08-20 10:57:03 +02:00
Sébastien Loriot
b2ef3b8673
Merge branch 'doc-remove_gif-local'
...
Successfully test in CGAL-4.3-Ic-102
This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.
Approved by the interim release manager
xplain why this merge is necessary,
2013-07-26 17:50:07 +02:00
Sébastien Loriot
2dfe8a3d73
workaround for a doxygen bug: remove space after /!* to avoid a verbatim env
...
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
2013-07-25 14:58:53 +02:00
Sébastien Loriot
74a1ac055e
remove pdf files from doxygen doc include path
2013-07-25 11:15:18 +02:00
Laurent Rineau
73887c6927
Revert "Revert the merge of Periodic_2 into master. It was pushed by error."
...
This reverts commit b27c0a4efb .
2013-06-28 17:48:15 +02:00
Laurent Rineau
b27c0a4efb
Revert the merge of Periodic_2 into master. It was pushed by error.
...
Revert "Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal"
This reverts commit 5ac2c05249 , reversing
changes made to 93b77ce529 .
2013-06-24 12:50:27 +02:00
Nico Kruithof
a9858ee784
Merge branch 'Periodic_2_triangulation_2-nkruithof'
2013-06-11 21:22:30 +02:00
Ross Hemsley
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
Philipp Möller
d4e379ba82
Small fixes in the generated Doxyfile.in
2013-05-30 15:32:33 +02:00
Philipp Möller
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +02:00
Nico Kruithof
01778a2347
Merge branch 'master' into Periodic_2_triangulation_2-nkruithof
2013-04-01 06:41:20 +02:00
Nico Kruithof
bb9a733bd1
Updated the P2T2 demo.
2013-03-31 19:50:37 +02:00
Nico Kruithof
bc0a55ad1e
Improved demo with Iterator_type-ed simplices
2013-03-31 14:58:49 +02:00
Laurent Rineau
b6ffa7c425
Merge branch 'CGAL-fix_warnings-GF'
...
That branch was successfully tested in CGAL-4.2-Ic-205.
2013-03-27 12:23:31 +01:00
Nico Kruithof
f5ba6b3ac0
Draw the bounding box around the middle cover if we have multiple covers
2013-03-26 15:07:44 +01:00
Nico Kruithof
f26692677f
Working on the demo, coloring the vertices of small triangulations
2013-03-24 09:19:52 +01:00
Andreas Fabri
0cbc8b0e40
remove unused parameters
2013-03-23 08:45:06 +01:00
Sébastien Loriot
3c7ad8410c
add classified reference manual pages
2013-03-12 15:07:19 +01:00
Laurent Rineau
723b28d39f
Fix warnings about incorrect type conversions
2013-03-05 12:44:11 +01:00
Andreas Fabri
f09633f71d
size_t -> int
2013-03-05 11:35:29 +01:00
Andreas Fabri
cd45bc8126
std::size_t -> int
2013-03-04 12:02:53 +01:00
Andreas Fabri
6ac85b1b27
remove unused variable
2013-03-01 16:35:23 +01:00
Nico Kruithof
1442e12512
Fixing compiler warnings with strict CXXFLAGS
2013-03-01 08:06:59 +01:00
Nico Kruithof
d1bb7d7bc8
remove debug log message
2013-02-28 20:40:36 +01:00
Andreas Fabri
84a7061b15
remove unused parameter name
2013-02-28 16:40:57 +01:00
Andreas Fabri
a3eafddd16
virtual function of derived class must match the API of the base class
2013-02-26 07:35:51 +01:00
Laurent Rineau
2d8da664a3
Merge branch 'CGAL-fix_warnings-gdamiand'
...
Conflicts:
.gitignore
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
Laurent Rineau
7f3045ee11
Remove the use of CGAL_SVN_REVISION
...
src/CGAL_Qt4/DemosMainWindow.cpp was the sole user of the macro
CGAL_SVN_REVISIONS, in CGAL's master branch. That macro is useless since
the switch to Git.
2013-02-21 15:26:03 +01:00
Laurent Rineau
26a7e70785
New license.txt files (eol changes)
...
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +01:00
Nico Kruithof
e940cf20e0
Merge branch 'master' into Periodic_2_triangulation_2-nkruithof
...
Conflicts:
Documentation/doxyassist.xml
2013-02-05 14:25:56 +01:00
Nico Kruithof
c97a1a1fbb
Worked on the dual functions
2013-02-05 14:07:12 +01:00
Andreas Fabri
61bb99e2f1
use types
2013-02-04 22:39:00 +01:00
Andreas Fabri
ee5b4683d0
deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3
2013-01-31 09:47:54 +01:00
Nico Kruithof
b11bdb4513
moved circumcircle from triangulation to delaunay triangulation
2013-01-28 08:05:48 +01:00
Nico Kruithof
27b2fb7054
Locating a point within the periodic domain
...
Using a hint for the face handle to speed up point location
Making sure that the chance is big that the face handle still exists
2013-01-28 07:57:19 +01:00
Nico Kruithof
b3e580c350
Implemented the Conflict zone in the demo
2013-01-26 22:08:54 +01:00
Nico Kruithof
fa1b7493f0
Fixing locating points outside the periodic domain
2013-01-25 17:37:11 +01:00
Nico Kruithof
b8babf5964
Adding conflict zone visuals to the single point insertion
2013-01-25 17:31:46 +01:00
Nico Kruithof
5487601ae1
Implemented the empty circumcircle button
2013-01-25 17:18:44 +01:00
Nico Kruithof
ae5565d912
Working on the P2T2 demo
2013-01-24 21:16:54 +01:00
Nico Kruithof
05f7dbc322
Working on the demo, adding more icons to the toolbar
2013-01-24 20:21:01 +01:00
Nico Kruithof
d23bb62118
Moved the Periodic demo to the graphicsview package. This makes it easier to find icons and other resources
2013-01-22 10:12:49 +01:00
Andreas Fabri
1ae5df0172
When reading a file with 2D points, read the x and y, and ignore the rest of the line. This implies 1 point per line.
2013-01-08 10:31:41 +01:00
Sébastien Loriot
7e095c7a7a
Merge branch 'Documentation-flat-ref-manual-pmoeller'
2013-01-04 15:19:57 +01:00
Sébastien Loriot
a109eb2d8a
graphics View grouping
2013-01-04 10:54:52 +01:00
Sébastien Loriot
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
Philipp Möller
75f69570dc
Change the titles of mainpages to "User Manual"
...
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
2012-12-13 14:47:09 +01:00
Philipp Möller
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
Efi Fogel
acb7dcebbc
Porting of the 2D Arrangements demo to Qt4
2012-11-29 11:14:01 +02:00
Sébastien Loriot
9576be3c3b
add doc in dont_submit
2012-11-27 08:42:02 +01:00
Sébastien Loriot
920eb63882
backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller
...
Conflicts:
Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
Installation/doc_tex/Installation/usage.tex
Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
2012-11-23 22:54:31 +01:00
Sébastien Loriot
88dd673c40
backport commit in tex file from master into doxygen
2012-11-23 17:06:47 +01:00
Andreas Fabri
625f9f6cd7
after git merge remotes/origin/hot-fixes-for-Git
2012-11-20 13:02:17 +01:00
Sébastien Loriot
8d741d504d
remove % in section name
2012-11-14 16:10:15 +01:00
Sébastien Loriot
128b02abb8
update CGAL custom doxygen macros
...
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
2012-11-14 00:31:05 +01:00
Sébastien Loriot
5ee1081f92
using cgal macros for all figures
2012-11-08 17:17:29 +00:00
Sébastien Loriot
ae159cbdf3
replace markup #, ##, ### by \section, \subsection and \subsubsection
...
(script replacement)
2012-11-06 22:02:15 +00:00
Efi Fogel
1e3833930c
merged with next
2012-10-25 10:07:41 +00:00
Philipp Möller
31e9eadf8b
Fix all PackageDescriptions to a newer layout
2012-10-19 15:52:31 +00:00
Laurent Rineau
b7b4b5f43e
s/qt.nokia.com/qt.digia.com/g
2012-10-08 08:02:37 +00:00
Andreas Fabri
59c77aec24
finished
2012-10-05 19:03:19 +00:00
Philipp Möller
bc48dfe5a0
Be consistent about author/authors
2012-10-03 16:40:16 +00:00
Philipp Möller
c9fdbf3edb
Add an anchor to each level one heading, so we get a nice tree in the
...
user manuals.
2012-10-02 11:53:01 +00:00
Philipp Möller
37778547bf
Fix example to point to paths similar to a flat layout
2012-10-01 18:02:44 +00:00
Laurent Rineau
e3cb421cd2
Fix: allow the drap&drop of a collection of files, and open all of them...
...
... instead of opening only the first one.
2012-09-27 13:29:40 +00:00
Philipp Möller
9d96057636
Add PkgDependsOn to the package summary
2012-09-27 11:13:37 +00:00
Philipp Möller
b64ba48134
The changes to move the package overview labels into the
...
PackageDescription.
2012-09-25 17:17:49 +00:00
Philipp Möller
1954eff3d6
* build normalized mainpage anchors
...
* better naming for Pkg commands
* User and Reference Manual links from the PackageOverview
2012-09-20 15:30:03 +00:00
Andreas Fabri
6f61e2b2ee
Downsize headings
2012-09-17 14:53:05 +00:00
Philipp Möller
864aebe2e5
Merge next.
...
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
2012-09-12 14:14:22 +00:00
Philipp Möller
5a0a5403c4
Enable autotoc on mainpages
2012-08-29 15:45:17 +00:00
Philipp Möller
e2616dafb1
Rebuild the how_to_cite structure
2012-08-28 17:33:45 +00:00
Andreas Fabri
a1724dfcc7
typo
2012-08-27 19:50:44 +00:00
Andreas Fabri
4bcb13f7a2
% to unlink
2012-08-27 12:20:04 +00:00
Philipp Möller
76aacb1add
Change created package names to be the pretty printed version instead
...
of the readable, short, easy-to-remember SVN version.
2012-08-23 17:00:30 +00:00
Laurent Rineau
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
Andreas Fabri
af87732f6a
Add \anchor of chapters
2012-08-21 10:18:58 +00:00
Philipp Möller
d3a9a641de
Refurb package descriptions with a label for the license.
2012-08-20 14:28:36 +00:00
Philipp Möller
6a45864c1a
Throw a set of ported doc files under version control
2012-08-09 16:07:44 +00:00
Eric Berberich
5f524b0802
subdirectories in src finally get correct name
2012-08-03 17:21:30 +00: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
Laurent Rineau
8e167590c8
Use include_directories(SYSTEM ...) for 3rd-party libraries
...
gcc has an option -isystem, that can replace -I. The documentation is:
-isystem dir
Search dir for header files, after all directories specified by -I but
before the standard system directories. Mark it as a system directory,
so that it gets the same special treatment as is applied to the
standard system directories. If dir begins with "=", then the "=" will
be replaced by the sysroot prefix; see --sysroot and -isysroot.
The "special treatment" means that gcc will not warn about constructions in
headers in directories pointed by -isystem instead of -I.
In the CGAL testsuite, there are a lot of warnings that comes from
third-party libraries (mostly from Boost, but also from Eigen).
This patch tells cmake to use -isystem with gcc, for all CGAL 3rd-party
directories.
2012-08-01 10:53:37 +00:00
Laurent Rineau
a7a89c25b7
add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless
...
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
2012-07-31 16:18:17 +00:00
Alex Tsui
09857e2e74
Used sfinae to use circular and non-circular kernels with Converter.
2012-07-30 21:03:25 +00:00
Ophir Setter
005904363f
Taking the multiplicity from base class. This caused all 64-bit programs to crash
2012-07-06 07:13:42 +00:00
Laurent Rineau
4953bbbc86
Remove buggy executable bits
2012-07-04 19:28:22 +00:00
Eric Berberich
bc6d9c1005
fixed typo: added missing '_'
2012-07-03 10:53:25 +00:00
Eric Berberich
d4cb1c2212
SetupDependicies needs also to check for essential lib (not just WITH_<lib>), side effect: mandatory->essential
2012-06-29 15:24:30 +00:00
Laurent Rineau
947dd14f31
Minor fix: ensure the OpenGL version is displayed by test results pages
2012-06-29 10:57:59 +00:00
Eric Berberich
b5a4e941fd
the mandatory libs need an particular order, and we simplify with a macro
2012-06-29 09:24:19 +00:00
Laurent Rineau
70e00b3d6e
First fix for Windows: the auto-linking needs link_directories commands
2012-06-28 15:32:04 +00:00
Eric Berberich
eb6c435c4a
correct spelling of GMPXX_FOUND variable
...
FOUND_GMPXX -> GMPXX_FOUND
2012-06-28 13:02:32 +00:00
Eric Berberich
df72a1aa08
macro use_lib now has an optional second parameter for UseFile
...
this avoids a nasty hack with checking for a leading ### in a string and
allows to use "use_lib( FOO )" in other places much easier
2012-06-28 12:20:52 +00:00
Eric Berberich
67291a2c6d
merge from next
2012-06-24 12:17:32 +00:00
Philipp Möller
ea6635c86d
Include the header with the declaration so that the declaration with
...
the attribute precedes the definition.
2012-06-20 10:20:27 +00:00
Alex Tsui
7ba8b08c4d
Implemented insertion and removal of segments to arrangements.
2012-06-15 05:28:38 +00:00
Eric Berberich
b6e350ccfa
removed old verbose output
2012-06-11 22:24:22 +00:00
Eric Berberich
463a030267
removed old verbose output
2012-06-11 22:23:28 +00:00
Laurent Rineau
7b2e34d267
merge with next
2012-01-27 16:46:42 +00:00
Laurent Rineau
2fbd163e14
Factorize the installation command of CGAL library into the macro
...
The macro build_cgal_library(..) now defines the installation rules. That
should also fix a bug: now .dll files will be installed in
${CGAL_INSTALL_BIN_DIR}.
2012-01-25 16:49:39 +00:00
Laurent Rineau
8b413cef28
Remove variables CGAL_<lib>_BASENAME: no longer used.
2012-01-25 16:37:06 +00:00
Eric Berberich
8b63cf18fd
fixed spacing
2012-01-24 13:13:27 +00:00
Eric Berberich
832c6c02e7
merge from next; installation.tex got major changes
2012-01-23 13:54:58 +00:00
Andreas Fabri
792deb3819
Fix for Windows 'min/max' bug and remove superfluous #include
2012-01-19 08:43:49 +00:00
Andreas Fabri
0d56ed88dc
Fix for Windows 'min/max' bug
2012-01-19 08:11:02 +00:00
Andreas Fabri
560246e34b
Fix for Windows 'min/max' bug
2012-01-19 08:07:40 +00:00
Andreas Fabri
0a89e16d86
Fix for Windows 'min/max' bug
2012-01-19 08:00:17 +00:00
Andreas Fabri
77f3648287
Fix for Windows 'min/max' bug
2012-01-18 12:02:15 +00:00
Andreas Fabri
26ec45fee9
Fix for Windows 'min/max' bug
2012-01-18 11:27:10 +00:00
Andreas Fabri
844e7869fa
Fix for Windows 'min/max' bug
2012-01-18 11:25:40 +00:00
Andreas Fabri
10d334d4a5
Fix for Windows 'min/max' bug
2012-01-18 11:21:11 +00:00
Andreas Fabri
73a21e0f47
Fix for Windows 'min/max' bug
2012-01-18 11:17:08 +00:00
Andreas Fabri
ae3244e596
Fix for Windows 'min/max' bug
2012-01-18 11:15:52 +00:00
Andreas Fabri
f880735fbf
Fix for Windows 'min/max' bug
2012-01-18 11:14:44 +00:00
Sébastien Loriot
f6784b96e7
merge from next
2012-01-17 13:47:33 +00:00
Laurent Rineau
29d617e712
Cosmetic change: add a space after the license, to be compatible
...
with the output of licensecheck
2012-01-16 15:56:10 +00:00
Laurent Rineau
a37c74d534
Add license files, per package
2012-01-16 15:54:22 +00:00
Sébastien Loriot
a7456a2736
merge from next
2012-01-16 15:28:51 +00:00
Sébastien Loriot
fca9a7bf54
*add operator>> for Constrained_triangulation_2
...
*update demo
*add save CDT for demo
see the related small feature:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_read_istream_for_constrained_triangulation .
2012-01-16 13:32:05 +00:00
Laurent Rineau
79f41a6c2f
Add a license header
2012-01-16 10:54:58 +00:00
Laurent Rineau
2af2160942
Turn \ccLicenseQPL into \ccLicenseGPL
2012-01-13 17:13:55 +00:00
Laurent Rineau
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
Eric Berberich
a42d72acaa
CGAL_USE_GMPXX is only set by use_lib macro
2012-01-11 00:00:05 +00:00
Eric Berberich
00d31036ea
build_cgal_library -> collect_cgal_library (new macro name)
2012-01-10 18:17:53 +00:00
Eric Berberich
10af9912d9
CGALcomponent libs are not own CMake projects anymore
2012-01-10 18:13:19 +00:00
Eric Berberich
9cd61d509c
let QT compile
2012-01-10 12:31:59 +00:00
Eric Berberich
66bc1cef1e
merge from next
2012-01-09 12:42:00 +00:00
Laurent Rineau
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
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
Laurent Rineau
93486787c3
The inside of ccPkgDescription must not contain black lines between macros
...
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
2011-11-15 19:16:23 +00:00
Olivier Devillers
f5636aa2fa
merge next
2011-11-04 12:57:12 +00:00
Laurent Rineau
6ed56d75b5
merge from next
2011-10-25 15:48:02 +00:00
Andreas Fabri
c5c387f45e
workaround to avoid an unjustified warning of g++
2011-10-24 13:21:59 +00:00
Laurent Rineau
13447f666c
auto-link files must include <CGAL/config.h>
...
<CGAL/config.h> includes <CGAL/compiler_config.h>, that is generated during
the build of libraries. CGAL_BUILD_SHARED_LIBS is defined in it.
2011-10-24 09:23:21 +00:00
Olivier Devillers
c239517f42
remove warning
2011-10-24 07:55:45 +00:00
Laurent Rineau
c37ce187ff
Factorize the settings of VERSION/SOVERSION properties of libraries
2011-10-19 15:53:46 +00:00
Laurent Rineau
338c6a9925
Update the export feature to non-Microsoft compilers
...
Support the ELF visibility feature of gcc/icl/clang
2011-10-18 16:53:54 +00:00
Laurent Rineau
9059b29647
Fix and factorize post-build commands on Windows
...
The function build_cgal_library defined in
Installation/src/CMakeLists.txt now handles a lot more than before, to
factorize between the various */src/*/CMakeLists.txt files used to
build CGAL libraries.
For example, the definition of mangled names is now factorized in that
function.
Installation/src/CMakeLists.txt also sets the output directories for
runtime, shared libraries, and static libraries. DLLs will be created
in bin/ instead of lib/.
2011-10-17 16:02:12 +00:00
Laurent Rineau
5946c69608
merge from next
2011-10-12 13:52:06 +00:00
Andreas Fabri
94191c33e7
fix a memory leak
2011-10-12 12:37:45 +00:00
Andreas Fabri
7566f2cdcc
Max area k-gon is implemented for k=3; Additionally the input must be convex
2011-10-12 11:08:33 +00:00
Andreas Fabri
1211b00e3b
bug fix: Check if item exists before removing it
2011-10-12 11:04:19 +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
4b355f0561
merge from next
2011-10-11 12:28:22 +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
Andreas Fabri
99408ec652
Disambiguate beginning of comment
2011-10-06 19:49:16 +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
Sébastien Loriot
75999b64d9
remove executable property
2011-10-03 08:22:54 +00:00
Sébastien Loriot
554f62d411
remove executable property from copyright files
2011-10-03 08:18:16 +00:00
Andreas Fabri
d10a333947
Add a file with the copyright holder(s) to the package_info
2011-09-29 20:45:16 +00:00
Laurent Rineau
fdb7ea6c6b
prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012)
2011-09-28 16:15:05 +00:00
Sébastien Loriot
eea04efa5f
remove debug output
2011-09-27 15:40:56 +00:00
Sébastien Loriot
22d59a631a
read constraints
2011-09-27 15:22:18 +00:00
Laurent Rineau
c6b789ca60
Allow to load a .cgal file (result of the operator<< of a CDT)
2011-09-27 15:12:34 +00:00
Philipp Möller
f9b288db90
Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
...
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Laurent Rineau
9fec0d4a60
Fix revision 64600
...
The revision 64600 was the merge of next into the branch
features/Aos_2-new_functors-tau. For an unknown reason (maybe a buggy svn
version), that merge forgot to apply some revision of next. And those
revision were thus cancelled when the branch has been reintegrated back
into next.
I am trying to fix that. This branch is a copy of the branch
features/Aos_2-new_functors-tau@64599 where the merge of next has been
reapplied. Let's see what are the differences with the buggy revision
64000.
2011-07-06 10:29:57 +00:00
Andreas Fabri
0a76c8f5d2
Add whitespace to avoid warning on closing comment
2011-06-29 10:58:44 +00:00
Laurent Rineau
ac9877372d
Update all PkgDescription files to CGAL-3.9
2011-06-27 14:31:45 +00:00
Eric Berberich
fbc101fbb8
Merge from nextwq
2011-06-15 09:20:39 +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
218f4abf1d
BUGFIX: when using clear button, really hide the rectangles
2011-06-09 08:36:32 +00:00
Sébastien Loriot
dafa949e75
BUGFIX: do not run rectangular_p_center_2 if the number of points is less than p
...
+cosmetic
2011-06-08 13:39:09 +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
f9c4053a0d
do not execute discoverComponent if the dimension of the triangulation
...
is not 2 (avoid seg fault when inserting a segment or a point)
2011-06-08 09:00:08 +00:00
Sébastien Loriot
1a6c568887
remove unused var warning
2011-06-08 07:50:16 +00:00
Eric Berberich
8d9c812cb4
merge from next
2011-06-07 15:54:55 +00:00
Laurent Rineau
0a363c52b5
Fix a bug introduced in trunk: criteria for Mesh_2 needs a geom traits
2011-06-04 17:00:31 +00:00
Eric Berberich
a7a06c4e2b
replaced Arr_..._side_category with :.._side_category
2011-05-31 18:08:54 +00:00
Laurent Rineau
7f7a8dc358
merge from trunk
2011-05-16 11:28:24 +00:00
Ophir Setter
83e1cfa332
Removing unnecesary comment
2011-05-06 05:58:11 +00:00
Laurent Rineau
704571e29d
Fix cmake_minimum_required
2011-04-28 18:04:28 +00:00
Laurent Rineau
3c02e07b23
Try to fix my last revision about cmake_policy, with CMake-2.6.x
...
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau
c97205f085
Global handling of CMake policies (second part)
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau
4b795c56f4
Global handling of CMake policies
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
2011-04-28 10:33:17 +00:00
Laurent Rineau
6f05e72cef
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 18:06:32 +00:00
Laurent Rineau
ca5c92e034
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Eric Berberich
eb7a5ed11e
branch-build is now HOT on next ;-)
2011-04-15 09:12:06 +00:00
Laurent Rineau
5a115a6792
Remove erroneous executable permission
2011-03-15 10:23:40 +00:00
Laurent Rineau
6036b7ca4b
Typo: a resource was not found because its path was wrong.
2011-03-14 12:51:17 +00:00
Laurent Rineau
59356984de
In the popup "About CGAL...", do not display the SVN revision number if the
...
release is a public release.
If the CGAL_Qt4 library is configured while there is an environment
variable CGAL_FAKE_PUBLIC_RELEASE, then the release version string is
stripped from its -I-.* part, so that is it equivalent to the version
string of the public release.
2011-03-09 12:49:30 +00:00
Sébastien Loriot
3698d4528c
use CGAL namespace
2011-02-28 07:40:38 +00:00
Sébastien Loriot
ae62b2ae4d
remove warnings
2011-02-24 16:36:04 +00:00
Laurent Rineau
da95064578
Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011).
2011-02-24 15:21:10 +00:00
Ophir Setter
2f91e1af2e
Changing name to L1_Voronoi_diagram_2 and removing .scm-urls files
2011-02-04 06:12:32 +00:00
Ophir Setter
a5d3cbc877
Adding L1_voronoi_diagram_2 example for the Envelope_3 package
2011-02-03 05:31:34 +00:00
Eric Berberich
987c9bbcd5
added Minkowski sum with itself (AF has accepted this extension)
2010-12-20 14:15:46 +00:00
Andreas Fabri
7520c27371
ItemUsesExtendedStyleOption is available only starting from Qt 4.6
2010-12-13 19:28:34 +00:00
Andreas Fabri
de2413466a
Reorder initialization
2010-12-12 20:34:18 +00:00
Andreas Fabri
716d469af5
cleanup
2010-11-12 09:03:43 +00:00
Laurent Rineau
3af1511a79
A polygon with two vertices... well, that is not a polygon! Then do not
...
insert its single edge twice!
2010-11-10 18:50:19 +00:00
Laurent Rineau
f1549b69ba
PainterOstream can now paint bboxes
2010-11-09 09:12:58 +00:00
Laurent Rineau
11b8bf1ce9
Open files whose names/paths are given on the command line.
...
(Maybe that should go to CGAL::Qt::DemosMainWindow.)
2010-11-09 08:46:31 +00:00
Marc Glisse
4177858be9
Use types consistently to avoid warning.
2010-10-29 13:12:27 +00:00
Andreas Fabri
caf090bfff
Conditional use of more recent Qt feature
2010-09-27 11:45:15 +00:00
Andreas Fabri
181646f64b
Add some QT_USE_.. as this is the only difference I see to the Alpha shapes demo which finds Qt4 in the 3.8-I-39 testsuite
2010-09-27 11:28:10 +00:00
Andreas Fabri
818e9909f6
Add max area k-gon
2010-09-23 15:58:54 +00:00
Andreas Fabri
93712c46cd
Add recenter and improve help
2010-09-23 14:42:13 +00:00
Andreas Fabri
20e83656cf
cleanup and use of CrossCursor only in the GraphicsView
2010-09-23 12:22:24 +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
b8db07094a
Draw points with line width 0, otherwise it is too slow when we have 1mio points
2010-09-23 09:25:29 +00:00
Andreas Fabri
2b8df41cdb
cleanup
2010-09-23 07:52:35 +00:00
Andreas Fabri
ef0c072342
Switch to PointsGraphicsItem that uses a kd-tree to quickly determine what points to redraw
2010-09-23 07:52:12 +00:00
Andreas Fabri
4306b967ee
cleanup
2010-09-23 07:32:53 +00:00
Andreas Fabri
044dab1d6d
Add typename
2010-09-23 07:30:03 +00:00
Andreas Fabri
476713ca97
Add a graphics item for a point set in a kd-tree
2010-09-22 20:22:58 +00:00
Andreas Fabri
e42710f1d2
cleanup
2010-09-22 20:22:00 +00:00
Andreas Fabri
569850f2f3
Access value type of iterator of container instead of value type of container
2010-09-22 14:34:35 +00:00
Andreas Fabri
086ce1423f
First version of a Qt4 based 2D spatial searching demo
2010-09-22 14:31:13 +00:00
Andreas Fabri
17fca99269
Set a pen
2010-09-22 06:16:09 +00:00
Andreas Fabri
b7f4ea49b6
Add typename
2010-09-22 06:15:46 +00:00
Andreas Fabri
5a4f57be05
Add #include file
2010-09-22 06:15:29 +00:00
Andreas Fabri
2d9beb8ef3
Add function to resive the grid
2010-09-21 13:26:25 +00:00
Andreas Fabri
b8e5221f14
Add icons for snap rounding demo
2010-09-21 13:25:46 +00:00
Andreas Fabri
0239147049
Add icons for snap rounding demo
2010-09-21 13:25:29 +00:00
Andreas Fabri
78f805a6e2
Add IO and minor polish
2010-09-21 12:15:08 +00:00
Andreas Fabri
106fe433e0
the item must not itself decide to hide or show
2010-09-21 10:43:22 +00:00
Andreas Fabri
0ba646cb24
Add on/off for grid,input,output and allow to change delta
2010-09-21 10:42:11 +00:00
Andreas Fabri
e7003b45ca
intial version of Qt4 based Snaprounding demo
2010-09-20 20:24:27 +00:00
Andreas Fabri
7e26a61cf4
intial version of Qt4 based Snaprounding demo
2010-09-20 20:23:15 +00:00
Andreas Fabri
d1ea6a8cb7
Rename vector field graphics item
2010-09-20 12:19:14 +00:00
Andreas Fabri
283ceae0b8
Rename vector field graphics item
2010-09-20 12:18:41 +00:00
Andreas Fabri
270081a303
cleanup
2010-09-20 09:44:32 +00:00
Andreas Fabri
c04f9aa037
Recenter when loading
2010-09-19 19:32:17 +00:00
Andreas Fabri
e04ca077c1
Add a GraphicsItem for the vector field
2010-09-17 20:57:27 +00:00
Andreas Fabri
779a234fab
Add a GraphicsItem for the vector field
2010-09-17 20:56:59 +00:00
Andreas Fabri
4d58757564
Fix name of file protection variable
2010-09-17 14:20:59 +00:00
Andreas Fabri
ed31acec91
Remove button
2010-09-07 11:29:44 +00:00
Andreas Fabri
c1ede1357a
Change site and edge color
2010-09-07 11:28:32 +00:00
Andreas Fabri
14ea9ef8bc
Change site and edge color
2010-09-07 11:28:04 +00:00
Andreas Fabri
1a7b49eca6
weight is the radius
2010-09-07 10:14:16 +00:00
Andreas Fabri
31dcbec573
weight is the radius
2010-09-07 10:13:45 +00:00
Andreas Fabri
3b4a54546d
Qt3 -> Qt3
2010-09-03 17:06:00 +00:00
Andreas Fabri
1545a1afe5
cleanup
2010-09-03 17:04:42 +00:00
Andreas Fabri
ec956b4044
cleanup
2010-09-03 17:03:23 +00:00
Andreas Fabri
f109e91c35
cleanup
2010-09-03 17:02:23 +00:00
Andreas Fabri
50617cdbeb
cleanup of my mess
2010-09-03 16:59:29 +00:00
Andreas Fabri
57666e687c
Qt4 based streamlines demo
2010-09-03 14:22:46 +00:00
Andreas Fabri
3a9132778d
Qt4 based streamlines demo
2010-09-03 14:20:48 +00:00
Andreas Fabri
c5818246ba
cleanup
2010-08-31 12:59:10 +00:00
Andreas Fabri
ea87ef81b6
Applications shall only go on the virtual screen (based on stored settings from a previous session), if the latter is available
2010-08-31 11:32:14 +00:00
Andreas Fabri
6208b71aaf
Towards a Qt4 based Apollonius_graph_2 demo
2010-08-25 15:04:34 +00:00
Andreas Fabri
82a6dfccd1
Towards a Qt4 based Apollonius_graph_2 demo
2010-08-25 15:02:06 +00:00
Andreas Fabri
4ff8be1faa
Qt4 based largest empty iso rectangle demo
2010-08-24 17:11:41 +00:00
Andreas Fabri
3dc854d29c
const QString& -> QString
2010-08-23 10:46:15 +00:00
Laurent Rineau
7606b93406
Merge last unmerged revision from the branch CGAL-3.7-branch:
...
| ------------------------------------------------------------------------
| r57979 | lrineau | 2010-08-11 15:24:20 +0200 (Wed, 11 Aug 2010) | 1 line
|
| Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
| ------------------------------------------------------------------------
| r58026 | stayeb | 2010-08-12 17:40:41 +0200 (Thu, 12 Aug 2010) | 2 lines
|
| Bug fix: ensure that c3t3 contains no in complex cell when starting a new refinement process. We need this because the first refinement of the surface does not update the volume, so c3t3 can't know that in complex cells have been deleted.
|
| ------------------------------------------------------------------------
(That shows it is difficult to avoid to merge the release branch in the
trunk from time to time.)
2010-08-20 13:09:22 +00:00
Laurent Rineau
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
Laurent Rineau
df1a58b1ab
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
2010-08-20 09:50:54 +00:00
Laurent Rineau
c89de3f1f0
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
2010-08-20 09:45:26 +00:00
Fernando Cacciola
72ed56006a
Reverting to release 3.6
2010-08-19 05:06:11 +00:00
Andreas Fabri
117e2a3355
drag and drop now come from the demo base class
2010-08-14 14:26:05 +00:00
Andreas Fabri
d56793d6b9
Add the CMakeLists of the Qt4 based Alpha_shapes_2 demo
2010-08-14 14:18:37 +00:00
Andreas Fabri
a9f1752243
Add the AlphaShapeGraphicsItem
2010-08-14 14:17:40 +00:00
Andreas Fabri
4b7f51399f
Add drag and drop
2010-08-13 15:05:34 +00:00
Andreas Fabri
32c2d35f99
Add drag and drop
2010-08-13 15:04:14 +00:00
Andreas Fabri
7e02bcebfe
Add drag and drop
2010-08-13 15:01:05 +00:00
Andreas Fabri
e88b07fd02
Added a Qt4 based 2D Alpha Shape demo
2010-08-13 14:49:39 +00:00
Andreas Fabri
eba2d33e3d
Remove event dropping as it is now provided by DemosMainWindow
2010-08-13 14:44:00 +00:00
Andreas Fabri
8ec4806dcc
Remove event dropping as it is now provided by DemosMainWindow
2010-08-13 14:42:09 +00:00
Andreas Fabri
bedfdf33d8
Move event dropping into DemosMainWindow
2010-08-13 14:38:51 +00:00
Laurent Rineau
26c4d0086d
Fix drap&drops: the graphicsview must not accept drops. By default,
...
graphics views accepts them.
2010-08-13 13:31:41 +00:00
Laurent Rineau
b88a30d51b
Backport from trunk:
...
| ------------------------------------------------------------------------
| r58013 | afabri | 2010-08-12 15:23:19 +0200 (Thu, 12 Aug 2010) | 1 line
| Changed paths:
| A /trunk/GraphicsView/demo/Bounding_volumes/icons/convex_hull.png
| A /trunk/GraphicsView/demo/Bounding_volumes/icons/min_ellipse.png
| A /trunk/GraphicsView/demo/Bounding_volumes/icons/min_parallelogram.png
| A /trunk/GraphicsView/demo/Bounding_volumes/icons/min_quadrilateral.png
| A /trunk/GraphicsView/demo/Bounding_volumes/icons/p_center.png
|
| more icons
| ------------------------------------------------------------------------
| r58014 | afabri | 2010-08-12 15:25:39 +0200 (Thu, 12 Aug 2010) | 1 line
| Changed paths:
| M /trunk/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
| M /trunk/GraphicsView/demo/Bounding_volumes/Bounding_volumes.qrc
| M /trunk/GraphicsView/demo/Bounding_volumes/Bounding_volumes.ui
|
| Added toggle buttons so that the different bounding_XX can be switched on and off
| ------------------------------------------------------------------------
| r58016 | afabri | 2010-08-12 15:46:50 +0200 (Thu, 12 Aug 2010) | 1 line
| Changed paths:
| M /trunk/GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h
|
| A GraphicsItem should not call itself show() and hide()
| ------------------------------------------------------------------------
2010-08-12 13:49:43 +00:00
Andreas Fabri
622eb3ce67
A GraphicsItem should not call itself show() and hide()
2010-08-12 13:46:50 +00:00
Andreas Fabri
c40a4eb1f1
Added toggle buttons so that the different bounding_XX can be switched on and off
2010-08-12 13:25:39 +00:00
Andreas Fabri
2f9a4cd565
more icons
2010-08-12 13:23:19 +00:00
Laurent Rineau
225672765a
Backport from trunk:
...
| ------------------------------------------------------------------------
| r57993 | lrineau | 2010-08-11 18:02:00 +0200 (Wed, 11 Aug 2010) | 5 lines
|
| Massive change in all .qrc files: the attribute lang= must not be used. It
| must be only used to create an alternative for another lang. If a resource
| exists only with lang=, then that resource will not be found if the locale
| had not that language.
|
| ------------------------------------------------------------------------
2010-08-11 16:03:25 +00:00