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

516 Commits

Author SHA1 Message Date
Guillaume Damiand 9b4b3ee846 More cleanup plus do not recenter the scene at each modification. 2015-09-03 12:32:20 +02:00
Guillaume Damiand 98b36b260e Update light parameters 2015-08-31 08:18:04 +02:00
Guillaume Damiand 24840dbd5c Improve drawing code in LCC demo. 2015-08-29 14:43:52 +02:00
Guillaume Damiand 921416603f Reintegrate LCC demo save/load in the new qt5 version ok. 2015-08-28 14:43:07 +02:00
Guillaume Damiand 600e7b1b30 Start to merge with the new qt5 version of the LCC demo (nyf). 2015-08-28 11:51:48 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix 
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
 2015-08-13 14:08:12 +02:00
Maxime Gimeno ee2b0b2011 Transparent facets fix 
- set the alpha value to 1 in the shaders to insure opaque color.
 2015-08-13 11:56:04 +02:00
Maxime Gimeno 52a35d4d8d Random displaying fix 
- The bounding box was set before being initialized.
 2015-08-13 08:55:10 +02:00
Maxime Gimeno 3a5d0a79fc Mesa Fix 
- Replaced the 3.3 context by a 2.1 context
- Set the shaders version to 120
 2015-08-10 10:11:29 +02:00
Maxime Gimeno e413b0c45a GLSL Version changed 
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
 2015-08-06 15:19:36 +02:00
Guillaume Damiand d3f2e9cba2 LCC viewer uses now qt5. 2015-08-05 18:26:19 +01:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau cb0bdd3ad2 Remove warnings about unused moc files 
Should fix #194.
 2015-08-03 16:27:28 +02:00
Maxime Gimeno 1b14d447e5 SEGFAULT Fix 
- the iterator he_circ was looping wrong. I changed he_circ_end(he_circ) in
he_circ_end = lcc.darts_of_orbit<1>(dartIter).end();
 2015-08-03 12:57:45 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Sébastien Loriot 50595505c4 Merge branch 'Fix_warnings-GF' 
Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
 2015-07-17 14:21:21 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Sébastien Loriot 10dddcc881 init base class to avoid a warning with clang 2015-07-16 17:45:52 +02:00
Sébastien Loriot 590106f5fc Changes in the other demos due to Polygon_mesh_processing package (PMP) 2015-07-16 17:27:17 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Andreas Fabri 6c46be1d01 static_casts 2015-07-09 13:17:41 +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 f76bb19734 Windows fix 
- add an attribute at the application in the main() function
- add a custom context to the viewer
 2015-07-08 12:16:51 +02:00
Sébastien Loriot 1d4358e052 update qt urls 2015-07-08 09:48:45 +02:00
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Maxime Gimeno 32a8cb7d0c Changed system fixed. 
- Problem remaining : OFF aren't displayed when loaded.Scene need an additional scene_changed to display OFFs.
 2015-07-07 09:07:04 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Guillaume Damiand 662408b2f8 Improve merge coplanar faces method. 2015-07-01 15:21:35 +02:00
Guillaume Damiand 7f0b73634a Remove typename outside templace class 2015-07-01 07:28:37 +02:00
Guillaume Damiand fbfd47896b Remove the use of glu tesselator to draw non convex faces. 2015-06-30 14:22:53 +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
Guillaume Damiand cf563fa834 Disable non flat rendering; add casts to solve problem of gluTessCallback on win32. 2015-06-25 16:09:51 +02:00
Guillaume Damiand d67542fb59 Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC. 2015-06-22 16:50:56 +02:00
Guillaume Damiand ff15468079 Remove flag in cmake, pushed by error 2015-06-22 16:02:32 +02:00
Guillaume Damiand 6395db7d5e Increase the size of the first column. 2015-06-18 09:55:35 +02:00
Guillaume Damiand a57e127412 Remove warnings 2015-06-17 09:45:59 +02:00
Guillaume Damiand 37b0d2256c * Better drawing when scene was empty. 
* Bug fix in triangulate all faces
 2015-06-16 12:14:47 +02:00
Guillaume Damiand 0a92fae044 Do not modify the user point of view after each operation. 2015-06-16 08:53:45 +02:00
Guillaume Damiand da8fbde03c Bug fix in merge coplanar faces 2015-06-16 08:39:00 +02:00
Guillaume Damiand d0cb5d35f5 Bug fix when changing the visible property of a volume. 2015-06-16 07:57:45 +02:00
Guillaume Damiand 50fabbec8d Add delaunay triangulation of faces 2015-06-15 22:59:00 +02:00
Guillaume Damiand 4bae2612d8 * Modify load to not take into account the typeid of attributes 
* Update the demo to draw non convex faces
 2015-06-15 21:14:02 +02:00
Guillaume Damiand 1797dc57e0 * add one more import 
* bugfix in drawing fuction (to draw a volume in wireframe)
 2015-06-15 16:18:05 +02:00
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