Commit Graph

185 Commits

Author SHA1 Message Date
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
Magne Sjaastad
06b5c9afbf
Adjustments for release
* Add notification of parent object when multiple objects are updated

* Make sure unchecked curves are removed from track

* Use object names instead of "Sub Items" when possible

* Set default simulation well visualization to top of reservoir

* Show plot window after plot is created

* Allow setting plot rendering flags

* Add more plots for update when clicking in 3D view

* Seismic Difference: Fix typo for poly line data extraction

* Version RC_5
2023-06-16 09:27:35 +02:00
Jørgen Herje
1335b4bc09 Use part name in dropdown rather than part id
Use part name rather than part id for readability
2023-06-12 15:23:47 +02:00
Jørgen Herje
66db9d73a9 Add geom part id to name/title of WellLogExtraction curve 2023-06-12 15:23:47 +02:00
Jørgen Herje
ee5f89c343 Make selection of part id into dropdown list for WellLogExtractionCurves 2023-06-12 15:23:47 +02:00
Magne Sjaastad
0e25f364f8 Fix build issues MSVC 17.6.2 2023-05-31 12:49:01 +02:00
Jørgen Herje
5975fe6765
Rename RimWellLogDiffCurve to RimWellLogCalculatedCurve and additional improvements
* Rename from DiffCurve to CalculatedCurve and add operators selection
* Add option to select depth source for resampling in CalculatedCurve

- Select source for depth values for resampling
- Depths from first curve, second curve or union of these
- Added unit tests for function creating union depth values and calculate value with selected operator.

* Guard divide by zero

* Adjust algorithm for union of depths

- Prevent duplicated depth values (no need for enter/exist of k-layer when resampling)
- Add threshold for depth distance
- Update unit tests
2023-05-27 10:30:03 +02:00
Magne Sjaastad
cca852ef1f
Adjustments related to user course
* #10285 Grid Cross Plot: Fix group highlighting
* #9329 Make Show plot data more robust
* Do not show the curve color tag for grid cross plot curves
* #10310 Add tab to show plot data for well log curves
2023-05-26 11:47:26 +02:00
Kristian Bendiksen
94f7bd3c1a
10214 ensemble appearance
* Regression Analysis: Use only positive values for Power Fit regression.

