Commit Graph

110 Commits

Author SHA1 Message Date
Magne Sjaastad
8e13d6c528 Use modern OpenGL Qt widget
Use cvfqt::OpenGLWidget and make required changes
- move code from paintEvent to paintGL to make grabFrambuffer work
- remove obsolete sharedWidget
- implement onWidgetOpenGLReady and initialize rendering in this function as OpenGL capabilities is required
- simplify snapshotImage to use grabFramebuffer

Fix missing include
2024-02-07 10:07:18 +01:00
Sigurd Pettersen
10a579fac5
Add support in VizFwk for using QOpenGLWidget derived view widget (#11091)
* Refactor to deprecate existing QGLWidget derived widget

Renamed cvfqt::OpenGLWidget to cvfqt::GLWidget_deprecated
Renamed cvfqt::CvfBoundQGLContext to cvfqt::CvfBoundQGLContext_deprecated
Renamed cvfqt::OpenGLContext to cvfqt::OpenGLContext_QGLContextAdapter_deprecated
Added cvf::OpenGLUtils

* Marked existing QtMinimal and QtMultiView as deprecated

* Additional deprecated renaming

* Added missing type

* Added missing include

* Fixes to get snippets up and running before introducing new OpenGL widgets

* Added class for OpenGLInfo

* Refactored cvf::OpenGLContext and cvf::OpenGLContextGroup, and added first cut impl of cvfqt::GLWidget and cvfqt::OpenGLWidget

* Removed unused TriggerTBBCopy.txt

* Initial support for compilation on Qt6

* Added QtMinimal and QtMinimal_GLWidget

* Refactored SnippetRunner to handle utilize cvfqt::OpenGLWidget

* Removed unused code

* Fixes and workarounds from compiling on linux

* Fixes by clang-format (#11056)

Co-authored-by: sigurdp <sigurdp@users.noreply.github.com>

* Added QTMultiView test app based on cvfqt::OpenGLWidget

* Removed includes of QOpenGLFunctions

* Modifications for compile with Qt6

* Added test bench for cvfqt::OpenGLWidget

* Minor fixes

* Force to use Qt5

* Fixes by cmake-format

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: sigurdp <sigurdp@users.noreply.github.com>
2024-01-23 08:48:05 +01:00
Kristian Bendiksen
98796b0dd9 #10649 Fwk: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
Magne Sjaastad
d23c6b4bb6
Janitor: Several code hygiene adjustments (#9981)
* Include all libraries in APP_FWK_LIBRARIES
* Several fixes detected by Static Code Analysis
* Remove unused code
* Add .clang.tidy
* Use QElapsedTimer
* Use horizontalAdvance
* Avoid | between enum of different classes
* Avoid illegal character
* Renaming and reorder of constructor initialization
2023-03-23 15:49:06 +01:00
Magne Sjaastad
583c248cf9
Janitor issues
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
2023-01-24 12:29:27 +01:00
Magne Sjaastad
dfa1bc2cd0
Some fixes for new gcc/clang
Minor fixes for newer gcc/clang. These issues were seen when using ubuntu-latest (Ubuntu 22.04) on Github Actions.
2022-11-25 08:59:10 +01:00
Magne Sjaastad
806a149809
Fix several deprecation warnings (#8657)
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
2022-03-11 13:24:01 +01:00
Magne Sjaastad
2d2bf0bbc7
CMake : Improve handling of compiler flags (#8486)
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
2022-01-26 10:08:28 +01:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
Magne Sjaastad
3c07989c51 Janitor : Remove obsolete code related to Qt 4 2021-02-22 13:37:05 +01:00
github-actions[bot]
223fe756fe
Fixes by cmake-format (#6874) 2020-10-30 12:31:16 +01:00
Gaute Lindkvist
069b427d10 Require CMake 3.12 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Magne Sjaastad
bdc536dfc4 #6106 Apply clang-format on AppFwk 2020-06-19 08:00:01 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Magne Sjaastad
4e3a894464 #5370 Unity Build : Add config for AppFwk 2020-01-23 13:37:29 +01:00
Jacob Støren
c27c19ce96 caf::Viewer: Add inComparisonView option to isAnimationActive
#4994 preparations
2019-11-08 10:40:37 +01:00
Jacob Støren
904808394b caf::Viewer: Maintain a flag telling if we have an active comparison view.
Set a custom widget property to communicate it to PdmUiSelection3dEditorVisualizer
Add method to specifically get the Ray intersect speck from each rendering
2019-11-06 14:13:01 +01:00
Jacob Støren
c6e4641725 caf::Viewer: Avoid updating boundingboxes when static models are not removed 2019-11-05 09:30:58 +01:00
Jacob Støren
ed54ccbd01 #4971 Fix Background color in comparison view is always the default color 2019-11-04 10:01:40 +01:00
Jacob Støren
720c83d2e3 caf::Viewer: Fixed linux warnings and a bogus comparison 2019-11-01 15:57:03 +01:00
Jacob Støren
e62645341c caf::Viewer: Add method to get correct ray definition when it is inside comparison view 2019-11-01 15:57:03 +01:00
Jacob Støren
016f26725a #4862 Lock scale Z in comparison view to follow the main view.
#4858 Make timestep independent in comparison view. Make Linked Views timestep linking work
2019-10-22 13:39:18 +02:00
Jacob Støren
3f203b808b AppFwk: Viewer: Fix missing nearplane adjustments in comparison view 2019-10-17 15:02:38 +02:00
Jacob Støren
e3dc32bd71 #4857 AppFwk: Add handling of comparison view to the 3d navigation policies 2019-10-17 15:02:38 +02:00
Jacob Støren
d438158691 #4857 AppFwk: Handle picking in the comparison part of the view 2019-10-17 15:02:38 +02:00
Jacob Støren
468cea28bc AppFwk: Add comparison view support to the Viewer.
Add a separate overlay rendering to make rendering of overlay items more flexible and to support the comparison view.
Add control of the Rendering Enable mask
2019-10-11 14:52:49 +02:00
Jacob Støren
f5f8df43a1 caf: Add support for user controlled fixed rotation sensitivity in trackball based navigations 2019-10-09 19:27:13 +02:00
Magne Sjaastad
b70c88330a #4508 Qt5 : Crash when taking snapshot of MDI window 2019-06-28 13:37:37 +02:00
Magne Sjaastad
d108e1f354 AppFwk : Guard use of timestamp() function introduced in Qt5 2019-06-25 18:02:47 +02:00
Jacob Støren
2930d41521 AppFwk: Fix of Qt5 OpenGL related problems: Offset + Context deletion.
Added option to control the direction of the parallel projection headlight
Added optional visualization of point of interest to caf::Viewer
2019-06-25 17:01:38 +02:00
Jacob Støren
936d2e122d AppFwk: Added optional adaptive rotation sensitivity to CAD and Ceetron Plus navigation policies 2019-06-25 16:59:53 +02:00
Gaute Lindkvist
5365f4dd7d Caf build fixes for CEE_USE_QT5 2019-05-31 11:00:32 +02:00
Gaute Lindkvist
10afe4987b #4448 Clean up CAF Qt5-enabling/detection 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
be95eefd69 Repository wide spelling correction overly -> overlay
* Impacts CAF and ResInsight
2019-03-05 10:41:41 +01:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Gaute Lindkvist
107a4b9b60 #4012 Always place well target points in real cell geometry 2019-02-01 07:56:05 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
65ee55c96d #3944 clang-tidy : Apply clang-tidy on caf 2019-01-11 08:14:53 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Gaute Lindkvist
914daded6b #3794 Improve wheel zooming 2018-12-12 08:01:13 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist
ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Magne Sjaastad
11de63a5ef Fix Linux build 2018-11-21 10:55:57 +01:00
Gaute Lindkvist
9145e6011d #3697 Fix zoom issues with ortographic views 2018-11-20 13:49:19 +01:00
Magne Sjaastad
b584ab905c AppFwk : Activate more warnings 2018-09-27 21:36:52 +02:00