Commit Graph

11850 Commits

Author SHA1 Message Date
Gaute Lindkvist
3c29ffbfab Revert "Always hide drop target for Grid Plots in release-2019.11"
* This commit was never meant to go into dev

This reverts commit 62655e17c6.
2019-12-04 14:17:28 +01:00
Magne Sjaastad
e138e1f7e8 Merge changes from release-2019.11 2019-12-04 14:05:39 +01:00
Magne Sjaastad
1ddf1bf88d
Merge pull request from OPM/fix-plot-issues
Fix some plot issues
2019-12-04 13:39:54 +01:00
Gaute Lindkvist
2e7d581c3e Apply correct frame indices for OBG0 and SH_MK WBS curve calculation 2019-12-04 13:36:22 +01:00
Gaute Lindkvist
df5c5fb2a8 Make the WBS parameter curves work right 2019-12-04 13:36:22 +01:00
Gaute Lindkvist
4bbb12e32a Don't attempt to export empty LAS-curves. It will crash in LAS-exporter. 2019-12-04 13:36:22 +01:00
Magne Sjaastad
87fecb876f Janitor : Avoid use of smart pointer on a QObject 2019-12-04 13:04:44 +01:00
Magne Sjaastad
df55c5f6dc Janitor : Avoid replot in destructor of RimPlotCurve 2019-12-04 12:48:48 +01:00
Magne Sjaastad
1ba2fc14a5 Saturation Plots : Plots are not deleted on project close 2019-12-04 12:48:48 +01:00
Gaute Lindkvist
2e8518b7c9 Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:37:25 +01:00
Gaute Lindkvist
3903d08b7a Always hide drop target for Grid Plots in release-2019.11 2019-12-04 12:37:18 +01:00
Gaute Lindkvist
ed1d02535d Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:36:22 +01:00
Gaute Lindkvist
9599b309bc Replace all occurences of QPalette::Background with QPalette::Window
QPalette::Background is deprecated and gives warning in Qt 5.13
2019-12-04 12:34:17 +01:00
Gaute Lindkvist
5139f1cadb Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
cd5b432267 Fix legend updates by getting rid of the show/hideEvent crash fix
* The crash is instead fixed by getting rid of deleteLater()
2019-12-04 12:34:17 +01:00
Gaute Lindkvist
b5712987de Fix y-axis text for observed data 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
445f28d26f Replace all occurences of QPalette::Background with QPalette::Window
QPalette::Background is deprecated and gives warning in Qt 5.13
2019-12-04 12:34:04 +01:00
Gaute Lindkvist
62655e17c6 Always hide drop target for Grid Plots in release-2019.11 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
f795dfcf11 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
28a0a3ad06 Fix legend updates by getting rid of the show/hideEvent crash fix
* The crash is instead fixed by getting rid of deleteLater()
2019-12-04 12:34:04 +01:00
Gaute Lindkvist
3e39866f6f Fix y-axis text for observed data 2019-12-04 12:34:04 +01:00
Magne Sjaastad
04162059b7 Observed Data : Do not repeat curve name twice 2019-12-04 08:05:46 +01:00
Magne Sjaastad
0909d820d2
Merge pull request from OPM/avoid-duplicate-text-2
Observed Data : Do not repeat curve name twice
2019-12-04 08:05:23 +01:00
Magne Sjaastad
8f99eb2274 Observed Data : Do not repeat curve name twice 2019-12-03 20:19:20 +01:00
Gaute Lindkvist
44a4ba8785 Make capital letter *.LAS files show up in import dialog 2019-12-03 14:38:31 +01:00
Gaute Lindkvist
73f5ac5126 Make capital letter *.LAS files show up in import dialog 2019-12-03 14:37:28 +01:00
Gaute Lindkvist
e894453f49 Fix wrong update of plot axis range
* The order of arguments passed to setAxisScale was wrong
2019-12-03 14:36:14 +01:00
Gaute Lindkvist
8d15a82147 Fix wrong update of plot axis range
* The order of arguments passed to setAxisScale was wrong
2019-12-03 14:35:48 +01:00
Magne Sjaastad
e0e984f703 Grid Case Group: Allow statistics on static data only
Support grid cases with no dynamic data present.
2019-12-03 14:20:43 +01:00
Magne Sjaastad
b5e9da3b75
Merge pull request from OPM/grid-groups-no-dynamic-data
Grid Case Group: Allow statistics on static data only
2019-12-03 14:20:16 +01:00
Magne Sjaastad
9424bdd0de Grid Case Group: Allow statistics on static data only
Support grid cases with no dynamic data present.
2019-12-03 12:58:04 +01:00
Magne Sjaastad
ce94b6ff9e Regression Test : Some images get wrong size 2019-12-03 10:40:43 +01:00
Magne Sjaastad
8a57912245 Regression Test : Some images get wrong size 2019-12-03 10:39:19 +01:00
Magne Sjaastad
fa1733bf79 AppFwk : Guard use of front() on empty list 2019-12-02 15:02:47 +01:00
Magne Sjaastad
1193a9c61e AppFwk : Guard use of front() on empty list 2019-12-02 15:02:10 +01:00
Magne Sjaastad
b9989b0ebd Merge release into dev
There are quite large diff between release and dev, so do a merge to ease later syncing
2019-12-02 12:47:52 +01:00
Gaute Lindkvist
631570f6a5 Improve wheel zoom with logarithmic axes
* Limit the amount to scroll at one time and set a fixed minimum
2019-12-02 12:34:58 +01:00
Magne Sjaastad
e03582ab4b Revert case Ids to start at 0 2019-12-02 12:17:50 +01:00
Magne Sjaastad
45c0ca38f1 Janitor : Guard index out of bounds 2019-12-02 11:23:34 +01:00
Kristian Bendiksen
e87466717c Remove input property collection from project tree. 2019-12-02 10:45:06 +01:00
Jacob Støren
f3fc7351d4 Add icon to Replace Case commands 2019-12-02 10:26:11 +01:00
Magne Sjaastad
d68e764a8f Merge pull request from OPM/timer-improvements
Timer improvements
2019-12-02 10:22:29 +01:00
Jacob Støren
59114d9624 Fix strange zigzag lines in summary curves 2019-12-02 10:21:12 +01:00
Gaute Lindkvist
4870071b8e Improve wheel zoom with logarithmic axes
* Limit the amount to scroll at one time and set a fixed minimum
2019-12-02 08:01:38 +01:00
Gaute Lindkvist
538e42f278 Fix crash when importing multiple well paths with the same name 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
c5f21b75fa Reassign summary curves to the file summary case copy when closing a grid case 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
01767803c3 Make well log curves work on statistics cases 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
7c3d45770b Remove unused variable 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
76d7f526ba load curve data after creating new well log curves 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
82155ae779 Fix crash when importing multiple well paths with the same name 2019-11-30 12:11:35 +01:00