Magne Sjaastad
9d06ef857e
#2003 Observed Data : Use time with highest available resolution
2017-11-07 11:16:33 +01:00
Magne Sjaastad
97d67f2d49
#2003 Observed Data : Refactor creation of time steps
2017-11-07 11:16:33 +01:00
Magne Sjaastad
d7f70f5c9f
Remove duplicate function
2017-11-07 11:16:33 +01:00
Magne Sjaastad
6b18493599
#2003 Observed Data : Collect detection of string types
2017-11-07 11:16:33 +01:00
Rebecca Cox
8a8234fd66
Rename function
2017-11-07 10:38:05 +01:00
Rebecca Cox
630dbd0ffc
Tab -> spaces
2017-11-07 10:02:43 +01:00
Rebecca Cox
a4d658423d
#2039 Update editor on toggling "Show formation"
2017-11-07 10:00:10 +01:00
Rebecca Cox
4120aecdc2
RFT Plot: Make extractor on correct path type
2017-11-07 10:00:10 +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
2fc796ac27
Update pdm-field names to include "formation"
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
de093fda4c
Formation names: Change color of annotations
2017-11-07 10:00:10 +01:00
Rebecca Cox
61067cbc24
Remove ternary operator (for Linux build)
2017-11-07 10:00:10 +01:00
Rebecca Cox
ecc1df5424
Fix crash when RFT plot does not exist
2017-11-07 10:00:10 +01:00
Rebecca Cox
5feee83706
#2077 Well Allocation Plot: Formation names for pseudo length
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
ae372a4a79
#2039 #2035 RFT/PLT Plot: Set default values for formation names
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
Jacob Støren
b708bb0ac3
#2035 Add MD to the intesection struct available from the WellLogExtractors
2017-11-06 22:24:57 +01:00
Jacob Støren
1089060539
#2035 Remove the unused Pseudo Length calculator
2017-11-06 22:24:57 +01:00
Jacob Støren
94c6bc763d
#2035 Commit unused Pseudo length calculation files, for reference.
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
Bjørn Erik Jensen
936568b22b
Curve calc. Reorganized context menus
2017-11-06 13:52:54 +01:00
Bjørn Erik Jensen
0f8b7ce907
#2048 Curve calc. Add command icon
2017-11-06 13:50:15 +01:00
Bjørn Erik Jensen
ca4562d853
#2052 Curve calc. Add user defined unit field
2017-11-06 13:26:32 +01:00
Bjørn Erik Jensen
71bb26a292
Column based user data parser. Fix Linux warning
2017-11-06 12:37:23 +01:00
Bjørn Erik Jensen
0c8067f022
Well center line calc. Fix Linux warnings
2017-11-06 12:11:51 +01:00
Bjørn Erik Jensen
faf703dfeb
#2053 Curve calc. Fix Linux build errors
2017-11-06 12:08:13 +01:00
Bjørn Erik Jensen
c6f3638dad
#2053 Curve calc. Resove ptr field and fix a bug
2017-11-06 11:35:54 +01:00
Bjørn Erik Jensen
d5a3b319b8
#2053 Curve calc. Add 'Create copy' context menu
2017-11-06 11:35:54 +01:00
Magne Sjaastad
f53acbdce2
#2003 Observed Data : Handle STEPTYPE with potentially missing text for first row
2017-11-06 10:53:46 +01:00
Magne Sjaastad
296bacf7f6
#2003 Observed Data : Merge tables if DATE is present and size is equal
2017-11-03 17:44:48 +01:00
Magne Sjaastad
7d3a547ad6
#2003 Observed Data : If YEARX is present, use this as basis for the time step
2017-11-03 17:42:16 +01:00
Magne Sjaastad
f50760bb35
#2003 Observed Data : Add basic support for fixed width in parser
2017-11-03 17:42:16 +01:00
Magne Sjaastad
50b2717ed2
#2003 Move conversion from string to double into RiaStdStringTools
2017-11-03 17:42:16 +01:00
Magne Sjaastad
713998fb38
#2003 Move conversion from string to integer into RiaStdStringTools
2017-11-03 17:42:16 +01:00
Magne Sjaastad
265c0ebb70
#2003 Observed Data : Add file parsing of fixed column width
2017-11-03 17:42:16 +01:00
Magne Sjaastad
f844c6fdb9
Fix invalid assert
2017-11-03 17:42:16 +01:00
Magne Sjaastad
3fa48d175f
#2003 Observed Data : Add RiaStdStringTools
2017-11-03 17:42:16 +01:00
Jacob Støren
bf8e4ed4ed
#2035 Add constructor for singel branch data with MD to well flow accumulator
2017-11-03 17:13:37 +01:00
Rebecca Cox
c5fd04f3f6
Avoid showing extraction curve name if no fields are set
2017-11-03 15:31:52 +01:00
Rebecca Cox
c638d63dfe
#2038 RFT Plot: Do not set form. case when toggliging show Formation off
2017-11-03 15:15:03 +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
46aa029717
Hide branch field when untoggling "show formations"
2017-11-03 14:14:07 +01:00
Rebecca Cox
312004446b
#2002 RFT Plot: Update rftPlot editor on change of track/plot-settings
2017-11-03 13:47:51 +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
cac5fa42a5
Fix crash on plot deletion
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
Rebecca Cox
4da066c2d4
#2002 RFT Plot: Add setters for members used in formation names function
2017-11-03 13:23:06 +01:00
Bjørn Erik Jensen
189a1478eb
#2041 Curve calc. Parse expression automatically after creating new calculation
2017-11-03 11:51:51 +01:00
Bjørn Erik Jensen
abcbe963eb
#2074 LAS import. Fix LAS file read error on Linux
2017-11-03 11:34:03 +01:00
Jacob Støren
374c6e7b34
#2046 Disable the new advanced branch detection, as it is not always better. Needs some more work.
2017-11-03 09:15:09 +01:00
Jacob Støren
5fcc0432e8
#2046 Partial experimental fix for one-cell-branches
2017-11-03 09:15:09 +01:00
Jacob Støren
7e1831bfa0
#2046 Whitespace cleanup
2017-11-03 09:15:09 +01:00
Jacob Støren
2443199bfd
#2046 Clean up
2017-11-03 09:15:09 +01:00
Jacob Støren
20b262043e
#2046 Prefer K-negative, K-positive faces when expanding the branchlines.
...
Add previous cell on stem to start of branch, and use the midface point of the shared face between this and the branching cell as start point for the branch
2017-11-03 09:15:09 +01:00
Jacob Støren
0762a2f08f
#2046 Ignore neighbours with small area overlap
2017-11-03 09:15:09 +01:00
Jacob Støren
daeb7c3bdc
#2046 Add line from well head to new branches. Handle branch lines with only one cell
2017-11-03 09:15:09 +01:00
Jacob Støren
956b73c0c9
#2046 First nearly working more advanced branch detection
2017-11-03 09:15:09 +01:00
Jacob Støren
f21e27e25b
Remove unneccesary code
2017-11-03 09:15:09 +01:00
Bjørn Erik Jensen
383a5c36f6
#2041 Curve calc. Set initial variable name consitently
2017-11-03 08:37:37 +01:00
Bjørn Erik Jensen
0f6d5f9c48
#2054 Curve Calc. Add context menu with operators and functions
2017-11-03 08:37:37 +01:00
Magne Sjaastad
9b7cfdd913
#2066 Observed Data : Improve error reporting
2017-11-03 08:24:25 +01:00
Magne Sjaastad
ea53018f54
#2016 Observed Data : Remove well override from reader interface
2017-11-03 07:40:18 +01:00
Magne Sjaastad
7fbc1d23fd
#2016 Observed Data : Hide identifier override fields
2017-11-02 19:54:24 +01:00
Magne Sjaastad
b58fd08c8f
Unit Tests : Use size_t to avoid warning on Linux
2017-11-02 19:41:20 +01:00
Magne Sjaastad
fee00918e9
#2066 Observed Data : Major rewrite of varying column width parsing
...
Add TableInfo to hold a table with several ColumnInfo objects
Improved detection of RifEclipseSummaryAddress from all variants
2017-11-02 19:00:27 +01:00
Magne Sjaastad
02cd42aa54
#2066 Add std::string to date parser
2017-11-02 18:56:58 +01:00
Rebecca Cox
8853021403
#2073 WLP: Add PL (Pseudo Length) to depth axis if a simulation well is used as extraction curve or rft curve
2017-11-02 12:32:54 +01:00
Rebecca Cox
e60941aa2c
#2075 RFT Plot: Add "New RFT plot" command to well path
2017-11-02 12:32:54 +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
5a0bab86a8
#2078 LAS files. Add import las/path to more objects in the tree
2017-11-02 10:24:36 +01:00
Bjørn Erik Jensen
d4c0e98c64
RimWellPath. Minor fix
2017-11-02 10:23:24 +01:00
Bjørn Erik Jensen
3955f29ce3
#2081 LAS import. Display dialog box when reading LAS file with missing or invalid date
2017-11-02 09:30:30 +01:00
Bjørn Erik Jensen
62b96a5ae5
#2049 Curve calc. Add curve calc command to more objects and toolbar
2017-11-02 09:30:30 +01:00
Rebecca Cox
af34f5618e
#2079 WLP: Add text "RFT" in legend
2017-11-01 16:19:18 +01:00
Rebecca Cox
99e2fc3570
#2080 WLP: Add text "LAS" in legend
2017-11-01 16:13:39 +01:00
Rebecca Cox
2a8cd9f499
#2080 WLP: Improve Las - file curve legend text
2017-11-01 15:59:27 +01:00
Rebecca Cox
0edbb600e4
Add override keyword
2017-11-01 15:11:14 +01:00
Rebecca Cox
94ecb3a084
Extraction curve: Use QStringList to build curve name
2017-11-01 14:35:53 +01:00
Rebecca Cox
6e3cdb6a77
RFT curve: Change name format to match extraction curve
2017-11-01 14:35:53 +01:00
Rebecca Cox
d645ecbfa4
RFT curve: Detach curve if depth values are invalid
2017-11-01 14:35:53 +01:00
Rebecca Cox
8d388bbd0e
Rft curve: Fix first depth value
2017-11-01 14:35:53 +01:00
Rebecca Cox
e40d41fe68
#1845 RFT/PLT Plot: Avoid crash when formation names does not exist
2017-11-01 14:35:53 +01:00
Rebecca Cox
80ee785e5e
Extractor: Fix crash when well path does not intersect any cells
2017-11-01 14:35:53 +01:00
Rebecca Cox
35d9935f88
#2038 RFT Plot: make fields readOnly when "Show Formations" is untoggled
2017-11-01 14:35:53 +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
073225e954
#2021 LAS file. Disable IO for proxy field
2017-11-01 09:32:13 +01:00
Bjørn Erik Jensen
297dfa5b5f
#2021 LAS file. Minor improvements
2017-11-01 09:05:36 +01:00
Bjørn Erik Jensen
23536c1dec
#2021 LAS file. Drop down for selecting well flow condition. Display date as well
2017-10-31 20:50:53 +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
Rebecca Cox
7695e5dabf
Correct calculation of MD
2017-10-31 15:06:22 +01:00
Rebecca Cox
4b1e64381d
Rename local variable
2017-10-31 15:06:22 +01:00
Rebecca Cox
36b9e0e28f
Remove depth as option in property selector
2017-10-31 15:06:22 +01:00
Rebecca Cox
ee52bc6e39
Use RiaQDateTimeTools to create QDateTime
2017-10-31 15:06:22 +01:00
Bjørn Erik Jensen
ae20e1af10
Refactoring. RimViewWindow.loadDataAndUpdate -> onLoadDataAndUpdate
2017-10-31 12:49:36 +01:00
Magne Sjaastad
6aaa8f7606
#2067 NNC : Guard before accessing values
2017-10-31 10:22:20 +01:00
Magne Sjaastad
dbc401ef71
#2067 NNC : Guard for null pointer access during import
2017-10-31 09:56:21 +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
7dd42d2da4
Well Path. Delete well log file object on when removed from well path
2017-10-31 08:26:58 +01:00
Jacob Støren
46e8144f3b
#2064 Fix wrong timestep range text in Gui. Complete Fix #1986 . Make it possible with Visible cells and FlowDiag/Injection flooding
2017-10-27 17:12:48 +02:00
Rebecca Cox
88b8bdf5c2
#2060 Rft Curve: Variable option menu grows and grows
2017-10-27 16:00:47 +02:00
Bjørn Erik Jensen
1abc5e0e27
#2042 Well import. Match wells, well paths and sim wells. Set 'master' well path name
2017-10-27 15:02:21 +02:00
Rebecca Cox
dda063cd68
Add vector of CellIntersectionInfo to WellLogExtractor
2017-10-27 14:28:53 +02:00
Rebecca Cox
112390e0a8
#2055 Curve Creator: Remove all text within "( )" , last period and "See note..."
2017-10-27 14:28:53 +02:00
Rebecca Cox
11a7cd4b69
#2038 RFT Plot: Remove last annotation line in plot
2017-10-27 14:28:53 +02:00
Rebecca Cox
d8bc1a7be1
Set date to None on update if timestep vector is empty
2017-10-27 14:28:53 +02:00
Rebecca Cox
a8abe32b79
#2038 RFT Plot: refactor
2017-10-27 14:28:53 +02:00
Rebecca Cox
0f66bf3dd5
#2038 PRF Plot: Remember chosen well when switching between sim and well
2017-10-27 14:28:53 +02:00
Rebecca Cox
69f33d312a
#2038 Rft plot: Make functions static
2017-10-27 14:28:53 +02:00
sigurdp
44e2d7d403
Workaround for compiler errors in cotire build due to local classes having the same name
2017-10-27 13:50:32 +02:00
Bjørn Erik Jensen
c0bce09a12
WellPathCollection. Fix Linux warning
2017-10-27 10:40:47 +02:00
Bjørn Erik Jensen
71caab54ec
Added first cut extraction and plotting of RelPerm plots. Also added skeleton implementation of extraction and plotting of PVT plots. #1991 , #1992 , #1992 , #2014
2017-10-27 10:20:34 +02: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
4cf80e3fe6
#2043 WellPath import. Improve well path name and sim well name matching
2017-10-27 09:14:39 +02:00
Magne Sjaastad
0db436a181
#2045 Curve Creator : Avoid dynamic_cast
2017-10-27 09:13:14 +02:00
Magne Sjaastad
1fb6d87c82
#2045 Curve Creator : Clear last curve selection when creating a new plot
2017-10-27 09:01:49 +02:00
Magne Sjaastad
0be241eb59
#2045 Remove obsolete factory and move curve editor into RicSummaryCurveCreator
2017-10-27 08:26:20 +02:00
Magne Sjaastad
1132d1fe7a
#2045 Curve Creator : Use unique_ptr and whitespace
2017-10-27 08:22:14 +02:00
Magne Sjaastad
d1579bd792
#2045 Curve Creator : Use PdmPointer
2017-10-27 08:22:14 +02:00
Magne Sjaastad
ae8d614fb0
#2045 Curve Creator : Make sure preview plot is updated in defineUiOrdering
2017-10-27 08:22:14 +02:00
Magne Sjaastad
f83df13394
#2045 Summary : Update object editors when case is created or closed
2017-10-27 08:22:14 +02:00
Magne Sjaastad
dab23164df
Summary Plot : Do not create object editor in command feature constructor
2017-10-27 08:22:14 +02:00
Magne Sjaastad
5844657a47
#2045 Curve Creator : Never auto add options for selected cases
2017-10-27 08:22:14 +02:00
Magne Sjaastad
14f3d2ffc3
Remove unused field
2017-10-27 08:22:14 +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
Bjørn Erik Jensen
fcefa1e55b
WellLogPath. Fix memory leak
2017-10-25 20:23:43 +02:00
Jacob Støren
c4bc81b2cc
Fix linux compile error and warning
2017-10-25 19:50:10 +02:00
Jacob Støren
12d0457e90
Whitespace changes
2017-10-25 16:04:41 +02:00
Rebecca Cox
27df9145f5
Fix build
2017-10-25 16:00:46 +02:00
Rebecca Cox
89cedb350a
#2038 RFT Plot: Add formation names
2017-10-25 16:00:46 +02:00
Magne Sjaastad
ec6d39c497
Fix failing unit test
2017-10-25 14:50:26 +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
0cb64ef982
WellLogFileCurve. Rename method
2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
3cd9333fd5
DateStringParser. Handle month-first when date is bigger than 12
2017-10-25 14:36:18 +02:00
Bjørn Erik Jensen
a35329555b
#1948 PLT plot. Initial version, RFT plot copy
2017-10-25 14:36:18 +02:00
Rebecca Cox
b2f4cd6696
#1845 RFT/PLT Plot: Add support for annotation of Qwt plot
2017-10-25 14:21:59 +02:00
Bjørn Erik Jensen
b3f77d1d70
#2036 . WellLogFile close command
2017-10-25 11:36:34 +02:00
Magne Sjaastad
4c223defec
#2000 Curve Creator : Use descriptive texts for variable shortnames
2017-10-25 10:16:59 +02:00
Magne Sjaastad
95a0c47d1c
#2000 Curve Creator : Fix initialization of map, and use std::string
2017-10-25 10:16:59 +02:00
Bjørn Erik Jensen
b62d4448d9
#1976 RFT/PLT Plot. Prevent multiple well paths from associate to the same sim well
2017-10-25 09:55:55 +02:00
Magne Sjaastad
85e2a5d3f3
2031 Curve Calculator : Move private class to cpp
2017-10-24 10:05:11 +02:00
Magne Sjaastad
605d3c25d6
#2031 Curve Calculator : Consolidate generation of address text
2017-10-24 09:58:04 +02:00
Magne Sjaastad
035e2ccaf9
#2031 Curve Calculator : Add display of curve address
2017-10-24 09:58:04 +02:00
Magne Sjaastad
9455ed1bac
#2031 Curve Creator : Select default category
2017-10-24 09:58:04 +02:00
Magne Sjaastad
5a15014dee
Whitespace cleanup
2017-10-24 09:58:04 +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
2d047aab84
WellLogPlot. Automatically select well log file when only one exists
2017-10-24 08:22:08 +02:00
Bjørn Erik Jensen
34d77d2733
WellLogPlot. Handle multiple well log files in well path
2017-10-24 08:22:08 +02:00
Magne Sjaastad
dc82888ede
#2031 Curve Calculator : Use unique_ptr
2017-10-23 20:20:18 +02:00
Magne Sjaastad
8cde20d662
#2033 SourSim : Guard for invalid index and show more error reports
2017-10-23 20:12:21 +02:00
Magne Sjaastad
da8fd7038f
#2032 Curve Creator : Move private class to cpp
2017-10-23 14:45:23 +02:00
Magne Sjaastad
35a2769cab
#2032 Curve Calculator : Rename of calculation and calculation collection
2017-10-23 14:42:38 +02:00
Magne Sjaastad
f943a80f95
#2032 Curve Calculator : Rename
2017-10-23 14:27:04 +02:00
Magne Sjaastad
2e6b7656d5
#2031 Curve Calculator : Show error messages in QMessageBox
2017-10-23 13:45:29 +02:00
Magne Sjaastad
f61c83a659
#2031 Curve Calculator : Sort variable names by the order they first appear
2017-10-23 13:31:57 +02:00
Magne Sjaastad
dd01863240
#2031 Curve Calculator : Allow assignment without spaces around :=
2017-10-23 13:11:38 +02:00
Bjørn Erik Jensen
8276d92ce7
#1999 Curve calc. Curve creator now uses CurveDefSelection component
2017-10-23 11:41:49 +02:00
Magne Sjaastad
ec53855cd4
Remove unused code
2017-10-23 11:37:40 +02:00
Magne Sjaastad
0bd745dd66
Remove unused variables
2017-10-23 11:37:40 +02:00
Rebecca Cox
359ac1cbd7
Avoid crash when wellPath size = 0
2017-10-23 08:48:56 +02:00
Bjørn Erik Jensen
e8c5666c44
Remove ununsed variables
2017-10-23 08:24:19 +02:00
Rebecca Cox
3eaeba8f67
#2025 Formations : Use imported formation names by default when sensible
2017-10-20 16:10:48 +02:00
Magne Sjaastad
3f90e8a632
#1877 Statistics case : Do not create placeholder results for statistics case
2017-10-20 15:48:12 +02:00
Magne Sjaastad
58cd4d112a
RegTest : Add support for execution of a subset of tests
2017-10-20 15:48:12 +02:00
Magne Sjaastad
bb549c6aed
#1878 : Ensure derived results are always tested for when creating result accessor objects
2017-10-20 15:48:12 +02:00
Rebecca Cox
9bd60ebec2
#2027 Select formation name on formation name import
2017-10-20 14:34:56 +02:00
Rebecca Cox
53912c4152
#2027 Select well log on well log import
2017-10-20 14:05:42 +02:00
Rebecca Cox
e9ee33a765
White space clean up
2017-10-20 12:42:41 +02:00
Rebecca Cox
1775045248
#2027 Select Well path on well path import
2017-10-20 12:40:11 +02:00
Magne Sjaastad
ead75326e1
#1987 Time Step Filtering : Guard use of emty time step vector
2017-10-20 12:09:31 +02:00
Rebecca Cox
360c3a03ec
#1862 Well log plot: Show plot data on missing data
2017-10-20 11:33:14 +02:00
Magne Sjaastad
07b3778a75
#2028 Summary : Use SummaryTools to access summary objects
2017-10-20 10:54:48 +02:00
Magne Sjaastad
167f56f95a
#2026 Curve Calculator : Update calculated curves and plots
2017-10-20 10:20:58 +02:00
Magne Sjaastad
bb4ac23c07
#2026 Curve Calculator : Create calculated summary case once
2017-10-20 10:20:58 +02:00
Magne Sjaastad
84440c0ca5
#1977 Curve Calculator : Add RiaSummaryTools
2017-10-20 10:20:58 +02:00
Magne Sjaastad
d6b0b8edf2
Remove obsolete includes and reorder
2017-10-20 10:20:58 +02:00
Bjørn Erik Jensen
92f30742ec
#1998 RFT plot. Handle old project files regarding well path and well log files
2017-10-20 10:17:30 +02:00
Bjørn Erik Jensen
c3ee28de5f
Fix Linux warning
2017-10-20 08:54:25 +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
Rebecca Cox
5a9af2bba6
#1750 Range filter: Set default values of sliders to extremal values
2017-10-19 14:00:26 +02:00
Rebecca Cox
e5cab39a7f
#1702 Faults: Remove artificial faults caused by gaps in grid
2017-10-19 12:54:44 +02:00
Rebecca Cox
66af820acd
Avoid crash on opening of input eclipse case without grid and log error
2017-10-19 11:37:20 +02:00
Magne Sjaastad
7c0c45b7b9
Curve Calculator : Do not report detected variables as lowercase
2017-10-19 11:23:30 +02:00
Rebecca Cox
ff0a8242d4
#1626 RimView: Add overrides in RimEclipseView and RimGeoMechView
2017-10-19 10:23:28 +02:00
Magne Sjaastad
22159a1c63
System : Simplify access to selected objects
2017-10-19 10:11:14 +02:00
Magne Sjaastad
66ff7d91bb
Cleanup whitespace and includes
2017-10-19 10:11:14 +02:00
Magne Sjaastad
215eb58de0
System : Always include Qt using <> and cleaned up some includes/whitespace
2017-10-19 10:11:14 +02:00
Magne Sjaastad
8e105ceb7a
System : Set default expand state to true when expanding an item in tree views
2017-10-19 10:11:14 +02:00
Rebecca Cox
18ebd742e6
#1997 Time Step Filtering: Add missing file
2017-10-19 10:00:47 +02:00
Rebecca Cox
adf55ec762
#1987 Time Step Filtering: Support dynamic NNC data time step filtering
2017-10-19 09:57:10 +02:00
Rebecca Cox
74ab333c49
#2017 Select Plot on Add To New Plot on RimWellLogFileChannel
2017-10-18 13:22:20 +02:00
Unknown
9d5facdbd9
#1986 Flooded PV: Fix crash. Set statistics calculator to FlowDiag calc
2017-10-18 12:54:46 +02:00
Unknown
de60c5a49f
Remove forward declarations
2017-10-18 12:54:46 +02:00
Unknown
314bb71ea4
#1986 Flooded PV: Add function isFlowDiagOrInjectionFlooding and replace
2017-10-18 12:54:46 +02:00
Unknown
d9170e064b
Fix indent
2017-10-18 12:54:46 +02:00
Magne Sjaastad
6015b99df9
#2022 Curve Calculator : Make sure calculated summary case is always present
2017-10-18 12:47:10 +02:00
Magne Sjaastad
9d335e1163
#1999 Curve Creator : Temporary fix for display of calculated curves
2017-10-18 12:47:10 +02:00
Magne Sjaastad
14d8e2aebb
#2022 Curve Calculator : Show calculation summary case for RimSummaryCurve
2017-10-18 12:47:10 +02:00
Magne Sjaastad
244916c0ed
#2022 Curve Calculator : Calculated summary case is now available
2017-10-18 12:47:10 +02:00
Magne Sjaastad
d5d26a36f2
#2022 Curve Calculator : Wire up access to calculated curve data
2017-10-18 12:47:10 +02:00
Magne Sjaastad
bd8abba779
#2022 Curve Calculator : Add enum Calculated
2017-10-18 12:47:10 +02:00
Bjørn Erik Jensen
f15f55795e
RFT plot. Increased readability
2017-10-18 10:55:19 +02:00
Bjørn Erik Jensen
bae1fcfa9e
#1997 RFT plot. Improve well path and simulation path matching
2017-10-17 17:07:51 +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
Unknown
b937bc53d8
#2017 Make all new objects selected after new / edit commands
2017-10-17 13:25:00 +02:00
Unknown
6c29a553ec
#1882 Well paths: Guard pointers
2017-10-17 13:22:33 +02:00
Bjørn Erik Jensen
b08b14f6bd
RFT plot. Check for nullptr
2017-10-17 11:37:32 +02:00
Bjørn Erik Jensen
f83b2adbef
RFT plot. Added RFT plot command menu item
2017-10-17 11:05:14 +02:00
Bjørn Erik Jensen
01cadd5a1c
#2010 RFT plot. Show relevant curves initially
2017-10-17 11:05:14 +02:00
Rebecca Cox
c52d9522c0
Fix crash when right clicking on a well when the case does not have RFT data
2017-10-17 09:52:31 +02:00
Rebecca Cox
764833edcf
#2013 Create map for summary vector -> description
2017-10-17 09:52:31 +02:00
Rebecca Cox
c579676543
#2012 Observed data: Select observed data on import
2017-10-17 09:52:31 +02:00
Rebecca Cox
0db43b0431
#1626 RimView : Ensure override functions are marked with override
2017-10-17 09:52:31 +02:00
Rebecca Cox
781200afc2
#1906 Preferences: Set default 3D navigation mode to RMS
2017-10-17 09:52:31 +02:00
Rebecca Cox
9bd556a1b9
#1996 Remane RimFieldCollection -> RimFaultInViewCollection
2017-10-17 09:52:31 +02:00
Rebecca Cox
f0cb458550
#1996 Renaming. cmakefile and fix compile issues
2017-10-17 09:52:31 +02:00
Rebecca Cox
6674f6087a
#1984 Ensure QDateTime spec set to UTC
2017-10-17 09:52:31 +02:00
Rebecca Cox
97e60ab5f2
#1996 : Rename RimFault -> RimFaultInView
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
e3ac94a940
#1996 Edit cmake for the rename RimEclipseWell -> RimSimWellInView
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
Magne Sjaastad
9449bbff20
#1977 Curve Calculator : Get summary values from summary reader
2017-10-16 22:04:00 +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
sigurdp
8d96e9e35a
Renamed RiuEclipseSelectionItem::m_cellIndex to RiuEclipseSelectionItem::m_gridLocalCellIndex
2017-10-16 14:35:43 +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
Bjørn Erik Jensen
d9a29a6c9a
#1982 RFT plot. Support for TVDMSL when showing well log file curve
2017-10-16 08:38:57 +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
Magne Sjaastad
ccd839c182
#1977 Curve Calculator : Use smaller and right aligned buttons
2017-10-13 16:22:39 +02:00
Magne Sjaastad
9819fe946e
#1977 Curve Calculator : Update object editors referencing a RimCalculation object
2017-10-13 15:35:19 +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
Magne Sjaastad
c50602c7de
Linux : Add missing include
2017-10-13 14:39:30 +02:00
Magne Sjaastad
82aee8f5bf
#1977 Curve Calculator : Create calculation description from addresses
2017-10-13 14:33:26 +02:00
Magne Sjaastad
15f71c29fa
#1977 Curve Calculator : Hide Edit header, hide new/delete variable buttons
2017-10-13 13:47:01 +02:00
Magne Sjaastad
dffaf8ed25
Guard for empty summary case
2017-10-13 13:44:18 +02:00
Magne Sjaastad
9d0e59c60f
#1977 Curve Calculator : Trigger parsing and evaluation of expression
2017-10-13 13:04:54 +02:00
Bjørn Erik Jensen
2b89b595f3
#1976 RFT Plot. Fixed matching of wellpaths and simulation wells
2017-10-13 11:19:02 +02:00
Bjørn Erik Jensen
5bab568a85
RFT Plot. Clear plot when changing well or branch
2017-10-13 11:19:02 +02:00
Magne Sjaastad
d02274a897
#1969 Curve Calculator : Support single select in tree selection editor
2017-10-13 08:54:06 +02:00
Magne Sjaastad
069d5ddf3b
#1969 Curve Calculator : Include missing handling of observed data postfix
2017-10-12 21:51:45 +02:00
Magne Sjaastad
c2b543b375
#1977 Curve Calculator : Rename to RiuSummaryCurveDefSelectionEditor
2017-10-12 21:07:35 +02:00
Magne Sjaastad
2dd18cec6e
#1977 Curve Calculator : Remove parent pointer from constructor
2017-10-12 21:07:35 +02:00
Magne Sjaastad
ad92b93e06
#1977 Curve Calculator : Rename to RicSummaryCurveCalculatorEditor
2017-10-12 21:07:35 +02:00
Rebecca Cox
44a5605936
#1982 RFT Plot: calculate TVD from MD and WellPath
2017-10-12 17:05:52 +02:00
Rebecca Cox
546e31a7c0
Linux build failed. Replace slash
2017-10-12 13:56:08 +02:00
Rebecca Cox
c9d8afc803
#1980 PLT Plot: Map data cells and MD in RFTCurves
2017-10-12 13:37:03 +02:00
Rebecca Cox
e3666a21fe
#1980 PLT Plot: Add argument for isExtractioncurve in setValuesWithTVD
2017-10-12 12:43:55 +02:00
Rebecca Cox
b8245c310c
RFT: case name derived from windows path
2017-10-12 12:43:55 +02:00
Rebecca Cox
901d03079a
#1980 PLT Plot: Make accessor for intersectedCellsGlobIdx
2017-10-12 12:43:55 +02:00
Rebecca Cox
306e32dba1
Forward declare vecIjk
2017-10-12 12:43:55 +02:00
Rebecca Cox
9aaf56b4ef
Observed data parser: Avoid infinite loop on parsing of invalid file
2017-10-12 12:43:55 +02:00
Rebecca Cox
2799d86c01
#1980 PLT Plot: Make cells available in .RFT reader
2017-10-12 12:43:55 +02:00
Bjørn Erik Jensen
0542f4ab40
RFT Plot. Clean up includes
2017-10-12 11:44:21 +02:00
Bjørn Erik Jensen
66d4a817a0
Fix Linux build error
2017-10-12 11:27:05 +02:00
Bjørn Erik Jensen
389234715c
Well branches. Simple well branch cache
2017-10-12 11:05:28 +02:00
Magne Sjaastad
445048c24b
#1985 Curve Calculator : Simplify interface to expression parser
2017-10-12 10:52:30 +02:00
Magne Sjaastad
650e29d6d5
#1977 Curve Calculator : Add button box to dialogs
2017-10-12 10:52:30 +02:00
Magne Sjaastad
e95b9a66a5
#1969 Curve Calculator : Guard against invalid summary category
2017-10-12 10:52:30 +02:00
Magne Sjaastad
6fd9bec353
#1977 Curve Calculator : Main dialog with expression editor
2017-10-12 10:52:30 +02:00
Magne Sjaastad
4b8186652f
#1967 Curve Calculator : Add calculation objects and containers
2017-10-12 10:52:30 +02:00
Magne Sjaastad
4046665044
#1977 Curve Calculator : Add RiuSummaryCurveDefinition and friends
2017-10-12 10:52:30 +02:00
Magne Sjaastad
ae915a7898
#1967 Curve Calculator : Add RiaSummaryCurveDefinition
2017-10-12 10:52:30 +02:00
Magne Sjaastad
5cd7ffc75e
#1985 Expression Parser: Add unit test
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
Jacob Støren
4d097a3149
#1988 Update flow diag libraries to handle multiple connections in same well, and have PVT Rel Perm support.
2017-10-11 18:05:53 +02:00
Bjørn Erik Jensen
6c51938000
#1976 RFT/PLT Plot. Associate well path and sim well when loading models and files
2017-10-11 15:23:14 +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
886c1ea256
#1981 RFT Plot. Disabled several commands
2017-10-10 11:18:53 +02:00
Rebecca Cox
ac10f21597
#1970 WLP: Update property and timestep on UI change of well name
2017-10-10 08:46:20 +02:00
Rebecca Cox
dae8d775be
Linux build failed. Replace slash
2017-10-09 15:33:01 +02:00
Rebecca Cox
69d4bb69c6
#1979 Observed Data: Add sensible filters on Import observed data file dialog
2017-10-09 15:23:50 +02:00
Rebecca Cox
634108de8c
Add wellLog Tools class and move static methods from newCurve-commands
2017-10-09 14:32:15 +02:00
Rebecca Cox
da118ac1da
#1971 WLP: Context command to create a new well log RFT curve from a selected well
2017-10-09 14:32:15 +02:00
Bjørn Erik Jensen
18552cf2f6
RifEclipseOutputFileTools. Let DateTime tools class create DateTime object with correct time spec
2017-10-09 13:43:56 +02:00
Bjørn Erik Jensen
35c70fc2a2
DateStringParser. Get time spec from DateTime tools
2017-10-09 13:40:29 +02:00
Bjørn Erik Jensen
60c40832fd
DateTime tools. Fix Linux build error (II)
2017-10-09 13:33:56 +02:00
Bjørn Erik Jensen
f5a387af73
DateTime tools. Replaced enum forward decl by include due to Linux build failure
2017-10-09 13:20:27 +02:00
Bjørn Erik Jensen
daf791d068
DateTime tools. Implement current TimeSpec getter and some QDateTime factory methods
2017-10-09 13:03:42 +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
0e832fad06
#1978 Curve Creator. Separate selections of observed data and simulated data
2017-10-09 08:54:49 +02:00
Rebecca Cox
8e80245544
#1970 WLP: Move command to dyncast of wellLogTrack in contextCommandBuilder
2017-10-06 15:15:37 +02:00
Rebecca Cox
d6d3ee4f28
#1970 WLP: Add new plot command to context builder
2017-10-06 14:55:20 +02:00
Rebecca Cox
984fbc66ac
#1970 WLP: Command to create an empty RFT-curve
2017-10-06 14:54:38 +02:00
Rebecca Cox
21f07d186f
#1947 RFT/PLT Plot: Update curve auto name
2017-10-06 14:38:27 +02:00
Bjørn Erik Jensen
02940992be
#1842 RFT Plot. Display RFT curve
2017-10-06 14:20:01 +02:00
Rebecca Cox
aeb854b895
#1947 RFT/PLT Plot: Use AppEnum for wellLogChannel and remove qwtPlot field in rftCurve
2017-10-06 13:35:56 +02:00
Rebecca Cox
a01dd00d62
Add default return value for RiaDefines depthUnit
2017-10-06 13:35:56 +02:00
Rebecca Cox
fdbbf75a88
Remove test on asctime
2017-10-06 13:35:56 +02:00
Jacob Støren
62b8da837f
Remove field accessor method. Adjusted whitespace
2017-10-06 13:34:45 +02:00
Jacob Støren
9bb5dcf011
Make wellLogFile field private in RimWellPath. Some whitespace changes
2017-10-06 13:24:45 +02:00
Jacob Støren
6f82f0f614
Rename and whitespace changes
2017-10-06 12:36:21 +02:00
Magne Sjaastad
f938827523
hasFlowDiagUsableFluxes : Add parenthesis to evaluate logical or before logical and
2017-10-06 10:56:59 +02:00
Magne Sjaastad
a5e684ffee
#1974 Dyn NNC : Read dyn NNC if flux data is available
2017-10-06 10:54:18 +02:00
Rebecca Cox
b604f85d8e
#1947 RFT/PLT Plot: Fix bug. Empty depth list
2017-10-06 09:32:27 +02:00
Unknown
4a2a80ba20
#1947 RFT/PLT Plot: Remove depth from value options of curve
2017-10-06 09:14:12 +02:00
Unknown
7db64e099e
#1947 RFT/PLT Plot: Fix calculateVaueOptions
2017-10-06 09:14:12 +02:00
Unknown
66b9bb34b5
#1947 RFT/PLT Plot: Use const string in rftAddress for wellLogChannelName
2017-10-06 09:14:12 +02:00
Unknown
e23783c1ed
#1947 RFT/PLT Plot: Create const string in rftAddress for wellLogChannelName
2017-10-06 09:14:12 +02:00
Bjørn Erik Jensen
5f050448f9
Move method to CPP file
2017-10-06 07:41:48 +02:00
Bjørn Erik Jensen
fba1d068e9
Forward declare class
2017-10-05 16:53:14 +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
d283e3aa8c
Curve creator. Minor refactoring
2017-10-05 16:27:39 +02:00
Bjørn Erik Jensen
a6e2a00122
Date string parser. Fix build error. Set UTC time spec
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
947d31bfcc
RimTools. Expose date format string
2017-10-05 16:26:39 +02:00
Bjørn Erik Jensen
282d8ef080
Date string parser. Move statement
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
Unknown
9c3b199e7e
#1947 RFT/PLT Plot: Add uiordering and change Address from std to qt variables
2017-10-05 13:49:54 +02:00
Jacob Støren
b8cef666e0
Whitespace cleanup
2017-10-05 13:42:40 +02:00
Unknown
234c9f8cb7
Code clean up
2017-10-05 11:13:15 +02:00
Unknown
9b54c26c4b
#1947 RFT/PLT Plot: Add fieldChangedByUi function
2017-10-05 11:08:30 +02:00
Unknown
e3c330d612
#1947 RFT/PLT Plot: Add QWT curve
2017-10-05 10:49:26 +02:00
Unknown
3ce1acb29f
Derive depth unit from unit system h
2017-10-05 10:48:41 +02:00
Unknown
94c743b9ab
Derive depth unit from unit system cpp
2017-10-05 10:48:35 +02:00
Magne Sjaastad
cc59b85ee9
#1966 : Use DATE if DATE is the only column present
2017-10-05 10:11:30 +02:00
Magne Sjaastad
56cd53a5f0
#1966 Observed Data : Use first item in DATE column as startdate for YEARS
2017-10-05 10:11:30 +02:00
Magne Sjaastad
4016681286
Convert to lower case before compare
2017-10-05 10:11:30 +02:00
Unknown
fd785044eb
#1947 RFT/PLT Plot: Add reader access in curve
2017-10-05 09:29:19 +02:00
Unknown
24d59d7f84
#1947 RFT/PLT Plot: Open RFT file on usage
2017-10-04 16:13:17 +02:00
Unknown
f56557f0c3
#1947 RFT/PLT Plot: Add unit test
2017-10-04 15:12:05 +02:00
Unknown
b2e6192dc1
#1947 RFT/PLT Plot: Add .RFT file reader
2017-10-04 14:59:51 +02:00
Bjørn Erik Jensen
41713816ee
Date string parser. Support dot as date separator as well
2017-10-04 14:50:06 +02:00
Jacob Støren
f654cd2bcc
#1960 Code adjustments
2017-10-04 11:18:38 +02:00
Jacob Støren
777a231606
#1960 Cache timestep times etc in the unified restart reader
2017-10-04 11:18:38 +02:00
Jacob Støren
9fc3443050
#1960 Use set<> to check if a timestep is already present instead of linear search
2017-10-04 11:18:38 +02:00
Magne Sjaastad
132c109ff2
Observed Data : Select in tree view and expand imported object
2017-10-04 07:36:30 +02:00
Magne Sjaastad
657f271cd1
Remove obsolete and unused code
2017-10-03 22:11:05 +02:00
Magne Sjaastad
54063aece2
#1957 Observed Data : Add handling of custom well name
2017-10-03 22:07:07 +02:00
Magne Sjaastad
2546dc631a
#1957 Observed Data : Add setters for well name and well group name
2017-10-03 22:05:33 +02:00
Magne Sjaastad
b36fcb5f09
#1954 Observed Data : Display imported variables as text in property editor
2017-10-03 15:31:45 +02:00
Magne Sjaastad
6ca1ef6653
Reorganized includes
2017-10-03 14:50:06 +02:00
Magne Sjaastad
db981e2eee
#1962 : Observed Data : Add helper class for QDateTime and use from parsers
2017-10-03 14:14:16 +02:00
Magne Sjaastad
f3f78995fa
#1959 Observed Data : Support custom ordering of header rows
2017-10-03 11:55:06 +02:00
Magne Sjaastad
4c61696f4e
#1959 Observed Data : Use seekg after parsing header
2017-10-03 11:55:06 +02:00
Magne Sjaastad
2fc1d20f45
#1959 : Improve detection of comment lines in header
2017-10-03 11:55:06 +02:00
Bjørn Erik Jensen
5375da3fc8
Date string parser. Add missing include to fix Linux build
2017-10-03 11:17:43 +02:00
Bjørn Erik Jensen
0516330b4d
Tools. Implement RiaDateStringParser. Parses various date string formats into a QDate
2017-10-03 11:05:23 +02:00
Jacob Støren
c8b329ddc3
Update libecl to 2e36798b43. For better memory usage reading wells
2017-10-02 17:11:36 +02:00
Magne Sjaastad
a362891d7e
#1940 Curve Creator : Make sure the curve tree is updated
2017-10-02 14:49:24 +02:00
Magne Sjaastad
2d50a68286
Observed Data : Rename to RifEclipseUserDataParserTools
2017-10-02 14:06:43 +02:00
Magne Sjaastad
62c8219a27
#1953 : Update curve visibility when unchecking RimSummaryCurveCollection
2017-10-02 13:32:02 +02:00
Magne Sjaastad
840abd5a5c
Summary Plot : Show EditSummaryPlot on context menu for SummaryCurveCollection
2017-10-02 13:03:45 +02:00
Magne Sjaastad
0fd2df9f57
Edit Summary Plot: Improve isCommandEnabled
2017-10-02 12:48:01 +02:00
Magne Sjaastad
eec974c53d
#1940 Curve Creator : Always recreate curve creator to ensure stable init
2017-10-02 12:46:40 +02:00
Jacob Støren
fd1b8c83ff
#1944 Use line style None, and force symbols on for observed data
2017-10-02 08:53:29 +02:00
Arne Morten Kvarving
ab4619bf74
fixed: add missing cmath include statements
...
highlighted by building with gcc6
2017-09-29 18:24:28 +02:00
Jacob Støren
1c2466fa85
#1951 Use a valid default start date
2017-09-29 15:11:21 +02:00
Rebecca Cox
05e3774d36
#1915 Curve creator: Remove option to make default curve filter in preferences
2017-09-29 13:23:23 +02:00
Unknown
e1c58fd1c3
#1945 Curve creator: Remove "Contribute to legend" option
2017-09-29 12:47:10 +02:00
Unknown
d9bee55116
Observed data: Rename Observed data to Observed Time History Data in GUI
2017-09-29 11:39:07 +02:00
Unknown
1ae470a415
#1946 Observed Data: Add Command to File->Import menu in main window
2017-09-29 11:38:19 +02:00
Unknown
500aaed00b
1941 Observed data: Set UTC time spec for parsed QDateTime object
2017-09-29 11:17:33 +02:00
Bjørn Erik Jensen
9db96cbb1b
#1943 Curve creator. RimProject::allSummaryCases also returns observed data
2017-09-28 14:42:13 +02:00
Unknown
8a139f7ebe
#1939 Curve creator: Created or edited plots is toggled on Apply/OK
2017-09-28 11:17:00 +02:00
Unknown
068bf64717
#1916 Plot project tree: Select first case of selection after grouping, and leave new group expanded
2017-09-28 10:46:26 +02:00
Unknown
29ac350b8f
#1939 Curve creator: Select newly created or edited plot on Apply/OK. Will only be visible if plot is toggled
2017-09-28 10:18:16 +02:00
Magne Sjaastad
8bae516af7
#1941 : Obseved Data : Add support for parsing of start date
2017-09-28 09:06:40 +02:00
Magne Sjaastad
9364efa4b7
#1941 Observed Data : Add RiaDateTimeTools
2017-09-28 08:04:27 +02:00
Jacob Støren
00ef13094a
Revert hard setting of linestyle NONE fro observed data. Must be more graceful
2017-09-27 19:43:11 +02:00
Bjørn Erik Jensen
fddabb61e2
Curve creator. Set line style NONE for observed data curves (II). Remove test code.
2017-09-27 15:33:46 +02:00
Magne Sjaastad
330f8a43b3
#1918 Observed Data : Scale time based on time unit
2017-09-27 15:28:34 +02:00
Magne Sjaastad
67c1ee2dbb
#1918 Observed Data : Rename
2017-09-27 15:19:04 +02:00
Magne Sjaastad
cdd1a96f44
#1934 Observed Data : Support for vector based files
2017-09-27 15:17:42 +02:00
Jacob Støren
53ec396449
#1927 Avoid enabling of command if text is not at least 12 char long
2017-09-27 15:13:35 +02:00
Rebecca Cox
faf5f59be6
#1820 Observed data: Add close command of observed data
2017-09-27 15:07:32 +02:00
Bjørn Erik Jensen
4f238a74b0
Curve creator. Set line style NONE for observed data curves
2017-09-27 14:58:01 +02:00
Rebecca Cox
31133f31c0
#1938 Curve creator: Close all widgets on closing of curve creator
2017-09-27 14:35:33 +02:00
Rebecca Cox
4019e76ae1
#1938 Curve creator: Show Plot Data will not raise main plot window
2017-09-27 14:35:33 +02:00
Magne Sjaastad
074795300c
#1918 Observed Data :Remove dummy placeholder
2017-09-27 14:26:46 +02:00
Magne Sjaastad
dc23c63b97
#1918 : Observed Data : Rename of several files
2017-09-27 14:21:58 +02:00
Jacob Støren
a24ce670cf
Fix two compiler warnings
2017-09-27 13:44:45 +02:00
Bjørn Erik Jensen
70a41709cf
#1842 RFT plot. Initial commit. Under construction...
2017-09-27 12:39:35 +02:00
Rebecca Cox
88902e8f03
#1933 Observed data: Sets restOfHeader correctly
2017-09-27 09:32:10 +02:00
Magne Sjaastad
802a9154e4
#1912 Curve Creator : Avoid selection in main project tree when clicking on curve
2017-09-27 08:12:01 +02:00
Magne Sjaastad
1b96ab747d
Cleaned up includes
2017-09-27 07:24:48 +02:00
Rebecca Cox
d8ebe508a2
#1933 Observed data: Speed up reading observed data file
2017-09-26 15:44:02 +02:00
Rebecca Cox
b8f18dd4c8
#1933 Observed data: set isAVector correctly
2017-09-26 14:06:36 +02:00
Rebecca Cox
2dda47014c
#1933 Observed data: Handle lack of unit name in file
2017-09-26 13:31:05 +02:00
Rebecca Cox
93971e541c
#1922 Observed data: Update column parser to handle keywords
2017-09-26 13:14:00 +02:00
Rebecca Cox
745bed2573
#1933 Observed data: change int to size_t and clean up
2017-09-26 11:06:09 +02:00
Jacob Støren
c0f978f006
Improved splitter handle images
2017-09-26 10:50:09 +02:00
Jacob Støren
64445e65b9
Moved Summary Plots collection above Well Log Plots
2017-09-26 10:50:09 +02:00
Bjørn Erik Jensen
4efe9ca944
Observed data. Fixed editor display for observed data
2017-09-26 10:39:36 +02:00
Rebecca Cox
e15d26cddb
#1933 Observed data: Add scaleFactor to ColumnInfo
2017-09-26 10:12:05 +02:00
Rebecca Cox
563a426ed5
#1839 Observed data: Add SummaryAddress to ColumnInfo
2017-09-26 09:38:29 +02:00
Rebecca Cox
b311d8827c
#1839 Observed data: Remove unused includes
2017-09-26 09:38:29 +02:00
Magne Sjaastad
c7fb2351b1
Cleaned up includes
2017-09-26 08:28:04 +02:00
Magne Sjaastad
e62d5e4277
Cleaned up includes
2017-09-26 08:25:49 +02:00
Bjørn Erik Jensen
4dde03c1ac
Curve creator. Fixed observed data address filtering
2017-09-26 08:25:36 +02:00
Bjørn Erik Jensen
8554b7eab0
#1930 Curve creator. GUI adjustments (II)
2017-09-25 15:39:13 +02:00
Rebecca Cox
e7896e59cf
#1839 Observed data: Unit test for keyword VECTOR parser
2017-09-25 14:38:32 +02:00
Rebecca Cox
8f14016eed
#1839 Observed data: Parser for data with keyword VECTOR
2017-09-25 14:38:32 +02:00
Magne Sjaastad
ef56591555
#1934 #1839 Observed Data : Add parsing of column based summary data
2017-09-25 14:37:45 +02:00
Bjørn Erik Jensen
05c07693b6
#1930 Curve creator. GUI adjustments
2017-09-25 14:33:21 +02:00
Rebecca Cox
5d52ba2a83
#1839 Observed data: Unit test for RSMSPEC tools
2017-09-25 09:07:43 +02:00
Rebecca Cox
32fe3d41a4
#1839 Observed data: Move RSMSPEC static methods to tools method
2017-09-25 09:07:14 +02:00
Rebecca Cox
cb2bb6d835
#1839 Observed data: Add unit test for column based RSMSPEC parser
2017-09-24 18:04:19 +02:00
Rebecca Cox
6e4c28605e
#1839 Observed data: Add column based rsmspec parser
2017-09-24 18:04:19 +02:00
Rebecca Cox
797c040057
#1816 Observed data: Remove superfluous functions in column ascii parser
2017-09-24 18:04:19 +02:00
Jacob Støren
1309424835
#1923 Avoid plot update for each curve when updating the Curve Creator target plot
2017-09-23 09:12:49 +02:00
Jacob Støren
0bb47cba88
#1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set
2017-09-23 08:47:04 +02:00
Jacob Støren
f9b26ce104
#1923 Replace int-based vector selection list with a summaryaddress based one
...
This removes a loop over all the adresses in the summary case for each curve, and makes the highlight of the selection more stable
2017-09-23 08:26:21 +02:00
Bjørn Erik Jensen
b28bcaa4e4
#1927 Paste Ascii data command. Create an empty summary plot
2017-09-22 15:38:40 +02:00
Magne Sjaastad
eb8dbb1b86
#1839 Observed Data : Added const to RifSummaryReaderInterface
2017-09-22 15:02:15 +02:00
Magne Sjaastad
eb744f381d
#1816 : Observed Data : Add mock data to RifReaderObservedData
2017-09-22 15:02:15 +02:00
Magne Sjaastad
363224e39a
#1839 Observed Data : Move summary files into summary folder
2017-09-22 15:02:15 +02:00
Magne Sjaastad
8f158510f9
#1918 Observed Data : Stripped down SummaryReaderInterface
2017-09-22 15:02:15 +02:00
Magne Sjaastad
30a77e4f68
#1918 Observed Data : Cleaned up includes
2017-09-22 15:02:14 +02:00
Magne Sjaastad
aba74bcdfd
#1918 Observed Data : Remove RigSummaryCaseData
2017-09-22 15:02:14 +02:00
Magne Sjaastad
32fa6d4920
#1918 Observed Data : Removed RigCase RigSummaryCaseData from RimSummaryCase
2017-09-22 15:02:14 +02:00
Bjørn Erik Jensen
2bad74b4aa
#1928 Curve Creator. Appearance label fix. Move group boxes
2017-09-22 14:40:06 +02:00
Magne Sjaastad
edd39b6ff1
#1926 Fishbones Export : Guard input values to std::vector::reserve()
2017-09-22 13:10:12 +02:00
Bjørn Erik Jensen
d83c468033
#1919 Curve Creator. Fix summary category initial selection
2017-09-22 12:53:54 +02:00
Bjørn Erik Jensen
0ae5c344d3
#1922 Curve creator. Set dialog window title
2017-09-22 12:02:13 +02:00
Bjørn Erik Jensen
f4148dfe7a
#1920 Curve creator. Adjust target plot combobox width to contents
2017-09-22 11:49:00 +02:00
Bjørn Erik Jensen
70ede18dc1
#1924 Curve creator. Fix auto appearance behavior
2017-09-22 11:02:49 +02:00
Bjørn Erik Jensen
8e2f97ffea
#1921 . Fix typo
2017-09-22 10:02:58 +02:00
Bjørn Erik Jensen
1590a2a26e
#1921 Curve Creator. Add curve name config
2017-09-22 09:54:55 +02:00
Magne Sjaastad
2773c00f25
#1918 Observed Data : Use RifEclipseSummaryAddress when asking for timesteps
2017-09-21 19:38:09 +02:00
Bjørn Erik Jensen
e7f19ff89d
#1914 Curve creator. Bring curve creator dialog to front on new plot and edit plot commands
2017-09-21 15:48:00 +02:00
Bjørn Erik Jensen
00fc2a2eaa
#1853 Summary curve filter. Remove unused includes and friend declarations
2017-09-21 15:18:28 +02:00
Magne Sjaastad
7e2b0d20b5
Remove unused code and clean up includes
2017-09-21 15:12:03 +02:00
Magne Sjaastad
940b452054
Remove #pragma once from cpp file
2017-09-21 15:10:36 +02:00
Bjørn Erik Jensen
4977d63c55
Summary plot. Remove include to fix Linux build failure
2017-09-21 14:55:16 +02:00
Bjørn Erik Jensen
e3a169e7b8
#1853 Convert project. Move all existing curves in a plot to summary curve collection.
2017-09-21 14:26:57 +02:00
Rebecca Cox
2966412bce
#1816 Observed data: Only one timesteps-vector in ascii parser
2017-09-21 12:21:52 +02:00
Rebecca Cox
62d9978504
#1816 Move functions from SummaryReaderInterface to EclipseSummaryReader
2017-09-21 12:21:52 +02:00
Rebecca Cox
68a101fe2d
#1816 Use new parser on pasting data to summary plot
2017-09-21 12:21:52 +02:00
Rebecca Cox
c7c06c311b
#1816 Observed data: Add time step index to summary address
2017-09-21 12:21:52 +02:00
Magne Sjaastad
3157346292
Preferences : Show Class Names is now available in Release
2017-09-21 12:05:45 +02:00
Bjørn Erik Jensen
4c6c3ae564
#1913 New summary plot. Always show 'new plot' in target plots drop down
2017-09-21 11:00:03 +02:00
Bjørn Erik Jensen
a72f2ea421
#1917 Plot project tree. Clean up summary plot popup menu.
2017-09-21 10:47:55 +02:00
Bjørn Erik Jensen
292ea3c67f
#1913 New summary plot. Command brings up curve creator and creates new plot on Apply/OK
2017-09-21 09:50:03 +02:00
Rebecca Cox
9d56cee1be
#1816 Observed data: In parser, split header on cellseparator, not tab
2017-09-21 09:00:51 +02:00
Rebecca Cox
e26d978da4
#1816 Observed data: Add unit test for ascii parser
2017-09-21 09:00:51 +02:00
Rebecca Cox
bea3bd12b8
#1816 Observed data: Add ascii parser
2017-09-21 09:00:51 +02:00
Rebecca Cox
d0d8a7d4be
#1816 Observed data: Reader interface will be used throughout the code
2017-09-21 09:00:51 +02:00
Jacob Støren
7429b21fff
#1910 Use NTG for transmissibility calculations of Perforations and fishbones and as std eclipse calculation as basis for WPIMULT
2017-09-20 15:25:02 +02:00
Bjørn Erik Jensen
b0554516dd
#1897 Curve creator. Use only one region editor for region to region category
2017-09-20 13:06:55 +02:00
Bjørn Erik Jensen
89bc438921
#1815 Curve creator. Fix bug related to observed data summaries
2017-09-20 12:55:16 +02:00
Jacob Støren
1326912b7c
Merge branch 'dev' of https://github.com/OPM/ResInsight.git
2017-09-20 12:34:08 +02:00
Bjørn Erik Jensen
b430982b2f
#1895 Curve creator. Filter curves by selecting summary category/categories
2017-09-20 11:42:56 +02:00
Bjørn Erik Jensen
dd8549d3d1
#1815 Curve Creator. Display observed data in summaries editor
2017-09-20 11:20:45 +02:00
Jacob Støren
b03da807ea
Merge fixes related to #1901 Perforation COMPDAT export errors
2017-09-20 11:05:59 +02:00
Jacob Støren
50a88dff4a
#1901 Fix error in peaceman radius calculation. Used int values 1/2 and 1/4 as exponent, which ends in 0.
2017-09-20 11:02:19 +02:00
Magne Sjaastad
9fee4d0511
#1895 : Curve Creator : Use TreeSelectionEditor for Summary Types
2017-09-20 10:44:14 +02:00
Magne Sjaastad
86fa56aedc
#1895 Curve Creator : Rename to currentSummaryCategory
2017-09-20 10:15:18 +02:00
Bjørn Erik Jensen
e369b8a131
Cleanup. Remove commented code
2017-09-20 08:23:48 +02:00
Bjørn Erik Jensen
8d23ae478a
Curve creator. Fixed label
2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
a0dae9209e
#1815 Observed data. Add folder 'Observed Data' in case editor
2017-09-20 08:06:41 +02:00
Bjørn Erik Jensen
952bfeefe8
#1851 Curve Creator. Appearance editor with apply button
2017-09-20 08:06:41 +02:00
Jacob Støren
8334c36eff
#1901 Use correct PERMY and PERMZ in wellpath perforation completion data export
2017-09-19 17:26:13 +02:00
Jacob Støren
dc1844f5d5
#1901 Use the more robust WellLogExtraction system for perforation interval intersection calculations.
2017-09-19 17:20:49 +02:00
Jacob Støren
3f099861a0
#1901 RigEclipseData::ownerCase() is made const
2017-09-19 17:12:46 +02:00
Rebecca Cox
11172d648c
#1813 Observed data: Add pragma once
2017-09-19 15:25:48 +02:00
Jacob Støren
19354b1a8b
#1901 Whitespace changes to improve readability
2017-09-19 15:22:14 +02:00
Rebecca Cox
fe1dfebea2
#1813 Observed data: Remove right click options if any object in selection is an observed data
2017-09-19 14:47:36 +02:00
Rebecca Cox
1eecef9f72
#1813 Observed data: Change ui names
2017-09-19 14:19:44 +02:00
Rebecca Cox
da2775d184
#1813 Observed data: Add pdmfields identifier type and name
2017-09-19 14:19:44 +02:00
Rebecca Cox
99e1f75633
#1813 Observed data: remove isObservedData as PDM field
2017-09-19 14:19:44 +02:00
Rebecca Cox
4e82aaf502
#1813 Observed data: Remove right click options for observed data
2017-09-19 14:19:44 +02:00
Rebecca Cox
28c86b08d7
#1813 Observed data: Move uniqueShortName to RimOilField to include observedData
2017-09-19 14:19:44 +02:00
Rebecca Cox
12c8051266
#1813 Observed data: Change order in context menu
2017-09-19 14:19:44 +02:00
Rebecca Cox
16f8b9771f
#1815 Observed data: Add function to return vector of all observed data
2017-09-19 14:19:44 +02:00
Rebecca Cox
dd45f7c453
#1818 Observed Data: Command to Import observed data
2017-09-19 14:19:44 +02:00
Rebecca Cox
d23675b466
#1818 Observed data: Create command to import observed data from file
2017-09-19 14:19:44 +02:00
Rebecca Cox
ae7430a697
#1813 Observed data: Functions to add observed data to collection
2017-09-19 14:19:44 +02:00
Rebecca Cox
7bb7e4c5f9
#1813 : Move file functions back to ObservedData
2017-09-19 14:19:44 +02:00
Rebecca Cox
3aa9abf4bc
#1813 : Move file functions from ObservedData to ObservedDataFile
2017-09-19 14:19:44 +02:00
Rebecca Cox
520befcad0
#1813 Observed data: Make RimObservedDataFile derived from RimObservedData. remove Ascii data model object
2017-09-19 14:19:44 +02:00
Rebecca Cox
b4f2b2accf
#1813 Observed data: Derive RimObservedData from RimSummaryCase
2017-09-19 14:19:44 +02:00
Rebecca Cox
1ac50e178e
#1813 Observed data: Make summary reader interface and make observed data reader object
2017-09-19 14:19:44 +02:00
Rebecca Cox
1a6e3447a7
#1813 Observed data: Rename Observed data child array
2017-09-19 14:19:44 +02:00
Rebecca Cox
3a0b0db8d1
#1813 Ascii data model object
2017-09-19 14:19:44 +02:00
Rebecca Cox
6d3d89bfe0
#1813 Observed data: Geometry data model object
2017-09-19 14:19:44 +02:00
Rebecca Cox
b87bbc12b2
#1813 Observed data: headers above functions
2017-09-19 14:19:44 +02:00
Rebecca Cox
e1263888b4
#1813 Observed data: Observed data folder as an oilfield child
2017-09-19 14:19:44 +02:00
