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
|
b3b0a7ba9b
|
#1895 Curve Creator : Use PdmFieldHandle instead of PdmUiFieldHandle
|
2017-09-20 10:43:19 +02:00 |
|
Magne Sjaastad
|
86fa56aedc
|
#1895 Curve Creator : Rename to currentSummaryCategory
|
2017-09-20 10:15:18 +02:00 |
|
Magne Sjaastad
|
f61122ce0e
|
#1895 Curve Creator : Added documentation
|
2017-09-20 10:06:57 +02:00 |
|
Magne Sjaastad
|
5ddb796059
|
AppFwk : Add multiselect field of AppEnum including highlight field
|
2017-09-20 10:06:57 +02:00 |
|
Magne Sjaastad
|
f45d065ac2
|
AppFwk : Add documentation for how do define OptionItemInfos
|
2017-09-20 10:06:57 +02:00 |
|
Magne Sjaastad
|
7ebc922541
|
AppFwk : Return reference to QTextStream for << and >> operator overloads
|
2017-09-20 10:06:57 +02:00 |
|
Magne Sjaastad
|
1bb1c87058
|
#1895 Curve Creator : Add support for single value fields
|
2017-09-20 10:06:57 +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 |
|
Rebecca Cox
|
aca3436e7b
|
#1813 Observed data: Create empty classes
|
2017-09-19 14:19:44 +02:00 |
|
Magne Sjaastad
|
b222561a81
|
AppFwk : Remove setFocus, as signals from the QModel triggers update
|
2017-09-19 12:37:55 +02:00 |
|
Magne Sjaastad
|
31cbd35862
|
Added more tests and guard for null pointer access
|
2017-09-19 12:01:16 +02:00 |
|
Magne Sjaastad
|
b078feb736
|
AppFwk : Add missing include
|
2017-09-19 11:14:08 +02:00 |
|
Magne Sjaastad
|
f9a026ad56
|
Curve Creator : Show curves above appearance
|
2017-09-19 11:11:01 +02:00 |
|
Magne Sjaastad
|
e8d515670d
|
#1896 Curve Creator : Set margins to zero for TreeSelectionEditor
|
2017-09-19 10:52:33 +02:00 |
|
Magne Sjaastad
|
b60758a0f3
|
#1896 Curve Creator : Add editor attributes to control search and toggle
|
2017-09-19 10:40:22 +02:00 |
|