Commit Graph

804 Commits

Author SHA1 Message Date
Guillaume Damiand ade06be0f0 Comment a test to simplify debugging. 2018-09-18 16:57:17 +02:00
Guillaume Damiand f52676769f Continue isotopy test. 2018-09-18 15:16:40 +02:00
Guillaume Damiand ee3ee27432 Continue draw for arrangement 2018-09-13 16:15:17 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +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
Guillaume Damiand ed81c8491c Add tests. 2018-09-04 18:31:31 +02:00
Guillaume Damiand c9a80f75ea Return a bool in undocumented read and write off functions 2018-09-04 16:17:33 +02:00
Guillaume Damiand 542d94dcdb Add default value for update attribute parameter 2018-09-04 16:17:11 +02:00
Guillaume Damiand 4fae0480fd Add option to fix the initial random seed; add some debug code. 2018-09-04 14:51:40 +02:00
Guillaume Damiand 142f36d6b4 New random path generator 2018-07-09 16:29:33 +02:00
Guillaume Damiand 30d5118740 Update path generators; start a test with long random paths deformed. 2018-07-06 16:42:23 +02:00
Maxime Gimeno 4086888964 Update glCode in 3D demos 2018-07-06 12:08:22 +02:00
Guillaume Damiand 53ed894ec7 Update isotopy test; seems to work now; need more tests. 2018-07-04 17:00:28 +02:00
Laurent Rineau 0e4e50f2e7 Merge pull request #3060 from maxGimeno/BGL-read_write_off_use_np-GF
BGL: Use Named Parameters in OFF I/O
2018-06-27 10:21:33 +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 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand
Add basic viewers
2018-06-14 17:36:37 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Laurent Rineau e33030b3a9 Add dependencies to GraphicsView 2018-06-11 15:54:56 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno 605bf1da52 Add missing includes in other plugins 2018-06-05 12:08:08 +02:00
Maxime Gimeno 6e878c4f66 Fix LCC example 2018-05-29 11:38:48 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 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 8a0dc2f279 Add one draw example in each user manual. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 23426e70c4 Remove macro modified. 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 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 202781aa93 The -> the 2018-05-29 11:06:07 +02:00
Guillaume Damiand 381d09104a Small update of LCC doc, following Andreas remarks. 2018-05-29 11:06:07 +02:00
Guillaume Damiand a251b3a0cd Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 82179b45a4 Some more replace of display by draw; for lcc basic viewer. 2018-05-29 11:06:07 +02:00
Guillaume Damiand d1bce718f9 Rename display into draw (for basic viewers) 2018-05-29 11:06:07 +02:00
Guillaume Damiand 69aa5d2188 Update user manual of LCC following Andreas comments. 2018-05-29 11:06:07 +02:00
Guillaume Damiand de23cdc86f Update cmake of LCC example 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand c7a4236281 Update CMakeLists.txt to allow drawing of lcc example 2018-05-29 11:06:07 +02:00
Guillaume Damiand 6d01411003 Remove ifdef in draw example since this is now done in the basic viewer. 2018-05-29 11:04:57 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d0010de73f Add an example to illustrate the use of display for LCC; remove all the use of display from other examples 2018-05-29 11:04:56 +02:00
Guillaume Damiand aaf0c578f0 Document in doxygen the new display function for LCC. 2018-05-29 11:02:00 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 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 8870e304a3 Update basic viewer; now it works for LCC, Polyhedron and Surface_mesh. 2018-05-29 11:01:59 +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 b7f5c709f0 rename filename for polyhedron 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 fbe5ee39c7 Update cmake files 2018-05-28 17:18:59 +02:00
Andreas Fabri 4712fbeb0d Fixes in Linear cell complex demo 2018-05-18 07:51:41 +01:00
Maxime Gimeno 25685fbedd add missing include 2018-05-17 10:43:03 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Andreas Fabri ff0836ec79 cleanup 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Maxime Gimeno c4da8690cb Add NamedParameters to the off IO functions. 2018-04-26 14:00:06 +02:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Guillaume Damiand a52a324262 Continue tests. 2018-03-30 16:42:22 +02:00
Guillaume Damiand ba014bfa3c Update all tests for canonical representation; start tests for isotopy. 2018-03-30 15:03:02 +02:00
Guillaume Damiand 6ec0beba66 Add more test of validity 2018-03-29 17:39:32 +02:00
Guillaume Damiand 122eeb0be8 3 first tests are ok. 2018-03-29 17:23:26 +02:00
Guillaume Damiand d302193844 Update tests to simplify the usage. 2018-03-29 12:03:20 +02:00
Guillaume Damiand 858c81c919 Update tests to remove debug messages. 2018-03-29 10:13:23 +02:00
Guillaume Damiand 13859a4fa4 Add test of random paths. 2018-03-28 22:40:52 +02:00
Guillaume Damiand 8be85817c7 l-shape case 8 OK. 2018-03-28 22:10:53 +02:00
Guillaume Damiand a42a4546ae l-shape case 7 started (nyf) 2018-03-28 17:53:48 +02:00
Guillaume Damiand e4afaf5ea5 l-push cases 5 & 6 ok. 2018-03-28 17:42:34 +02:00
Guillaume Damiand c8cdf75b8b l-push case 4 ok. 2018-03-28 16:36:21 +02:00
Guillaume Damiand b3389488f5 Better test suite for path canonizing. 2018-03-28 12:45:34 +02:00
Guillaume Damiand dec0a55276 Push l-shape ok for cases 1, 2 and 3. 2018-03-28 10:19:41 +02:00
Laurent Rineau 624bb54475 Merge pull request #2953 from gdamiand/LCC-remove_one_dependency-gdamiand
Remove one useless dependency in LCC to Polyhedron.
2018-03-27 10:11:36 +02:00
Guillaume Damiand 4ee2036093 Update l-shape right shift. 2018-03-26 17:54:10 +02:00
Laurent Rineau 312f61248e Modify the file `dependencies` 2018-03-26 12:53:41 +02:00
Andreas Fabri b918ab4ba7 Move internal class from Polyhedron to BGL 2018-03-24 11:41:30 +01:00
Guillaume Damiand 8f8cbbc84e Remove one useless dependency in LCC to Polyhedron. 2018-03-23 16:46:38 +01:00
Guillaume Damiand d3f1a4c703 Seems ok for bracket flatering and spurs removal. 2018-03-23 16:10:55 +01:00
Guillaume Damiand 1d97d27ba9 Case (1 2^r) is now ok. 2018-03-20 11:30:14 +01:00
Guillaume Damiand 5521f52d96 Add more tests for special cases of bracket reduction 2018-03-20 09:17:09 +01:00
Guillaume Damiand dfc76816b3 Update 2018-03-19 22:19:38 +01:00
Guillaume Damiand b848314336 Improve method 2018-03-19 16:36:03 +01:00
Guillaume Damiand 584def3c0f Continue path simplification for homotopy test. 2018-03-14 22:20:53 +01:00
Guillaume Damiand 763edf0030 Update path generator and bracket reduction 2018-03-14 19:43:46 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF
BGL: Document graph_has_property
2018-02-19 14:26:33 +01:00
Guillaume Damiand 39742b0d32 Continue bracket_flattening 2018-02-11 17:02:54 +01:00
Guillaume Damiand 8e73a49cb4 Start method bracket_flattening() 2018-02-10 10:52:36 +01:00
Guillaume Damiand 275c133a2c Continue the homotopy test algorithm. 2018-02-09 11:19:09 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +01:00
Guillaume Damiand 3ed36aa4fd Initialize dart info, when non void; otherwise isomorphism is sometimes false (on some 32 bits os in release mode). 2018-01-20 18:10:22 +01:00
Sébastien Loriot f6459368aa move fig_src dirs 2018-01-08 20:35:40 +01:00
Guillaume Damiand 7694565cb0 Update new functionalities 2017-12-17 19:01:39 +01:00
Guillaume Damiand 58387e9af4 Add viewer for surface and paths; add function to generate random paths. 2017-12-17 11:31:06 +01:00
Guillaume Damiand 4bb1758a0d Simplification in one vertex uses now also union find trees 2017-12-16 11:53:02 +01:00
Guillaume Damiand 78efb73a75 cmap function cont 2017-12-15 20:51:01 +01:00
Guillaume Damiand 9495a4da73 Add example for lcc new functionality 2017-12-15 10:35:52 +01:00
Guillaume Damiand e3b6a38adf Add default value for insertion operation in lcc 2017-12-15 10:35:35 +01:00
Guillaume Damiand 425a330f68 load/write fct now return bool 2017-12-15 09:52:45 +01:00
Guillaume Damiand fb1f44ab60 Add a new class for cmap functionalities; plus one example to use it. 2017-12-15 09:52:26 +01:00
Laurent Rineau 4e91d4d768 Merge pull request #2595 from gdamiand/BGL_LCC-use_generic_load-gdamiand
BGL/LCC: use generic load

