Commit Graph

626 Commits

Author SHA1 Message Date
Magne Sjaastad
c48451a532 Summary Import : Support cases with one file per time step (#8493) 2022-03-28 08:46:10 +02:00
Magne Sjaastad
cf4d2c9ad2 Janitor : Support import of stand alone ESMRY files
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
2022-03-28 08:46:10 +02:00
Magne Sjaastad
f028491bb9 #8409 NNC : Make sure user defined legend ranges work 2022-03-28 08:46:10 +02:00
Magne Sjaastad
e09a839228 Merge pull request #8402 from OPM/8401-flow-vector-result
Use OpenMP for vector calculations

Janitor: Use field of double instead of float to avoid rounding errors. If float is used in field, the current editor is has rounding effects that makes the text representation of 0.1 turn into 0.09999999....
2022-03-28 08:46:10 +02:00
Magne Sjaastad
869921d300 #8375 Flow Vectors : Avoid recomputing NNCs when accessing flow data
Avoid include of RigNNCData.h in header files.
2022-03-28 08:46:10 +02:00
Magne Sjaastad
985a2c8f30 Merge pull request #8376 from OPM/fault_visibilityupdates
Faults: Add Visibiliy mode for overlapping area
2022-03-28 08:46:10 +02:00
jonjenssen
19dc7493a8 Change ouput model name 2022-03-28 08:46:10 +02:00
jonjenssen
abd4e80b48 Add well angles in degrees, not radians. 2022-03-28 08:46:10 +02:00
jonjenssen
f41c772f03 Show plot curves at the first level below a summary plot. 2022-03-25 20:02:23 +01:00
jonjenssen
8d3f41ded8
Merge pull request #8732 from OPM/summarymultiplot_updates2
Summary Multiplot updates
2022-03-25 11:39:12 +01:00
Kristian Bendiksen
80234ca105
#8644: Avoid overwriting preferences for date and time axis format (#8725)
Co-authored-by: kriben <kriben@users.noreply.github.com>
2022-03-24 11:57:05 +01:00
Magne Sjaastad
696c6a15fa #8676 QtChart : Create curve legend widget for multiplot 2022-03-23 14:28:56 +01:00
Kristian Bendiksen
d4d79d3dec #8623 Contour Map: exclude surfaces from appearing
Fixes #8623.
2022-03-23 13:37:38 +01:00
Magne Sjaastad
f45637b7f0
#8715 Fix multi summary title and legend updates 2022-03-23 13:35:47 +01:00
Kristian Bendiksen
c00aea75fb #8662 QtCharts: Implement tooltip when hovering over curves 2022-03-21 14:56:23 +01:00
Kristian Bendiksen
c87d68899e #8635 Improve well head position on extreme grids.
Fixed by introducing max characteristic cell size for extreme grids.

Fixes #8635.
2022-03-21 14:29:45 +01:00
kriben
f27a5b4e9e Fixes by clang-format 2022-03-21 14:23:14 +01:00
Kristian Bendiksen
ca769a53d4 #8649 Contour Map: Show static data for all time steps. 2022-03-21 14:23:14 +01:00
Jon Jenssen
560917a481 Rename NewSummaryPlot command to what it actually is - OpenSummaryPlotEditor command. Remove unused includes.
Move Single Summary Plots to bottom of tree and show them as Single Summary Plots.
2022-03-21 13:05:57 +01:00
jonjenssen
e20adcdb69
Further Summary Multiplot improvements (#8707)
* Create a specialized summary plot page for showing multi plots
* Make summary plots always show in grid of selected size.
* Allow dragging summary addresses into empty main window area
* Limit grid to 4x4 cells
2022-03-21 11:31:25 +01:00
Magne Sjaastad
8d3f381b4f
Janitor: Update qwt to 6.2.0 2022-03-18 13:16:07 +01:00
jonjenssen
ffc84457c6
Summary Multiplot: add button to create plot copy (#8698)
* Add button to create a duplicate of the active summary multiplot
* Block dropping other things than RimSummaryAddress objects in empty areas
2022-03-16 14:14:14 +01:00
jonjenssen
75a3d3d8f1
Summary Multiplot: drag/drop updates (#8692)
Drag'n'drop improvements - accept drops in empty multiplot areas to create new plots
2022-03-15 15:57:15 +01:00
Kristian Bendiksen
20ec6e20f2 Summary Plot: fix axis logic for left axis 2022-03-14 15:48:24 +01:00
Magne Sjaastad
0ca70249ae
Move defines to RiaDateTimeDefines 2022-03-14 09:18:48 +01:00
Magne Sjaastad
e435e28e7d #8660 Axis range: If water cut is assigned, use 0..1 as axis value range 2022-03-14 08:24:49 +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
Kristian Bendiksen
72fc47e003 #8452 QtCharts: Add fill color and pattern 2022-03-11 13:15:20 +01:00
Magne Sjaastad
0bab8a9834
Fix update issues when switching from axis side (#8664)
* #8610 Ensemble import : Set default axis
* Summary Axis : Delete previous axis when switching side
* Janitor: Use auto and empty()
2022-03-11 13:11:24 +01:00
Magne Sjaastad
262aed3c8d #8663 QtCharts: Update labels when date format changes 2022-03-11 11:39:51 +01:00
Magne Sjaastad
721ba508de Axis sync: Reset zoom to make sure the complete range for min/max is available 2022-03-11 08:41:53 +01:00
jonjenssen
c9b762fb16
Merge pull request #8654 from OPM/filter_wheelevents
Summary Multiplot: page scroll and zoom fixes
2022-03-10 13:13:44 +01:00
Jon Jenssen
cdbeec7ff8 Remove unused include 2022-03-09 11:29:03 +01:00
Jon Jenssen
d7555cbf4c Add support for giving all axes with the same label the same range. 2022-03-09 11:29:03 +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
6700c21086 Janitor : Use RimWellLogTrack in RimDepthTrackPlot 2022-03-09 08:33:56 +01:00
Jon Jenssen
85d3f98f91 Allow drag'n'drop of realizations into summary plots
Improve "Create Summary Case Group" feature to not delete selected realizations from the source collection.
2022-03-08 07:55:39 +01:00
Kristian Bendiksen
93f754102d #8615 Qt Charts: fix use-after-free crash.
Fixes #8615.
2022-03-04 18:11:10 +01:00
Kristian Bendiksen
7a954804ef #8451 Qt Charts: show fewer curve symbols.
The "Symbol Skip Distance" is used to space the symbols.

Fixes #8451.
2022-03-04 18:11:10 +01:00
Jon Jenssen
2e9c6e7a64 Allow dragging and dropping ensemble data vectors into summary plots 2022-03-04 17:06:28 +01:00
Magne Sjaastad
1563ae7b58
Merge pull request #8614 from OPM/minor-adjustments 2022-03-04 12:24:15 +01:00
jonjenssen
abff06d2d5
Summary multiplot improvements (#8598)
* Create multi summary plot from summary plot(s)
* Rearrange multi summary plot properties
* Enable source stepping toolbar for multi summary plot
* Automatically activate new summary plot when creating from data sources -> data vector tree
* Enable global key controls for switching data in summary and multi summary plots
* Update tooltip texts for summary plot toolbar
2022-03-04 10:52:17 +01:00
Magne Sjaastad
84694cdbc3 Memory Management : Fix memory leak in FaultRASettings 2022-03-03 14:39:41 +01:00
Kristian Bendiksen
423dde93fc #8523 Summary Plot: Improve axis name.
Use same name as axis in plot now.
2022-03-02 13:49:17 +01:00
jonjenssen
0cd965dd5b
Summary plot crash fixes (#8595)
Disable assert for duplicated signal connections for now, just ignore everyone but the first one
Temp. workaround for crash when duplicating plot axis properties.
Update test
2022-03-01 17:27:46 +01:00
Magne Sjaastad
9826d94e9a Make sure a signal is connected only once 2022-02-28 10:52:05 +01:00
Magne Sjaastad
5c0082f20b Avoid setting signal multiple times 2022-02-26 16:35:59 +01:00
Magne Sjaastad
4693dc44ef Memory Management : Fixes related to plot objects and curves 2022-02-26 16:35:27 +01:00
Magne Sjaastad
47a44a79df Axis assignment : Use axis with same unit by default 2022-02-26 16:35:27 +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
7f41349b5c #8582 Eclipse Case : Make it possible to access RFT data without grid data 2022-02-24 13:03:15 +01:00
Kristian Bendiksen
f955d9e645 #8575 Summary Plot: Restore zoom of time axis on project load. 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
10cb2d7d0b #8522 Summary Plot: Prune unused axes after move or delete 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
1a1acfa006 #8522 Summary Plot: handle plot axis deletion. 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
bd22336ba8 #8522 Summary Plot: ensure plot axis are restore when creating plots. 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
2e6795bd1d Summary Plot: Refactor to use new RimSummaryPlot::addNewAxisProperties(). 2022-02-23 21:54:40 +01:00
Kristian Bendiksen
3180b419d0 #8522 Summary Plot: Add menu item to add plot axis. 2022-02-23 21:54:40 +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
jonjenssen
208ae7692b
Merge pull request #8578 from OPM/summaryplot_fromdatavector
Summary Plot: create new plot from data vector tree nodes
2022-02-22 11:32:35 +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
5c72d31cc9
Improve well path target configuration (#8570)
Improve the scripting possibilities for well targets
Added tests and examples
2022-02-19 13:18:49 +01:00
jonjenssen
0b5bc2ba68 Change ouput model name 2022-02-17 15:39:39 +01:00
jonjenssen
4a3d9470b4
Summary Plots: Support dragging wells, groups and regions into plots (#8550)
Support dropping wells, wellgroups and regions into summary plots.
2022-02-16 16:36:50 +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
Kristian Bendiksen
a8a3d3332b #8536 Summary Plot: Fix axis position for legacy projects.
The axis property position has to be reassigned for all axis types.
2022-02-14 10:56:51 +01:00
magnesj
e85bba9014 Fixes by clang-format 2022-02-12 14:46:00 +01:00
Kristian Bendiksen
5973dde70c Well Measurement: fix duplication in property editor. 2022-02-12 14:24:42 +01:00
Kristian Bendiksen
377df9ab3a Well Log Plot: have multiple rows of plots for horizontal depth orientation. 2022-02-12 14:24:42 +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
Magne Sjaastad
6c92206893
Make curve drawing more robust (#8537)
* Janitor : Improve robustness

* Guard nullptr access

* Limit the curve points to incoming from/to curve point index range

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2022-02-11 13:18:36 +01:00
Kristian Bendiksen
6591de716b #8521 Summary Plot: Allow moving axis to other side of plot. 2022-02-11 10:31:01 +01:00
Magne Sjaastad
43d890697d Multiaxis: Avoid transformation of the right axis to a left axis 2022-02-09 12:26:42 +01:00
Magne Sjaastad
64bed86f8f
Intersection : Add Python support for triangle and result values (#8505)
#8508 Python : Make sure an empty list will be received as empty list in Python

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2022-02-07 17:38:19 +00:00
Magne Sjaastad
f2b6291a6b Refactor RimSummaryCurvesData 2022-02-07 09:55:11 +01:00
Magne Sjaastad
4ea4479a34 Move code to RimSummaryCurvesData 2022-02-07 09:55:11 +01:00
Magne Sjaastad
2b39b95011 Add new axis object the side with least axes 2022-02-07 09:55:11 +01:00
Magne Sjaastad
15797bd739 Preferences : Add flag for default plot type QtCharts or Qwt 2022-02-07 09:55:11 +01:00
Kristian Bendiksen
e92e2e8764 Summary Plot: Add support for multiple plot axis. 2022-02-07 09:55:11 +01:00
jonjenssen
a3ad9d2c1e
Merge pull request #8524 from OPM/tree_filter
Add Project Tree filter support
2022-02-04 15:49:22 +01:00
jonjenssen
35adae926f Add well angles in degrees, not radians. 2022-01-31 15:10:19 +01:00
jonjenssen
66fd79175c
Project Tree updates (#8490)
Split project tree into multiple dockable tree views for plots, keeping one for 3d views.
2022-01-28 13:19:52 +01:00
Magne Sjaastad
ffc77516e8
Summary Import : Support cases with one file per time step (#8493) 2022-01-28 13:18:46 +01:00
Magne Sjaastad
2d2bf0bbc7
CMake : Improve handling of compiler flags (#8486)
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
2022-01-26 10:08:28 +01:00
Magne Sjaastad
d5b17976ed
Merge pull request #8459 from OPM/8458-summary-drop-target
Closes #8458
2022-01-21 14:32:51 +01:00
Magne Sjaastad
40d59b7bdc Regression Test : Make it possible to override plot engine
Add GUI to override plot engine to either Qwt or QtCharts in regression test dialog
2022-01-20 14:34:34 +01:00
Magne Sjaastad
5ff9f36448
Merge pull request #8461 from OPM/8460-plot-curve-fixes
Guard access to QtCharts objects that might be null
Fix visibility of items in legend based on state in parent plot
2022-01-20 12:52:36 +01:00
Magne Sjaastad
8f75dcb29f #8456 Early reject if no plot is created 2022-01-18 09:20:23 +01:00
Kristian Bendiksen
f996b5383a #8453 Fix crash when changing plot type (QtCharts <-> Qwt). 2022-01-17 16:23:53 +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
jonjenssen
d9bb82de91
Merge pull request #8447 from OPM/intersection_filterupdate
Intersection: depth filter updates
2022-01-16 23:56:00 +01:00
jonjenssen
376451da2e Update GUI text for faults 2022-01-14 16:52:41 +01:00
jonjenssen
9d4b7422e8
Show summary data as tree structure in explorer. (#8430)
* Show summary data vectors in project explorer for both summary cases and ensembles.
* Enable Drag to be able to drag'n'drop data vector into future summary plot
* Make sure tree is refreshed on reload/replace operations
* Provide case id and ensemble id in drag/drop object in addition to address
2022-01-13 09:02:07 +01:00
Magne Sjaastad
dc31a731ad Summary Data Source Stepping : Reintroduce stepping for summary plot
Data source stepping for multi plot is work in progress, and have disabled stepping for single summary plots. This commit will make it possible to do source stepping on single summary plots.
2022-01-11 15:15:56 +01:00
Magne Sjaastad
eb02908dc7 Intersection : Support creation of multiple intersections from sim wells 2022-01-10 22:19:22 +01:00
Magne Sjaastad
051bbe6467 Intersection Depth Filter : Add missing geometry update 2022-01-10 21:57:18 +01:00
Magne Sjaastad
e203c76099
#8425 Summary Multi Plots: Add grouping on wells, groups, ...
* #8425 Multi Graph : Support grouping on object name
* #8425 Multi Graph : Improve creation of new graphs
* #8425 Multi Graph : Improve default tick mark count
* Handle history and non history as identical headers
* #8425 Multi Graph : Increase space below a graph
2022-01-10 14:51:31 +01:00
Magne Sjaastad
aeb0bf0677 #8416 VFP Plot : Support import of all units (Field, PVT, ..) 2022-01-09 19:22:54 +01:00
Magne Sjaastad
fef0a2b70c Janitor : Remove obsolete includes in header files 2022-01-07 10:38:56 +01:00