Commit Graph

516 Commits

Author SHA1 Message Date
Guillaume Damiand 1867f5b096 Add save/load in the demo. 2015-06-15 14:53:00 +02:00
Sylvain Brandel 25b2727381 mark type modified from int to size_type, exception thrown in get_new_mark and test added in the test-suite 2015-06-12 15:11:04 +02:00
Laurent Rineau fae635d2fb Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF
All Qt4-based demos now use  `-DQT_NO_KEYWORDS`
2015-05-26 12:32:40 +02:00
Guillaume Damiand 98bbdbfc2d Move functor that detect non void attributes and point in CGAL namespace (before they were in internal); add a missing void typedef. 2015-05-15 19:58:37 +02:00
Andreas Fabri c5d196f78c remaining demos 2015-05-06 18:53:44 +02:00
Maxime Gimeno 8fc89ebf86 WIP : non-triangle facets management
- Sometimes at run time nothing is displayed
  for the entire life of the program, sometimes
  it's ok but a message is displayed about the
  scene radius which is negative

- Voronoi crashes for points sets in 3D (wrong map,
  darts xxx does not have a vertex or something similar)
  and displays nonsense for 2D set points
2015-04-10 14:29:05 +02:00
Maxime Gimeno 7b2f0ebe89 WIP : Upgrade to OpenGL 3 with Qt wrappers
- de-activated the light for the points and lines
- rendering with shaders
- need of non-triangle facets management
2015-04-10 09:43:21 +02:00
Sylvain Brandel 41464f142f type of boolean marks modified from int to size_type in both Combinatorial_map and Linear_cell_complex 2015-04-01 15:36:34 +02:00
Maxime Gimeno 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +02:00
Pranav 0310953938 undo a redundant change in import_from_triangulation_3 2015-04-01 11:02:47 +05:30
Pranav 78dd583dac fixes issue of infinite vertex in import_from_triangulation_3 2015-03-31 14:18:41 +05:30
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 93ceb66149 Remove -Wall for demo 2015-03-04 13:36:53 +01:00
Guillaume Damiand c0e4987190 Add wall option for lcc demo 2015-03-03 11:13:25 +01:00
Guillaume Damiand fd4162a5a1 Bug fix in size function in ranges 2015-03-03 10:37:37 +01:00
Guillaume Damiand 2ee8f25ba6 Update the undocumented function write_off to allow the export of mesh with dimension higher than 2 2015-02-27 13:57:52 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel'
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-08 14:48:47 +01:00
Guillaume Damiand e2c433bd7e One more remove^Crailing whitespace. 2015-01-06 15:53:51 +01:00
Guillaume Damiand 60c9eb8cbc Remove trailing whitespace. 2015-01-06 15:52:41 +01:00
Guillaume Damiand 4d6a8573f5 Add one example. 2015-01-06 12:24:50 +01:00
Guillaume Damiand 31f97645d9 Finalize doc + example. 2015-01-05 18:37:50 +01:00
Guillaume Damiand 090f2f5cfd Remove warning 2015-01-02 18:50:49 +01:00
Guillaume Damiand 32464de4a5 Update demo for Menger, Sierpinski Carpet and Sierpinski Triangle. 2014-12-28 17:15:02 +01:00
Guillaume Damiand 237c4b87fb Remove warnings. 2014-12-27 20:12:51 +01:00
Guillaume Damiand 029724ab67 Add example file 2014-12-25 08:20:52 +01:00
Guillaume Damiand d851f35651 Remove warnings; wrong use of typename and template in viewer; default argument for example. 2014-12-25 08:20:00 +01:00
Guillaume Damiand 69b53d262d Improve demo drawing. 2014-12-24 09:18:55 +01:00
Guillaume Damiand 34e9139cde Update viewers. 2014-12-24 08:19:09 +01:00
Guillaume Damiand bdc0dee6ce Update operations to use are_attributes_automatically_managed 2014-12-23 22:15:49 +01:00
Guillaume Damiand 0860cf5012 Remove trailing whitespaces 2014-12-23 21:52:15 +01:00
Guillaume Damiand c9345af46b add the new function in Linear cell complex class. 2014-12-23 21:51:04 +01:00
Guillaume Damiand 882c6033df Bug fix; optimize merge volume operations. 2014-12-23 21:07:53 +01:00
Guillaume Damiand 919bf8af74 Cleanup + some optimizations. 2014-12-23 09:34:09 +01:00
Sylvain Brandel 08af113c95 Adding linear_cell_complex_3_attributes_management.cpp example 2014-12-12 15:41:23 +01:00
Sylvain Brandel b0591661fd Adding example linear_cell_complex_3_attributes_management.cpp 2014-12-12 15:38:14 +01:00
Sylvain Brandel 1cb63c386b Modification of the names of attributes management functions 2014-12-05 16:03:44 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +01: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 f1f6218ca7 Fix of some bugs with Arrangement on surface 2 and others demonstrations.
Improvement of some comentaries.

Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +02:00
Aurélien Vialon 2d65524aea All last demonstrations ported to Qt4or5. Need to check working of it on Linux. 2014-08-12 22:12:42 +02:00
Aurélien Vialon 7f408374a1 Modification of LCC CMakeList to make the Qt version missing appears. 2014-08-05 20:13:45 +02: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 9a1461442b Some bug correction for new Qt inclusion way.
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
2014-08-04 20:16:44 +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
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
Aurélien Vialon a3a84ce2e8 Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported. 2014-07-11 19:22:13 +02:00
Laurent Rineau e4b033e964 Add/remove #include
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
2014-06-26 19:10:06 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Sylvain Brandel d62a535fd7 minor addons in the code, not in the API 2014-06-13 16:02:55 +02:00
Aurélien Vialon 5be86812ea Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
Conflicts:
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
2014-06-12 22:16:31 +02:00
Aurélien Vialon 956bdabe0e Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations. 2014-06-12 21:46:52 +02:00
Aurélien Vialon 6ec9415dc1 Demonstrations LCC and Trigulation_3 and surface mesher working. 2014-06-12 14:34:19 +02:00
Sylvain Brandel ec61d7cdc0 Updating new branch with modified and new files, in accordance with provided features 2014-06-03 11:22:47 +02:00
Sylvain Brandel 4d34b88770 Updating new branch with modified and new files, in accordance with provided features 2014-06-03 11:15:08 +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 75dcf91cc9 Suppression de code superflu dans le CMakeLists de la demonstration de LinearCellComplex. 2014-06-02 00:46: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
Aurélien Vialon 1f669ad498 Update Support for Qt5 project. 2014-05-29 12:07:42 +02:00
Clement Jamin 239b6d0932 Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin 2014-04-16 14:14:24 +01:00
Guillaume Damiand 7749eb75d5 Remove unused parameter when tests are not traced. 2014-04-08 09:27:19 +02:00
Guillaume Damiand 3ab46250db Reinit always ref counting when creating attribute. VC12 does not use the specialized version for copy constructor but always the generic one. 2014-04-07 19:53:06 +02:00
Laurent Rineau 29f28936a0 Revert "Add minimal example showing the vc12 bug (?)"
This reverts commit 907a2a3130.
2014-03-31 17:00:16 +02:00
Guillaume Damiand 907a2a3130 Add minimal example showing the vc12 bug (?) 2014-03-27 09:41:04 +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
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +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
Guillaume Damiand 8e8ab82527 Merge branch 'CMap_no_static_for_null_dart_handle-gdamiand'
null_dart_handle is no longer static; implies to move several methods from Dart concept into CMap concept. This will simplify  the changing of the underlying container in the near future.

