Commit Graph

40 Commits

Author SHA1 Message Date
Kristian Bendiksen
c074033dc2 Refactor: Fix misspelling of "synchronize". 2024-04-05 13:55:09 +02:00
Kristian Bendiksen
873282b339 Refactor: avoid local variable only used in range-based for loops 2024-04-04 10:24:21 +02:00
Kristian Bendiksen
be3d06c549 Refactor: improve api for views and oil fields. 2024-04-04 10:24:21 +02:00
Jon Jenssen
b33d117784 Show measurement in static geomech view, too 2024-02-28 14:51:27 +01:00
Magne Sjaastad
a3d520e26e
Use project polygons from polygon cell filter
* Use RimPolygonInView to edit locally defined polygon
* Add scaling to polygon in view
* Move polygon line visualization to RimGridView
* Rename to polygonInViewCollection
* Show appearance for local polygon
2024-02-22 15:13:29 +01:00
Magne Sjaastad
5fdf30d124 Add polygon classes 2024-02-16 15:51:19 +01:00
Magne Sjaastad
8e13d6c528 Use modern OpenGL Qt widget
Use cvfqt::OpenGLWidget and make required changes
- move code from paintEvent to paintGL to make grabFrambuffer work
- remove obsolete sharedWidget
- implement onWidgetOpenGLReady and initialize rendering in this function as OpenGL capabilities is required
- simplify snapshotImage to use grabFramebuffer

Fix missing include
2024-02-07 10:07:18 +01:00
Kristian Bendiksen
d2d1929f18 #10587 Improve filtering of comparable views.
Filter views based on the content of the source view. The option to
unsuccessfully compare 2D intersection views with 3D views is now removed.
2023-11-17 12:47:47 +01:00
Magne Sjaastad
10189da362
Fix display of intersection lines in 3D view
* 10675 Fix missing intersection line geometry
* Change to list of visible surface intersection lines
* Enable surface intersection band for any intersection
* Show labels for intersection curves in 3D

The polylines are defined in the display coordinate system without Z-scaling. The z-scaling is applied to the visualization parts using Part::setTransform(Transform* transform)
The annotation objects are defined by display coordinates, so apply the Z-scaling to the coordinates.

