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