* Add visible tag short cut for changning curve color.
* #10214 Ensemble Curve Set: Fix color mode text.
* #10214 Ensemble: Switch P10 and P90 symbols to point towards mean.
* Cache hit rects for tree item tags.
* #10214 Ensemble curve set: allow reordering with tree view tag
* #10214 Keep curve legend text when ensemble curves are hidden
2023-05-23 08:10:35 +02:00
magnesj
329a199863 Fixes by clang-tidy 2023-05-23 02:07:04 +00:00
Jørgen Herje
b83fe73395
Displacement curves fault faces (#10243) 2023-05-22 11:37:57 +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
jonjenssen
1d43e1a948
Specify part id for well extraction from geomech data (#10240)
* Specify part id for well extraction from geomech data
* Make sure we clear curve data if there isn't any valid input data
2023-05-12 08:13:56 +02:00
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00
Magne Sjaastad
d4f11e0f8f
WBS-plot: Add optional support for maximum curve interval for UCS parameter curve (#10118)
* WBS-plot: Add optional support for maximum curve interval for UCS parameter curve
* GeoMech: Guard out-of-bound access to Pore pressure data
2023-04-19 07:16:13 +02:00
Magne Sjaastad
6f6dc80bc6
Added more clang-tidy checks
Improved GitHub Action to run clang-format as part of clang-tidy

* Simplify clang-tidy workflow
* Added modernize-use-using, modernize-redundant-void-arg, readability-static-accessed-through-instance
* Add nolint for libecl typedefs
2023-04-14 14:07:45 +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
fdef535284 Add missing include to fix build on ubuntu 22 2023-04-06 17:14:30 +02:00
Magne Sjaastad
b2e8cc1663
Add optional max distance between curve points in WBS plots 2023-03-31 16:27:14 +02:00
Magne Sjaastad
09c04cbcd0
Improve RFT reader performance
* #9963 Rft reader: Search for DATA file when required
WSEGLINK is used to establish the branch topology for MSW wells. Search and read WSEGLINK data when segment data is requested by the user. This can be a time consuming operation.
Avoid doing this search for standard RFT plots.

* Make sure that single summary curves are displayed correctly
* Make sure single summary curves are visible in the plot
2023-03-14 13:14:40 +01:00
Magne Sjaastad
ab44f9fa17 Add open in text editor feature 2023-03-13 16:09:20 +01:00
Magne Sjaastad
836822c2b9
Adjustments for release
* Show segment plots in Well Log Plot collection
* Improve menu text for operations related to segment plots
* Show reservoir rates for annulus and device
* Make sure curve objects are visible in the Project Tree
* When importing the first summary case, expand case in project tree
* Bump version
2023-03-13 08:10:33 +01:00
jonjenssen
3772fbac79 Turn off statistics curve legends by default and add option to turn them on, 2023-03-11 14:16:25 +01:00
jonjenssen
4f9cbe8e97 Guard nullptr 2023-03-10 14:07:51 +01:00
Magne Sjaastad
e2e239fd07
Several RFT plot adjustments
* #9923 Call loadDataAndUpdate() after visibility of curves is updated
This will ensure that all zoom ranges are recalculated based on visible curves.

* #9923 Put new segment plots in RFT Plot collection
* #9923 Add "Create Rft Sement Plot" to RFT plot collection
* #9923 Make sure the main window is displayed when required
Make sure the main window is opened and views updated when a grid model is opened from a summary case.

* #9923 Make sure fieldChanged is triggered when required
Exclude field having the target state. If these fields are included, the one and only call to setValueWithFieldChanged() can contain a field with the target state value. When setting a value to a field with the same value, nothing happens and the UI will get an inconsistent state (some curves toggled off are still visible in a plot).
2023-03-08 07:35:27 +01:00
Magne Sjaastad
70c1a2c064 Guard null pointer access 2023-03-06 15:57:20 +01:00
Magne Sjaastad
c248c9fb57
RFT segment plot adjustments (#9912)
* Delete RFT plot when associated case is deleted
* Rename
* Hide track/curves with no data
2023-03-06 14:34:22 +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
Jørgen Herje
5c5e460025
Realization in Ensemble RFT-plot hover info + refactoring of point tracker functionality
* Add realization number to mouse over text for Ensemble RFT

* Refactor Curve Info Text Provider functionality

- Refactor provider implementation, to separate RiuWellLogTrack from the point tracker and text provider.
- Move creating of point tracker outside of RiuWellLogTrack.
- Makes it possible to override/write new CurveInfoTextProvider implementation when needed.

* Add guards for nullptr
2023-02-23 15:08:22 +01:00
Magne Sjaastad
70bb221162
Janitor issues
* Remove obsolete code
* Fix path modification of a relative folder
Replace start token '.' with file path to the project file to make sure that the path './wells/a-1h.dev' can be imported correctly.
* Add more logging when keywords are missing from import
2023-02-15 07:56:17 +01:00
Magne Sjaastad
62ce2b18e0
RFT improvements
* Avoid accessing nullptr
* remove unused function
* Allow RFT data from single summary case to be used in RFT plots
* #9736 Support horizontal plotting of LAS curves
2023-01-27 10:29:11 +01:00
Jørgen Herje
e3a347ccaa Invert default isCurveHighlightSupported flag for RimPlot
- Make default flag = false, thus highlighting must be activated
- To prevent unwanted logic for new RimPlot objects
- Activate highlighting for RimSummaryPlot, RimVfpPlot and RimCorrelationMatrixPlot
2023-01-27 07:14:40 +01:00
Jørgen Herje
632107e77c
Move Reference Well functionality to WellLogExtractionCurve
* Remove reference well feature from plot objects
* Move Reference Well functionality to WellLogExtractionCurve
* Reset reference well selection if new selected well path equals ref
2023-01-23 15:07:48 +01:00
Magne Sjaastad
ab165b0d72
Fix issues related to well bore stability plots
* Check if data is present
* Move plot update to geomech case
* Return empty vector if no data is present
2023-01-23 12:38:55 +01:00
Kristian Bendiksen
1eac9f8a1f #9620 Pressure/depth data: add user interface. 2023-01-19 09:00:05 +01:00
jonjenssen
85f1b004cb
Geomech frames support (#9678)
Support for showing frames in geomech data.
2023-01-18 14:42:33 +01:00
Magne Sjaastad
500b4d2922 #9549 RFT plotting: Improve visibility for topology curves
- set row span to 2
- adjust default min/max for zoom
- make symbols a bit smaller
2022-12-16 06:57:31 +01:00
Jørgen Herje
40e0f471d0
Upgrade reference well adjustment algorithm (#9569)
* Add checkbox for enable/disable usage of ref well for curve

- Individual control of utilizing reference well selected on plot-level.
- Default use state = true
- Make ref well path read only

* Upgrade adjustment algorithm to map values from ref well

- Map values from reference well into selected well
- Linearize depth values between top and bottom of k-layer.
- Neglect values and depths outside of common k-layer region
- Handle smoothing of curves after mapping

* Set curve name based on use ref well flag

* Use auto name for parameter track curves

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-12-13 08:29:00 +01:00
Magne Sjaastad
5ec32f8613
Update text for curve names and plot titles when source data changes
* Update titles after dropping vectors into plot
* Do not replace _Name variables
* Make sure signals are wired when opening a project file
* Add auto name field and set default on
* Remove includes from header files
2022-12-09 08:46:36 +01:00
Jørgen Herje
2e5683aead
Add reference well depth adjustment to geomech case (#9547)
- Fix bug in retrieving bottom TVD value from ref well
- Add result calculator for K-indices in geomech case
- Improve depth adjustment algorithm
2022-12-07 09:28:57 +01:00
Magne Sjaastad
1eb44e519e
RFT plot: Fix stepping on well
* Rft: Store segment and connection count per well
* Update the segment branch index combo box when well changes
* Bump version number
2022-12-05 18:36:21 +01:00
Magne Sjaastad
d3a5355141
#9534 Make sure indexIJK values are computed only once (#9537) 2022-12-02 14:36:32 +01:00
Jørgen Herje
278828b08f
Add reference well to well log extraction curve eclipse case (#9516) 2022-11-30 23:13:39 +01:00
Magne Sjaastad
0e5d121993 Forward wellLogTrack::zoomAll to depth track plot 2022-11-16 07:05:52 +01:00
Magne Sjaastad
ba8587d6ae
Fix depth range for tracks with no data, bump version 2022-11-14 19:11:11 +01:00
Magne Sjaastad
d36ab7e2d7
Fix RFT segment plot issues
* RFT curves: Disable auto color by default
* RFT curves: Fix wiggling legend caused by too many plot updates
* RFT Curves: Search multiple layers for CONFAC data
* Move plot orientation to Depth Axis, Advanced group
2022-11-14 10:55:08 +01:00
Magne Sjaastad
0d3347d4d7
RFT plot improvements
* Make curve selection optional to avoid flickering in depth plots
* Replace undefined with zero for some curves
* Add spacing factor for min and max depth
2022-10-28 15:37:45 +02:00
Magne Sjaastad
4c3e1c3fe8 RFT Curves: Add more segment curves
- add CONGRAT
- add pressure track
- add CONFAC
- fix some plot layout issues
- Fix bug for first segment MD location
- Add default scale factor 1e-3 for gas curves
- Avoid inf values in some curves, seen in PRESSURE and CONFAC
- Use assignment in statements instead of std::get
2022-10-27 12:43:46 +02:00
Magne Sjaastad
a33f651bcc
Depth Track Plots: Optionally show a line in all tracks
* #9378 Depth Track Plots: Optionally show a line in all tracks
* Use RiaDefines::Orientation
2022-10-24 16:24:51 +02:00
Magne Sjaastad
493531626f
Rft segment plot adjustments
* #9371 RFT Curves: Add scaling factor
* Make sure isUsingAutoName is guarded by project file date
* Rearrange font and legend group in property editor
2022-10-19 15:13:15 +02:00
Magne Sjaastad
760bfaeec2 #9369 Curve Probing: Show data from other curves in tooltip text
Optionally show data from other curves in tooltip text when hoovering over a curve point
2022-10-18 07:22:56 +02:00
Magne Sjaastad
7c2941aedd #9366 RFT: Show all results with supported item count 2022-10-18 07:22:56 +02:00
Magne Sjaastad
c8d6e29447 #9364 Well Log Plot and Track: Activate and improve Show Plot Data 2022-10-18 07:22:56 +02:00
Magne Sjaastad
1d23e8f5c9
Show packer in RFT topology track
* Show packers in topology track
* Support optional display of property axis values
* Add legend item clickable option to RimPlotWindow
2022-10-13 13:03:55 +02:00
Magne Sjaastad
e7a486c802
Improve curve naming for plot and use in RFT segment plots
* Improve plot naming for depth track plots
* Move template text replace to string tools
* More data available for object template text
* Set plot visible and define default object name template text
2022-10-12 12:41:08 +02:00
Magne Sjaastad
5e184df670
Improve curve naming
* Add curve name template and handling of string variables
* Mark autoName as obsolete field
* Use key-value map to populate variable values
* Add curve naming methods Auto, Custom and Template
2022-10-11 14:02:46 +02:00
Magne Sjaastad
3f9f337e64 #9347 Well Log Plot : Add possibility to show depth axis in all tracks 2022-10-10 15:58:05 +02:00
Kristian Bendiksen
1a5da47418 #9344 Horizontal plots: Support row span for tracks 2022-10-07 14:14:02 +02:00
Magne Sjaastad
6d5e303361
Add topology curves and show in additional track
* Add topology curves and default plot
* Improve visual appearance
* Update sub module opm-common
* Add support for INCLUDE keyword to allow parsing of include files recursively
* Search for *.DATA with fallback to *.SCH to automatically import WESEGLINK data
* Find annulus branch based on MD diff on segment start
* Stop growing device branch if segment starts at a lower MD than previous
2022-10-07 12:37:23 +02:00
Magne Sjaastad
89d7dd4561 Show branch ID range in addition to branch index 2022-10-06 10:32:44 +02:00
Magne Sjaastad
f1139f5f14 Well Log Plot: Make sure curves with constant property value is visible 2022-10-06 10:32:44 +02:00
Magne Sjaastad
4d244bc848
Depth Axis : Improve visibility logic 2022-08-24 08:55:40 +02: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
Magne Sjaastad
506bfbd638
Remove control flag in setCollapsedByDefault
* Remove control flag in setCollapsedByDefault
* Set regions/annotations collapsed by default
2022-08-19 14:18:36 +02:00
Magne Sjaastad
597a3d1f97
Create features to append plots with RFT curves (#9200)
* Add create plot with RFT curve
* Add RFT segment plot with curve
* Create tracks for all three branch types

* Make sure the zero is displayed when adjusted minimum is changing sign
2022-08-17 10:04:10 +02:00
jonjenssen
1507894066 Selecting a well path in 3d view can now update selected well path in well log plots 2022-08-17 10:03:12 +02:00
Magne Sjaastad
1f2e9babe6
RFT: Support device and annulus branches (#9168)
* Add unit test used to read data from WSEGLINK
* Add segment branch type
* Add detection of device branches
* Add data source stepping on branch type
* parse wseglink data
* add RFT case as child of RimFileSummaryCase
2022-08-16 12:40:25 +02:00
Magne Sjaastad
e6af123094 #9194 Area Fill : Area filled curves should use zero as base line 2022-08-16 11:58:45 +02:00
jonjenssen
0e45a90e1f
Link selection in 3D view with plots (#9195)
* Allow well selections in 3D view to update well selection in summary plots and well log plots
2022-08-15 20:27:49 +02:00
Magne Sjaastad
016216bdb9
Show well completion annotations in horizontal plots (#9193) 2022-08-15 14:55:17 +00:00
Kristian Bendiksen
413288df0a Well Log Plot: avoid hard-coding depth/value axis 2022-08-15 15:09:27 +02:00
Kristian Bendiksen
b4bca2276f #9092 WLP: show only axis for first and last track. 2022-08-15 15:09:27 +02:00
Kristian Bendiksen
80961161d2 Well Log Plot: Avoid hard-coded axis (gave incorrect axis labeling). 2022-08-15 15:09:27 +02:00
Magne Sjaastad
f102a8b249
Improve annotations to work in both vertical and horizontal plots (#9154)
* Move enums to RiaPlotDefines.h
* Add support for formation names shading in horizontal plots
* Refactor line property code
* modernize code
2022-08-05 13:14:58 +02:00
Magne Sjaastad
55966ef6e8 RFT : Fix several update issues 2022-06-27 19:25:27 +02:00
Magne Sjaastad
d854a3d3e7
Merge pull request #9063 from OPM/more-rft-fixes-01
More RFT fixes
2022-06-17 17:24:58 +02:00
Magne Sjaastad
62cf62b9a2
Improve UI for RFT segment curves (#9061)
* Make sure all curve values are set correctly for plot orientation
* Make sure depth zoom is propagated to the Qwt plot
* Expand min/max value range to allow more space around curves
* Use int values to represent RFT segment branch number
2022-06-16 13:55:42 +02:00
Magne Sjaastad
ccbda23b96
Merge pull request #9048 from OPM/9047-performance-avoid-update-project
- Avoid update of project when creating new objects
- Added icon resource cache
- Avoid use of descendantsIncludingThisOfType()
2022-06-13 13:54:55 +02:00
Magne Sjaastad
95e9ef8bf1 Rename to RiaFieldHandleTools 2022-06-03 08:00:55 +02:00
Magne Sjaastad
c74701b687 Rename several child() and children() functions 2022-05-31 15:05:07 +02:00
Magne Sjaastad
787d3ae379 #8868 Well Log Plot: Appearance update not working 2022-05-31 07:29:59 +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
f91fe41f1d
Several minor issues (#8948)
* #8947 Plot Template : Split export dialog into file path and name
* #8946  Update multi plot title when curve is appended by copy/paste
* #8946 Separate axis object name and axis title text
* If multi plot auto name is empty, use plot title "Plot N"
* QwtPlotWidget: Double click activates Zoom All
* More testing on valid main window before use
* Return false if event is not handeled
* Improve fallback plot name
* Tree View Editor: Early exit if selected object is unchanged
Resetting selection causes flickering
* Summary Plot : Select curve object in project tree when clicking on curve
2022-05-24 15:24:38 +02:00
Magne Sjaastad
74075cc9ab
Merge pull request #8888 from OPM/8887-fix-reorder-capability
Fix reorder capability
2022-05-06 10:52:08 +02:00
Kristian Bendiksen
11060078d8 RiuQwtPlotWidget: fix actions on selection of axis. 2022-04-04 12:10:20 +02:00
Magne Sjaastad
dde0487024 Multiaxis: add support for Qwt multiaxis plot 2022-04-04 12:10:20 +02:00
Magne Sjaastad
8d3f381b4f
Janitor: Update qwt to 6.2.0 2022-03-18 13:16:07 +01:00
Magne Sjaastad
806a149809
Fix several deprecation warnings (#8657)
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
2022-03-11 13:24:01 +01:00
Magne Sjaastad
728885a6c8 Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots
Fix deprecated
2022-03-09 08:33:56 +01:00
Magne Sjaastad
10a01972f3 #8583 RFT Plots : Add support for data source management to well log plots 2022-02-24 13:03:15 +01:00
Magne Sjaastad
f154f8c500
Import RFT segment data as well log curve (#8449)
Add reader for RFT data using opm-common
Extend RFT curve with support for RFT segment data
Adjustments related to horizontal well log plots

8581 Well Log Plot : Update of curve appearance does not update plot
2022-02-23 13:57:02 +01:00
Magne Sjaastad
4ed5250d3b
Support horizontally stacked curves (#8553)
* #8548 Horizontal track : Improve stacked curves
* Add horizontal track bar
* Show relevant scroll bar for horizontal and vertical plots
* Show max property value at top for horizontal plots
2022-02-21 07:15:56 +01:00
Magne Sjaastad
79614e09e9
#8555 Well Log Extraction : Fix missing curve data for no console 2022-02-15 15:43:44 +01:00
Magne Sjaastad
477ae02382
Logarithmic curve support and renaming (#8546)
* Add test for both positive and negative numbers
* Remove redundant sample count from parameter list
* Propagate useLogarithmicScale
* Renaming
2022-02-14 11:49:37 +01:00
magnesj
e85bba9014 Fixes by clang-format 2022-02-12 14:46:00 +01:00
Kristian Bendiksen
5c9bf502e7 Well Log Plot: Add option to plot depth horizontally. 2022-02-12 14:24:42 +01:00
Magne Sjaastad
1488eec855 Rename to isLogCurve 2022-02-12 14:23:06 +01:00
Kristian Bendiksen
e92e2e8764 Summary Plot: Add support for multiple plot axis. 2022-02-07 09:55:11 +01:00
Kristian Bendiksen
258fbddc10
Merge pull request #8387 from OPM/qtcharts-summary-plots
Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
2022-01-17 13:14:21 +01:00
Magne Sjaastad
fef0a2b70c Janitor : Remove obsolete includes in header files 2022-01-07 10:38:56 +01:00