Commit Graph

5234 Commits

Author SHA1 Message Date
Jacob Støren
b1942e0844 #5147 RimWellLogFile::m_fileName ->FilePath 2019-12-11 08:38:31 +01:00
Jacob Støren
7f1ccc0169 #5147 RimStimPlanFractureTemplate::m_stimPlanFileName -> FilePath 2019-12-11 08:30:32 +01:00
Jacob Støren
eb421db040 #5147 RimWellPath::m_wellPathFormationFilePath ->FilePath
RimFileWellPath::m_filepath ->FilePath
2019-12-11 08:23:37 +01:00
Jacob Støren
059288ef97 #5147 RimEclipseInputProperty::fileName -> caf::FilePath 2019-12-10 16:58:07 +01:00
Jacob Støren
11807029a5 #5147 RimEclipseInputCase::m_gridFileName -> FilePath 2019-12-10 16:43:12 +01:00
Jacob Støren
723caaaf79 #5147 RimEclipseCase::m_filesContainingFaults -> vector<FilePath> 2019-12-10 16:36:07 +01:00
Jacob Støren
d19c87c23a #5147 RimEclipseResultCase::caseFileName -> PdmField<caf::FilePath> 2019-12-10 16:19:39 +01:00
Jacob Støren
18cf59530f #5147 RimSummaryCase::m_summaryHeaderFilename -> PdmField<caf::FilePath> 2019-12-10 16:12:21 +01:00
Jacob Støren
a9d089df6d #5147 PdmField<caf::FilePath> now uses a reference list in the start of the project file to store the paths. 2019-12-10 14:58:47 +01:00
Gaute Lindkvist
ea793c15f3 Fix ensemble selection if statistics curves are not shown 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
0b5188e4b7 Fix updates after legend change 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
08afc1f8d7 Add automatic name updating of EnsembleRftCurveSets 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
9c458ec3ba Fixed typo in comment SFINA -> SFINAE 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
7fd4aa1ce9 #5002 Ensemble RFT curve sets with parameter coloring and separate legends 2019-12-06 08:13:31 +01:00
Gaute Lindkvist
f56a34843a Refactored ensemble parameter legends 2019-12-06 08:13:31 +01:00
Magne Sjaastad
d4b7797bb1 #5187 Info Box: Change defaults for Statistics Options 2019-12-06 07:47:19 +01:00
Kristian Bendiksen
54820eb20a
Merge pull request #5173 from OPM/feature-well-measurement-reorg 2019-12-05 15:51:24 +01:00
Magne Sjaastad
948d193e3e #5189 Grid Case Group: Read Well Data Source when importing project 2019-12-05 14:29:53 +01:00
Magne Sjaastad
ad648eadc1 Janitor : Guard access to undefined memory 2019-12-05 11:56:04 +01:00
Gaute Lindkvist
b5ab1d6e82 #5159 Make user defined shale PP proportional to hydrostatic PP 2019-12-04 15:09:04 +01:00
Magne Sjaastad
e138e1f7e8 Merge changes from release-2019.11 2019-12-04 14:05:39 +01:00
Magne Sjaastad
df55c5f6dc Janitor : Avoid replot in destructor of RimPlotCurve 2019-12-04 12:48:48 +01:00
Magne Sjaastad
1ba2fc14a5 #5177 Saturation Plots : Plots are not deleted on project close 2019-12-04 12:48:48 +01:00
Gaute Lindkvist
2e8518b7c9 #5179 Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:37:25 +01:00
Gaute Lindkvist
ed1d02535d #5179 Fix missing LAS-file data in plots when las-file doesn't contain TVD 2019-12-04 12:36:22 +01:00
Gaute Lindkvist
5139f1cadb #5174 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:17 +01:00
Gaute Lindkvist
cd5b432267 #5171 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
f795dfcf11 #5174 Paint non-filled plot symbols with curve color rather than edge color 2019-12-04 12:34:04 +01:00
Gaute Lindkvist
28a0a3ad06 #5171 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
4fb0542946 #5125 Well measurements : Select all wells by default 2019-12-04 10:41:44 +01:00
Magne Sjaastad
0a1e6fc1d3 #5125 Well measurements : Hide legend if well measurement is unchecked 2019-12-04 08:40:39 +01:00
Magne Sjaastad
04162059b7 #5169 Observed Data : Do not repeat curve name twice 2019-12-04 08:05:46 +01:00
Kristian Bendiksen
cf15beb808 #5110 Update well measurement plots when WBS well is changed. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
12abf6494f #5110 Show only relevant well measurements in WBS track. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
0e4f9fe114 #5125 Show well measurements based on selection in RimWellMeasuremenInView. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
3583e2ee10 #5125 Update RimWellMeasurementInViewCollection when measurements are imported. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
66ac8fee1d #5125 Use category legend for well measurements without values. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
6efceea597 #5125 Make each well measurement a checkable entity. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
ad9c767a36 #5125 Only update relevant grid view on well measurement changes. 2019-12-03 21:19:02 +01:00
Kristian Bendiksen
660d68a4d1 #5125 Update well measurement colors on legend changes in 3d views. 2019-12-03 21:19:02 +01:00
Magne Sjaastad
8f99eb2274 #5169 Observed Data : Do not repeat curve name twice 2019-12-03 20:19:20 +01:00
Magne Sjaastad
e0e984f703 #5158 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
9424bdd0de #5158 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
Gaute Lindkvist
631570f6a5 #5150 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 #5132 Janitor : Guard index out of bounds 2019-12-02 11:23:34 +01:00
Kristian Bendiksen
e87466717c #5047 Remove input property collection from project tree. 2019-12-02 10:45:06 +01:00
Gaute Lindkvist
4870071b8e #5150 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 #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