Small feature Combinatorial map dart attribute pre-approved in May 2013.

Approved by the release manager.
2013-11-28 08:22:40 +01:00
Guillaume Damiand 60e9c235af typo 2013-11-26 17:29:31 +01:00
Guillaume Damiand e42f41a615 Small modif in explanations of modifications. 2013-11-22 08:00:00 +01:00
Guillaume Damiand db7c14cc58 * Document the deprecated function in Dart, CMap concept and LCC class;
* Add paragraph in changes.html;
* Bugfix in Linear_cell_complex_constructors for lcc without 2-attributes.
2013-11-21 10:23:24 +01:00
Guillaume Damiand 95dd472779 Remove trailing whitespace. 2013-11-19 16:38:13 +01:00
Guillaume Damiand c34014bcf7 Doc update. 2013-11-19 16:31:53 +01:00
Guillaume Damiand b3a7330a33 Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Guillaume Damiand 96f3835d0a Remove null vector in traits (pb with Kernel_d ?) 2013-11-19 07:30:43 +01:00
Guillaume Damiand 44687b4f5d Add option allowing to trace the tests in LCC. 2013-11-16 18:22:36 +01:00
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand cd3b457f67 Modif in CMakeList in LCC examples.
Trivial bug fix for master.
2013-11-14 11:59:30 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +01:00
Guillaume Damiand 08b29d689f Remove trailing whitespace. 2013-11-13 17:42:37 +01:00
Guillaume Damiand 3766e7c8e6 Cleanup in benchmarks 2013-11-13 17:41:35 +01:00
Guillaume Damiand 61d6236b60 Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Guillaume Damiand e6647d3751 Add benchmarks for lcc. 2013-11-13 13:50:35 +01:00
Guillaume Damiand 53f02ea00d Add storage classes (forgotten in the previous commit) 2013-11-13 13:49:59 +01:00
Guillaume Damiand dccdec40a5 Combinatorial map with no static dart_null_handle.
This is a copy from the branch CMap_no_dart-gdamiand by keeping only the part with dart_handle.
The modifications are the ones given in the small feature Combinatorial map dart attribute.
2013-11-12 22:27:44 +01:00
Guillaume Damiand cfad121d1a Remove a useless #include
Approved by the Release Manager
2013-09-05 10:28:00 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot 143a2181b3 add latex format for \imagei doxygen command
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
2013-07-25 11:50:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Guillaume Damiand d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +02:00
Guillaume Damiand 6653320136 Tests for reverse orientation.
Bugfix: initialization of internal::Test_is_same_attribute_functor<Self, Map2>::value.
Add text in changes.html.
2013-06-24 10:27:26 +02:00
Guillaume Damiand 5cf231d998 add tests to verify that reverse(reverse(map))=Id 2013-06-23 21:29:07 +02:00
Guillaume Damiand 37d7b8ef0f Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori 2013-06-23 21:02:11 +02:00
Guillaume Damiand 444ba939a8 Dynamic attributes for onmerge and onsplit.
Copy of master, and integrations of modifs done in the branch Combinatorial_map_dynamic_onxxxfunctors-gdamiand. Add an example in  map_3_dynamic_onmerge.cpp.
2013-06-16 20:48:01 +02:00
Guillaume Damiand 98a4e30f34 Merge branch 'Combinatorial_map_copy2-gdamiand'
Approved by the release manager
2013-06-14 13:33:46 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Guillaume Damiand 7f7788bd84 Small corrections on reverse orientations; reformating; start to add tests 2013-06-13 11:14:03 +02:00
Guillaume Damiand eabe898d25 Initialize bbox in Viewer (default initialization does not work when using std::array) 2013-06-11 09:10:00 +02:00
Guillaume Damiand a4e392b552 Copy of CMap: ok for code and test suite. 2013-06-05 16:16:02 +02:00
Guillaume Damiand 035ff356b6 Better solution for lcc copy 2013-06-04 18:27:13 +02:00
Guillaume Damiand 6e7babc14b copy cont 2013-06-04 13:23:43 +02:00
Guillaume Damiand 1cc9540daf copy cont 2013-06-03 22:08:57 +02:00
Guillaume Damiand 6cc05e3920 wip copy 2013-06-03 18:50:35 +02:00
Guillaume Damiand 13a1bf5903 cont... 2013-06-03 09:10:44 +02:00
Guillaume Damiand 6fca991923 Copy constructor for cmap cont 2013-06-02 21:07:33 +02:00
Guillaume Damiand 21387b2601 tests for lcc copy (nyf) 2013-05-31 15:45:47 +02:00
Guillaume Damiand d3e2d15be7 Add tests to copy lcc 2013-05-31 15:02:25 +02:00
Guillaume Damiand 49a19b0b71 End of copy constructor for cmaps. Add tests. 2013-05-31 14:43:56 +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
Guillaume Damiand bac62f48fc Add constructor in derived cmap and lcc classes 2013-05-30 14:38:53 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Sébastien Loriot 7e15467c72 new cgal doxygen advanced macro to put the text inside a div 2013-05-27 19:36:33 +02:00
Guillaume Damiand 7f6cf78570 LCC test 2013-04-27 08:54:56 +02:00
Guillaume Damiand 8510fb2853 Two bugfix: 1) one mark not shared for CMap_cell_iterator 2) use of two least significant bits for Cell_attribute when support of dart is disable. Add tests in test suite for these cases. 2013-04-26 10:57:53 +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
Sébastien Loriot 9fcf46e11a replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests
this should be the case, following our guidelines.

