Commit Graph

40 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
2110323be7 Swap use of deprecated auto_ptr for unique_ptr in cvfMutex.h 2020-10-20 11:05:10 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +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
Kristian Bendiksen
568a135d82 #5448 Remove warnings about uninitialized values in cvf::Vec2/Vec3. 2020-03-29 22:19:34 +02:00
Magne Sjaastad
70cbb7fe3f #5370 Unity Build : Add config for CeeViz 2020-01-23 13:28:05 +01:00
Magne Sjaastad
59616d5c65 AppFwk : Disable some warnings 2019-09-16 13:42:36 +02:00
Magne Sjaastad
97d6638293 #4683 VizFwk : Make several header files self contained by include of cvfBase.h 2019-09-06 10:52:50 +02:00
Gaute Lindkvist
6ba9d42b45 #4448 Move Resinsight from -std=c++0x to -std=c++11 on GNU CXX 2019-05-28 15:58:49 +02:00
Magne Sjaastad
1b60ddc846 System : Exclude VizFwk to fix appveyor 2019-02-04 12:26:10 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Bjørn Erik Jensen
9543649858 Revert "Fix Linux build by adding missing include"
This reverts commit ab8a4f58ab.
2018-03-09 08:47:43 +01:00
Bjørn Erik Jensen
ab8a4f58ab Fix Linux build by adding missing include 2018-03-09 08:37:53 +01:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
13606f0295 Clang : Exclude special code in release() to avoid warning 2018-02-12 20:09:01 +01:00
Magne Sjaastad
c208569fb6 Clang : Remove inline from template function 2018-02-12 20:09:01 +01:00
Bjørn Erik Jensen
5d672356d2 Color3f. Add operator < 2017-10-09 09:01:19 +02:00
Magne Sjaastad
2e8a411df8 VizFwk : Added support for optional multiple arguments to a command line option 2016-11-09 11:30:11 +01:00
Roland Kaufmann
e0da9a611f Remove copy ctor of atomic counter on OS X
This is not present on any of the other platforms so it is not needed,
but it uses a removed method (to receive the value) so it won't compile.
2015-01-01 19:46:24 +01:00
Roland Kaufmann
90249e1158 Use pthreads on MacOS X too
MacOS X is POSIXy enough for this to be a suitable choice
2015-01-01 19:46:24 +01:00
Magne Sjaastad
bf9ecc7c5f Changed how synchronization functions are detected 2014-04-15 11:50:04 +02:00
Magne Sjaastad
486f383de7 Integrated changes for framework
Pdm fields can contain a forward declared Pdm object without the include
file
VizFwk: Added VertexColoring shader to be able to use per vertex color
used from drawableGeo::setColorArray()
2014-04-11 11:06:42 +02:00
JacobStoren
5ca8911a68 Linux compile fixes 2013-12-09 15:48:55 +01:00
sigurdp
cc72c7b2f6 Merged down changes from Resinsight dev branch 2013-12-04 16:06:48 +01:00
sigurdp
368af75bf2 Refactored ProgramOptions class 2013-12-04 14:56:04 +01:00
sigurdp
4db4e44668 Added member ProgramOptions::firstValue() 2013-12-04 11:49:05 +01:00
Jacob Støren
c608376c4e Added ArrayWrapper and BoundingBoxTree to VizFwk 2013-12-04 11:24:53 +01:00
sigurdp
58412c010c Added cvf::ProgramOptions class to Fwk
Integrated from CS PF as of changelist 235
2013-11-29 13:00:09 +01:00
sigurdp
bbebebadd5 Added complete VizFwk
Added the complete VizFwk from the ResInsight branch in Perforce as of
changelist 190.
2013-11-01 08:49:42 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
2013-10-31 14:57:52 +01:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00