* Improve naming of surfaces
* Use scaling factor of 1.0 for flat intersection views
2023-10-03 09:04:46 +02:00
Kristian Bendiksen
959c9d48fa #10649 ApplicationLibCode: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +02:00
Magne Sjaastad
6f6f77322b Guard null pointer 2023-09-14 15:19:01 +02:00
Magne Sjaastad
3e340361e8 Add annotation label support to surface intersection lines 2023-09-13 08:29:15 +02:00
jonjenssen
2172199999
Add seismic 3d view (#10472)
* Show seismic, surfaces, annotations and wellpaths in new view not requiring a grid loaded first.
2023-08-07 16:35:59 +02:00
Kristian Bendiksen
5bf2c2a89d #10367 Janitor: Remove unneccessary 'this' pointers 2023-08-07 13:38:27 +02:00
Magne Sjaastad
59ca0b943c
Add readability-simplify-boolean-expr
* Add readability-simplify-boolean-expr
* Fixes based on review
2023-06-26 13:12:41 +02:00
jonjenssen
17f09878d2
Enable filters for curve intersections (#10329)
* Enable cell filters
* Enable property filters
* Clean up fault collection interface and use similar setting for controlling filters as in intersection collection
* Enable cell/property filters on geomech intersections
* Enable cell and property filters for box intersections
2023-06-05 07:33:04 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
Magne Sjaastad
f8c5cf389f
clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Magne Sjaastad
a2e73d7cee Move prepareForDelete() to Rim3dView 2023-01-11 12:30:06 +01:00
Magne Sjaastad
e8f5806e55 Guard use of nullpointer 2022-12-02 07:51:43 +01:00
Magne Sjaastad
82968ca1a9
Support linking of 2D intersection views
* Major refactor from RimGridView to Rim3dView
* Move view linker/controller functions to Rim3dView
* Add bitmask to define the content of a 3D view
* Link views based on matching content
* Enable bit mask operators at global scope
* Make it possible to use 2d intersection views as comparison views
* Fix crash when a view used as comparison view is deleted
* Move unlinking to Rim3dView

* Add options to snapshot only 3D views/plots as part of regression testing
* WBS plot: Improve default name, hide axis for some tracks
2022-11-24 10:46:54 +01:00
Magne Sjaastad
d4086ee371
Allow linking of contour map views
* Place copy of contour map in correct collection
* Allow linking of contour maps
* Improve handling of contour views and 3D views
* Guard nullptr
* Guard assert seen on Linux
* Zoom all on contour map when unlinked to reset zoom
If a contour map is linked to a 3D view, the view can get distorted. Call ZoomAll to reset to sensible defaults.

* Remove default rainbow legend
2022-11-04 15:48:25 +01:00
Magne Sjaastad
9b61ebcac2
Maintenance october
* Hide contour plot collection when empty
* Update the project tree when a linked view is removed
* Make sure the window title is in sync with link state
* Do not use link state to find window tile ordering
2022-10-31 10:41:50 +01:00
Magne Sjaastad
4cd38d7daf
Simplify access to RimMainPlotCollection
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
2022-08-19 14:30:25 +02:00
jonjenssen
6105813d28
Allow using scale values less than 1.0 (#9108)
* Change view scale into list of predefined double values in both toolbar and property editor. Add values less than 1.0
2022-07-04 15:48:52 +02:00
Magne Sjaastad
95e9ef8bf1 Rename to RiaFieldHandleTools 2022-06-03 08:00:55 +02:00
Magne Sjaastad
f0ce04597d
Merge pull request #8985 from OPM/8926-remove-useoptionsonly
AppFwk : Remove obsolete useOptionsOnly
2022-05-29 13:01:27 +02:00
Magne Sjaastad
3c35244809
#8420 Janitor: Remove empty parameters in initialization macros 2022-01-07 08:31:52 +01:00
Magne Sjaastad
2a65636ba3 #8250 Use variadic macros and remove obsolete parameters 2021-11-14 15:26:09 +01:00
Magne Sjaastad
12d0e9b89d #8192 Use nullptr as parent to the OpenGL widget to avoid Qt bug 2021-11-05 08:04:21 +01:00
Magne Sjaastad
54a4f35588 #8142 Preferences : Move system settings into separate file 2021-10-13 12:52:02 +02:00
Magne Sjaastad
f9c2bb4349 Janitor : Remove confusing concept hasUserRequestedAnimation 2021-10-06 07:43:32 +02:00
Magne Sjaastad
1cf1eef048 #7632 Preferences : Add separate tab Eclipse Summary
Remove obsolete includes
2021-04-28 14:10:23 +02:00
jonjenssen
9bd0a9ebac
Streamlines: New generator and UI usability improvements (#7424)
Co-authored-by: jonjenssen <jonjenssen@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2021-02-25 16:38:56 +01:00
Magne Sjaastad
f3a824eeef #7361 Janitor : Remove obsolete fields 2021-02-22 16:51:30 +01:00
jonjenssen
05aceef936
Polygonfilter updates2 (#7286)
* Make sure all contourmap copies are getting the correct case set for cell filters when creating/copying maps.

* Rewrite polyline part manager to be more generic, not just linked to annotations.
* Add new partmgr for cell filters to draw polygon filter outlines in both eclipse and geomech views
* Show lines/spheres for polygon filter outline
* Add color edit for line and spheres
* Add support for z plane lock in poygon filter outline
* Add new flags for enabling filter and/or polyline display

* Add K range filter to polygon filter

* Enable picking automatically when creating a new polygon filter
2021-01-26 13:08:21 +01:00
jonjenssen
a7775214c8
Rewrite of cell filters. Added new polyline filter and user defined filter types. (#7191)
Make 3d view picker more generic to enable picking cell filter polygon

Give cell filters a new, generic interface for updating included/excluded cells from collection

Remove old range filter collection and replace with new filter collection that supports both range filters, polyline filters and user defined filters.

Update existing range filter code for the new collection and interface

Add user defined cell filter type

Add polyline cell filter type

Implement both Z and K index depth for polyline filters
Allow interactive editing of polyline filter node positions.
Support both geomech and eclipse views
Support view linking with both eclipse and geomech views and the new filter types

Support loading old project files with range filter collections into the new collection type

Adjust to new world order.
2021-01-11 18:47:09 +01:00
Gaute Lindkvist
81699db187 Rename ApplicationCode to ApplicationLibCode 2021-01-11 15:27:45 +01:00