using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
2013-03-21 10:50:55 +01:00
Alexandros Konstantinakis-Karmis 3b1d281efb Abbreviations trigger end of \brief description
Fixes bug #15482:
https://gforge.inria.fr/tracker/index.php?func=detail&aid=15482&group_id=52&atid=13845
2013-03-13 11:58:56 +01:00
Sébastien Loriot 890b02ead6 add last missing classified reference manual 2013-03-12 18:46:37 +01:00
Guillaume Damiand b1d65019c1 Doxygen LCC ok. 2013-03-01 16:30:48 +01:00
Guillaume Damiand f38df827b6 LCC doc, ok for concepts. 2013-03-01 14:29:38 +01:00
Guillaume Damiand 2a04b964cd * More links in CMap doc.
* Add tag in doxyassist for LCC.
* Ok for LCC user manual.
2013-03-01 13:45:52 +01:00
Guillaume Damiand 2c4950eff3 Figures for LCC doc. 2013-03-01 11:15:27 +01:00
Guillaume Damiand 8734f2cf51 Doxygen version of the CMap doc. 2013-02-28 17:19:11 +01:00
Guillaume Damiand 07ec5d15f8 Remove debug flags for LCC-demo in CMakeLists.txt 2013-02-21 08:55:35 +01:00
Guillaume Damiand 5def71590e Merge branch 'Combinatorial_map_contractions_v2-gdamiand'
Several bug fixes; modification of the way onsplit/onmerge are tested as all the cases were not considered before; update all the operations to use this new tests.

