songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
106,750 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

538 Commits

Author SHA1 Message Date
Maxime Gimeno f39fce13e3 Remove remaining #version from compatibility glsl and use compatibility shaders in basic_viewer 2019-03-15 13:36:36 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Maxime Gimeno d069b6f673 Only use -Wdeprecated-copy if GCC version is >=9 2019-01-30 11:15:51 +01:00
Andreas Fabri a7d65b7913 Try to fix Polyhedron examples with Basic Viewer 2019-01-24 18:22:02 +01:00
Andreas Fabri f627339eea Fix Vec and Exponent_vector 2019-01-15 18:32:48 +01:00
Maxime Gimeno 955053e239 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-12-11 10:49:41 +01:00
Maxime Gimeno 4571c4555e Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-11-28 11:58:55 +01:00
Guillaume Damiand edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 9c3faed5c5 Bug fixes; nyf 2018-11-26 22:06:13 +01:00
Sébastien Loriot e925b1aba6 Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF 
Polyhedron demo: remove the Scene_polyhedron_item
 2018-10-30 15:50:17 +01:00
Laurent Rineau 73dd93c4e1 Merge pull request #3405 from gdamiand/CGAL_basic_viewers-bugfix-gdamiand 
Basic viewers: bugfix for Epeck
 2018-10-29 10:27:37 +01:00
Maxime Gimeno ceee4b8e2d fix axis system 2018-10-26 17:24:10 +02:00
Maxime Gimeno 9e563d1307 Fix conflicts 2018-10-16 09:30:04 +02:00
Guillaume Damiand f8a9bec308 Expose local type so that we can use them in basic viewers. 2018-10-15 14:18:24 +02:00
Maxime Gimeno b0bf4e371f Remove wrong permissions 2018-10-08 12:07:26 +02:00
Maxime Gimeno 20a6797bea Replace nullptr by NULL in qglviewer. 2018-10-08 11:55:24 +02:00
Maxime Gimeno 32c0064900 Use the same QSettings everytime to save 200ms everytime. 2018-10-05 15:56:42 +02:00
Maxime Gimeno d6c1301e0a Fix conflicts 2018-10-04 14:06:16 +02:00
Maxime Gimeno c3fab3df15 workaround for multiple linking under windows. 2018-10-03 09:16:27 +02:00
Maxime Gimeno ab3ad395fc RemoveViewer on context destroyed 2018-10-03 09:02:43 +02:00
Maxime Gimeno 6d54163bbd Edit_sphere_item 2018-09-25 12:13:37 +02:00
Maxime Gimeno 9ca2833588 Fix conflicts, fix polygon_soup normals computation, change Extrude Item text. 2018-09-24 11:34:32 +02:00
Maxime Gimeno 665c25886a Done textured_item and selection_item 2018-09-20 15:11:43 +02:00
Guillaume Damiand 865e6bf01e Move operator << inside CGAL::qglviewer namespace. 2018-09-11 17:26:15 +02:00
Maxime Gimeno fd27bd9c09 Share VBOs between viewers. 2018-09-11 13:06:02 +02:00
Guillaume Damiand 1db0bd0a79 Bugfix for operator<< 2018-09-11 11:46:26 +02:00
Guillaume Damiand 64c7a083ce Bugfix in doc 2018-09-11 11:46:13 +02:00
Guillaume Damiand 243a12be43 Fix viewer in 2D for 2D data sets. 2018-09-10 12:20:10 +02:00
Guillaume Damiand bf20b43ea5 Start to implement 2D mode for viewers; nyf. 2018-09-07 20:19:41 +02:00
Guillaume Damiand 71555b18cf Update namespace 2018-09-06 18:46:39 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Maxime Gimeno e5aaab93d5 Remove visibleBbox from scene. Working subviewer. 2018-09-04 10:35:46 +02:00
Maxime Gimeno 06ce5dddca WIP : trying to figure out why the items are not drawn. 2018-09-03 10:51:01 +02:00
Maxime Gimeno daac3e124d WIP: integrate is_sharing in qglviewer 2018-09-03 09:21:09 +02:00
Maxime Gimeno 805e4669e4 Avoid having the visual hints hidden by the mesh when zooming too much. 2018-08-21 09:32:29 +02:00
Maxime Gimeno 818e0d1f11 Clean-up 2018-07-06 12:33:52 +02:00
Maxime Gimeno c8adcc3e86 Downgrade to GLSL 150 (OpenGL 3.3) because of some systems. 2018-07-05 15:35:30 +02:00
Maxime Gimeno b68f63e508 Fix basic_viewer 2018-07-05 15:21:58 +02:00
Maxime Gimeno 4c58c214c3 make 2 versions of all shaders : 1 for --old and 1 for 4.3 2018-07-05 14:34:10 +02:00
Maxime Gimeno 640243a658 Remove calls to glLineWidth, as OpenGL ES 2.0 doesn't support higher than 1. 2018-07-05 10:37:41 +02:00
Maxime Gimeno 9a258d081f Remove remaining calls to GL_LIGHT smth 2018-07-04 15:37:24 +02:00
Jane bace15874b to the app to force use 2.1 context.he commit. 2018-07-04 13:34:26 +01:00
Maxime Gimeno 73adc3e300 Fix edit_plugin 2018-07-04 13:58:01 +02:00
Jane d72fd85053 context is correct.commit message for your changes. Lines starting 2018-07-04 12:52:27 +01:00
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Maxime Gimeno 2dbbca18b3 Restore point size 2018-07-02 11:09:48 +02:00
Maxime Gimeno 54e0e16167 Restore 4.3 context 2018-07-02 10:04:40 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Laurent Rineau 2b33f0690d Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF 
Polyhedron demo: add some OpenGL debugging information
 2018-06-14 17:36:54 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand 
