Commit Graph

461 Commits

Author SHA1 Message Date
Laurent Rineau 11e3c689ed Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1
2021-03-03 16:39:47 +01:00
Maxime Gimeno a16bd23d04 Replace Qt::MidButton by Qt::MiddleButton, qhich is the same thing but not deprecated 2021-03-02 09:56:14 +01:00
Laurent Rineau fa1a355751 Merge branch '5.1.x-branch' into 5.2.x-branch 2021-02-18 15:19:05 +01:00
Maxime Gimeno 23b1024f1b fix direction-constraint in qglviewer 2021-02-18 14:01:15 +01:00
Maxime Gimeno 0a085569bf Fix parent error 2021-02-17 08:37:57 +01:00
Maxime Gimeno 38f1b179c0 Test the dynamic_cast rsult 2021-02-16 09:56:32 +01:00
Maxime Gimeno 0010df67e6 Remove useless if. 2021-02-16 08:57:47 +01:00
Maxime Gimeno 4a6aa7e024 use Qt::MiddleButton instead of MidButton(deprecated since 5.6 or earlier) 2021-02-15 15:22:41 +01:00
Maxime Gimeno a74914ecbd Fix warning null pointer 2021-02-15 15:18:02 +01:00
Laurent Rineau b134ed8246 Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:07:32 +01:00
Maxime Gimeno a91d63699f Fix PCA demo and remove debug warnings 2021-01-21 11:06:01 +01:00
Maxime Gimeno 9a202e2bbc Add missing headers 2021-01-12 13:27:31 +01:00
Maxime Gimeno 04753381e5 Rename file and add ::Qt 2021-01-12 13:22:34 +01:00
Maxime Gimeno 95192d6d4b factorize context initialization 2021-01-12 13:08:58 +01:00
Maxime Gimeno 3ec3ffc518 WIP 2021-01-12 11:05:10 +01:00
Maxime Gimeno 78f1b28e41 Fix message about context not made current 2021-01-08 12:46:39 +01:00
Maxime Gimeno 2a212bb2a8 Upgrade non-compatibility sahders in Basic_viewer to glsl 150 and add a context creation before the creation of the QApp in draw_xxx examples 2021-01-07 13:06:40 +01:00
Maxime Gimeno 4f3c4256b0 Use version150 2021-01-07 12:03:46 +01:00
Maxime Gimeno 08469076fc Remove false key binding 2020-10-22 14:06:09 +02:00
Laurent Rineau 86e1fc18ce Merge pull request #4876 from lrineau/GraphicsView-Basic_viewer_improvements-GF
Improvements to Basic_viewer
2020-10-16 13:43:10 +02:00
Laurent Rineau 9c97b1dafc Remove trailing whitespaces 2020-10-13 14:34:42 +02:00
Laurent Rineau 7a48e35ffe Merge pull request #5042 from maxGimeno/Viewer-Zoom_to_rectangle
Viewer zoom to rectangle
2020-10-09 16:50:24 +02:00
Maxime Gimeno a28dd524b7 another warning fix 2020-10-07 09:59:18 +02:00
Maxime Gimeno dcbb50a134 fix warning 2020-10-06 12:58:45 +02:00
Maxime Gimeno 43a49605e0 Fix conflicts 2020-10-05 13:20:40 +02:00
Sebastien Loriot 9a9acceb10
Merge pull request #4761 from maxGimeno/GraphicsView-Fixes_for_Regular_triangulation_2-maxGimeno
GraphicsView: Regular_triangulation_2 enhancements
2020-10-02 15:20:20 +02:00
Maxime Gimeno e75b70064a Recenter the scene resets the FOV 2020-10-01 10:05:18 +02:00
Maxime Gimeno a175741570 Add help for optical zoom 2020-10-01 09:10:33 +02:00
Maxime Gimeno 06995b543a Add a zoom with z+wheel 2020-09-30 16:28:25 +02:00
Maxime Gimeno bd5d625e7b restore rectangle drawing while zooming on position 2020-09-30 13:12:23 +02:00
Maxime Gimeno 9503a6a18b Remove state of camera. It is supposed to be reinit when launching the app and sometimes it leads to not being to visualize anything 2020-09-29 16:06:35 +02:00
Maxime Gimeno cfa89e9da4 Replace < by O to have it on all keyboards, not only french ones 2020-09-29 15:51:16 +02:00
Sébastien Loriot 30ac63a867 remove trailing whitespaces 2020-08-31 16:08:38 +02:00
Guillaume Damiand 86307add6d Add an option to toggle between 2D and 3D mode for the viewer. 2020-08-31 15:14:53 +02:00
Laurent Rineau 4d59f718ac Add setters to set all those Booleans afterwards 2020-07-24 13:10:51 +02:00
Laurent Rineau e831481e6e Make `redraw()` public 2020-07-24 13:10:37 +02:00
Laurent Rineau a1a1ee4496 Move shortcuts and descriptions in the constructor
@gdamiand Please review this patch
2020-07-23 17:37:23 +02:00
Laurent Rineau 66040cb5f3 A few fix to our LEDA testsuite 2020-07-20 17:13:01 +02:00
Maxime Gimeno 624e8e803a Fix flag fix 2020-06-12 10:34:48 +02:00
Maxime Gimeno a9795c3562 Fix deprecation warnings 2020-06-11 13:11:36 +02:00
Maxime Gimeno e28a3ac2cc Fix some edge width and add a double click event to add a 0 wheighted point. 2020-06-02 12:55:25 +02:00
Sebastien Loriot 2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien
Surface mesh topology shortest cycle
2020-04-29 09:10:37 +02:00
Guillaume Damiand 7ec9d576cd Do not re-use standard keys in basic viewer. 2020-04-27 18:55:25 +02:00
Sébastien Loriot 58b10a3605 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:58:50 +01:00
Sébastien Loriot c1a42c7d37 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:21 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Laurent Rineau bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00