Merge approved by Laurent (released manager).
2013-02-20 17:43:06 +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
Guillaume Damiand 35509487a9 On split can now be called with a cmap as parameter. 2013-02-17 21:19:17 +01:00
Guillaume Damiand bf70c5b8e5 * Bug fix in is_sewable for i>3.
* replace some assert by CGAL_assertion.
* add composition of beta, static version when no c++11.
2013-02-15 13:25:51 +01:00
Guillaume Damiand 7cf8b4944c Bug fix in default traits parameter of LCC (already in master) 2013-02-14 17:40:14 +01:00
Guillaume Damiand 450a07786b Ok for group/degroup and operations.
* clarify all the tests of group/ungroup cases for non void attributes
* create specialized functors allowing to consider all the different cases
  (group two edges along their two extremities, only the first or the second...)
* make many cleanup to move functors in different files, and to comment them
* add namespace before global functions

Still to do: sewable for dim>3 (build the isomorphism); try to improve onsplit
  test by testing only one out of two modified darts; add a parameter to
  operations to do not test group/ungroup; do a functor which updates the
  attributes of all the map (avoid do make many small tests, and do only one
  big test once).
2013-02-14 16:27:51 +01:00
Guillaume Damiand 6035180c7a cont... 2013-02-13 22:17:09 +01:00
Guillaume Damiand 173f8bc073 Continue on operations, group and degroup... 2013-02-13 17:57:49 +01:00
Guillaume Damiand 6678832c7a Wip on group/degroup 2013-02-11 17:57:10 +01:00
Guillaume Damiand 6a06c5b0f4 Modify LCC tests to be able to know which test is run by the testsuite. 2013-02-09 17:49:49 +01:00
Guillaume Damiand 9a0b1d17e9 Add test for contraction<3> 2013-02-08 21:36:41 +01:00
Guillaume Damiand 1817476e2b add test for contraction<3> 2013-02-08 17:29:04 +01:00
Guillaume Damiand d61ec5bdca Move tests in LCC, add more tests (nyf) 2013-02-08 17:22:13 +01:00
Guillaume Damiand ec5e746696 Trivial bug-fix in Linear_cell_complex class.
The default template argument used for LCCTraits (CGAL::Linear_cell_complex_traits<..>) does not use the correct dimension: it was d_ while it must be ambient_dim.