Add basic viewers
 2018-06-14 17:36:37 +02:00
Laurent Rineau 3a4121b207 Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF 
Polyhedron demo:Fix_orthographic selection

# Conflicts:
#	GraphicsView/include/CGAL/Qt/qglviewer_impl.h
 2018-06-14 17:36:26 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace 2018-06-12 16:15:34 +00:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Guillaume Damiand c08546276b Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined. 2018-06-11 13:06:20 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00
Maxime Gimeno 1c6a96d1cf Add qt gl debugging info. 2018-06-06 16:59:34 +02:00
Maxime Gimeno c4b28fd000 Remove the using namespace from the impl files 2018-06-06 16:15:55 +02:00
Laurent Rineau 1f646405e8 Fix -Wconversion warnings (and a few others) in QGLViewer 2018-06-05 14:48:24 +02:00
Maxime Gimeno 39a645883b add misisng namespace before EXIT_VIEWER 2018-06-05 09:45:40 +02:00
Maxime Gimeno 2e56820d8d Fix after rebase 2018-06-04 12:00:22 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Maxime Gimeno 025968643b Fix_orthographic selection 2018-06-04 11:44:56 +02:00
Andreas Fabri 1969ee9853 Fix the license header, as the dual licensing does not apply to pur fork 2018-05-31 10:05:46 +01:00
Andreas Fabri f5b6ec67ef Remove 'using namespace std;' from the qglviewer files 2018-05-31 09:44:49 +01:00
Maxime Gimeno 979bde1025 Fix Triangulation_3 viewer 2018-05-29 11:27:53 +02:00
Guillaume Damiand 4c5b0d31d4 Remove unused variable 2018-05-29 11:11:50 +02:00
Andreas Fabri 4b14990209 Fix warnings; Remove typename in non-template code 2018-05-29 11:11:50 +02:00
Guillaume Damiand 39de8ac459 Add licence includes 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 82e30832ed Add a redraw method. 2018-05-29 11:04:57 +02:00
Guillaume Damiand f1e9fc7ed8 Move class in CGAL namespace 2018-05-29 11:04:57 +02:00
Guillaume Damiand 62492150e0 Update Buffer_for_vao and Basic_viewer_qt 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand cc3410a729 Bugfix in basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02:00
Maxime Gimeno d617e33253 Add possibly missing include QMouseEvent containing the Qt::NoButton enum. 2018-05-18 10:02:09 +02:00
Andreas Fabri 3804bf6983 Fix Triangulation_3 demo (CGAL_PI) 2018-05-18 08:01:26 +01:00
Andreas Fabri 13454d01c1 Replace M_PI with CGAL_PI 2018-05-17 10:26:08 +01:00
Maxime Gimeno f7d0fc72cd fix the <:: error 2018-05-17 10:20:57 +02:00
Maxime Gimeno 8bf7fcbfe1 Add missing license include 2018-05-17 10:20:57 +02:00
Maxime Gimeno f94a50646f Add license to new file 2018-05-17 10:20:57 +02:00
Maxime Gimeno 03aa69c039 Clean-up the code: 
Remove deprecated functions
Remove useless file
 2018-05-17 10:20:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Laurent Rineau 8fbab5edde Enfore singleton, using qApp->property 2018-05-17 10:20:56 +02:00
Jane Tournois 7d49e2fb17 make the copy-constructor private, and do not define it, 
to make sure it will not be used.

