Commit Graph

592 Commits

Author SHA1 Message Date
Andreas Fabri 47683f2dea The Truiangulation_2/examples which use draw() compile and visualize but have an assertion in a QMap 2023-04-19 14:27:45 +01:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Luiz Georg 42752d0c53 Add converter to QPolygonF 2023-03-29 11:39:37 -03:00
SaillantNicolas ea7adb83e1
Remove ImageInterface.ui from resources 2023-03-09 14:19:54 +01:00
Nicolas Saillant 8b90cb40b2 Move ImagerInterface.ui into QT folders 2023-03-09 13:29:46 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Andreas Fabri c7fb2f56ae Three: Add an #include# 2022-12-07 09:47:41 +00:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Guillaume Damiand 14848d4508 Add a class allowing to create a qt application and a basic viewer, which can be ran latter. This allows modification of the viewer (for example add shortcuts description). 2022-10-19 13:44:36 +02:00
Guillaume Damiand 89f7e05dc6 some drawing functor are necessary non null; review of draw for lcc. 2022-10-14 16:03:25 +02:00
Guillaume Damiand 9c77619fde Remove unused constructor; move function that does not depend on Qt 2022-10-14 15:08:05 +02:00
Guillaume Damiand 47f01c77bc Remove enum duplication 2022-10-14 11:32:58 +02:00
Guillaume Damiand 62201124d3 Merge branch 'EBVs-Mostafa-ashraf19-cgal-dev-OLD' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 09:03:30 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Guillaume Damiand 09ce35d9ba Correct template specialisation for add_in_graphic_buffer functions, lcc and voronoi 2 2022-10-13 11:18:32 +02:00
Guillaume Damiand 91016007cd Some cleanup 2022-10-13 11:11:57 +02:00
Mostafa-ashraf19 f1274c637c Solved custom KeyPressEvent callback. 2022-10-11 18:28:46 +02:00
Mostafa-ashraf19 8141fab21c Initial commit to adding custom KeyPressEvent. 2022-10-09 01:49:45 +02:00
Mostafa-ashraf19 0e2586f83d Added template arg. 2022-10-08 12:34:46 +02:00
Mostafa-ashraf19 cc4aa7cd9d Applied new APIs version in Voronoi 2, with modifications in Basic_viewer_qt. 2022-10-06 17:48:58 +02:00
Laurent Rineau be28464cdc Merge pull request #6838 from MaelRL/Polyhedron_Demo-Fix_grid_axes_scaling-GF
Demo: Fix grid axes scaling + use basic shader
2022-10-04 13:53:26 +02:00
Laurent Rineau 7a36d9af83 Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:52:56 +02:00
Laurent Rineau 3a0a7fe34e Merge pull request #6863 from lrineau/Polyhedron-demo_fix_display_of_protecting_spheres-GF
Polyhedron demo - Fix the display of protecting balls (second version)
2022-10-04 13:50:20 +02:00
Mostafa-ashraf19 796ec13391 Modified GraphicBuffer class name to snake case. 2022-10-03 13:27:22 +02:00
Mostafa-ashraf19 6c95908e6c Renamed functors and GB, added handles to test functors. 2022-09-23 18:03:11 +02:00
Laurent Rineau 3b6b6f9018 Polyhedron demo - Fix the display of protecting balls 2022-09-20 16:15:49 +02:00
Guillaume Damiand 899b8eaa82 Bugfix for negate normal 2022-09-12 15:58:04 +02:00
Guillaume Damiand 6076849ea5 Update for basic viewer 2022-09-12 10:55:37 +02:00
Mostafa-ashraf19 b61722fb1c Added template inheritance. 2022-09-10 21:22:18 +02:00
Mael cf06114d97
Comment out unused variable 2022-09-09 22:21:35 +02:00
Mael Rouxel-Labbé 5c8f36e0ca Fix grid axes scaling + use basic shader 2022-09-07 20:54:21 +02:00
Mostafa-ashraf19 c8c068ecff Moved draw_buffer function. 2022-07-25 19:45:45 +02:00
Sébastien Loriot 0b63b76008 fix copy/paste error 2022-07-25 16:51:38 +02:00
Mostafa-ashraf19 b8509e4da1 Fixed bugs, migrated variables to graphics buffer, and removes unneeded variables. 2022-07-25 15:08:18 +02:00
Mostafa-ashraf19 e050176613 Removed forward declaration. 2022-07-20 12:47:29 +02:00
Mostafa-ashraf19 5d7bb68480 Fixed typo, added forward declaration at basic viewers. 2022-07-20 11:46:30 +02:00
Mostafa-ashraf19 2a3144b7f3 Dealing bounding box from the graphic buffer. TODO for expected would remove 2022-07-20 10:04:47 +02:00
Mostafa-ashraf19 8778d1c4b4 Handled constructor. 2022-07-20 09:50:38 +02:00
Mostafa-ashraf19 6768426af6 Moved the graphical store elements, and used elements from the graphic buffer.
Moved m_texts, arrays, m_bounding_box.
Handled methods that use basic viewer arrays to use them from the graphic buffer.
Moved a few methods.
2022-07-20 09:40:17 +02:00
Guillaume Damiand a303529e17 small correctioin 2022-07-19 10:47:51 +02:00
Mostafa-ashraf19 a859f50716 fixes bugs, WIP constructor 2022-07-19 09:36:45 +02:00
Guillaume Damiand e92373740e Add constant for init size of window 2022-07-13 10:15:50 +02:00
Mostafa-ashraf19 32ecb11947 CGAL: Initial commit to handle GraphicBuffer with Basic viewers. 2022-07-04 10:25:59 +02:00
Guillaume Damiand 1d9280afae Update basic viewer to set camera mode ealier (following Efi issue). TODO: test if this solves the bug. 2022-07-04 10:04:20 +02:00
Mael Rouxel-Labbé 37390bb6b8 Add dialog-less QGLviewer::saveSnapshot 2022-06-08 12:03:25 +02:00
Sébastien Loriot ebf9fb025a Merge remote-tracking branch 'cgal/5.4.x-branch' 2022-05-26 18:13:59 +02:00
Sébastien Loriot 6f84cbebc2 Merge remote-tracking branch 'cgal/5.3.x-branch' 2022-05-26 18:13:19 +02:00
Laurent Rineau b32619fedd Fix the picking 2022-05-16 17:12:00 +02:00
Laurent Rineau 213da3115f Fix the display of the pivot point 2022-05-16 16:20:13 +02:00
Laurent Rineau 9211f1768f Add a generic read_pixel for other pixel readings 2022-05-12 14:15:01 +02:00
Laurent Rineau 225e3c2217 Add a function read_depth_under_pixel
The function takes care of HiDPI screen, using `devicePixelRatio()`.
2022-05-12 12:41:58 +02:00
Laurent Rineau 9ade574b1a Add devicePixelRatio() to Camera 2022-05-12 12:13:08 +02:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Sébastien Loriot 993a7b29b0 fix warnings about arithmetic operations on enum
cherry-pick of 364009
2021-11-29 17:59:12 +01:00
Sébastien Loriot 3640099261 fix warnings about arithmetic operations on enum 2021-09-28 15:36:51 +02:00
Guillaume Damiand c71138c3b0 Regenerate clipping plane in initialize_buffers, to adapt it to the possible new bounding box; add methods to retreive the clipping plane as a cgal plane_3. 2021-06-30 18:40:13 +02:00
Guillaume Damiand 29d54bb66b trailling 2021-06-29 19:54:13 +02:00
Guillaume Damiand 53cdabe0c3 Do not delete clipping plane frame, but only hide it, to keep its position. 2021-06-29 17:39:30 +02:00
Guillaume Damiand 1ab891ee35 Do not clear pos buffer of clipping plane. 2021-06-29 15:49:05 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Maxime Gimeno 17602e589e Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF 2021-04-07 09:17:51 +02:00
Maxime Gimeno 5066d5ae4b Fix Qt::midbutton deprecation warning 2021-03-16 13:28:00 +01:00
Laurent Rineau 2d5678bc91
Merge pull request #5406 from gdamiand/gsoc2020-basic-viewer-jyang-gdamiand 2021-03-08 09:21:39 +01:00
Laurent Rineau f712a2a3a0 Merge pull request #5473 from maxGimeno/Demo-Fixes-maxGimeno
Polyhedron demo: Fixes for 5.1

