OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,616 Commits 28 Branches 61 Tags 290 MiB
6839e82613
Commit Graph

52 Commits

Author SHA1 Message Date
Gaute Lindkvist
6839e82613 #4448 Clean up Qt5-detection CVF 2019-05-28 15:58:49 +02:00
Magne Sjaastad
6f7730c1f5 #4061 VizFwk : Use variable CEE_USE_QT5 2019-02-08 11:02:26 +01: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
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
398a59d0a6 Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
a7e76679e1 #3754 Support both Qt4 and Qt5 in Ceevis build. 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
237623ef21 #3752 CVF Code changes to build on Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
100aabd332 CVF Code changes to hide std::tr1 warnings so unit tests build. 2018-11-30 09:47:51 +01:00
Bjørn Erik Jensen
d287a2fb64 #3721, #3707 Scale legend. Do not add duplicate overlay items. Fix scale bar transparency and show/hide 2018-11-21 15:11:11 +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
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
5e14e56609 #1062 Use minimalistic title flags for dialogs 2017-04-27 14:22:47 +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
Jacob Støren
853e92723b #168 Added hacklish control over Fixed Function default light. 2016-08-15 14:26:44 +02: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
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
477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +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
Jacob Støren
c7a4b48224 Linux compile fix 2013-12-04 14:37:54 +01:00
sigurdp
192f4bba59 Added conversion of lists/arrays plus renames 
Renamed/deprecated fromQString(), new function is toString()
 2013-12-04 11:51:12 +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
df5f1f85af Integrated from CeeSol Perforce, changelist 203 
AppFwk tests.
Added rotation to locator.
Caf::FrameAnimationControl : Set current frame to 0 if a framecount
change makes the current frame invalid
 2013-11-01 16:54:24 +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
Magne Sjaastad
08b970d084 Normalize line endings 2013-10-07 09:07:27 +02: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
15eab9b261 Performance: Added Utils::copyFromQImage() in cvfqtUtils. Optimized copy 
for QImage::Format_ARGB32, and use this function from the paint event in
cafViewer.
 2013-09-30 13:17:05 +02:00