Commit Graph

11052 Commits

Author SHA1 Message Date
Magne Sjaastad
07c778280b #6252 Category Legend : Reverse the ordering in the category legend 2020-08-14 11:00:36 +02:00
Magne Sjaastad
bc47487d68 #6252 Formations : Use user-defined color legend 2020-08-14 11:00:36 +02:00
Magne Sjaastad
d276d0eefe #6252 Category Colors : Name and corresponding color do not match
Set category data directly to the category mapper with no reverse ordering
When drawing the color legend, always draw categories with lower index first
2020-08-14 11:00:36 +02:00
Magne Sjaastad
e61b97f836 Guard access of nullptr 2020-08-13 14:17:20 +02:00
Magne Sjaastad
40183ce640 Move function to private section 2020-08-13 14:17:13 +02:00
Jon Jenssen
beef70a791 Fix spelling of "Petrel" 2020-08-12 19:44:40 +02:00
Kristian Bendiksen
96c7ac422f
Merge pull request #6300 from OPM/mud-weight-window-improvements
Mud weight window improvements
2020-08-12 14:27:32 +02:00
Kristian Bendiksen
96c42ac9dd Unify methods for calculation hydrostatic pore pressure. 2020-08-12 11:20:23 +02:00
Kristian Bendiksen
5fa38d43c0 Solve for fracture gradient only in sand regions. 2020-08-12 09:21:12 +02:00
Kristian Bendiksen
b12db3f957 Use hydrostatic pore pressure calculation 2020-08-11 14:31:51 +02:00
jonjenssen
bbc659799e
Surfaces: Improve UI and usability for surfaces (#6290)
* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Fixes by clang-format

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2020-08-11 11:34:34 +02:00
Kristian Bendiksen
02013f4816 #6284 Mud Weight Window: Improve handling of non-reservoir elements. 2020-08-11 11:14:58 +02:00
Gaute Lindkvist
af44659860 #6293 Make sure stacking is only available for some curv
* Well Log Curves and Summary Curves for now.
2020-08-11 09:57:56 +02:00
Gaute Lindkvist
e0cf133721 #6285 Add context menu stacking/unstacking of curves 2020-08-11 08:40:33 +02:00
Kristian Bendiksen
e93c4e75f2 #6284 Mud Weight Window: add option for non-reservoir pore pressure data. 2020-08-10 19:30:41 +02:00
Kristian Bendiksen
e3628906c8 #6286 Mud Weight Window: Use initial overburden gradient from grid. 2020-08-10 18:15:15 +02:00
Kristian Bendiksen
68ce7f590d #6286 Mud Weight Window: Improve fracture gradient calculation for shale. 2020-08-10 18:15:15 +02:00
Gaute Lindkvist
c3982a5782 Fix update problems with stacked curves 2020-08-10 12:58:53 +02:00
Gaute Lindkvist
86a4f5613c Major improvements to D&D of curves. 2020-08-10 12:58:53 +02:00
Gaute Lindkvist
9393c27b13 Improved naming following review 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
92763ee902 Make well log tracks reorderable 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
5e9403d9f1 Make summary curves reorderable 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
75ae2a7b58 #6258 Implement reordering of well log curves 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
78ff71c44d #6258 Update RimViewWindow to work with new tag system for tree view items 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
c1bc522511 #6259 Implement stacking per curve 2020-08-10 09:17:46 +02:00
Gaute Lindkvist
31246b59f3 #6266 Fix unwanted selection change when changing window focus 2020-08-10 09:17:46 +02:00
Kristian Bendiksen
372df1e407 #6213 Make input fields and default values more similar to WBS plot. 2020-08-06 15:23:15 +02:00
Kristian Bendiksen
fee4318b92 #6213 Fix comparison of lower limit, and simplify initialization. 2020-08-06 15:23:15 +02:00
Kristian Bendiksen
91410c4434 #6213 Improve UI for selecting mud weight window reference layer. 2020-08-06 15:23:15 +02:00
Kristian Bendiksen
5d99526d98 #6213 Add UI for configuring "mud-weight window" calculation. 2020-08-06 15:23:15 +02:00
Kristian Bendiksen
fcc0f710d5 #6213 GeoMech: Add calculation of Mud Weight Window. 2020-08-06 15:23:15 +02:00
Magne Sjaastad
6a6a093d05 #5961 Color Legend : Improve default color legend for contour plots 2020-08-06 11:20:17 +02:00
Magne Sjaastad
860e6d54a9 Make Linux happy
Use correct type
Remove unused variable
Fix placement of local variable
2020-08-06 11:20:17 +02:00
Magne Sjaastad
058573b391 #5961 Color Legend : Set legend only when required 2020-08-06 11:20:17 +02:00
Magne Sjaastad
e069dfe9cc #5961 Color Legend : Creation custom color legend only when required 2020-08-06 11:20:17 +02:00
github-actions[bot]
bd09f2de54 Fixes by misspell-fixer 2020-08-06 11:20:17 +02:00
Stein Inge Dale
9a3dace180 WIP: Surface : Add export of surface to PTL file format #5957
- restructured according to issue
- but issue indicate export of K-layer only despite RimGridCaseSurface
did support I/ slices, too?
- if so, test and possibly extend RimGridCaseSurface methods
extractDataFromGrid() and getStructGridIndex()
- need to check whether all offsets are taken care of
2020-08-06 11:20:17 +02:00
Stein Inge Dale
0424202461 WIP: Color legend: import of lyr file with colors should generate custom color legend #5961
Work in progress:
- lacks support of views other than Eclipse views
- signature of RicImportFormationNamesFeature::importFormationFiles()
- reconsideration of variable names
2020-08-06 11:20:17 +02:00
Stein Inge Dale
edc4b39acb Color Legend : Added RAINBOW for better depth visualization (issue #6168)
- Included RAINBOW color legend
- RAINBOW set as default when creating a new contour plot
2020-08-06 11:20:17 +02:00
Kristian Bendiksen
6a8fdd9582
Merge pull request #6267 from OPM/fracture-model-plot-crash
Fix crash in fracture model plot.
2020-08-05 15:03:53 +02:00
github-actions[bot]
4729221373 Fixes by clang-format 2020-08-05 12:07:14 +00:00
Kristian Bendiksen
1dd5cc65bc Fix crash in fracture model plot.
The parent of RimWellLogTrack can also be a RimDepthTrackPlot.
2020-08-05 13:53:25 +02:00
Jon Jenssen
ea32743ad5 Add additional check 2020-08-05 13:36:54 +02:00
Jon Jenssen
0ce53a3219 Fix for issue #6187 - hide surfaces when creating a contour map 2020-08-05 13:20:59 +02:00
Ruben Manuel Thoms
bb8612c6a6 Unintended autocomplete in CMakeLists.txt 2020-08-04 14:01:38 +02:00
Ruben Manuel Thoms
40a4e57129 Qt 5.15 adjustments related to the change of location of QPainterPath 2020-08-04 14:01:38 +02:00
Ruben Manuel Thoms
23ab5adfd3 Installation adjustments 2020-08-04 14:01:38 +02:00
Gaute Lindkvist
34f3b0e369 #5730 Add a default analysis plot filter that lets everything through. 2020-07-31 20:33:47 +02:00
Gaute Lindkvist
69d782b92f Remove None as an option for ensemble parameter in analysis plot filter 2020-07-31 20:33:47 +02:00
Gaute Lindkvist
71954f7252 Fix analysis plot filter limits to include the interval min/max 2020-07-31 20:33:47 +02:00