Conflicts:
	Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert
	Polyhedron/demo/Polyhedron/resources/shader_spheres.vert
2021-03-03 18:27:33 +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
Guillaume Damiand 1561f3a523 Remove duplicated shaders 2021-02-23 11:11:04 +01:00
Mael Rouxel-Labbé 5efa544734 Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-02-22 17:19:40 +01:00
Guillaume Damiand 4f6291e3f2
Merge branch 'master' into gsoc2020-basic-viewer-jyang-gdamiand 2021-02-22 09:42:52 +01:00
Maxime Gimeno b80daff6fb Fixes 2021-02-19 11:31:52 +01:00
Laurent Rineau db338aa1ee Merge pull request #5417 from maxGimeno/Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
QGLViewer: remove the need for Qt5::Xml
2021-02-18 15:19:06 +01:00
Laurent Rineau 5bd98167d4 Merge pull request #5462 from maxGimeno/CGAL-Fix_qt_warnings-maxGimeno
Fix Qt warnings
2021-02-18 15:18:53 +01:00
Maxime Gimeno d5811d0a41 clang-tidy on tests 2021-02-18 15:15:12 +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
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno c9a020bb1a Remove remaining includes 2021-02-09 12:28:58 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau c5ba414c72 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:12:42 +01:00
Maxime Gimeno 5e63293747 Replace plane manipulation by frame manipulation. 2021-02-03 11:41:07 +01:00
Guillaume Damiand a09a4684f4 Start to use manipulated frame for clipping plane 2021-02-03 08:56:52 +01:00
Guillaume Damiand 3b838da50a Re-add clipping plane. 2021-01-27 18:47:38 +01:00
Mael Rouxel-Labbé 1f45360d7a Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-01-26 09:05:24 +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
Laurent Rineau 9db83004d5 Merge pull request #5107 from maxGimeno/Demo-Optical_zoom_to_pointer-maxGimeno
GraphicsView: Zoom enhancement
2021-01-06 16:11:51 +01:00
Mael Rouxel-Labbé 6b87fe393d Fix various grammar issues 2020-12-05 11:11:33 +01:00
Maxime Gimeno b116a92be3 Center the camera on the cursor at first tick of optical zoom 2020-10-23 13:35:05 +02: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