Commit Graph

34 Commits

Author SHA1 Message Date
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
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
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
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
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
70cbb7fe3f #5370 Unity Build : Add config for CeeViz 2020-01-23 13:28:05 +01:00
Jacob Støren
6d2253ad26 VizFwk: Add scissoring to cvf::Rendering 2019-10-11 14:52:49 +02:00
Magne Sjaastad
59616d5c65 AppFwk : Disable some warnings 2019-09-16 13:42:36 +02:00
Gaute Lindkvist
a54e3f30c4 Fix CVF compile flags on GNUCXX 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
Gaute Lindkvist
0b9b7e8eb7 #3971 Contour maps: add a label candidate for every segment but use bounding boxes and minimum curve distance to skip. 2019-01-16 14:09:28 +01:00
sigurdp
db9b225112 VizFwk compiler fixes for VS2010 2019-01-15 11:45:46 +01:00
Gaute Lindkvist
7a275be335 #3876 Implement rotated labels on contour maps 2019-01-08 11:07:37 +01:00
Magne Sjaastad
9e3a100bcc #3253 OpenMP : Give name to all critical sections 2018-08-27 13:04:29 +02:00
Gaute Lindkvist
88cc6ea3f5 Fix wrong assert in cvfScalarMapperRangeBased::setLevelsFromValues
* Old code always causes assert failure when calling this method.
2018-05-07 11:17:51 +02:00
Jacob Støren
df6c9f69d1 ScalarMapperRangeBased: Avoid adding duplicate ticks. Typically when max == min value 2018-05-04 13:33:06 +02:00
Gaute Lindkvist
5d89ad3a6d 3D Well Log Curves (#2674): Show what the value axis direction is 2018-04-19 13:43:12 +02:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
975f52a78d VizFwk : Added guard for one level only scalar values 2016-08-05 17:19:47 +02:00
Magne Sjaastad
9a25a71cde Fwk : Added support for more characters in axis labels
Moved drawing of axis cross slightly closer to left edge of available
viewport
2015-11-23 09:56:48 +01:00
Jacob Støren
33148edef4 VizFwk: Discrete log legend: Added missing clamping 2015-05-16 09:36:03 +02:00
Jacob Støren
7a2640b52f Discrete legend: Fix of discrete texture and end colors
Added changes from ChList 2078-2081
2015-05-13 20:51:44 +02:00
Roland Kaufmann
6d38344261 Don't validate shader programs on MacOS X
If the paint event is called before the view is visible, validation
of the shader program will cause an error on MacOS X 10.8 and forward,
stating that the operation was ignored.
2015-01-01 19:46:25 +01: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
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
Magne Sjaastad
90402c285d VizFramework: Improve the stability of text color in ResInsight.
The setting for current OpenGL texture engine is not controlled well
enough, causing the wrong texture to be active when rendering text -
hence giving semi-random colors for the text.
2013-10-04 14:02:14 +02:00
Magne Sjaastad
764f564c0c Performance: Access memory directly instead of using access functions. 2013-09-30 07:55:26 +02:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00