Approved by the release manager.
2013-02-08 14:28:12 +01:00
Guillaume Damiand 29039d2fde wip split... 2013-01-29 16:30:43 +01:00
Guillaume Damiand 7f6cf79490 Onsplit again... 2013-01-28 22:13:56 +01:00
Guillaume Damiand ba0e0858ea Degroup when remove is now ok 2013-01-28 13:34:49 +01:00
Sébastien Loriot 26fa06bcfe remove namespace in inheritance relationship
this produces a empty page to document it in doxygen
2013-01-23 16:28:37 +01:00
Sébastien Loriot 8f839f91ae add missing space after $. 2013-01-23 14:58:03 +01:00
Sébastien Loriot 8fb18e7e63 fix linking warning and fix bug in naming 2013-01-18 17:48:27 +01:00
Sébastien Loriot 17bf812365 remove warnings in doxygen doc for Linear Cell Complex 2013-01-18 17:43:55 +01:00
Sébastien Loriot 5ec28b1cf4 replacing the usage of section in user man by \cgalHeading macro call 2013-01-07 18:04:37 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Guillaume Damiand c63050b70c Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-12-17 07:59:33 +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
Guillaume Damiand f849fa0ea5 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-12-04 21:38:39 +01:00
Sébastien Loriot 7d20531b1d Convert remaining CRLF files to LF 2012-12-04 17:09:28 +01:00
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Guillaume Damiand 4ab6143652 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-11-28 21:37:27 +01:00
Guillaume Damiand 703e5d4149 Remove warnings.
Unused typedef, variable; unitialized type.
2012-11-28 10:10:48 +01:00
Guillaume Damiand bff6b44f5c Remove warnings in LCC test.
3 unused typedef; and one unitialized variable.
2012-11-28 09:51:59 +01:00
Guillaume Damiand 68dfccb046 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-11-27 22:19:06 +01:00
Guillaume Damiand 9143c7cc08 Merge branch 'Combinatorial_map_improve_iterators-gdamiand'
Approved by the release manager.
2012-11-27 11:16:00 +01: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 6cc7d66415 Revert "Replace tex-style quotes with quotes that you would expect, as there"
This reverts commit e65a8028ea.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Approximate_min_ellipsoid_d/documentation/mel.tex
	Documentation/doxyassist.xml
	Installation/doc_tex/Installation/usage.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Optimisation_doc/doc_tex/Bounding_volumes/user_part.tex
	Optimisation_doc/doc_tex/Inscribed_areas/user_part.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
2012-11-23 18:08:13 +01:00
Sébastien Loriot ae8362b7d6 replace \cgalModels ::FOO by \cgalModels `FOO`
using:
 perl  -pi -e 's/\\cgalModels\s+::([A-Za-z0-9_:]+)\s*$/\\cgalModels `$1`\n/'
2012-11-23 09:37:53 +01:00
Guillaume Damiand 2e8a492d4d Typo in messages 2012-11-22 19:26:10 +01:00
Guillaume Damiand aa31f66f50 Add benchmark code (from branch Surface_mesh-GF, thanks to Philipp). 2012-11-20 09:15:01 +01:00
Sébastien Loriot 0f69c2a512 remove cpp0x namespace from documentation pages 2012-11-14 16:16: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
Andreas Fabri 7a6634b5a7 No need for CGAL:: in user manuals 2012-10-31 20:11:16 +00:00
Philipp Möller 31a3c07418 Turn \refines :: into \refines `X` globally 2012-10-25 09:48:39 +00:00
Philipp Möller 31e9eadf8b Fix all PackageDescriptions to a newer layout 2012-10-19 15:52:31 +00:00
Philipp Möller 6615bcee09 Fix some minor glitches in headings 2012-10-18 12:55:17 +00:00
Andreas Fabri b8b7a5dad3 get rid of spurious XX 2012-10-03 17:02:54 +00:00
Philipp Möller bc48dfe5a0 Be consistent about author/authors 2012-10-03 16:40:16 +00:00
Andreas Fabri 16992d9713 change link for \ccDepends 2012-10-03 11:00:43 +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
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
Andreas Fabri ccf985cbc0 capitalize heading; add a const; add a \ after an i.e. 2012-09-24 18:04:45 +00:00
Philipp Möller b9e174747a A function group was forgotten. 2012-09-24 10:45:37 +00:00
Philipp Möller 0aa7cd1c3b Global heading reduction. Rename some Parameter section to Template
Parameters. Fix dependencies.
2012-09-21 09:42:24 +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
Philipp Möller 1b3a78a08f Salvage the demo information from the old package description. 2012-09-20 13:30:49 +00:00
Guillaume Damiand d6d70cf00a Regroup figures for LCC. 2012-09-20 11:48:55 +00:00
Philipp Möller 50e5409ffe Merge next and restore the temporary delete of Bounding_volumes/doc 2012-09-20 11:37:03 +00:00
Philipp Möller 5ffc0edd06 Add Linear_cell_complex doc. 2012-09-18 17:47:11 +00:00
Guillaume Damiand d00df7f8e5 use \ccc in doc 2012-09-13 10:13:38 +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
Guillaume Damiand c871aa06b4 * Add generic beta in CMap (small feature);
* Add generic create_dart and create_attribute in CMap (small feature);
* Add generic create_vertex_attribute in LCC (small feature);
* BugFix in LCC doc (wrong concept for item class).
2012-09-06 11:42:50 +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
Guillaume Damiand dee5e3bfd2 Remove licence headers in examples of LCC. 2012-08-14 14:54:46 +00:00
Philipp Möller e65a8028ea Replace tex-style quotes with quotes that you would expect, as there
is no way to handle them in the converter.

