Commit Graph

11853 Commits

Author SHA1 Message Date
Jacob Støren
bf8ed71641 Method rename 2019-11-26 10:35:45 +01:00
Jacob Støren
5593fb198c
Merge pull request #5094 from OPM/feature-#5019-separate-intersection-results
Feature #5019 separate intersection results
2019-11-26 10:15:30 +01:00
Magne Sjaastad
11f46e3696 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:50 +01:00
Magne Sjaastad
b758854463 #5069 Janitor : Hide some menu items related to toggling 2019-11-26 07:42:04 +01:00
Magne Sjaastad
be764d76cb #5077 Summary Plots: Simplify context menu 2019-11-25 15:52:09 +01:00
Magne Sjaastad
1e92687745 #5077 Summary Plots: Simplify context menu 2019-11-25 15:51:20 +01:00
Jacob Støren
15aa4d6e0b Merge dev and feature-#5019-separate-intersection-results branch 2019-11-25 15:50:29 +01:00
Magne Sjaastad
c9abd09495
Merge pull request #5091 from OPM/integrate-from-release-branch
Integrate from release branch
2019-11-25 15:39:15 +01:00
Jacob Støren
c2717f9bb9 #5019 Preliminary fix crash when picking intersections using sep results 2019-11-25 15:36:35 +01:00
Jacob Støren
6e99a43247 #5019 Add/Delete Separate Intersection Result commands 2019-11-25 15:34:36 +01:00
Jacob Støren
7aec88de3c #5019 Fix wrong use of explicit scalar mappers for intersections
Only 2d intersection view is supposed to use them
2019-11-25 15:33:42 +01:00
Jacob Støren
baedf02ba9 #5019 Fix crash when case is not set in Separate intersection Result 2019-11-25 15:27:25 +01:00
Gaute Lindkvist
d44775aba6 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
95f8c44f0f Improve RimNameConfig API 2019-11-25 15:20:15 +01:00
Gaute Lindkvist
dbee9759a0 #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
cf7608e6bf Improve RimNameConfig API 2019-11-25 15:19:53 +01:00
Gaute Lindkvist
d770dda163 Converted RiaGrpcCallbacks.h to using instead of typedef 2019-11-25 15:13:30 +01:00
Gaute Lindkvist
dc3c92ab26 Improve plot redraw scheduler 2019-11-25 14:26:52 +01:00
Magne Sjaastad
71ad9e0da2 Merge pull request #5081 from OPM/move-error-bar-curve
Curve Error Bars : Move to RimPlotCurve
2019-11-25 14:08:12 +01:00
Magne Sjaastad
62357672e3 Revert "Janitor : Fix memory leak"
This reverts commit 88d961e516.
2019-11-25 14:03:09 +01:00
Magne Sjaastad
a511f580e4 Merge pull request #5073 from OPM/progress-bar
Progress bar to summary reader
2019-11-25 13:59:18 +01:00
Magne Sjaastad
72a5c6cfef Merge pull request #5071 from OPM/memory-fixes
Release of memory
2019-11-25 13:58:55 +01:00
Gaute Lindkvist
db869ccbd5 Improve plot redraw scheduler 2019-11-25 13:55:49 +01:00
Jacob Støren
919f035a48 #5019 Add an enable separate results button to each intersection 2019-11-25 13:31:21 +01:00
Jacob Støren
4bafefa225 #5019 2D Intersection views based on separate intersection results now respects the animation toolbar 2019-11-25 13:02:35 +01:00
Jacob Støren
eed9f6abad #5019 Update 2dIntersection views when toggling sparate intersection results 2019-11-25 11:42:46 +01:00
Jacob Støren
9bfe51b205 #5019 Support separate intersection results for 2Dintersection views 2019-11-25 11:40:57 +01:00
Magne Sjaastad
3f75cda593
Merge pull request #5083 from OPM/fix-plot-crash-release-2019.11
Fix crash when closing and reopening plots
2019-11-25 09:43:56 +01:00
Magne Sjaastad
9f0c4b4bed
Merge pull request #5081 from OPM/move-error-bar-curve
Curve Error Bars : Move to RimPlotCurve
2019-11-25 09:43:38 +01:00
Gaute Lindkvist
1d4d261129 Disable multiplot functionality 2019-11-25 08:41:47 +01:00
Gaute Lindkvist
293290827b Fix crash when closing and reopening plots 2019-11-25 08:32:30 +01:00
Gaute Lindkvist
d6ec710fd9 Fix crash when closing and reopening plots 2019-11-25 08:22:39 +01:00
Magne Sjaastad
36772e77b1 #5079 Curve Error Bars : Move to RimPlotCurve 2019-11-22 14:23:59 +01:00
Jacob Støren
1ab815e673 #5019 Use same code for separate intersection legend setup in eclipse and geomech 2019-11-22 13:31:35 +01:00
Jacob Støren
b5e39519c5 #5019 Separate intersection legends in place in ordinary views
Needs some cleanup and not working in 2dintersection views
2019-11-22 12:36:39 +01:00
Jacob Støren
f3b458dfbc Fix regressions for intersection views.
Introduced by cd08185678
Wrong scalar mappers used when coloring.
Wrong timestep used
2019-11-21 15:14:17 +01:00
Magne Sjaastad
d079f233a4 Revert "Janitor : Fix memory leak"
This reverts commit 88d961e516.
2019-11-21 13:13:25 +01:00
Jacob Støren
c1df283369 Fix crash in intersection coloring wne geometry is missing 2019-11-21 12:43:26 +01:00
Jacob Støren
10257e3bfb Fix missing rebuild of intersections in geomech view
Fix missing ternary legend reset
Fix missing regular legend reset in geomech view
2019-11-21 10:05:56 +01:00
Jacob Støren
53f2c94763 #5019 Sep Intersection Res: Fix missing use of user range when loading from project file 2019-11-21 09:24:24 +01:00
Jacob Støren
5d03ecb115 Add some const to GeoMechResultDefinition
To prepare for separate legend update code needed bu #5019
2019-11-21 08:30:04 +01:00
Jacob Støren
31a698243d #5019 Update display model on separate intersection settings change 2019-11-21 08:28:00 +01:00
Gaute Lindkvist
5fae9646ae
Fix curves not showing up after moving plots to multi plot (#5070)
* Fix curves not showing up after moving plots to multi plot

* Fix typo in RiuQwtPlotWidget::closeEvent

* Fix incompatibility with release-branch
2019-11-21 08:22:33 +01:00
Gaute Lindkvist
f130163ee8 Fix up tests to match new view id 2019-11-21 08:15:17 +01:00
Gaute Lindkvist
dfb5896edf Revert case Ids to start at 0 2019-11-21 08:15:17 +01:00
Magne Sjaastad
22ca504907
Merge pull request #5065 from OPM/remove-input-property-collection-from-tree
#5047 Remove input property collection from project tree.
2019-11-21 07:11:35 +01:00
Magne Sjaastad
f0e728d303
Merge pull request #5073 from OPM/progress-bar
Progress bar to summary reader
2019-11-21 07:10:32 +01:00
Magne Sjaastad
57b94d8795
Merge pull request #5071 from OPM/memory-fixes
Release of memory
2019-11-21 07:10:07 +01:00
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Magne Sjaastad
caf5ce8666 Janitor : Add missing includes 2019-11-20 15:29:53 +01:00