Commit Graph

479 Commits

Author SHA1 Message Date
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
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 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 3406bf0c3f Merge remote-tracking branch 'cgal/master' into Polyhedron-demo__add_qtscript_support_to_Mesh_3_plugin-GF 2020-01-28 15:56:42 +01:00
Laurent Rineau bf8205642e Fix conversion warnings 2020-01-20 18:18:45 +01:00
Laurent Rineau 3b1f11dd0d Merge pull request #4383 from gdamiand/Basic_viewer_bugfix-gdamiand
Basic viewer bugfix
2020-01-17 16:28:25 +01:00
Guillaume Damiand a666cb0857 Resolve conflict 2020-01-16 08:33:24 +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
Laurent Rineau 25bcb34608 Merge pull request #4440 from maxGimeno/CGAL_qt-Fix_deprecation_warnings-maxGimeno
Graphics_view : Fix QTime warnings
2020-01-15 17:19:22 +01:00
Maxime Gimeno 8b30d9c752 remove obsolete hint fon antialiasing 2020-01-13 15:52:36 +01:00
Maxime Gimeno 1968f2cf20 Replace `QTime`s by `QElapsedTimer`s. It seems the header of QTime has been deprecated but it has not been documented... 2020-01-02 10:04:31 +01:00
Guillaume Damiand 3d0b69be50 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-03 16:15:09 +01:00
Guillaume Damiand 8be7c183b4 Remove warnings (thanks @sloriot) 2019-11-29 15:51:34 +01:00
Guillaume Damiand 1e93ad3579 Draw 2D objects in XY plane to have correct normal by default. 2019-11-29 08:46:16 +01:00
Guillaume Damiand 8ba7f76cd1 Bug fix in Buffer_for_vao.h 2019-11-29 08:35:47 +01:00
Guillaume Damiand e4300e4ddc Anticipate a conflict with another branch. 2019-11-26 13:54:15 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Guillaume Damiand c94c1a0874 Continue case with perforated faces. 2019-11-20 16:04:04 +01:00
Guillaume Damiand 157116f7c8 Re-add add_xxx method as static, since they are used without instance in Polyhedron demo. 2019-11-19 10:36:08 +01:00
Guillaume Damiand 1c52b7e715 One more bug 2019-11-13 12:24:30 +01:00
Guillaume Damiand cc663c5e36 Bugfix for negate normals. 2019-11-13 12:18:27 +01:00
Guillaume Damiand bb117e9792 Bug fix 2019-11-13 11:51:54 +01:00
Guillaume Damiand d638c80b5a
Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-11-12 22:13:10 +01:00
Sébastien Loriot 1ef976e3a5 Remove license notice from libQGLviewer forked files 2019-10-19 16:09:56 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0$/SPDX-License-Identifier: GPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0$/SPDX-License-Identifier: LGPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0$/SPDX-License-Identifier: LGPL-2.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00