Needs to be revert before this is being merged into next.
2012-08-02 12:55:15 +00:00
Guillaume Damiand bf0d1025eb Revert last commit: cgal is really too rigid... 2012-07-17 08:56:13 +00:00
Guillaume Damiand 46f16de7c9 Add operator += in BBox classes (more or less a trivial bug-fix). 2012-07-17 08:18:59 +00:00
Guillaume Damiand ad06e50196 Remove a warning 2012-07-06 05:09:00 +00:00
Guillaume Damiand 49780518f2 Remove some warnings 2012-07-05 13:39:34 +00:00
Guillaume Damiand 44d29a5c8f * Add a second subdvision method in LCC demo
* Add two basic usefull functions (internal as undocumented)
* Add an example showing how to customize the type of point used in LCC
2012-07-02 09:20:14 +00:00
Philipp Möller 91dbadcf7d Drop an unused variable. 2012-06-20 11:54:28 +00:00
Guillaume Damiand 82fe54b829 Warnings 2012-05-10 11:27:30 +00:00
Guillaume Damiand 1041faed99 More warnings 2012-05-09 11:25:38 +00:00
Guillaume Damiand 084dc9e99c Small errors and warning 2012-05-09 10:45:32 +00:00
Guillaume Damiand cb7e3bde41 Merge with next 2012-05-05 07:07:53 +00:00
Guillaume Damiand 71c334496c Add timers in LCC demo. 2012-05-05 07:03:14 +00:00
Guillaume Damiand 559ac7992a Bugfix: Remove an undocumented constructor of Cell_attribute_with_point class which involves a conflict if an user uses Point as Info template argument. 2012-05-03 19:15:06 +00:00
Guillaume Damiand 39f29392b0 Remove a warning 2012-04-05 06:59:46 +00:00
Guillaume Damiand 4e1e4e3739 Remove warnings and replace pow by CGAL::ipow 2012-04-03 07:41:31 +00:00
Guillaume Damiand dee0350bd3 Demo... 2012-04-01 19:37:45 +00:00
Guillaume Damiand df1af8c5e4 Extend filled volumes 2012-03-30 14:43:40 +00:00
Guillaume Damiand 002ca688a3 Reinit the dialog box to create several menger sponges 2012-03-30 14:23:17 +00:00
Guillaume Damiand de2244f46d Demo ok for menger v2 2012-03-30 14:01:27 +00:00
Guillaume Damiand c61f107354 Demo... 2012-03-30 11:00:40 +00:00
Guillaume Damiand d2160fd6ce Bug fix in sew3_same_facets method 2012-03-29 19:55:53 +00:00
Guillaume Damiand f04bc65cf0 Wip refactoring demo 2012-03-29 19:55:20 +00:00
Guillaume Damiand 2e79d76bbe Wip refactoring the demo. 2012-03-29 13:39:14 +00:00
Guillaume Damiand bc1faf125e Remove some warnings 2012-03-28 11:30:12 +00:00
Guillaume Damiand 60476a44fa LCC demo improve 3D subdivision 2012-03-26 20:13:07 +00:00
Guillaume Damiand e33465fa33 Improve the flip edge method (avoid remove and insert edge) 2012-03-26 16:07:17 +00:00
Guillaume Damiand be0b67ba72 Create menger sponge is not modeless. 2012-03-26 14:53:13 +00:00
Guillaume Damiand be004894bc Create mesh is now modeless 2012-03-26 13:39:58 +00:00
Guillaume Damiand 72a62b217c cleanup 2012-03-26 12:49:54 +00:00
Guillaume Damiand 1651561609 Menger demo is ok 2012-03-26 12:30:53 +00:00
Guillaume Damiand 99b0a3cd56 Menger demo: ok for remove edges. 2012-03-26 11:44:53 +00:00
Guillaume Damiand 108f7a330e Modification of the edge removal 2012-03-26 10:16:16 +00:00
Guillaume Damiand 5638f518f3 Update dialog box; start menger subdivision to 0. 2012-03-26 07:46:54 +00:00
Guillaume Damiand 98db531bdf Wip on menger sponge demo to decrease the resolution. 2012-03-23 16:34:33 +00:00
Guillaume Damiand db7fb1e941 Modify name of slots to use qt auto connect. Add function allowing to merge all connected volumes. 2012-03-23 13:44:08 +00:00
Guillaume Damiand 8508f48c4d Menger increase level ok 2012-03-23 12:05:36 +00:00
Guillaume Damiand c243971b40 V1 for menger sponge. 2012-03-23 09:28:20 +00:00
Laurent Rineau 4d9ad434eb Add/fix the bib entry for Linear Cell Complex 2012-02-09 10:32:10 +00:00
Guillaume Damiand e341c43baf Typo. 2012-01-25 14:00:57 +00:00
Laurent Rineau 3c9313ae52 Rename Linear_cell_complex_3.cpp to Linear_cell_complex_3_demo.cpp
That way, the automatically generated cgal_test script will work.
2012-01-24 18:39:05 +00:00
Laurent Rineau 08fa2f98c9 Rename the target Linear_cell_complex_3 to Linear_cell_complex_3_demo
On Windows, CMake makes the difference between the target
linear_cell_complex_3 (from examples) and Linear_cell_complex_3 (from
demo). But those two targets only differ by the case, and that makes
a confusion at the level of nmake.
2012-01-20 15:03:37 +00:00
Guillaume Damiand 5f642cffd5 typo 2012-01-19 18:17:21 +00:00
Andreas Fabri f2cbdf7eec typos fixed 2012-01-19 17:35:01 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Guillaume Damiand 3a3cd7cdca Bad comment. 2012-01-16 10:13:43 +00:00
Guillaume Damiand 307f74ab94 Remove links in package description. 2012-01-16 10:12:22 +00:00
Laurent Rineau 36aab7376c Fix the initialization of CGAL Qt resources, on Windows platforms 2012-01-16 10:09:33 +00:00
Guillaume Damiand adb73b256c Add readme to explain the different examples in LCC. 2012-01-04 12:07:01 +00:00
Guillaume Damiand 9c203dec50 Remove warnings + useless data file. 2011-12-28 14:03:24 +00:00
Guillaume Damiand 8496ccedd0 Remove a warning 2011-12-23 07:43:26 +00:00
Guillaume Damiand ecbc71a4d7 Remove some warnings. 2011-12-22 07:06:55 +00:00
Guillaume Damiand 609b2a9242 Re-add file for example plane_graph_to_lcc_2.cpp which has strangely disappeared. 2011-12-21 07:30:21 +00:00
Guillaume Damiand 5a0c179699 Remove typename outside template class. Replace int by uint to avoid a warning. 2011-12-21 07:26:28 +00:00
Guillaume Damiand 3410b98aab Remove typename outside template class. 2011-12-21 07:17:24 +00:00
Guillaume Damiand aa7cd239a0 Demo is now able to compute voronoi 3D. 2011-12-20 15:30:25 +00:00
Guillaume Damiand ce8b663b83 * Add functions to extend the visible volumes to adjacent ones.
* Modification of the way that properties are associated with volumes.
2011-12-20 14:51:29 +00:00
Guillaume Damiand 449a6f8e39 Examples are now all ok. 2011-12-20 11:41:36 +00:00
Guillaume Damiand 19665940f1 Modifs of example. Now voronoi2 is a real voronoi diagramm. 2011-12-20 10:31:16 +00:00