# Conflicts:
#	BGL/test/BGL/CMakeLists.txt
2017-12-05 18:23:58 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand
CMap bugfixes
2017-12-05 18:20:56 +01: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 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Guillaume Damiand 34b1e620c1 Remove my copy of cgal/bgl/graph/io.h 2017-11-24 11:18:01 +01:00
Guillaume Damiand a189c1b1cc Use generic load_off function (in cgal/bgl/graph/) instead of my own copy. For that, add the degree function that takes a face descriptor as parameter. 2017-11-24 11:16:55 +01:00
Guillaume Damiand d5372e1a7d Remove option '-std=c++11', committed by error. 2017-11-21 10:02:23 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Sébastien Loriot 19adf3b05e make the doc match struct/class with the implementation 2017-11-17 11:34:55 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Guillaume Damiand b21b9e21c9 By default, disable the use of viewer in LCC examples. 2017-11-16 15:20:23 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Guillaume Damiand 4c893ef009 Add missing #include 2017-11-15 14:19:43 +01:00
Guillaume Damiand 2f0f97fa47 Update basic viewer to use a generic name. 2017-11-15 12:16:13 +01:00
Guillaume Damiand f0a44e2483 update basic viewer to allow to draw mono and color faces 2017-11-14 19:12:10 +01:00
Guillaume Damiand 877e8783f5 Add new file for generic viewer. 2017-11-13 13:33:05 +01:00
Guillaume Damiand c9ba6c2950 Split the LCC viewer in two; to prepare a generic base for all cgal ds viewers. 2017-11-13 12:27:48 +01:00
Guillaume Damiand 0783fa8241 Do not clear model before loading something; this is more generic. 2017-11-13 12:24:24 +01:00
Guillaume Damiand 5f939d33ab Bug fix in CMap/GMap/LCC dart methods 2017-11-13 12:17:03 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Sébastien Loriot 72cda50a5e fix incorrect LGPL version tags 2017-11-12 10:17:52 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau 39516eaa2b Merge pull request #2478 from mtola/master
fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during …
2017-10-13 16:54:11 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Martial Tola 6ce7afb6e0 fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during link process... 2017-10-01 16:07:33 +02:00
Sébastien Loriot 9bb2d4433f Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch' 2017-08-04 13:37:58 +02:00
Maxime Gimeno 831f0239cb Fix CMP0071 warning. 2017-08-03 10:38:19 +02:00
Maxime Gimeno 8104d153af Fixes
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
2017-07-10 16:16:34 +02:00
Maxime Gimeno f1a7ddf5b8 FIx LCC demo for QGLViewer v2.7 2017-07-10 16:11:09 +02:00
Laurent Rineau 80829925b7 Merge pull request #2174 from gdamiand/BGL-LCC-gdamiand
BGL version for Linear_cell_complex_for_combinatorial_map
2017-07-10 15:38:21 +02:00
Maxime Gimeno 1a5d74f020 Fixes 2017-07-03 09:39:12 +02:00
Maxime Gimeno 4a4cb688fe FIx LCC demo for QGLViewer v2.7 2017-07-03 09:35:14 +02:00
Guillaume Damiand cc4faa1151 Reorder #include, trying to solve boost bug about flat_map.hpp. 2017-06-29 10:35:02 -04:00
Guillaume Damiand d2f80b3da9 Rename internal namespace to avoid conflict 2017-06-28 09:43:24 -04:00
Guillaume Damiand 6244136d3c Remove two warnings (thanks laurent) 2017-06-27 12:25:45 -04:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f8fba47ac5 Remove cgalModif in doc 2017-06-15 09:47:30 -04:00
Guillaume Damiand 5089b05ace Add local version of read and write off for bgl; to remove when small feature generic read/write off will be integrated. 2017-06-14 11:41:25 -04:00