OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,140 Commits 27 Branches 61 Tags 309 MiB
f2696b003d
Commit Graph

459 Commits

Author SHA1 Message Date
Gaute Lindkvist
de4a032fe2
Merge pull request #4728 from OPM/feature-ensemble-rft-md-labels 
Feature ensemble rft md labels
 2019-09-18 15:43:04 +02:00
Gaute Lindkvist
a35533f4fc #4732 Switch P10/P90 for Ensemble RFT 2019-09-18 10:21:57 +02:00
Gaute Lindkvist
63eac19c07 #4727 Apply initial default well path for new RFT Plots 2019-09-17 19:07:55 +02:00
Magne Sjaastad
29cb7cd8dc #4718 Qt5 : Use grab() instead of grabWidget() 2019-09-13 15:13:49 +02:00
Gaute Lindkvist
fb12ad7db0 #4696 Sensible defaults for well log plot and improve reliability of common date source 2019-09-11 12:51:25 +02:00
Gaute Lindkvist
81cb97ead7 Fix memory leak 2019-09-09 13:14:20 +02:00
Gaute Lindkvist
71c4642f13 Make Well Allocation Plots work well again 2019-09-09 11:00:11 +02:00
Gaute Lindkvist
9fe021c6ca Use layouts for tracks in Well Log Plot 2019-09-06 15:52:45 +02:00
Gaute Lindkvist
ff42e8b1be Merge branch 'dev' into system-refactor-welllogplot 2019-09-06 13:44:20 +02:00
Gaute Lindkvist
de8a5a59f3 Clang-format changed files 2019-09-06 13:17:36 +02:00
Gaute Lindkvist
565e5b0418 RFT/PLT/WAP: Calculate value options for fields inherited from WellLogPlot 2019-09-06 12:53:52 +02:00
Gaute Lindkvist
45103da354 Fix crashes related to name config and make name correct for old plots when loading 2019-09-06 10:59:47 +02:00
Magne Sjaastad
fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad
ef80f5b629 #4683 System : Remove obsolete include of cvfBase.h 2019-09-06 10:52:54 +02:00
Gaute Lindkvist
c0f7f4e056 Make plot titles work well in RFT/PLT again 2019-09-05 08:21:31 +02:00
Gaute Lindkvist
42f494be5f Make the refactored RFT and PLT plots work 2019-09-04 20:19:15 +02:00
Gaute Lindkvist
b9d78152e1 Fix crashes 2019-09-04 20:19:06 +02:00
Gaute Lindkvist
a03435b2fe Refactor WellLogPlot, RftPlot, PlotPlot and WellAllocationPlot 2019-09-04 20:18:59 +02:00
Gaute Lindkvist
8c4bb0e163 #4663 Fix loading of PLT plots with observed data 2019-09-03 14:42:01 +02:00
Gaute Lindkvist
789daed42b Interpolating MDvalues 2019-08-28 16:00:33 +02:00
Gaute Lindkvist
d4fd2d795a Ensemble RFT: make ensemble and observed curves work even if you have a well path with the same name 2019-08-27 10:54:52 +02:00
Gaute Lindkvist
2c5ca4ce46 Import and plot of FMU RFT data works 2019-08-26 12:52:07 +02:00
Gaute Lindkvist
4bddefeb0c #4608 Add only one legend item per RFT ensemble 2019-08-26 11:58:18 +02:00
Gaute Lindkvist
71da659506 #4580 Import Eclipse RFT data as part of ensemble import 2019-08-26 11:56:36 +02:00
Magne Sjaastad
b8f0fcd7e9 Flow Diag : Do not assert when tracername is not found 2019-07-30 11:23:31 +02:00
Magne Sjaastad
0f0e440185 #4136 Flow Characteristics : Avoid space in CSV column header 2019-06-25 18:18:47 +02:00
Magne Sjaastad
b2857676c8 #4136 Command File : Export of flow characteristics 2019-06-25 17:49:47 +02:00
Magne Sjaastad
56a53fedff Flow Characteristics : Load data in default plot when project is loaded 2019-06-23 19:00:14 +02:00
Magne Sjaastad
3c644629df #4136 Export of Flow Characteristics : Use CSV text export 2019-06-23 18:32:05 +02:00
Magne Sjaastad
7879fe186d #4136 Export of Flow Characteristics : Create text for export and add context menu 2019-06-23 15:18:17 +02:00
Magne Sjaastad
79df075fe4 #4136 Export of Flow Characteristics : Rename 2019-06-23 15:12:33 +02:00
Gaute Lindkvist
30769d7f2a Rename caf::PdmUiItem::setUiIcon(QString) to setUiIconFromResourceString 2019-05-06 11:08:59 +02:00
Gaute Lindkvist
57b33b0d4c
First implementation of Headless (#4392) 
* Revert "#4377 Octave : Use RiaLogging for error messages instead of QErrorMessage "

This reverts commit f758a8edb2.

* Revert "#4380 Preferences : Changing scene font size when geo mech view is open causes crash"

This reverts commit df62a41397.

* Revert "#4379 Documentation : Update command line parser for import of summary files"

This reverts commit d0b5357ed4.

* Unfinished WIP

* Builds but crashes

* Refactored code now builds and runs

* ResInsight can now run the unittests headless

* Can run some command files successfully

* Build on Linux

* Extra headless hack header

* Moved PdmUiItem hack to cpp file

* Fix headless crash in RimWellAllocationPlot

* Handle error gracefully if ExportSnapshots command is executed from console

* Add caf::QIconProvider and remove some hacks

* Also made the greying out of disabled icons work for a couple of cases where it didn't.

* Linux build fix

* #4380 Reimplement fix df62a41397 by @magnesj on top of Headless code changes

* #4379 Reintroduce kode from d0b5357ed4 by @magnesj

* #4377 Restore f758a8edb2 in new Headless code
 2019-05-06 10:36:05 +02:00
Magne Sjaastad
b6c9e3b278 #4363 RFT plots: For Measured Depths PL is sometimes used for grid pressures 2019-04-25 16:02:47 +02:00
Magne Sjaastad
e486432391 #4276 RFT-plot: Add support for Measured Depth as Y-axis 2019-04-03 12:27:49 +02:00
Magne Sjaastad
77dbd8a25f Whitespace 2019-03-27 19:20:42 +01:00
Magne Sjaastad
d0a23252ab #4239 Show Well Allocation Plots: Add well name to suggested view name 2019-03-27 19:19:19 +01:00
Magne Sjaastad
907337015f Minor refactoring fixes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
f7600199c7 Fix whitespace and includes 2019-03-12 09:22:48 +01:00
Magne Sjaastad
246326229e #4189 RFT Plot : Move common code to RifEclipseRftAddress 2019-03-12 09:22:48 +01:00
Magne Sjaastad
564ab1d84b #4189 RFT Plot : Separate request based on PLT/RFT plot 2019-03-12 09:22:48 +01:00
Gaute Lindkvist
1e994ac8b8 #4117 Improve time step names for Grid Cross plot categorisation 2019-02-27 11:38:35 +01:00
Magne Sjaastad
4eea7e91ee #4093 RFT Plot : Not possible to select both RFT and Grid as source at the same time 
Avoid updating the UI selections based on curves in defineUiOrdering
 2019-02-15 10:53:56 +01:00
Magne Sjaastad
157ff774e8 #4068 System : Add forward declare 2019-02-12 14:49:37 +01:00
Jacob Støren
5fe4a057ce #3958 Fix warning and error from refactoring 2019-01-29 08:35:42 +01:00
Jacob Støren
dbb2a564a2 #3958 Refactoring: RigCaseCellResultsData: Remove the final result index based interface 2019-01-28 16:18:28 +01:00
Jacob Støren
3e3d3871ed #3958 Refactoring: Remove scalarResultIndex from RigEclipseResultAddress 
and real external use (outside CaseCellResultsData)
Regression tests OK.
 2019-01-25 16:19:15 +01:00
Jacob Støren
ccfee8f34a #3958 Starting refactoring of eclipse results addressing 
Preparations for time diff results
 2019-01-25 16:19:13 +01:00
Magne Sjaastad
a9c7773ef7 CppCheck : Fix various minor issues 2018-12-21 12:32:57 +01:00
Magne Sjaastad
be77e4e048 CppCheck : Guard null pointer access 2018-12-21 12:31:42 +01:00
Magne Sjaastad
6346ed012c clang-tidy : Remove redundant 'virtual' and add 'override' 2018-10-18 19:45:57 +02:00
Magne Sjaastad
726658d642 #3512 System : Remove unused functions 2018-10-18 15:40:11 +02:00
Magne Sjaastad
766fea603e #3512 System : Remove unused functions 2018-10-18 15:14:25 +02:00
Magne Sjaastad
5a1acc124f #3512 System : Remove unused functions 2018-10-17 13:52:48 +02:00
Magne Sjaastad
2b1c6e9706 #3428 Text string creation based on date and time : Use toStringUsingApplicationLocale() at relevant places 2018-10-03 08:44:01 +02:00
Magne Sjaastad
ac8c6edafa Flow Diagnostics : Guard null pointer access 2018-10-02 08:23:45 +02:00
Magne Sjaastad
bbebbf108f #3340 Remove unused variables 2018-09-10 10:27:54 +02:00
Gaute Lindkvist
12484bf1e9 #3297 Make casing shoe a right-angled triangle and refactor symbols 
* Put plot symbol enum inside the symbol class.
* Put line style enums inside the line class.
* Add custom capability.
 2018-09-04 12:02:06 +02:00
Gaute Lindkvist
707a7a91e6 #3103 Make grid lines match major and minor interval and make the grid lines optional 2018-07-02 09:51:10 +02:00
Bjørn Erik Jensen
bb2e136df7 #3080 Ensemble statistics curves. Fix typo 2018-06-27 11:35:29 +02:00
Gaute Lindkvist
2ebd2def2c Reorganise depth axis settings and title/legend settings in Well Log Plot property editor 2018-06-27 08:35:17 +02:00
Gaute Lindkvist
208313f672 #2944 Stop auto-zooming on load of Well Log Curves. 2018-05-23 11:29:16 +02:00
Jacob Støren
ae8fa06e4d #2909 RFT Plot: Created icons 2018-05-14 10:20:27 +02:00
Magne Sjaastad
b02bf07568 #2901 Whitespace 2018-05-11 14:20:24 +02:00
Magne Sjaastad
bf2f524d34 #2901 RFT Plot : Initialize default time step selection based on all sources 2018-05-11 14:20:24 +02:00
Magne Sjaastad
e1abaa1b6c #2901 RFT Plot : Use empty() and move for loops 2018-05-11 14:20:24 +02:00
Magne Sjaastad
803da0668b #2901 RFT Plot : Whitespace cleanup 2018-05-11 14:20:24 +02:00
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