Commit Graph

5234 Commits

Author SHA1 Message Date
Gaute Lindkvist
538e42f278 #5106 Fix crash when importing multiple well paths with the same name 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
c5f21b75fa #5133 Reassign summary curves to the file summary case copy when closing a grid case 2019-12-02 08:01:38 +01:00
Gaute Lindkvist
82155ae779 #5106 Fix crash when importing multiple well paths with the same name 2019-11-30 12:11:35 +01:00
Gaute Lindkvist
bfa9ff637b #5133 Reassign summary curves to the file summary case copy when closing a grid case 2019-11-30 09:46:44 +01:00
Gaute Lindkvist
9656692afc Improve canvas top alignment in well log plots 2019-11-29 15:56:43 +01:00
Gaute Lindkvist
4029953c24 Rename SummaryYAxisFormatter (it isn't just for the Y-axis) 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
ec4194c0b0 Fix Well Allocation Plot depth axis zoom 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
2c1180fa85 Fix Pseudo-length labels for RFT plots 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
9a01c769e9 #5128 Fix right y-axis titles in summary plots 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
602751dccc #5129 Fix depth ranges when curve units don't match display units 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
1267ba64d4 #5051 Do not auto zoom when adding/removing curves in plot 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
dedb437ce5 #5051 Fix Well Log Plot zoom with scrolling with scrollbar 2019-11-29 15:03:52 +01:00
Gaute Lindkvist
d5c3c3f9e8 Rename SummaryYAxisFormatter (it isn't just for the Y-axis) 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
8e94caceed Fix Well Allocation Plot depth axis zoom 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
1b345fa20f Fix Pseudo-length labels for RFT plots 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
e65d9aa22d #5128 Fix right y-axis titles in summary plots 2019-11-29 15:03:37 +01:00
Gaute Lindkvist
d05328e184 #5129 Fix depth ranges when curve units don't match display units 2019-11-29 15:03:37 +01:00
Magne Sjaastad
d4230416af #5132 Janitor : Guard index out of bounds 2019-11-29 13:40:14 +01:00
Jacob Støren
6ac18d52ff #5117 Sep Inter Res: Fix missing use of cathegory legend 2019-11-29 10:27:43 +01:00
Jacob Støren
f446d58b60 #5124, #5123 Fix irratic collapse of property group
Fix missing timestep menu
2019-11-29 10:27:43 +01:00
Jacob Støren
021af085a7 #5119, #5120 Default case for intersection result
Fixed missing intersection colors when cellresults are turned off
2019-11-29 10:27:43 +01:00
Gaute Lindkvist
3b0ba03e87 Fix duplicate parts of names in Well Log Plots 2019-11-29 08:29:33 +01:00
Gaute Lindkvist
6eccba7398 Fix crash when dragging plot from one multiplot to another 2019-11-28 20:43:49 +01:00
Jacob Støren
ad25bb89c2 #5112 Add cell highlight on intersections with separate intersection result 2019-11-28 14:09:53 +01:00
Jacob Støren
2a3c43bcc3 #5112 Fixed result info text for eclipse
Needs more testing
2019-11-28 14:09:52 +01:00
Jacob Støren
5556d2d9eb #5112 Make selected result definition available through 3ditem selection system
Make PVT, Relperm, Mohr and rResult plot aware
2019-11-28 14:09:52 +01:00
Gaute Lindkvist
cf190b05c1 #5051 Do not auto zoom when adding/removing curves in plot 2019-11-27 14:17:23 +01:00
Magne Sjaastad
df2fc7111f
Merge pull request #5105 from OPM/feature-wbs-plot-data-along-well-path
Feature wbs plot data along well path
2019-11-27 14:08:29 +01:00
Magne Sjaastad
4aac43c167 Fix headers and whitespace 2019-11-27 13:54:58 +01:00
Gaute Lindkvist
18090338c7 Fix zoom all in well log plots 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
62817054c4 Improve canvas top alignment in well log plots 2019-11-27 13:22:23 +01:00
Gaute Lindkvist
4fd9562b4b #5051 Fix Well Log Plot zoom with scrolling with scrollbar 2019-11-27 13:22:23 +01:00
Kristian Bendiksen
6bec758d15 #5001 Add RimWellMeasurementInViewCollection and legends. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ea7df94649 #5001 Improve filtering of measurement collection. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
b4fea5f00a #5001 Move RimWellMeasurementCollection from RimWellPath to
RimWellPathCollection.

Also add filtering of measurements by well path.
2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ea534cace6 #5001 Update plots on changes in RimWellMeasurement. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
18c2350bdf #5001 Add measurements to WBS plot. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
d266e44f1f #5001 Add RicImportWellMeasurementsFeature. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
ff15ff939d #5001 Add object definition for well measurement collection. 2019-11-27 12:05:51 +01:00
Kristian Bendiksen
75c3e8732d #5001 Add object definition for well measurement. 2019-11-27 12:05:51 +01:00
Gaute Lindkvist
3db9948a3b #5063 Improve auto name for well log plots and use it for well allocation plots 2019-11-27 10:14:15 +01:00
Gaute Lindkvist
431f0ff347 Add additional WBS curves and rewrite parameters 2019-11-27 10:14:15 +01:00
Magne Sjaastad
4f4c48635b Merge pull request #5099 from OPM/improve-ensemble-statistics
Improve ensemble statistics
2019-11-27 09:57:46 +01:00
Magne Sjaastad
a4b08fcd29 #4155 Ensemble Statistics Curves : Guard empty vector 2019-11-26 15:39:59 +01:00
Magne Sjaastad
6969c2f299 #4155 Ensemble Statistics Curves : Add option to include partial curves when computing statistics 2019-11-26 15:02:52 +01:00
Magne Sjaastad
6264eb49c8 #5095 Summary Statistics : Guard vector acces when calculating statistics curves 2019-11-26 15:01:14 +01:00
Jacob Støren
191419b6b4 clang-format after intersection rename 2019-11-26 13:56:02 +01:00
Jacob Støren
06596673dc Rename RimIntersectionHandle to RimIntersection 2019-11-26 13:26:37 +01:00
Jacob Støren
4672528a4d Rename RimintersectionBox to RimBoxIntersection
Rename RivIntersectionBoxPartMgr to RimBoxIntersectionPartManager
2019-11-26 13:14:55 +01:00
Jacob Støren
0e14c63f07 Rename crossSection to intersection in general code 2019-11-26 12:45:08 +01:00
Jacob Støren
0617b56850 Rename RivIntersectionGeometryGenerator to RivExtrudedCurveIntersectionGeometryGenerator
and RivIntersectionPartMgr to RivExtrudedCurveIntersectionPartMgr
2019-11-26 11:51:54 +01:00
Jacob Støren
152d2bde17 Rename RimIntersection to RimExtrudedCurveIntersection 2019-11-26 11:35:21 +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
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
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
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
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
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
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
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
Kristian Bendiksen
3fafe90aeb #5047 Remove input property collection from project tree. 2019-11-20 22:01:07 +01:00
Magne Sjaastad
ec7f1a1a7f #5028 Performance Summary : Add progress bar to summary reader 2019-11-20 15:24:05 +01:00
Gaute Lindkvist
7f0efb61f4 Remove superfluous updateLayout from RimPlot 2019-11-20 14:07:20 +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
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
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
0bf782147a Janitor : RimProject : Skip obsolete delete in desctructor 2019-11-20 11:42:13 +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
Jacob Støren
c79de08c40 Improve const-ness somewhat on some results color related methods 2019-11-20 10:39:48 +01:00
Jacob Støren
439071dddf Fix crash when copying the intersection.
Updating of the default is handled later, so is not neccesary when doint initAfterRead after deserialization.
2019-11-20 10:39:48 +01:00
Jacob Støren
57dfd3b67a Intersection color texturing: Remove dependency on view and RimEclipseResultColor
Also start to harmonize intersection and intersection box texturing
2019-11-20 10:39:48 +01:00
Jacob Støren
612332cbbc #5019 Move RimIntersectionHandle to separate files Use in RimIntersectionBox 2019-11-20 10:39:48 +01:00
Jacob Støren
9ed3d8babc #5019 WIP: Made fields in IntersectionHandle protected 2019-11-20 10:39:48 +01:00
Jacob Støren
8fb3fbc097 #5019 WIP: Create a RimIntersectionHandle base class 2019-11-20 10:39:48 +01:00
Jacob Støren
62ed71ed76 #5019 Intersections have first data source as ianctive default
Icon state update for IResDefCollection
2019-11-20 10:39:48 +01:00
Jacob Støren
fec449dc43 #5019 Add separate intersection results collection and items 2019-11-20 10:39:47 +01:00
Kristian Bendiksen
5e480bf438 #5042 Add "Export Property To File" command to eclipse view. 2019-11-19 22:23:03 +01:00
Gaute Lindkvist
60b09d7bfd #5061 WAP: fix update of well allocation data when changing depth type 2019-11-19 13:19:56 +01:00
Gaute Lindkvist
4d38c2ea39 #5061 WAP: Trigger reload of Well Allocation Data when updating depth type 2019-11-19 13:18:36 +01:00
Gaute Lindkvist
ae9575feb2 #5049 Fix missing axis title for well allocation plots 2019-11-19 10:33:18 +01:00
Magne Sjaastad
710352e4bf Janitor : Remove unused code and reorganize includes 2019-11-19 08:50:03 +01:00
Gaute Lindkvist
6f4ae69cc9 #5048 Add comment to well log curve for zoom calculation 2019-11-19 08:16:56 +01:00
Gaute Lindkvist
61e443cc69 #5048 Fix zoom all for well allocation plots 2019-11-19 08:02:36 +01:00
Jacob Støren
6c0c5803da #5058 Use two decimals in vector positions in Well Paths 2019-11-18 09:51:51 +01:00
Jacob Støren
9f6d6f693e #5050 Improve Insert Well Target command 2019-11-18 09:51:51 +01:00
Magne Sjaastad
40f95f349c #5053 Ensemble RFT : Avoid selection of large number of time steps 2019-11-15 13:11:19 +01:00
Jacob Støren
de6dab7d2e
Merge pull request #5046 from OPM/bugfixes-wellpath-modelling
Bugfixes wellpath modeling
2019-11-15 09:16:02 +01:00
Jacob Støren
f6675b7c45 #4789, #5045 Made wellpath calculator control dogleg editability
Making them correct.
Doglegs with an actual value less than the user provided value  are colored green.
Removed the text stating that the constraint is not met.
2019-11-14 17:23:52 +01:00
Magne Sjaastad
3455b305e0 Revert "#5031 Summary Data : Make sure the reader is created in constructor"
This reverts commit 2b8219a855.
2019-11-14 15:18:03 +01:00
Jacob Støren
e82f6a5ab7 #5030, #5035 Fix missing update of intersection boundingboxes.
Regression introduced by 3c3c207bbc
Which removes (mostly) unneccessary recursiveBBox updates when inserting static models in viewer
The commit might expose other bugs as well.
2019-11-14 14:00:54 +01:00
Gaute Lindkvist
aa40816f49 #5026 Fix summary plot closing crash 2019-11-13 14:41:17 +01:00
Kristian Bendiksen
f8468dc7a6
Merge pull request #5009 from OPM/feature-replace-summary-case
Replace binary eclipse case and summary case feature.

Closes #4499 and #4987.
2019-11-13 13:29:40 +01:00
Kristian Bendiksen
b09103e596 #4987 Add feature to replace grid case. 2019-11-13 11:42:21 +01:00
Kristian Bendiksen
544c160510 #4499 Add feature to replace summary case. 2019-11-13 11:42:21 +01:00
Magne Sjaastad
57f6ee0660 #5033 Ensemble RFT : Auto select first date if no date is matching 2019-11-13 11:12:51 +01:00
Magne Sjaastad
280f8c1d45 #5031 Summary Data : Only use openMP on open of summary file 2019-11-12 18:26:47 +01:00
Magne Sjaastad
2b8219a855 #5031 Summary Data : Make sure the reader is created in constructor 2019-11-12 18:25:38 +01:00
Magne Sjaastad
8157790068 #5022 Performance Summary : Use openmp when loading metadata for cases 2019-11-11 12:35:27 +01:00
Magne Sjaastad
aa11e3601b #5020 Flow Diag : Avoid creating plots in constructor to make pytest work 2019-11-11 09:47:01 +01:00
Magne Sjaastad
cb89823474 #5020 Flow Diag : Improve default initialization of plots 2019-11-08 14:20:11 +01:00
Jacob Støren
19fe1fcd1b
Merge pull request #5017 from OPM/feature-adjust-comparison-overlay-items
Feature adjust comparison overlay items
2019-11-08 11:24:09 +01:00
Jacob Støren
e78b0d4204 #4994 Make ComparisonView mode for InfoBox and animation progress 2019-11-08 10:40:37 +01:00
Jacob Støren
a9dc07ddc9 #4995 Place legends from comparison view to the right.
Adjust the axiscross to follow the legends
2019-11-08 10:40:37 +01:00
Gaute Lindkvist
3d6b53841d #5010 Attempt to read formation file even if it isn't called .lyr 2019-11-07 14:33:54 +01:00
Gaute Lindkvist
c5bca4cc7e Hide RimViewWindow::m_viewId so it doesn't show up in property editors 2019-11-07 12:50:17 +01:00
Magne Sjaastad
c7e97b4447
Merge pull request #5008 from OPM/avoid-virtual-method-constructors
Avoid virtual calls in constructor and desctructors
2019-11-07 09:46:36 +01:00
Magne Sjaastad
70d220ae19 Janitor : Remove unused variable 2019-11-07 09:44:50 +01:00
Magne Sjaastad
a413f672ec #5007 Janitor : Do not call virtual methods from destructors 2019-11-07 08:48:11 +01:00
Magne Sjaastad
0caaaf7159 clang-format : Fixes related to bug in clang-format plugin
The LLVM/clang plugin to visual studio has a bug related to single space formatting changes. This commit fixes invalid formatting related to these issues.
2019-11-07 07:37:50 +01:00
Jacob Støren
6bd07aa8ee #650 Removed the ugly nan legend displayed while loading things 2019-11-06 18:01:55 +01:00
Jacob Støren
55470cc1cd #5004 Remove comparison view option from 2dIntersection view 2019-11-06 18:01:55 +01:00
Magne Sjaastad
9f320c1dda
Merge pull request #5000 from OPM/move-3d-settings-to-system-tab
Move 3d settings to system tab
2019-11-06 12:45:34 +01:00
Magne Sjaastad
25d2ee0e27
Merge pull request #4989 from OPM/import-ascii-data-to-simulation-case
Import ascii data to simulation case
2019-11-06 11:35:35 +01:00
Magne Sjaastad
0b3e5ecf0c #4982 Preferences : Move Show 3D information to development tab 2019-11-06 11:22:03 +01:00
Magne Sjaastad
28c77d4b67 #82 Import Ascii-data : Minor code adjustments 2019-11-06 10:54:42 +01:00
Magne Sjaastad
791de201b3 #82 Import Ascii-data : Add icon and move item in context menu 2019-11-06 09:38:32 +01:00
Gaute Lindkvist
3203881418 More improvements to column/rowspan system 2019-11-06 08:24:57 +01:00
Magne Sjaastad
16536cfde7 Fix missing return statement 2019-11-05 15:47:32 +01:00
Gaute Lindkvist
b227ef7bdb #4992 Rename combination plots to plot report 2019-11-05 15:34:36 +01:00
Gaute Lindkvist
c1dfe193d7 #4990 Column and row span 2019-11-05 15:34:36 +01:00
Kristian Bendiksen
470fab787d Hide InputPropertyCollection until it has some items. 2019-11-05 12:23:26 +01:00
Kristian Bendiksen
22a5a1fe0f #82 Import ascii grdecl input properties into simulation case.
This allows data from text files to be imported into a binary Eclipse case
imported based on *.EGRID.
2019-11-05 12:23:26 +01:00
Kristian Bendiksen
357b07506f Move RimEclipseInputPropertyCollection to make it available in RimEclipseResultCase.
Ref #82.
2019-11-05 12:21:29 +01:00
Kristian Bendiksen
ce15aa1b5e Extract utility for loading input properties from file. 2019-11-05 12:21:29 +01:00
Gaute Lindkvist
03ff43237d Add a view id tag to project tree and tooltip
* Remove it from property editor
2019-11-05 11:09:18 +01:00
Kristian Bendiksen
7d817d0277
Merge pull request #4967 from OPM/improve-export-filedialog-behaviour
Improve export filedialog behaviour
2019-11-05 10:39:50 +01:00
Magne Sjaastad
57cab2457e clang-format : Set PenaltyBreakAssignment to 130 2019-11-04 15:08:09 +01:00
Magne Sjaastad
7c8cf60dba clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false 2019-11-04 14:35:41 +01:00
Magne Sjaastad
96a26662fc Janitor : Apply clang-format fixes on codebase in ApplicationCode 2019-11-04 11:34:34 +01:00
Magne Sjaastad
e8cdf1a8ef Janitor : Remove boolean function always returning true 2019-11-04 10:16:29 +01:00
Magne Sjaastad
9ae07c838a #4919 Summary Plot : Improve colors of history curve symbols 2019-11-04 10:15:57 +01:00
Jacob Støren
5044784201
Merge pull request #4968 from OPM/feaure-fix-point-picking-in-comparison-view
Fixes several issues from #4857
#4956 Fix List editor background setting
#4880 Fix annotations missing in comparison view
2019-11-04 09:44:56 +01:00
Jacob Støren
52177994bd Improve readability of 3dView measurement in comparison view fix 2019-11-04 09:09:03 +01:00
Magne Sjaastad
a950852559 #4972 Summary : Add placeholder text to combo box editor 2019-11-03 14:49:08 +01:00
Magne Sjaastad
93f6bc8c72 Janitor : Remove invalid conditionals 2019-11-03 11:43:46 +01:00
Magne Sjaastad
67e7bb0cf3
Fixes detected by cppcheck (#4974)
* Janitor : Remove obsolete pointer to dialog

* Janitor : Remove unused functions

* Janitor : Remove unused functions

* Janitor : Add explicit to constructors

* Janitor : Remove unused variables

* Janitor : Remove unused functions related to summary plot templates

* clang-tidy : Use nullptr instead of 0

* clang-tidy : Fix usage of virtual and override

* Upped to version 2019.08.2-dev.05

* Janitor : Remove unused variables

* Janitor : Clean up several cppcheck issues

* Janitor : Add cppcheck config files

* Janitor : Use const when possible
2019-11-03 08:37:03 +01:00
Jacob Støren
6220225cfa #4970 Fix measurement text not visible in comparison view 2019-11-01 16:42:42 +01:00
Jacob Støren
f7fb4caa69 #4880 Fix annotations missing in comparison view 2019-11-01 15:57:04 +01:00
Jacob Støren
8bdb05447c Reordered Rim3dView.h 2019-11-01 15:57:04 +01:00
Jacob Støren
e85cd1b456 #4880 Further renaming of methods in Rim3dView 2019-11-01 15:57:04 +01:00
Jacob Støren
c9af22cf91 #4880 Refactoring in Rim3dView: De-virtualize updateCurrentTimeStepAndRedraw 2019-11-01 15:57:04 +01:00
Jacob Støren
b51e054ffd Renaming of more methods in Rim3dView.
Removed virtual method from RiuViewerToViewInterface as it was not used from the interface.
2019-11-01 15:57:03 +01:00
Jacob Støren
7f3f6419ac Rename virtual methods in Rim3dView
To make it more clear that they are virtual methods to be distinguished from implementations in the base class. Also make their meaning somewhat more expressed.
2019-11-01 15:57:03 +01:00
Jacob Støren
1ef4d49f14 #4857 Fix Intersection Box 3d manipulator interaction in comparison views 2019-11-01 15:57:03 +01:00
Kristian Bendiksen
60ac760254 Add txt suffix file pattern to make windows dialog behave better on windows. 2019-11-01 15:07:08 +01:00
Gaute Lindkvist
5f72c03d52 Fix warning in RImSummaryCurvesCalculator 2019-10-31 15:37:30 +01:00
Gaute Lindkvist
e8c745d704 Implement creation of combination plots from selected plots 2019-10-31 15:12:54 +01:00
Gaute Lindkvist
30db19a1d0 Create Grid plot collection and allow creation of new combination plots 2019-10-31 14:09:50 +01:00
Magne Sjaastad
1d88f4d48a Guard null pointer access 2019-10-31 09:38:44 +01:00
Magne Sjaastad
45cc94abd2 Janitor : apply clang-format 2019-10-31 09:35:48 +01:00
Magne Sjaastad
856580699c
Merge pull request #4955 from OPM/summary-adjustments
Summary adjustments
2019-10-30 14:40:20 +01:00
Gaute Lindkvist
a925c0f29e Partial revert of 38e0b150 2019-10-30 12:54:51 +01:00
Gaute Lindkvist
38e0b150ac Allow deleting of the last sub plot and have nice visible drop targets 2019-10-30 11:56:22 +01:00
Gaute Lindkvist
089ca3d39d #4931 Add available diameters to casing design and split casing and liner. 2019-10-30 11:53:02 +01:00
Gaute Lindkvist
f741c878db Update depth axis grid when changing grid line setting 2019-10-30 11:53:02 +01:00
Magne Sjaastad
e4fd536d21
Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry
Summary curve filter recently used
2019-10-30 11:12:59 +01:00
Magne Sjaastad
d6b7aa301c #4951 Summary Plot Template : Hide template collection in project tree 2019-10-30 10:48:23 +01:00
Magne Sjaastad
2dfa6b9d9f #4951 Summary Plot Template : Remove obsolete template pointer 2019-10-30 10:45:15 +01:00
Jacob Støren
f7f3e72700 Fix crash when closing project due to virtual call inside destructor.
isScaleZEditable called inside destructor of Rim3dView when the deleted view is the active view
2019-10-30 09:26:41 +01:00
Magne Sjaastad
bcb4150ae4 #4951 Summary Plot Template : Hide context menu to select template 2019-10-30 09:26:41 +01:00
Magne Sjaastad
18c52b0e18 Janitor : Avoid using .. when referencing include files 2019-10-30 09:12:13 +01:00
Magne Sjaastad
facfd062dc #4949 Summary Curve Filter Toolbar : Store recently used strings to registry 2019-10-29 14:17:24 +01:00
Magne Sjaastad
ba89a60e8d #4946 Ensemble Colors : Show color control in curve filter property editor 2019-10-29 13:40:57 +01:00
Jacob Støren
1774d123cc #4892 Simplified Unlink View command. Works on pprimary view as well. 2019-10-29 12:48:38 +01:00
Jacob Støren
b2f8c56a0d Fixed crash on project close introduced by update of MDI window title with Primary/Controlled 2019-10-29 12:47:01 +01:00
Jacob Støren
b729ce7228 #4892 Add (Primary) and (Controlled) labels to view window titles 2019-10-29 12:47:01 +01:00
Jacob Støren
3710b4ba58 #4892 Avoid comparison view accidentally added when linking views 2019-10-29 12:47:01 +01:00