Commit Graph

684 Commits

Author SHA1 Message Date
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
Guillaume Damiand f816adc18e Remove file Linear_cell_complex_incremental_builder_for_bgl.h which is no more used thanks to the generic read_off function. 2017-06-14 10:54:47 -04:00
Laurent Rineau 0338ae79a6 Merge branch 'releases/CGAL-4.9-branch' into releases/CGAL-4.10-branch 2017-06-12 18:10:14 +02:00
Guillaume Damiand 6ab57ccc2a Bug fix in doc 2017-06-12 18:09:36 +02:00
Guillaume Damiand 57928985a9 Bug fix in doc of Linear cell complex 2017-06-12 18:09:14 +02:00
Laurent Rineau 4325f22314 Merge pull request #2145 from gdamiand/patch-1
Bug fix in doc
2017-06-12 11:51:33 +02:00
Guillaume Damiand dba7e36944 Bug fix in doc of Linear cell complex 2017-05-31 17:35:43 -04:00
Guillaume Damiand 08578afb7c Bug fix in doc 2017-05-31 17:30:51 -04:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Guillaume Damiand 4b196e686b Some cleanup 2017-05-12 08:37:11 -04:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Guillaume Damiand 8799b904b6 Add classes Linear_cell_complex_for_bgl_combinatorial_map_helper and Linear_cell_complex_bgl_min_items in separated files. 2017-05-10 10:06:55 -04:00
Guillaume Damiand 09f82093a3 Update doc of BGL for LCC, following Sebastien comments. 2017-05-10 10:06:17 -04:00
Guillaume Damiand 1bb0a3dda3 Document class Cell_attribute_with_point_and_id 2017-05-10 08:24:40 -04:00
Guillaume Damiand 42a1419dbf Document class Cell_attribute_with_id 2017-05-10 08:22:22 -04:00
Guillaume Damiand 977876ca48 Replace class by template alias. 2017-04-19 14:12:39 -04:00
Guillaume Damiand 5e5868418b Add reserve function. 2017-04-19 14:12:23 -04:00
Guillaume Damiand 8a5828dbd5 Update licence header 2017-04-19 08:42:17 -04:00
Guillaume Damiand d343811416 One more example compile. 2017-04-18 16:51:40 -04:00
Guillaume Damiand f8f2506a38 add graph_has_property for lcc 2017-04-18 16:18:03 -04:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand 5030a424f3 Remove unused parameter 2017-03-29 12:47:37 -04:00
Guillaume Damiand af7a401afd Bug fix in operator++ for edge; we need to test that we are not on the end before to do a second ++ 2017-03-29 12:47:01 -04:00
Guillaume Damiand 13ed16043b Update BGL for LCC and continue on examples/tests 2017-03-29 14:22:27 -04:00
Guillaume Damiand 3f382fe6b4 Add more examples for LCC BGL 2017-03-28 12:52:31 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand 06f73990f4 Small modifs to minimize diff with master. 2017-03-22 17:41:58 -04:00
Guillaume Damiand ff61b85322 update after rebase 2017-03-22 17:39:33 -04:00
Guillaume Damiand acad419a9a Update after rebase with master. 2017-03-22 17:33:05 -04:00
Guillaume Damiand daf726166c Update source/target one more time. 2017-03-22 16:37:24 -04:00
Guillaume Damiand a232565907 Debug (nyf) 2017-03-22 16:37:24 -04:00
Guillaume Damiand f3a6a80382 Remove my previous trick to change the orientation. 2017-03-22 16:37:24 -04:00
Guillaume Damiand fbf23b4173 Add Kernel as inner type of Linear cell complex class. 2017-03-22 16:37:01 -04:00
Guillaume Damiand 89645b3797 Add missing include 2017-03-22 16:36:01 -04:00
Guillaume Damiand 48db4e157b Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations. 2017-03-22 16:36:01 -04:00
Guillaume Damiand ebd54153ea Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries. 2017-03-22 16:33:39 -04:00
Guillaume Damiand 533bb318cc Update source/target one more time. 2017-03-22 14:59:27 -04:00
Guillaume Damiand 97ad6e35ce Debug (nyf) 2017-03-22 14:08:25 -04:00
Laurent Rineau fcbf2d7e2f Delete flat.cpp 2017-01-19 16:31:04 +01:00
Andreas Fabri 3f5a0bd27a Linear_cell_complex_demo: Reorder includes to work around a bug in boost
Reordering includes of CGAL headers changes the inclusion order
for boost headers.  The test file  flat.cpp should reveal the bug
2017-01-13 10:57:21 +01:00
Sébastien Loriot aec5d6a60c clean up after rebase 2016-11-29 11:43:47 +01:00
Guillaume Damiand 98e0ec06f1 Test for LCC et CMap. 2016-11-29 11:43:47 +01:00
Guillaume Damiand 269dcaf78d Remove a warning 2016-11-29 11:43:47 +01:00
Guillaume Damiand a9ac4013fa Update lcc demo and viewer to allow to reverse normal and to change the light. 2016-11-29 11:43:46 +01:00
Guillaume Damiand 0a95173dc7 Add an entry in the demo to reverse the orientation of objects. 2016-11-29 11:43:46 +01:00
Guillaume Damiand c546d5ba80 Remove a test for LCC. 2016-11-29 11:43:46 +01:00
Guillaume Damiand b0c5476e69 LCC test 2016-11-29 11:43:46 +01:00
Guillaume Damiand 9aaf51c17d Use delaunay triangulation instead of triangulation in test. 2016-11-29 11:43:45 +01:00
Guillaume Damiand 5ff5358c51 Remove template keyword outside template class 2016-11-29 11:43:44 +01:00
Guillaume Damiand 5509ec0227 Remove space 2016-11-29 11:43:43 +01:00
Guillaume Damiand 04e6e0f73b Remove unused variable 2016-11-29 11:43:43 +01:00
Guillaume Damiand 9731a1a51e Correction of copy dart info functor. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 8f07f91fa8 Remove red text in LCC doc; that was used for reviewing process. 2016-11-29 11:43:42 +01:00
Guillaume Damiand 5d0ce4fea4 Update LCC examples 2016-11-29 11:43:41 +01:00
Guillaume Damiand e4889ceb4c UPdate LCC test to add tests for close and insert_cell_2_in_cell_3. 2016-11-29 11:43:40 +01:00
Guillaume Damiand c500f8be73 Update LCC test. 2016-11-29 11:43:39 +01:00
Guillaume Damiand bbf4bc8471 Update LCC test; use a smaller off file to speed up tests. 2016-11-29 11:43:39 +01:00
Guillaume Damiand 81a8184879 Update demo following the renaming of .h to import from T3 and Polyhedron3 2016-11-29 11:43:38 +01:00
Guillaume Damiand b655c8df82 Update test CMap and LCC. 2016-11-29 11:43:38 +01:00
Guillaume Damiand d5fbe24775 Remove useless Dart_info 2016-11-29 11:43:38 +01:00
Guillaume Damiand d6d6d27c93 Update LCC doc to follow the modification in examples. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 12328929b2 Update LCC tests: now they are done both for CMap and GMap. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 588ba4f527 Allow isomorphism to test dartinfo and/or point and/or attribute independently; use this in LCC test. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 80ffced770 Update lcc test 2016-11-29 11:43:37 +01:00
Guillaume Damiand 02e1eb7e96 Add is_orientable function in GMap. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Guillaume Damiand df3b2a4850 LCC constructors compile now both for CMap and GMap (need tests) 2016-11-29 11:43:36 +01:00
Guillaume Damiand 7618192d21 Start incremental builder 2016-11-29 11:43:36 +01:00
Guillaume Damiand 1a357d5519 Now sew3 same facets works for both CMap and GMap. 2016-11-29 11:43:35 +01:00
Guillaume Damiand 4bacc7a25a Remove some useless include; set constructor of Dart and attribute protected; check for friend directives. 2016-11-29 11:43:35 +01:00
Guillaume Damiand e571639c94 Continue to work on LCC operations for CMap and GMap... 2016-11-29 11:43:35 +01:00
Guillaume Damiand a0fb8e0a26 Update LCC operations to work with CMap and GMap 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d22d7e7dc Update LCC to be compatible both for CMap and GMap. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 8d577b35da Modif of copy contructors in GMap; bugfix in copy function. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 1d963f4ce7 Update copy between map to copy also dart_info; update also isomorphism function; start to update test (nyf) 2016-11-29 11:43:34 +01:00
Guillaume Damiand 57e4ff3abd * replace CGAL_CMAP_DEPRECATED macro by CGAL_CMAP_DART_DEPRECATED
* protect deprecated code with #ifndef CGAL_NO_DEPRECATED_CODE
2016-11-29 11:43:33 +01:00
Guillaume Damiand 21a121019a * Update names for next, previous and opposite functions (following the ref manual);
* update GMap examples.
2016-11-29 11:43:33 +01:00
Guillaume Damiand 233840ffc5 Replace pointer by reference in all functions.
This allows to use non const reference in Foreach_static functor (why this is not possible with pointers ? there is some black magic under tuple and variadic template...).