and add missing include
 2018-05-17 10:20:56 +02:00
Laurent Rineau 02d5c69066 typo: frok/fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 1c8b2a02c9 use CGAL_QT_EXPORT 2018-05-17 10:20:56 +02:00
Maxime Gimeno 9c1c0b027a Fix UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 130e42569e Fix snapshot for othographic view 2018-05-17 10:20:56 +02:00
Maxime Gimeno 55c3048a69 Remove GPL_EXCEPTION and add GeometryFactory 2018 copyrights 2018-05-17 10:20:56 +02:00
Maxime Gimeno c570c7ea7d Change text in licenzse headers tospecify this is a fork 2018-05-17 10:20:56 +02:00
Maxime Gimeno f1162b9914 Add missing tags in license headers 2018-05-17 10:20:56 +02:00
Maxime Gimeno cadee2cac1 force GPL 3.0 to test. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 89882de039 Update licenses 2018-05-17 10:20:56 +02:00
Maxime Gimeno f1700285de Restore snapshot feature in P3T3 demo 2018-05-17 10:20:56 +02:00
Maxime Gimeno 495b087c6f Finish snapshot implem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno fb10d4ac55 Fix errors. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 18e38c2344 Fix license GPL 3+ into GPL 3 2018-05-17 10:20:56 +02:00
Maxime Gimeno e7613f7841 restore erased file 2018-05-17 10:20:56 +02:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Maxime Gimeno 8c32592f83 Add missing file and fix interface for QGraphicsItem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 4d13eb724f Remove render video feature of loyd demo and fix drawvisualhnts in the qglviewer code. 2018-05-17 10:20:55 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00
Maxime Gimeno 3995c80524 fix warning in camera and fix fps display in cgal_qt5 so we don't have to overwrite it in the viewer 
Begin the implementation of the graphcal hints
 2018-05-17 10:20:55 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Maxime Gimeno 2156017402 Remove native gl.h include and native gl code in Surface_mesher/archive 2018-02-28 10:36:26 +01:00
Andreas Fabri 52549b1145 STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator 2018-02-14 18:46:45 +00:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF 
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
 2017-12-05 18:20:05 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Michael Vetter 154c48e8e3 Include OpenGL ES for arm 
If we compile CGAL with having Qt present on arm, Qt will use OpenGL ES
headers. But CGAL/gl.h includes specifically include <GL/gl.h> which are
the desktop headers. They cannot be mixed.
 2017-09-27 15:59:28 +02:00
Mael Rouxel-Labbé 16392c92d1 Fixed bare_point / weighted_point issue 2017-06-28 10:15:30 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files 
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
 2017-01-19 15:20:25 +01:00
Andreas Fabri 76d751be01 Use CGAL_FALLTHROUGH 2016-10-17 13:45:42 +02:00
Andreas Fabri 335a87df79 Fix package GraphicsView: include headers 2016-09-30 15:23:14 +02:00
Laurent Rineau 2bb72c7f26 Compatibility with QT_NO_KEYWORDS 2016-03-09 17:02:59 +01:00
Maxime Gimeno b9856fe1a7 - fix MESA 
Restoring the memory leak in order to keep the demo running on Mesa.
 2016-02-17 15:18:11 +01:00
Sebastien Loriot 69ba6238a3 Merge pull request #764 from maxGimeno/Fix_For_761 
Fix for 761
 2016-02-16 16:21:56 +01:00
Maxime Gimeno 507fdc9f58 Fix the MemoryLeak 2016-02-12 09:26:32 +01:00
Laurent Rineau 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
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 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 106fe433e0 the item must not itself decide to hide or show 2010-09-21 10:43:22 +00:00
Andreas Fabri e7003b45ca intial version of Qt4 based Snaprounding demo 2010-09-20 20:24:27 +00:00
Andreas Fabri d1ea6a8cb7 Rename vector field graphics item 2010-09-20 12:19:14 +00:00
Andreas Fabri e04ca077c1 Add a GraphicsItem for the vector field 2010-09-17 20:57:27 +00:00
Andreas Fabri 4d58757564 Fix name of file protection variable 2010-09-17 14:20:59 +00:00
Andreas Fabri c1ede1357a Change site and edge color 2010-09-07 11:28:32 +00:00
Andreas Fabri 1a7b49eca6 weight is the radius 2010-09-07 10:14:16 +00:00
Andreas Fabri 3a9132778d Qt4 based streamlines demo 2010-09-03 14:20:48 +00:00
Andreas Fabri 6208b71aaf Towards a Qt4 based Apollonius_graph_2 demo 2010-08-25 15:04:34 +00:00