Commit Graph

114 Commits

Author SHA1 Message Date
Kristian Bendiksen
58656f900b Qt6: string-related deprecations. 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
835cf4a53c Qt6: Fix QMouseEvent.x() and .y() deprecation. 2024-10-04 15:27:43 +02:00
Kristian Bendiksen
596ab564c8 Fix "nonnull asserts" warnings on gcc 13.
The C++ standard guarantees that the this pointer is never nullptr
in valid programs.
2024-09-27 14:42:53 +02:00
Kristian Bendiksen
3255b649ca #11072 Refactor: remove homemade atomic counter.
std::atomic was introduced in C++11, and provides same functionality in
platform-independent way.

Fixes #11072.
2024-04-17 15:41:15 +02:00
Magne Sjaastad
2250084176 Always link shader program if OglId is zero
The OpenGL resources can be invalidated at any time. Make sure that the shader program is linked if this happens.
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
Magne Sjaastad
12ca418ef0 Add fixes to handle missing data correctly 2024-01-19 11:53:06 +01:00
Sigurd Pettersen
ce9a65ee41
VizFwk housekeeping (#11026)
Housekeeping in VizFwk in preparation for introducing support for QOpenGLWidget and Qt6

* Adjusted unit tests to changes in source code
* Use Qt5 as default and removed copying of Qt DLLs
* Removed support for Qt4
* Removed the CVF_OPENGL_ES define. If we ever want to re-introduce support fro OpenGLES/Angle it should be handled differently.
*Added include of <locale.h>
* Added target for running Glsl2Include in order to build cvfShaderSourceStrings.h
* Removed all usage of CVF_USING_CMAKE
* Removed visual studio project files
2024-01-09 14:38:57 +01:00
Eirik Marthinsen
9701866736 CMake: Update/Remove old minimum version check
- Update the minimum required CMake version to 3.15 for Fwk folders
  that might be used as top level projects.
- Remove the minimum required CMake version from projects that is just
  included from other top level projects.

Since version 3.19 CMake has been warning that CMake versions below 3.5
is deprecated and support will be removed in the future. This will
silence those warning.

By removing the minimum required version check from projects that is not
intended as top level projects we avoid redundant checks and simplifies
future maintenance.

Closes #10957
2023-12-16 17:35:54 +01:00
Magne Sjaastad
21843820e6
Update clang-tidy.yml
* Make sure clang-tidy action use .clang-tidy config file
Use add-paths to instruct create-pull-request to a sub folder to avoid diff from Qt and vcpkg

* Use empty() in macro to avoid clang-tidy warning
* Add NOLINT to CAF_ASSERT
* Add NOLINT to cvfAssert
2023-10-03 09:04:08 +02:00
Kristian Bendiksen
98796b0dd9 #10649 Fwk: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +02:00
Magne Sjaastad
f4255ba16e Remove unused include 2023-09-04 15:37:51 +02:00
Magne Sjaastad
533b0805c0 Color legend range: Do not round values if min and max is identical
If min and max is identical, keep the original value. This will ensure that a discrete legend contains only one level.
2023-08-17 07:02:26 +02:00
jonjenssen
6a137f5ca9 Do some additional assert cleanup 2023-05-25 14:56:26 +02:00
Magne Sjaastad
bce8177033
Delete some unused variables and disable warnings 2023-05-21 15:15:09 +02:00
Arne Morten Kvarving
2a22cbe610 fixed: do not compare index 2 twice 2023-05-15 13:28:02 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +02:00
Jon Jenssen
090293c421 Use assert less for boundingbox methods. 2023-03-28 18:38:32 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +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
38bfa9ef1f
#9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Magne Sjaastad
a423ecf95f
Several OpenMP improvements
Several optimizations based on profiling of 20M grid model. These fixes will improve the largest performance issues, but there are still more operations that can be refactored.

* OpenMP: Use in fault geometry generator
* OpenMP: Use when computing statistics for result values
* OpenMP: Use multithreading on fault detection
* Add RiaOpenMPTools
* VizFwk: Use openMP for texture generation
2022-12-19 13:49:03 +01:00
Magne Sjaastad
befab37588 Add debug output of AABB tree 2022-12-16 15:36:48 +01:00
Magne Sjaastad
32614152a6 Memory Management : Fix memory leak in bounding box tree 2022-03-03 14:39:41 +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
Kristian Bendiksen
99fde63af1 Janitor: remove assert(this) warnings.
The c++ standard guarantees that "this" is nonnull in valid programs.
So this check is unneccessary, and gcc warns in debug mode.
2022-01-20 12:53:26 +01:00
jonjenssen
55ba4bc802
Intersection depthfilter (#8408)
* Implement a simple depth filter to cut all geometry below a certain level for intersections
* Add option to override all curve intersection cut depths from collection.
* Add support for showing intersection above or below threshold. Update label texts.
2022-01-05 15:52:04 +01:00
Magne Sjaastad
3c07989c51 Janitor : Remove obsolete code related to Qt 4 2021-02-22 13:37:05 +01:00
Gaute Lindkvist
558bee72af New functions for creating cvf::refs to avoid "naked new" in App code 2020-12-11 10:56:25 +01:00
Gaute Lindkvist
069b427d10 Require CMake 3.12 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
2110323be7 Swap use of deprecated auto_ptr for unique_ptr in cvfMutex.h 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
13025e92fb Remove /W3 warning in cvf (already use /W4) 2020-09-25 14:32:27 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Kristian Bendiksen
2eb18d8151 #6029 Upgrade gtest to v1.10 for Fwk/. 2020-06-03 22:06:30 +02:00
Gaute Lindkvist
d6be12bf02 Improved Bounding Box tree for ill-formed grids 2020-05-25 15:30:45 +02:00
Kristian Bendiksen
30cec3e280 Fix comparison between signed and unsigned integer expressions. 2020-05-20 14:23:22 +02:00
Gaute Lindkvist
6d5216f794 AABB Tree: Cache bounding box center in leaf nodes and calculate bounding box while assigning leaves. 2020-05-19 16:14:08 +02:00
Gaute Lindkvist
96fe8b07e2 Stop using node pool for AABB tree because it interferes with parallelism.
(still using the leaf pool)
2020-05-19 16:14:08 +02:00
Gaute Lindkvist
a486f4ac76 Minor tree improvements 2020-05-19 16:14:08 +02:00
Gaute Lindkvist
d04bf2da8a Add quicker method for adding bounding boxes to bounding boxes. 2020-05-19 16:14:08 +02:00
Gaute Lindkvist
8bfcaa0341 Bounding box clearing 2020-05-15 14:47:04 +02:00
Gaute Lindkvist
99aa65c611 Other improvements to bounding box calculation 2020-05-15 14:47:04 +02:00
Gaute Lindkvist
64b0687dee Parallel AABB tree 2020-05-15 14:47:04 +02:00
Gaute Lindkvist
0922b68302 Simplified AABB tree 2020-05-15 14:47:04 +02:00
Kristian Bendiksen
f735d19c2c Remove incorrect null pointer check in Object::release.
"this" should never be null here, and warns about it.
2020-04-30 12:46:50 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Kristian Bendiksen
568a135d82 #5448 Remove warnings about uninitialized values in cvf::Vec2/Vec3. 2020-03-29 22:19:34 +02:00
Magne Sjaastad
6f54d176cc AABB Tree : Do resize based on number of leaf nodes 2020-01-27 14:17:43 +01:00
Gaute Lindkvist
b958db0b1f AABB Tree : Implement simple pool allocation for bounding box tree 2020-01-27 14:17:37 +01:00