Commit Graph

392 Commits

Author SHA1 Message Date
Jacob Støren
9885c9d2d7 #2809, #2858, #2859 Fix icon inconsistencies. Edd icons for ensemble curves and new icons for cross plot 2018-05-06 10:09:39 +02:00
Magne Sjaastad
c267f32638 Rename to RiuPlotMainWindow 2018-04-27 06:28:08 +02:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Rebecca Cox
007602dbf9 #2326 Well allocation plot: Remove formation options regarding well path 2018-01-26 10:28:24 +01:00
Rebecca Cox
cf12e5ae36 #2303 Formations: Update well path only when formation source changes 2018-01-05 08:36:59 +01:00
Rebecca Cox
fc2e638ba2 #2303 Formation: Make formations for RFT and PLT work 2018-01-05 08:36:59 +01:00
Bjørn Erik Jensen
6beb217882 #2282 RFT plot. Fix strange behavior 2017-12-21 09:39:26 +01:00
Magne Sjaastad
cd340f7713 #2273 Well Accocation Plot : Add flag to control branch detection 2017-12-18 09:34:28 +01:00
Magne Sjaastad
f8f30db5b3 #2265 Xml Keywords : Rename to uppercase and match field name 2017-12-18 07:13:58 +01:00
Bjørn Erik Jensen
448eefd0e8 RFT plot. Fix missing plot title 2017-12-14 14:22:21 +01:00
Bjørn Erik Jensen
fc2b6694ae #2263 PLT plot. Display warning dialog when selecting grid/rft case when no well path 2017-12-14 12:54:07 +01:00
Bjørn Erik Jensen
f84a535511 #2264 PLT plot. Filter wells list based on well geometry and production data 2017-12-14 11:23:04 +01:00
Jacob Støren
7d39d29ca5 Merge fix of #1858 2017-12-12 17:41:45 +01:00
Jacob Støren
7e820cd251 #1858 General refactoring as preparations. Renaming Whitespace change. Remove obsolete code. 2017-12-12 16:32:57 +01:00
Jacob Støren
b15664cfc5 #1858 Rename WellPathIntersectionInfo classes 2017-12-12 13:53:02 +01:00
Rebecca Cox
c3cd0a650e #2227 Well formations: update ui. remove level from RigWellPathFormation 2017-12-11 15:12:12 +01:00
Bjørn Erik Jensen
d3d2ccea20 PLT plot. Display unit int legend for observed curves 2017-12-08 11:07:36 +01:00
Magne Sjaastad
46bad03c4a #2127 Clamp sim well branch index to valid range 2017-12-08 10:24:14 +01:00
Magne Sjaastad
0e5e88008a #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
9c4077a040 #2127 Sim Well Branches : Move logic related to uiOrdering to RiaSimWellBranchTools 2017-12-08 10:24:14 +01:00
Magne Sjaastad
97743e6d70 #2127 Sim Well Branches : Use helper function instead of local function 2017-12-08 10:24:14 +01:00
Magne Sjaastad
9ef040d891 #2127 Sim Well Branches : Add branch detection and branc index to RtfCurve 2017-12-08 10:24:14 +01:00
Magne Sjaastad
1841379e64 #2127 Sim Well Branches : Major refactor of sim well branch computation
Remove local branch geometry caches
Add checkbox to control if branch detection should be used
Add RiaSimWllBranchTools and move helper functions from RimProject
2017-12-08 10:24:14 +01:00
Bjørn Erik Jensen
94a4bfeea5 PLT plot. Show plot title 2017-12-08 09:55:41 +01:00
Jacob Støren
f0ad02bc37 #2233, #2236 Fix some timestep related issues in RFT/PLT plot
Missing first grid timestep in RFT, and missing previous closest timestep if all available are before observed timesteps.
2017-12-07 16:24:53 +01:00
Bjørn Erik Jensen
609963bb73 RFT plot. Mark wells that have an observed well path in wells list 2017-12-06 15:45:35 +01:00
Magne Sjaastad
88559c8252 #2215 Plt Ploit : Show units in legend 2017-12-05 09:51:06 +01:00
Magne Sjaastad
7b3a9de199 #2215 Plt Plot : Extract unit string text generation 2017-12-05 09:45:45 +01:00
Magne Sjaastad
efb5648721 Plt Plot : Guard agains pop_back on empty vector 2017-12-05 09:45:45 +01:00
Rebecca Cox
6fc888d718 Capitalize ui name in PDM fields 2017-11-30 13:44:18 +01:00
Jacob Støren
da56696a26 #2072 Allign code for x-axis title on well flow plots. Handle combination of surface and reservoir conditions for PLT plot 2017-11-24 08:14:20 +01:00
Jacob Støren
eaefaf4980 #2119, #2072 Handle well flow condition and total flow 2017-11-23 15:11:43 +01:00
Jacob Støren
69a61a2cb8 #2119, #2072 Move private section to the bottom. Add isTotalFlowChannel 2017-11-23 15:11:43 +01:00
Bjørn Erik Jensen
e0b6062eca Fix Linux build warning and error 2017-11-20 08:57:20 +01:00
Jacob Støren
f032a3eb9f #2136 Sort observed data phases largest first 2017-11-17 20:17:44 +01:00
Jacob Støren
5731acb319 #2136, #2136 Zoom PLT plot when adding curves (respect autoscale)
Fix "New PLT plot" command using simwell name and not wellpath name
Rename of some methods
Use Phase Split as default
2017-11-17 15:35:07 +01:00
Jacob Støren
8c95975054 #2136 PLT plot curve appearance improved. First group gets solid fill. If Observed data is available, it will be first. The other groups are drawn with a gentle transparency on the last curve to "connect" the groups visually. 2017-11-17 15:33:43 +01:00
Jacob Støren
503c7bf37c Remove memory leak, Simplified code 2017-11-17 11:09:14 +01:00
Bjørn Erik Jensen
5a5a36abf5 RFT plot. Reset branch index when changing well due to exception 2017-11-17 09:02:43 +01:00
Jacob Støren
30e3622ad4 #2126, #2139 Removed unused methods 2017-11-16 17:02:39 +01:00
Jacob Støren
1808745ea0 #2126, #2139 Rftplot alignment with PLT plot. Move two new static methods to WellPlotTool 2017-11-16 17:02:39 +01:00
Jacob Støren
6b2231478c #2126, #2139 Rftplot alignment with PLT plot. WIP 2 2017-11-16 17:02:39 +01:00
Jacob Støren
49c2d6df0d #2126, #2139 Rftplot alignment with PLT plot. WIP 2017-11-16 17:02:39 +01:00
Jacob Støren
0007682f03 Use RiaRftPltCurveDefinition in Plt Plot 2017-11-16 17:02:39 +01:00
Jacob Støren
7ff93e9154 Remove obsolete code in RimWellPlotTools, sorted header according to actual use. 2017-11-16 17:02:39 +01:00
Magne Sjaastad
3f05300d2a Use PdmUiPushButtonEditor::configureEditorForField 2017-11-16 12:51:55 +01:00
Jacob Støren
f027f7395d #2126, #2139 Several improvements in PLT Plot
Improved timestep and source filtering
Show contribution sources on timestep
Axis unit set from the cases actually used
Warning on inconsistent units
2017-11-15 16:18:36 +01:00
Jacob Støren
259ea5b0e7 #2126, #2139 Simplified PLT sources IO field update. Remove obsolete code 2017-11-15 16:18:36 +01:00
Jacob Støren
42ee25d29e #2126, #2139 Improve timestep filtering in PLT plot 2017-11-15 11:32:25 +01:00
Jacob Støren
07264140cb Add deleteAllCurves method, and rename removeCurve to takeOutCurve in order to minimize wrong use. 2017-11-15 11:32:25 +01:00
Jacob Støren
a172f0ccfe #2133 Rft cases only returned if they actually contain the well.
Simplified gridCasesForWell code as well.
2017-11-13 15:23:38 +01:00
Jacob Støren
10e1f0f8ab Rename RimRftAddress to RimDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Jacob Støren
c02538b8bd Rename of RifWellRftAddress to RifDataSourceForRftPlt 2017-11-13 15:23:38 +01:00
Rebecca Cox
4f4635181d #2107 RFT PLT Plot: Hide all children 2017-11-13 10:21:24 +01:00
Rebecca Cox
da7c817023 #2129 Rft/Plt plot: Show formations on default, and not always 2017-11-13 08:56:22 +01:00
Rebecca Cox
3e40331c5b #2129 Rft/Plt plot: Show formations on default 2017-11-13 07:55:22 +01:00
Jacob Støren
5efd60c227 #2135 Fix broken drawing order of WellFlowRateCurves. Add group awareness to the drawing order. Higher groupids are drawn on top. 2017-11-12 23:51:08 +01:00
Jacob Støren
efa48c2cf5 #2114 Remove code causing timesteps to be unchecked 2017-11-12 23:46:12 +01:00
Jacob Støren
49c6fd9ac4 #2134 Rewrite the wellLogFilesContainingFlow to fix observed data always available bug 2017-11-12 16:18:48 +01:00
Jacob Støren
fadc9d12ff #2130 Avoid resetting zoom when last curve is removed 2017-11-12 15:46:32 +01:00
Jacob Støren
645421fa60 #2130 RFT And PLT plot: Show formation names also when no timesteps are visible. Do not overwrite the users case setting unless none are chosen. 2017-11-12 14:45:06 +01:00
Jacob Støren
fcf5093fb9 #2130 Zoom all when adding or removing curves.
WellLogTrack will not zoomAll but respect the visible-window setting to avoid overwriting the set zoom on project reload.
2017-11-12 13:45:01 +01:00
Jacob Støren
7f038e98ab #2130 Rewrite the wellLogFilesContainingPressure to fix observed data ways available bug 2017-11-12 12:38:12 +01:00
Jacob Støren
324d6d72e3 #2112 Avoid updating legend for each curve. Generalize and roll out the solution found for summary curves 2017-11-11 23:15:13 +01:00
Jacob Støren
c5e4773a58 Fix RFT plot after change of well name meaning 2017-11-10 15:44:35 +01:00
Bjørn Erik Jensen
f8a2250f3c RFT plot. Fix invisible grid curves bug 2017-11-09 15:50:32 +01:00
Bjørn Erik Jensen
290458b77a PLT plot. Fix crash when stacking curves containing NULL sample values 2017-11-09 15:34:31 +01:00
Bjørn Erik Jensen
4ad6198d42 PLT plot. Update plot after synced curves from ui selection change 2017-11-09 15:34:31 +01:00
Jacob Støren
1fba5e13c4 #2119 Support total reservoir flow from Grid wells in PLT plot 2017-11-09 15:20:15 +01:00
Jacob Støren
dfa0ade9fe #2116 Convert the PLT plot gas rate from RFT file to oil equivalents 2017-11-09 15:20:15 +01:00
Bjørn Erik Jensen
d277a08d29 #2100 PLT plot. Remove branch index field 2017-11-09 13:36:14 +01:00
Bjørn Erik Jensen
f131f1274a #2101 PLT plot. Support for regex matching when comparing flow channels 2017-11-09 13:11:44 +01:00
Bjørn Erik Jensen
d3d5a89979 #2100 PLT plot. Refactoring. Use RimWellPlotTools methods 2017-11-09 11:18:57 +01:00
Bjørn Erik Jensen
89e5c04aef #2100 RFT plot. Add RftPltCurveDefinition. Use that in RFT plot 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
a46c5af1f8 RFT plot. Refactoring. Move several static methods to RimWellPlotTools class 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
cf069aaf5c RFT plot. Fix list of wells (display well path name when possible) 2017-11-09 10:04:17 +01:00
Bjørn Erik Jensen
444ad2ff90 PLT plot. Fix observed-data-even-if-no-selected-well issue 2017-11-08 17:01:18 +01:00
Bjørn Erik Jensen
95a5085ba0 #2099 #2101 (partly) PLT plot. Well path/well name matching issues. Display only wells with well path 2017-11-08 16:37:19 +01:00
Jacob Støren
aa45dd5fcd #2035 Fix crash when bottom of well path ends after last well cell
Add symbols to curves
2017-11-08 11:59:38 +01:00
Jacob Støren
014dd9497a #2035 Add color and legend text to the PLT curves 2017-11-08 11:59:38 +01:00
Jacob Støren
994313fcc9 #2035 Fix some bugs in the PLT plot use of wellFlowAccumulator, and in the new constructor of the wellFlowAccumulator. Renamed to m_pipeBranchesWellResultPoints (instead of misleading "CellIds") 2017-11-07 18:35:56 +01:00
Jacob Støren
a920f16def #2035 Add Simulation well and *.RFT file curves to PLT plot. Work In progress. Does not quite work. 2017-11-07 14:41:20 +01:00
Jacob Støren
93d449bc6e Switched QString compare to == 2017-11-07 14:41:20 +01:00
Rebecca Cox
8a8234fd66 Rename function 2017-11-07 10:38:05 +01:00
Rebecca Cox
726adcacf3 PLT Plot: Move settings and hide track and plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
99f6d21e68 #2039 PLT Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
e0b0fb1c13 #2077 Well Allocation Plot: Move formation logic from track to plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
bac2d2b4b2 #2037 RFT Plot: Set formation case from plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
1e943e1607 #2038 RFT Plot: move formation logic from track to rft plot 2017-11-07 10:00:10 +01:00
Rebecca Cox
3919b3012b Remove "uiConfigName" from uiOrdering-functions 2017-11-07 10:00:10 +01:00
Rebecca Cox
bf00807aee #2077 Well Allocation Plot: Set default formation name values 2017-11-07 10:00:10 +01:00
Rebecca Cox
7e707f131c #2039 PLT Plot: Add branch index getter 2017-11-07 10:00:10 +01:00
Jacob Støren
7f3ec2ad84 #2035 Add accumulated PLT plot curves from *.RFT file. (Not yet available due to missing calculate value options) 2017-11-06 22:24:57 +01:00
Bjørn Erik Jensen
95d9e1b722 RFT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:22:21 +01:00
Bjørn Erik Jensen
32e9a06ec3 PLT plot. Add None to wells drop down if no wells are loaded 2017-11-06 14:20:43 +01:00
Bjørn Erik Jensen
1a5db83046 RFT plot. Made some methods static 2017-11-06 14:14:55 +01:00
Rebecca Cox
c8b05fe9ce #2038 RFT Plot: Set default values for formation names 2017-11-03 14:53:00 +01:00
Rebecca Cox
fc4ceeda95 Add branch index accessor 2017-11-03 14:52:15 +01:00
Rebecca Cox
771c9d62ed #2002 RFT Plot: Move settings and hide track and plot 2017-11-03 13:23:06 +01:00
Rebecca Cox
95f7f40b15 #2002 RFT Plot: Add visible x range and new logic for formations 2017-11-03 13:23:06 +01:00
Rebecca Cox
40b7f99de3 #2002 RFT Plot: Add formation name properties 2017-11-03 13:23:06 +01:00
Bjørn Erik Jensen
dc93767683 #2076 RFT Plot. Support PRES_FORM las channel name 2017-11-02 11:05:39 +01:00
Bjørn Erik Jensen
593633cd6e #2071 LAS file. User can set date when LAS file date is invalid or missing 2017-11-01 10:29:03 +01:00
Bjørn Erik Jensen
e7c0d6d59a #2044 Close LAS file. Update plots after LAS delete and import 2017-10-31 15:42:11 +01:00
Bjørn Erik Jensen
ae20e1af10 Refactoring. RimViewWindow.loadDataAndUpdate -> onLoadDataAndUpdate 2017-10-31 12:49:36 +01:00
Bjørn Erik Jensen
d591177872 #1948 PLT plot. Support for setting doFillCurve flag 2017-10-31 08:28:19 +01:00
Bjørn Erik Jensen
0c6fd31e07 #1948 PLT plot. Support for stacked curve grouping 2017-10-31 08:28:19 +01:00
Bjørn Erik Jensen
3ef2ec3f33 #1948 PLT plot. Save editor selections to project file 2017-10-27 09:43:35 +02:00
Bjørn Erik Jensen
bd5671d1ea #2047 PLT plot. Fix plot title 2017-10-27 09:17:05 +02:00
Bjørn Erik Jensen
cb78ad8c31 #1948 PLT plot. Prepare for saving PLT plot editor selections to project file 2017-10-26 10:35:23 +02:00
Jacob Støren
c4bc81b2cc Fix linux compile error and warning 2017-10-25 19:50:10 +02:00
Bjørn Erik Jensen
a97fc2b9ba #1948 PLT Plot. Display curves from well log file 2017-10-25 14:43:17 +02:00
Bjørn Erik Jensen
a35329555b #1948 PLT plot. Initial version, RFT plot copy 2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
53d1d284e7 RFT plot. Set brancnIndex default value 2017-10-24 09:02:14 +02:00
Bjørn Erik Jensen
e8c5666c44 Remove ununsed variables 2017-10-23 08:24:19 +02:00
Bjørn Erik Jensen
b99f12b3e4 #1998 RFT plot. Support for multiple LAS files per well path 2017-10-19 16:13:53 +02:00
Bjørn Erik Jensen
f15f55795e RFT plot. Increased readability 2017-10-18 10:55:19 +02:00
Bjørn Erik Jensen
646c4aa9d7 Plot curve. Support for setting Z order on curve objects 2017-10-17 15:59:05 +02:00
Bjørn Erik Jensen
339c46d39c #2009 RFT Plot. Remove time step selections for untoggled sources 2017-10-17 13:35:53 +02:00
Bjørn Erik Jensen
b08b14f6bd RFT plot. Check for nullptr 2017-10-17 11:37:32 +02:00
Bjørn Erik Jensen
01cadd5a1c #2010 RFT plot. Show relevant curves initially 2017-10-17 11:05:14 +02:00
Rebecca Cox
9bd556a1b9 #1996 Remane RimFieldCollection -> RimFaultInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
7da8e3091b #1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection 2017-10-17 09:52:31 +02:00
Rebecca Cox
44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Rebecca Cox
7d908394db #1996 Renaming. Remove unused includes and rename local variables 2017-10-17 09:52:31 +02:00
Rebecca Cox
d748803159 #1996 Rename RimEclipseWell -> RimSimWellInView 2017-10-17 09:52:31 +02:00
Bjørn Erik Jensen
3e986a63a1 #2008 RFT plot. Cycle symbols and colors 2017-10-17 09:17:23 +02:00
Bjørn Erik Jensen
5f39bc5c39 #2007 RFT plot. Use central logic for date/time formatting. 2017-10-16 16:11:48 +02:00
Bjørn Erik Jensen
9c0fa50834 #2001 RFT plot. Use only TVD depth type 2017-10-16 14:01:45 +02:00
Bjørn Erik Jensen
4ca757f1b5 RFT Plot. Bugfix and minor refactoring 2017-10-16 12:22:13 +02:00
Jacob Støren
869ad4752f Fix crash creating RFT plot from well with well path but without LAS file 2017-10-13 16:28:12 +02:00
Bjørn Erik Jensen
fd6a4d2709 #2005 RFT plot. Show the first grid source time step as well 2017-10-13 14:46:58 +02:00
Bjørn Erik Jensen
25f1976273 #2005 RFT plot. Show only relevant time steps 2017-10-13 14:46:58 +02:00
Bjørn Erik Jensen
5bab568a85 RFT Plot. Clear plot when changing well or branch 2017-10-13 11:19:02 +02:00
Bjørn Erik Jensen
0542f4ab40 RFT Plot. Clean up includes 2017-10-12 11:44:21 +02:00
Magne Sjaastad
4046665044 #1977 Curve Calculator : Add RiuSummaryCurveDefinition and friends 2017-10-12 10:52:30 +02:00
Bjørn Erik Jensen
a33a2411ef Fix Linux build warnings 2017-10-12 10:00:32 +02:00
Bjørn Erik Jensen
574effd6f2 RFT Plot. Do not show cases with no time steps. Do not show source editor headers when no cases 2017-10-12 08:10:28 +02:00
Bjørn Erik Jensen
dcb1c40414 #1976 RFT/PLT Plot. Associate sim well and well path. RFT branch index impl 2017-10-11 13:53:05 +02:00
Bjørn Erik Jensen
0cb97b9c74 #1983 RFT Plot. Apply colors and symbols to curves 2017-10-09 10:51:07 +02:00
Bjørn Erik Jensen
02940992be #1842 RFT Plot. Display RFT curve 2017-10-06 14:20:01 +02:00
Jacob Støren
62b8da837f Remove field accessor method. Adjusted whitespace 2017-10-06 13:34:45 +02:00
Bjørn Erik Jensen
b6c74ee559 #1842 RFT Plot. Command enabling criteria. Minor refactoring 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d5034d8011 #1842 RFT Plot. Populate editors from saved curves 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
883b815fac #1842 RFT Plot. Grid data curves 2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
d090f8ac2d #1842 RFT Plot. First visible RFT curve 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
1a5c63af39 #1842 RFT Plot. Handle selections 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
2add09ea33 #1842 RFT Plot. Show plot when new RFT plot command is triggered 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
141bfd27d7 #1842 RFT Plot. Implement property view and RFT plot commands 2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
536225eb7e #1842 RFT plot. Removed unnecessary fields in RFT plot 2017-10-05 16:26:39 +02:00