Commit Graph

11883 Commits

Author SHA1 Message Date
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
Magne Sjaastad
ec7f1a1a7f #5028 Performance Summary : Add progress bar to summary reader 2019-11-20 15:24:05 +01:00
Gaute Lindkvist
f2be9dd3b8 Fix typo in RiuQwtPlotWidget::closeEvent 2019-11-20 14:26:15 +01:00
Gaute Lindkvist
7f0efb61f4 Remove superfluous updateLayout from RimPlot 2019-11-20 14:07:20 +01:00
Gaute Lindkvist
8f6e875ea4 Fix curves not showing up after moving plots to multi plot 2019-11-20 14:04:22 +01:00
Jacob Støren
a181e0c11d #5019 Refactoring Move IntersectionResultsColoringTool to a separate file
Also moved the implementation code
2019-11-20 13:59:16 +01:00
Gaute Lindkvist
bf6da1c6c4 Guard creation of view widget in RimMultiPlotWindow 2019-11-20 13:38:50 +01:00
Gaute Lindkvist
85d683634c Further refactoring 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
3dd4cb505b Increase font size of view id tags 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
228810fd05 Refactor view id 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
d9043db5e0 Refactor RimPlotWindow and RimPlotInterface 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
4dd0651dae Remove width scaling factors 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
8252ab8808 Rename GridPlot to MultiPlot throughout 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
a73c7a4b97 Rename Plot Report and Combination Plot to Multi Plot 2019-11-20 13:14:45 +01:00
Gaute Lindkvist
81db22586d Remove description-field from RimPlotWindow
* Leave it to sub-classes to deal with this
2019-11-20 13:14:45 +01:00
Jacob Støren
cd08185678 #5019 Use the static methods to color intersections as well
Move all the color/texture  generation methods into a separate tools class.
(Only scope wise)
2019-11-20 13:01:25 +01:00
Jacob Støren
46f335ad0b #5019 Refactor the color generation in the boxintersection into static methods
These methods are to be used from the normal intersections as well.
2019-11-20 12:00:43 +01:00
Magne Sjaastad
5fc576b8f3 Janitor : Release memory to make it easier to detect memory leaks 2019-11-20 11:48:02 +01:00
Magne Sjaastad
0bf782147a Janitor : RimProject : Skip obsolete delete in desctructor 2019-11-20 11:42:13 +01:00
Magne Sjaastad
4225e67834 Janitor : Make sure memory is released by using unique_ptr 2019-11-20 11:41:14 +01:00
Jacob Støren
c8053284d1 #5019 Add relevant access to IntersectionResultDefinition
Implement initAfterRead to populate the resultDefinitions with correct case
2019-11-20 10:39:48 +01:00