Thanks to this possibility, remove static variables used to return value in two functors.
2016-11-29 11:43:33 +01:00
Guillaume Damiand 788e680ecb Use index in debug functions instead of adress of elements. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 2aff4068b5 Allow to not define Dart_info and Attributes type in item class. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 676b547a93 Doc of CMap, GMap and LCC is now ok for rev 4 2016-11-29 11:43:31 +01:00
Guillaume Damiand 4624a0b97b Factorize dart between CMap and GMap.
Now we use the same class in both packages.
TODO: modify the doc accordingly.
2016-11-29 11:43:31 +01:00
Guillaume Damiand d277576b15 Keep deprecated classes in the doc. 2016-11-29 11:43:31 +01:00
Guillaume Damiand 268036a088 Keep old names in the doc, marked deprecated. 2016-11-29 11:43:30 +01:00
Guillaume Damiand 74b5316bde Update name in fig 2016-11-29 11:43:30 +01:00
Guillaume Damiand 535c2caff9 Update LCC examples 2016-11-29 11:43:30 +01:00
Guillaume Damiand b12b490e12 Rename classes. 2016-11-29 11:43:29 +01:00
Guillaume Damiand bd805cd44f Modif doc CMap, GMap, LCC 2016-11-29 11:43:28 +01:00
Guillaume Damiand d0539bbd5b Doc for CMap, GMap and LCC ok after review 2 2016-11-29 11:43:28 +01:00
Guillaume Damiand 954c7c2800 Doc CMap, GMap, LCC 2016-11-29 11:43:27 +01:00
Guillaume Damiand c88fd4fd1c Corrections following Sebastien review (nyf) 2016-11-29 11:43:26 +01:00
Guillaume Damiand 12f8efdba0 Typo 2016-11-29 11:43:26 +01:00
Guillaume Damiand 20979072cb Small modifs following Sebastien review. 2016-11-29 11:43:26 +01:00
Guillaume Damiand c0e903a106 Update copyright headers 2016-11-29 11:43:25 +01:00
Guillaume Damiand 288313128e End of doc for LCC. 2016-11-29 11:43:25 +01:00
Guillaume Damiand c660599bed Add a missing link 2016-11-29 11:43:24 +01:00
Guillaume Damiand 52266f5f82 Ok for LCC doc 2016-11-29 11:43:24 +01:00
Guillaume Damiand c1ff5763f6 Continue doc of LCC 2016-11-29 11:43:22 +01:00
Guillaume Damiand 101700a2e0 Add figures for GMap doc 2016-11-29 11:43:22 +01:00
Guillaume Damiand de634dbd87 Doc of GMap and LCC. 2016-11-29 11:43:21 +01:00
Guillaume Damiand 7e3cb2094e Update also LCC doc accordingly. 2016-11-29 11:43:21 +01:00
Guillaume Damiand eca1865ad7 Add an example of lcc using GMaps. 2016-11-29 11:43:18 +01:00
Guillaume Damiand 9b8eb9e785 Correction for make_tetrahedron and make_quadrangle for gmaps; modify corresponding methods in LCC to be able to work both for CMaps and GMaps. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 6656ab9f4e Update doc in header files for make_xxx function in LCC. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 8670c7b150 Update doc of LCC and figures. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 3737af7a44 Add linear cell complex storage for GMaps. 2016-11-29 11:43:15 +01:00
Guillaume Damiand 0e80ecf8c0 Work to be able to use LCC with GMap as underlying DS (nyf) 2016-11-29 11:43:13 +01:00
Guillaume Damiand fce9c1db1c Cleanup figures in LCC. 2016-11-29 11:43:10 +01:00
Guillaume Damiand 79febdd8a3 All figures of CMap and LCC are now in svg. 2016-11-29 11:43:00 +01:00
Guillaume Damiand 55f0b69fdf Remove my previous trick to change the orientation. 2016-11-01 14:33:24 -04:00
Laurent Rineau 3044d512f2 Merge pull request #1511 from gdamiand/CMap_LCC-bugfixes-gdamiand
Some bugfixes in CMap and LCC
2016-10-17 10:01:36 +02:00
Guillaume Damiand 9aae106124 Add explicit call to base contructor to avoid warning. 2016-10-12 08:22:37 -04:00
Sébastien Loriot 6ff846a483 add missing CGAL namespace 2016-10-11 15:21:09 +02:00
Guillaume Damiand 7620635cfe * Bugfix in correct_invalid_attributes in LCC
* Remove deprecated code in LCC (that should be removed for CGAL 4.9)
2016-10-06 08:19:04 -04:00
Guillaume Damiand 0073b85d7e Some bug fixes in CMap and LCC:
* Bugfix in Combinatorial_map::copy and Combinatorial_map::swap
* Bugfix in erase dart if automatic attribute are disabled
* Add missing operator= in Linear_cell_complex
* Remove deprecated code in Linear_cell_complex storage (code which was already removed in Combinatorial_map_storage and not in LCC)
* add const for isomorphic function
2016-10-06 08:11:14 -04:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 3fac1b31f0 Fix typos (and compilation errors!) 2016-10-03 12:12:46 +02:00
Andreas Fabri cebf2f8bab include import_from_.. headers in LCC demo 2016-10-03 08:53:28 +02:00
Andreas Fabri cf8c1a6cdf Dispatch import functions to Polyhedron, T2, T3 2016-09-30 15:23:15 +02:00
Andreas Fabri d95e7301da Fix package Linear_cell_complex: include headers 2016-09-30 15:23:14 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00