OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,415 Commits 27 Branches 61 Tags 309 MiB
4f68f2b11a
Commit Graph

11163 Commits

Author SHA1 Message Date
Kristian Bendiksen
67af692f96 Fix clang-format. 2020-08-18 10:09:52 +02:00
Ruben Manuel Thoms
1bd710d0db Added checks for first and last table values of first column. 2020-08-17 14:41:59 +02:00
rubenthoms
0da301a785 Made sure an exception is also thrown for too few columns. Added a test for this use case. 2020-08-17 14:41:59 +02:00
rubenthoms
3a5ef7fb86 Fixed issue #6034 - Improve INP import : Add support for columns spanning more than one line. 2020-08-17 14:41:59 +02:00
Magne Sjaastad
523cdc2b7d Janitor : Use class enum 2020-08-14 11:00:36 +02:00
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
Gaute Lindkvist
3cb40ca50d #5729 Fix updates when changing analysis plot filters 2020-07-31 20:33:47 +02:00
Gaute Lindkvist
342f4a8ac6 Improve font selection in plot axis properties 2020-07-31 20:33:47 +02:00
Gaute Lindkvist
052dd38ab1 #6193 Make ensemble case parameters default for analysis plot filters 2020-07-31 20:33:47 +02:00
Gaute Lindkvist
698677f3ac #6253 Support creating analysis plots directly from an ensemble plot 2020-07-31 13:39:40 +02:00
Gaute Lindkvist
b7e1d6e377 #5737 Add different time step UI with filtering to analysis plots 2020-07-31 12:15:57 +02:00
Gaute Lindkvist
2614852d8c #6188 Analysis plots: improve handling of empty data selection 2020-07-30 14:35:21 +02:00
Gaute Lindkvist
1130fad55c #6186 and #6191 Have sensible Analysis Plot defaults 2020-07-30 14:04:12 +02:00
Gaute Lindkvist
6f50201e3a #6189 Add check box on ensemble level in summary vector dialog 2020-07-30 14:04:12 +02:00
Gaute Lindkvist
7241132256 #6245 Shift labels to left side for negative tornado plot bars 2020-07-29 16:08:14 +02:00
Gaute Lindkvist
eee30f3d1d #6236 Change Correlation plots to use caf::Signals 2020-07-29 16:08:14 +02:00
Gaute Lindkvist
658cffd8e0 Make Correlation plots work with multiple ensembles 2020-07-29 13:59:18 +02:00
Gaute Lindkvist
ae7c4d9e31 Improve consistency of correlation plots 2020-07-29 13:59:18 +02:00
Gaute Lindkvist
4f36332e52 #6243 Support filtering of time steps for Correlation plots 2020-07-29 13:59:18 +02:00
Gaute Lindkvist
fde92ad931 #6240 Improve the way dates are handled in Correlation Plots 2020-07-29 10:13:32 +02:00
Gaute Lindkvist
bfd4719d10 #6197 Disable UI text field for vector selection in Correlation Plots 2020-07-29 10:13:32 +02:00
Gaute Lindkvist
aeecaa3ff1 #6237 Implement creation of correlation plot from ensemble plots 2020-07-29 10:13:32 +02:00
Gaute Lindkvist
447d335fc8 Remove superfluous use of epsilon in EnsembleParameter and fix test 2020-07-28 15:13:07 +02:00
Gaute Lindkvist
ee5c058634 Refactor out findClosestPlotItem 2020-07-28 15:13:07 +02:00
Gaute Lindkvist
ae23e2f252 #6201 Select parameters that go into a tornado plot 2020-07-28 15:13:07 +02:00
Gaute Lindkvist
ad59f79dea #6201 Select parameters that go into matrix plot 2020-07-28 15:13:07 +02:00
Gaute Lindkvist
a9b6c1bd7b #6198 expand axes of cross plot slightly 2020-07-27 14:53:59 +02:00
Gaute Lindkvist
651277e587 #6200 Add option to sort by Correlation Matrix by rows/columns or both 2020-07-27 14:53:59 +02:00
Gaute Lindkvist
054d2864f6 #6196 Add option to remove parameters without variation 2020-07-27 14:53:59 +02:00
Gaute Lindkvist
a9c9471e7f Fix crashes in Drag and Drop if the drop target is the same as the current dragged item 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
da6360cf98 Clean up move code for well log curves. 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
2e00d9a719 Support drag and drop of summary curves 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
5b126c3b98 Swap well log curves with drag and drop if the target is just above the single drag item. 
* Currently nothing happens in this case, because we insert the dragged item
  after the target.
* On balance it seems more intuitive to swap the items in this particular case
  even if it is slightly against the regular drag operations.
 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
1ceee51a7d Fix further crash issue with stacked data interpolation for well log curves 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
bfaff27d51 Re-add missing drag and drop for well log tracks 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
77eafc6a6e Fix crash in well log curve interpolation for stacking 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
4e7eff261e Fix summary plot crash when changing vector 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
9d274adc5f Fix stacking for well log curves 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
fd0766f1a1 Fix oil/gas colors 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
d861af44b6 Temp work 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
908dcd6828 Support stacked curves for Summary Plots 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
82a96a1866 Fix zoom for stacked well log curves and support dataChanged() 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
48a9fa01bb Fix stacking crash in WellLogCurveData 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
30e32a1c50 data send in loadDataAndUpdate 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
beaf4ebd5a Implement signal handler 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
6856597770 Implement stacked well log curves 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
3202a5f85d Make plotZoomed a RiuQwtPlotWidget signal and not just in a couple of sub classes 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
a723d0d1fa Refactor PLT stacked curve code to be more general 2020-07-27 08:47:01 +02:00
Kristian Bendiksen
3971f0dde3 #6224 Fracture Model: fix "Result Property" track annotations. 2020-07-14 14:17:50 +02:00
Kristian Bendiksen
f7f9f93303 #6228 Fix crash when creating user-defined curves in fracture model plot. 2020-07-14 14:04:50 +02:00
Kristian Bendiksen
a0dce934f0 #6173 Fix conversion for over/underburden pressure. 2020-07-13 10:39:23 +02:00