Commit Graph

38 Commits

Author SHA1 Message Date
Ruben Manuel Thoms
8290f3e293 Added function for importing surfaces from OpenWorks XYZ files.
Added helper function for fuzzy comparing vectors.
Adjusted (old) code to avoid warnings.
2020-09-05 13:24:57 +02:00
jonjenssen
cfe64f5706 Surface python interface (#6370)
* Add python interface for importing surfaces with example.
2020-08-26 12:31:23 +02:00
Magne Sjaastad
1f2f1bf14e #6314 Rename to RifSurfaceImporter
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +02:00
Magne Sjaastad
4f68f2b11a #6314 Fix typo
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +02:00
Magne Sjaastad
0bd328f4df #6314 PTL format from generated surface
Co-authored-by: Ruben Manuel Thoms <ruben.thoms@ceetronsolutions.com>
2020-08-24 14:35:34 +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
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
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
Magne Sjaastad
c13f1d752d #6081 Color Results : Update views when color legend content changes 2020-06-17 14:37:14 +02:00
Magne Sjaastad
869f6ce39b #6033 Surface Properties : Change name to Surface Result 2020-06-17 14:37:14 +02:00
Magne Sjaastad
8cc167568c #6033 Surface Properties : Add legend and adjust update functions 2020-06-11 15:03:08 +02:00
Magne Sjaastad
0799a9cf83 #6033 Surface Properties : Add result selection object 2020-06-11 15:03:08 +02:00
Magne Sjaastad
b7fb6c4e5a Recreate object when reading file 2020-06-04 11:33:09 +02:00
Stein Inge Dale
10e4c60073 Code review, brush-up, and extended surface unit tests 2020-06-04 11:33:09 +02:00
Stein Inge Dale
e5f3a3b67d Surface Import : import of properties from TS files #5995 2020-06-04 11:33:09 +02:00
Kristian Bendiksen
c366e85682 Refactor delete operations for pdm objects. 2020-05-22 07:02:53 +02:00
Kristian Bendiksen
c016c02e40 Replace RiaApplication::instance()->project() with RimProject::current().
Also remove uneccessary includes of RiaApplication.h.
2020-05-12 12:01:44 +02:00
Magne Sjaastad
3ef41345d0 Add missing include 2020-05-04 07:30:49 +02:00
Magne Sjaastad
0eb94ef574 #5379 Surface : Fix slicing in IJ direction 2020-05-04 06:32:37 +02:00
Magne Sjaastad
5d31912971 #5379 Surface : Update name from slice settings 2020-05-04 06:32:37 +02:00
Magne Sjaastad
5fcb42210c #5379 Surface : Add alias 2020-05-04 06:32:37 +02:00
Magne Sjaastad
e0d426df12 #5379 Surface : Add depth offset to base surface class 2020-05-04 06:32:37 +02:00
Magne Sjaastad
7bfe631118 #5379 Surface : Offset coords by a delta to avoid numerical instability
When creating a surface from top layer coords, we end up with a lot of geometrical operations in the same geometrical plane. Adjust the location of the surface coords to avoid these issues.
2020-05-04 06:32:37 +02:00
Magne Sjaastad
77734b8b57 #5379 Surface : Add grid case surface 2020-05-04 06:32:37 +02:00
Magne Sjaastad
699a3f9b34 #5380 Surface : Modification of depth 2020-02-20 14:01:12 +01:00
Magne Sjaastad
3aa4ffb0da #5529 Surface : Add reader for GOCAD file format
wip
2020-02-19 10:19:24 +01:00
Magne Sjaastad
c82df63e10 #5101 clang-format: Adjusted penalties
Use lower absolute values to improve control of behavior
2020-02-12 13:35:31 +01:00
Magne Sjaastad
10f0abc9b5 #5101 clang-format: Allow short functions on a single line
Use AllowShortFunctionsOnASingleLine: InlineOnly
2020-02-12 13:35:31 +01:00
Jacob Støren
27737b51bc #5358, #5317, #5019 Fix several issues regarding separate results definitions 2020-01-21 15:28:26 +01:00
Jacob Støren
d32db574cb #5318 Surface Intersection geometry with results 2020-01-17 13:24:25 +01:00
Jacob Støren
63eea9de10 #5317 Made RimSurfaceInView inherit RimIntersection
to get all the separate results stuff from there.
2020-01-17 13:24:24 +01:00
Jacob Støren
cf74891952 #5317 Add separate results definition objects for Reservoir Surfaces 2020-01-17 13:24:24 +01:00
Jacob Støren
5b1b7e630a #5316 Prototype of results mapping on native surface nodes only 2020-01-17 13:24:24 +01:00
Jacob Støren
1a1706d2fa Compile error fix for gcc on ubuntu 16.04 2020-01-09 08:48:05 +01:00
Jacob Støren
e6d96316d4 #5285 Visualization and update of Surfaces 2020-01-08 12:11:10 +01:00
Jacob Støren
45a3225ec8 #5285 Surface Import command. SurfaceInView tree-items. Delete.
Ready to start on visualization code
2020-01-08 12:09:51 +01:00
Jacob Støren
3488280c69 #5285 Add icons to the Surface items 2020-01-08 12:09:51 +01:00
Jacob Støren
26db8d7351 #5285 Surface import command Items and parsing infrastructure 2020-01-08 12:09:50 +01:00