Commit Graph

2826 Commits

Author SHA1 Message Date
Gaute Lindkvist
daf24c773b #6359 Improve context menu creation of correlation plots 2020-08-26 08:19:49 +02:00
Gaute Lindkvist
f82b2f73ec #6320 Refactor of PdmScripting
* Make base class abstract
* Implement support for IOHandling for PdmChild and PdmChildArray fields
2020-08-25 08:33:47 +02:00
jonjenssen
7cb9a071c1
Surface: Support for folders, copy and drag'n'drop (#6335)
* Enable surface reordering support. Automatically update surface in view ordering based on surface collection ordering

* Remove obsolete code

* Enable drag'n'drop support for surfaces within a surface collection. Still missing the collection update part.

* Bring back code lost in prev. commit

* Add code to accept drops in surface collections. Keep view  in sync.

* Add command for adding additional surface folders.

* Make sure we use the current surface collection as our parent when importing

* Enable name editing.
Make sure we use the correct surface collection when importing/creating surfaces

* More work on getting surface collections working.

* Clean up naming

* Make sure name for surfaceinviewcollection is read only

* Support drawing surfaces from subcollections, too

* Allow deleting subfolders.
Fix legends in view

* Refactor topmost flag for surface collections.

* Fix reload surface to work in all subfolders, too
Add copy surface skeleton. Actual copy operation is still missing

* Add support for copying surfaces

* Remove possibility to choose I and J slice directions for grid case surfaces.

* Fix warnings.

* Make sure we create the surface folder at the correct level

* More warning fix

* Use XML serialization for copy operation

* Fix missing delete

* Fix typo

* Remove unnecessary method.
2020-08-24 11:09:22 +02:00
Magne Sjaastad
6bd99fcbea Merge remote-tracking branch 'origin/2020.04-patch-02' into dev 2020-08-24 08:33:16 +02:00
Magne Sjaastad
afa8804e5b #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:26:39 +02:00
Magne Sjaastad
6655946be5 #6345 Remove obsolete include of QFileDialog 2020-08-24 08:26:32 +02:00
Magne Sjaastad
665b475e9f #6345 Use wrapper class instead of QFileDialog 2020-08-24 08:10:49 +02:00
Magne Sjaastad
1adf97b075 #6345 Remove obsolete include of QFileDialog 2020-08-24 08:10:49 +02:00
Gaute Lindkvist
e19cb1a45b Fix build issues due to unused variables 2020-08-21 17:23:53 +02:00
Magne Sjaastad
c3829da41b #6156 Handle gaps and inactive cells in MSW valve accumulation 2020-08-21 17:23:40 +02:00
Gaute Lindkvist
2188a33d4e #6157 Move splitting of MSW segments to just before WELSEGS output
* this is to avoid it impacting on COMPSEGS and other output
2020-08-21 17:22:17 +02:00
Gaute Lindkvist
6bcf1b56fe Disallow dropping curves onto other curves
* Dropping curves between other curves works much better with this change.
2020-08-20 12:50:55 +02:00
Gaute Lindkvist
fee1608cda Fix build issues due to unused variables 2020-08-19 08:35:15 +02:00
Gaute Lindkvist
b82566751e #6156 Handle gaps and inactive cells in MSW valve accumulation 2020-08-19 08:35:15 +02:00
Gaute Lindkvist
374478ab16 #6157 Move splitting of MSW segments to just before WELSEGS output
* this is to avoid it impacting on COMPSEGS and other output
2020-08-19 08:35:15 +02:00
Kristian Bendiksen
a79b794eab #6232 Add python api for creating fracture model. 2020-08-18 10:12:10 +02:00
Magne Sjaastad
523cdc2b7d Janitor : Use class enum 2020-08-14 11:00:36 +02:00
Jon Jenssen
beef70a791 Fix spelling of "Petrel" 2020-08-12 19:44:40 +02:00
jonjenssen
bbc659799e
Surfaces: Improve UI and usability for surfaces (#6290)
* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Add reload command to surface context menus. Still missing the part that actually reloads the data.

* Add additional check for null ptr to avoid crash

* Surfaces: implements reload command in context menu to reload surface data from its source (i.e. a file).
Rename function names to better show what they are actually doing
Refactor a bit to give all RimSurface subclasses the same interface for reloading data.
Also makes sure new RimGridCaseSurface instances are shown by default in the view(s)

* Fixes by clang-format

* Include offset and slice index in surface name shown in project explorer

* Allow importing the same file multiple times

* Disable lighting for surfaces, as it doesn't look good for now. Fixes #6084

* Surfaces: Remove depth offset setting from view. Add slider to depth offset edit for surface

* Create new surfaces only on collection context menu

* Make sure tree view icon is enabled/disabled when the check box is clicked

* Fix depth offset for grid case surfaces, missing base function call.

* Make public method .. public.

* Fixes by clang-format

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2020-08-11 11:34:34 +02:00
Gaute Lindkvist
af44659860 #6293 Make sure stacking is only available for some curv
* Well Log Curves and Summary Curves for now.
2020-08-11 09:57:56 +02:00
Gaute Lindkvist
e0cf133721 #6285 Add context menu stacking/unstacking of curves 2020-08-11 08:40:33 +02:00
Gaute Lindkvist
86a4f5613c Major improvements to D&D of curves. 2020-08-10 12:58:53 +02:00
Magne Sjaastad
6a6a093d05 #5961 Color Legend : Improve default color legend for contour plots 2020-08-06 11:20:17 +02:00
Magne Sjaastad
860e6d54a9 Make Linux happy
Use correct type
Remove unused variable
Fix placement of local variable
2020-08-06 11:20:17 +02:00
Magne Sjaastad
058573b391 #5961 Color Legend : Set legend only when required 2020-08-06 11:20:17 +02:00
Magne Sjaastad
e069dfe9cc #5961 Color Legend : Creation custom color legend only when required 2020-08-06 11:20:17 +02:00
Stein Inge Dale
9a3dace180 WIP: Surface : Add export of surface to PTL file format #5957
- restructured according to issue
- but issue indicate export of K-layer only despite RimGridCaseSurface
did support I/ slices, too?
- if so, test and possibly extend RimGridCaseSurface methods
extractDataFromGrid() and getStructGridIndex()
- need to check whether all offsets are taken care of
2020-08-06 11:20:17 +02:00
Stein Inge Dale
0424202461 WIP: Color legend: import of lyr file with colors should generate custom color legend #5961
Work in progress:
- lacks support of views other than Eclipse views
- signature of RicImportFormationNamesFeature::importFormationFiles()
- reconsideration of variable names
2020-08-06 11:20:17 +02:00
Stein Inge Dale
edc4b39acb Color Legend : Added RAINBOW for better depth visualization (issue #6168)
- Included RAINBOW color legend
- RAINBOW set as default when creating a new contour plot
2020-08-06 11:20:17 +02:00
github-actions[bot]
4729221373 Fixes by clang-format 2020-08-05 12:07:14 +00:00
Jon Jenssen
ea32743ad5 Add additional check 2020-08-05 13:36:54 +02:00
Jon Jenssen
0ce53a3219 Fix for issue #6187 - hide surfaces when creating a contour map 2020-08-05 13:20:59 +02:00
Gaute Lindkvist
698677f3ac #6253 Support creating analysis plots directly from an ensemble plot 2020-07-31 13:39:40 +02:00
Gaute Lindkvist
aeecaa3ff1 #6237 Implement creation of correlation plot from ensemble plots 2020-07-29 10:13:32 +02:00
Gaute Lindkvist
a9c9471e7f Fix crashes in Drag and Drop if the drop target is the same as the current dragged item 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
da6360cf98 Clean up move code for well log curves. 2020-07-27 08:47:01 +02:00
Gaute Lindkvist
5b126c3b98 Swap well log curves with drag and drop if the target is just above the single drag item.
* Currently nothing happens in this case, because we insert the dragged item
  after the target.
* On balance it seems more intuitive to swap the items in this particular case
  even if it is slightly against the regular drag operations.
2020-07-27 08:47:01 +02:00
Gaute Lindkvist
bfaff27d51 Re-add missing drag and drop for well log tracks 2020-07-27 08:47:01 +02:00
Kristian Bendiksen
3971f0dde3 #6224 Fracture Model: fix "Result Property" track annotations. 2020-07-14 14:17:50 +02:00
Kristian Bendiksen
f7f9f93303 #6228 Fix crash when creating user-defined curves in fracture model plot. 2020-07-14 14:04:50 +02:00
Kristian Bendiksen
cb9e3fe30d #6173 Improve pressure extrapolation in overburden and underburden.
Use gradient derived from fluid density.
2020-07-10 11:59:33 +02:00
Kristian Bendiksen
709da35a3e #6221 Fracture Model: Simplify menu item for fracture model export. 2020-07-10 09:26:30 +02:00
Kristian Bendiksen
b8890defa2 #6212 Fracture Model Plot: Add option use data from other curves when missing values 2020-07-10 09:18:45 +02:00
Kristian Bendiksen
56cbf6b5df #6171 Fracture Model Plot: Use "Step Left" interpolation for stress gradient. 2020-07-08 09:57:36 +02:00
Kristian Bendiksen
71f2a6c73e Avoid hiding facies result curve to make stress calculation work. 2020-07-02 18:47:58 +02:00
Kristian Bendiksen
3c2f540492 #6113 Use enum to identify curves in RimFractureModelPlot. 2020-07-02 18:42:58 +02:00
Kristian Bendiksen
6bda75b38e #6089 Display stress and stress gradient in fracture model plot. 2020-07-02 08:58:40 +02:00
Kristian Bendiksen
9f0a6c6223 #6038 Add support for overburden and underburden. 2020-07-02 08:58:40 +02:00
Magne Sjaastad
c3aecaf514 #6164 Color Legend : Use defines for UI text used multiple times 2020-07-01 08:22:26 +02:00
Magne Sjaastad
c50ace8a01 #6153 MSW: Do not report WSEGVALV for inactive cells 2020-06-29 14:33:52 +02:00