Commit Graph

318 Commits

Author SHA1 Message Date
Kristian Bendiksen
42c4e4a0c4
Summary calculation data sources fixes
* File Summary Case: set up multiple readers correctly for multithreaded configuration.
* Summary Data Sources: fix sorting of vectors.
2023-02-27 11:17:45 +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
8768e186d8
#9671 summary calculations for summary items
* Summary Calculation: use shorter name in title
* Sort summary addresses to group calculated results last.
* Summary Calculation: add option to distribute calculation to other items.
* Add support for summary calculation for RimGridSummaryCase.
* Use short name for calculations in plot titles.
* Update ensembles in Data Sources when calculation is added.
* Summary Calculation: allow drag-and-drop of ensembles
* Summary Plot: fix axis range aggregation for calculated ensemble addresses.

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2023-02-26 08:08:06 +01:00
Kristian Bendiksen
69a668df50 Simplify RifSummaryReaderInterface timeSteps. 2023-02-24 10:03:16 +01:00
Jørgen Herje
0601de4c18 Prevent update of show statistics selection in source stepping
- Refactor code into two functions
- Do not update selection when performing source stepping
2023-02-23 07:40:27 +01:00
Jørgen Herje
a6ee41aaee Fix grouping of properties for date tickmarks 2023-02-20 16:04:57 +01:00
Jørgen Herje
dfb942cc97
Add custom tickmark configuration for Summary Plot (#9867)
- Added custom tickmark configuration in time axis properties for `Time Mode = Date` 
- Refactor code to separate handling of time axis properties and regular axis properties in RimSummaryPlot
- Add method for setting major ticks by use of list for RiuPlotWidget interface.
2023-02-20 14:45:16 +01:00
Jon Jenssen
f5ee8d269a Rearrange order of source stepping options 2023-02-07 17:46:08 +01:00
Magne Sjaastad
cc21e2f3b4 #9147 Fix wrong curve name for summary group curves 2023-02-02 13:42:44 +01:00
Magne Sjaastad
ec611a9a3a #9780: Compare axis unit text case insensitive 2023-02-02 07:25:43 +01:00
jonjenssen
33e908dd94
Avoid progress window staying behind on Linux when loading summary data (#9774)
Adjust progress info usage in summary file loading
2023-02-01 08:46:22 +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
Magne Sjaastad
abc9e82ff5 System: Enable and use c++20
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
2023-01-19 08:33:02 +01:00
Kristian Bendiksen
6b631b3d5a #9591 Janitor: remove unused parameter in RiuPlotWigdet::createPlotCurve. 2023-01-09 15:39:42 +01:00
Magne Sjaastad
752363a4b8 #9624 Add alphabetical and by value sorting 2023-01-05 12:14:49 +01:00
Magne Sjaastad
09e05e9996
Fix summary issues
* Add missing time conversion for month
* #9606: FIx wrong usage of function when accessing data from summary file
The result values are aggregated into the destination vector in RimSummaryCaseCollection::computeMinMax(), so make sure the vector is recreated per case.
* #9602 : Make sure the plot is updated correctly for "Time since simulation start"
* Move roundToNumSignificantDigits() to RiaNumericalTools
* Make sure the time axis is consistent when individual time range differs
2023-01-02 10:22:44 +01:00
Magne Sjaastad
f27f47fad5 Ensemble: Disable auto name for old projects
Set auto name to false to be able to use the stored name in project files.
2022-12-21 13:59:20 +01:00
Magne Sjaastad
a423ecf95f
Several OpenMP improvements
Several optimizations based on profiling of 20M grid model. These fixes will improve the largest performance issues, but there are still more operations that can be refactored.

* OpenMP: Use in fault geometry generator
* OpenMP: Use when computing statistics for result values
* OpenMP: Use multithreading on fault detection
* Add RiaOpenMPTools
* VizFwk: Use openMP for texture generation
2022-12-19 13:49:03 +01:00
Magne Sjaastad
7cb6c587c1
Adjustments to UI
* #9551: Guard nullpointer if no RFT data is present
* Hide RFT in tree view if no RFT file is found
* Avoid display of 3d main window when importing a summary case
* Use specific grid import feature instead of general file import feature
2022-12-09 08:47:40 +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
Magne Sjaastad
3d594257dd
Add name variable for path in project file
Add support for user defined variables in the path section of the project file
2022-12-08 07:08:22 +01:00
Kristian Bendiksen
99553382f5
9437 fix missing summary sub plot update
Summary plot: fix missing sub plot title updates.
Janitor: improve RiuPlotWidget interface.
2022-11-29 19:28:57 +01:00
Magne Sjaastad
95813f510e
Summary Plot adjustments
* #9435 Do not auto update curve appearance during source stepping
* Update toolbar after vector is dropped into empty plot
* Use summary vector text in RiaSummaryDefines
* Fix missing update of curve color when curve is highlighted
2022-11-08 08:18:31 +01:00
Magne Sjaastad
e29b310566
Summary improvements
* #9424 Show vector name in curve names when history vector is present
* #9426 Curve Legend disappears when curve is unchecked
* Remove duplicate call to visibilityChanged
* Remove unused code
2022-11-01 08:00:51 +01:00
Magne Sjaastad
f6bde92d81 Remove unused space caused by bottom margin 2022-10-27 12:43:46 +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
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
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
22cd06b4c7
Adjust auto plot settings
* Adjust the max value for summary curves to get more space on top of plot
* Compute axis range before computing auto plot settings
* Use axis object name as key when computing aggregated min/max
* Guard infinite recursion for enableAutoValue()
2022-09-13 17:45:41 +02:00
Magne Sjaastad
c734a22bd6
Improve user interface for axis linking
Several adjustments to UI as discussed with Håkon and Alireza.

* add link/unlink command to right-click menu of axis
* select curve in project tree when clicking on legend item
* make sure internal legend is always visible when toggling plot
* fix issue when using sub plot as data source for axis range
2022-09-09 16:06:56 +02:00
Magne Sjaastad
8887676007
Issues related to user course
* #9277 Observed Data : Assign case ID when importing observed data
If no case ID is assigned, the first observed case is always used when creating new plots of observed data

* #9278 Match on summary vector name when curve unit text is missing
2022-09-09 13:58:28 +02:00
Magne Sjaastad
b641d6b86f
Adjustments for RC2
* Add dependency to Svg
* Renaming
* Remove special handling of bright colored curves
For some ensemble cases, the curve highlight does not work well. A prototype for ensemble curve highlight was introduced, but this was not working for a collection of standalone summary curves.
* Set version to RC_02
2022-09-06 15:29:10 +02:00
jonjenssen
2aedf38f79
Highlight the curve belonging to the legend you click on. (#9259)
* Highlight the curve belonging to the legend you click on.
* Make sure legend curve order remains the same when changing hilited curve
2022-09-06 07:21:24 +02:00
Magne Sjaastad
945f1b1902
Use field auto values for summary plots
Use auto value concept in summary plot configuration. Default behavior is unchanged, but it is now possible to unlink a field to specify a custom value for this field.

Other changes:
* Add missing requirement for Svg in test application
* Use calculator icon and rename panel text
Use icon and relevant text to make it clear that the content in Calculator Data can be used for Grid Property Calculator and nothing else.
* Add example with scoped enum and auto value
* Use enum value starting av 10 to make sure enum values (not option item index) are working as expected
2022-09-05 14:12:49 +02:00
Magne Sjaastad
7f78cb8c89
Fix some smaller issues
* #9253 Well allocation plot: Keep checked state of curves when changing time step
* #9254 Guard pointer when clicking on linked time axis icon
* #9250 Cross Plot : Ensure summary case change update both x and y data sources
2022-09-01 07:50:40 +02:00
Jon Jenssen
7c2720f980 Make sure curve legends are shown in same order as the curve items in the explorer when moving them up/down 2022-09-01 07:28:10 +02:00
Magne Sjaastad
3ff5d238b1 Remove unused members and remove includes 2022-08-25 13:56:53 +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
a1e7b64d92
Simplify RiuPlotMainWindowTools (#9211)
* Janitor: Add and use onObjectAppended()
* Janitor: Simplify API
2022-08-18 12:37:51 +02:00
Kristian Bendiksen
9d5a4e7939 #9202 Summary Multi Plot: add option for having the legend inside the plot 2022-08-18 08:50:16 +02:00
Magne Sjaastad
c8f642d83a
Add rename case to summary and grid cases (#9204)
* #9203 Summary Case : Add rename to right-click menu
* Janitor: Move ID and description to private fields
* Eclipse Case: Add rename to right-click menu
* Rename feature
2022-08-18 07:12:23 +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
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
f8e19e68d2 Avoid setting summaryCaseX, as this will cause issues for RimSummaryPlotNameHelper
In summary plots, we only use summary case for Y-axis
2022-08-10 14:12:28 +02:00
Magne Sjaastad
6977fa59f7 Plot Manager: Activate individual sub plots per data source 2022-08-09 18:36:18 +02:00
Magne Sjaastad
489b4bf66b Make sure curve names and plot titles are updated using Plot Editor 2022-08-09 18:36:18 +02:00
Magne Sjaastad
63b26ebf2d Guard pointer before use 2022-08-09 13:28:18 +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
76edb49e89 #9126 Improve plot and curve handling for ensembles
Add append plots and append curves to context menu of ensembles
Make sure we create an unique color when adding multiple ensembles
2022-07-08 17:54:37 +02:00
Magne Sjaastad
1d4ab6bf9b #9125 Do not reset user defined axis range when stepping data source 2022-07-08 17:54:37 +02:00
jonjenssen
d5269abc6e
New dockingsystem (#9116)
* Use Qt Advanced Docking as forked submodule
* Use new docking system in code
2022-07-07 12:03:02 +02:00
Magne Sjaastad
af77fdad81 Prepare for release
Always create plots using Qwt
Always create plot for command "New Summary Plot"
#9103 : Fix missing updates in multiselect field update operation
Add Open Summary Plot Editor
Trigger missing load of data
Enable data source display for first realization of an ensemble
Always show legend text
Set version to 2022.06.0-RC-02
2022-06-30 18:24:25 +02:00
jonjenssen
d4ff0a0175
Missing legend (#9095)
* Make sure ensemble curveset legends are shown in multiplot legend.
* Remove information already shown in title from curve legend.
* Fix missing legend when creating curve plot from ensemble curves
* Show actual curve color in legend
2022-06-29 11:49:46 +02:00
Magne Sjaastad
e5cf5f4cf3 Improve history curve color and symbols 2022-06-27 19:25:27 +02:00
Magne Sjaastad
cb1c94630b Guard null pointer use 2022-06-27 19:25:27 +02:00
Magne Sjaastad
b706192ea3
Performance updates (#9082)
* Avoid creation of curve legend widgets during construction of a multi plot
* Make sure default z-value is correct to avoid expensive Qwt updates
* Avoid duplicate plot updates
* Do not create internal Qwt legend by default
* RFT import: Avoid expensive method throwing exception if no data is found
2022-06-24 16:16:46 +02:00
Magne Sjaastad
5078f4072f
Minor adjustments (#9070)
* Add system commands to test toolbar
* #9069 Summary Plot: Update only Y axis values during source stepping
* Reduce default brightness for ensemble summary curves
* Add a separate flag to control linking of time axis
* Make sure interactive zoom in plot is handled
* Move message dock window to right dock panel
2022-06-21 15:33:00 +02:00
Magne Sjaastad
8aaf98823a
Regression test fixes (#9068)
* Make sure font size is updated correctly
* Hide empty sub titles
* Do not categorize as water cut if no curves are visible
* Propagate settings from single summary plot to summary multi plot
2022-06-21 14:40:54 +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
magnesj
3477ac7cb7 Fixes by clang-format 2022-06-13 15:13:15 +02:00
Magne Sjaastad
fe0d009b25
Improve visual appearance for ensemble curves (#9016)
* Ensemble Curves : Improve visual appearance
Set line thickness to 1
If ensemble curves are bright, use a high saturation color for the highlight curve
Increase line thickness for highlighted curve
* Use color by summary vector phase for ensemble curves
* Do not create curves for non-existing history vectors
2022-06-13 15:08:15 +02:00
Magne Sjaastad
3b5139c24d #9023 Performance : Use cached analyzer
Remove min max from RimSummaryCaseCollection
Guard null pointer access
Improve default behaviour for axis range control
2022-06-10 06:25:41 +02:00
jonjenssen
2fdd5875ea
Update multiplot source stepping - append plot (#9030)
* Make sure we append a new plot for all plots that matches the current source stepper, allows stepping and appending multiple plots at once
2022-06-09 13:23:28 +02:00
Magne Sjaastad
47fb8957c1 #9023 Performance : Temporary fix for axis range aggregation 2022-06-07 23:20:31 +02:00
Magne Sjaastad
d36bf11c62
Several performance fixes (#9026)
* #9023 Performance: Use count instead of for loop

* #9023  Analyzer: Cache vector names for categories

* #9023 Performance : Use cached ensemble analyzer

* #9023 Performance : Add min/max values to ensemble statistics

* #9023 Performance : Improve statistics calculator

* #9023 Performance : Use high performance toInt()

* #9023 Performance : Build summary addresses in parallell
2022-06-07 21:09:36 +02:00
jonjenssen
ed392e6300 Keep source step dimension when saving/loading multiplots, including templates 2022-06-03 18:05:26 +02:00
Magne Sjaastad
95e9ef8bf1 Rename to RiaFieldHandleTools 2022-06-03 08:00:55 +02:00
Magne Sjaastad
2b8bab3bd8 #9011 Disable input controls controlled by automation
Disable fields controlled by automation and append label text with (overridden)
2022-06-03 08:00:55 +02:00
Magne Sjaastad
4146e8bbd1 #9011 Rename axis range aggregation to None 2022-06-03 08:00:55 +02:00
Magne Sjaastad
5e53f5687d Improve auto name for curves and plots
- use vector name as plot title if a vector and the associated history vector is present
- use short vector name as fallback for curve name
- use Plot N as fallback name for sub plot
2022-06-03 08:00:55 +02:00
Magne Sjaastad
36dab01cf5 #9009 Data Source Object : Do not allow rename by double-click on item 2022-06-03 08:00:55 +02:00
jonjenssen
41904df681
New feature: delete unchecked subitems (#9010)
* New feature: delete unchecked subitems
2022-06-02 06:50:14 +02:00
Kristian Bendiksen
cbe731d187 #8994 Plot axis range : Fix incorrect reset of user-defined min max value 2022-06-01 15:10:38 +02:00
Jon Jenssen
cf9f69b620 Fix plot layout after plot visibility filter has been applied 2022-06-01 14:07:27 +02:00
Magne Sjaastad
33f0831de5 #8982 Allow mouse wheel zoom for a single sub plot 2022-06-01 12:25:36 +02:00
Magne Sjaastad
c7cf6d19f8 #8995 Drag drop summary vector : Optionally include history vector 2022-06-01 12:25:36 +02:00
Magne Sjaastad
6a7e2f6033 #8993 Default Ensemble Curve : Do not show statistics for history vectors 2022-06-01 12:25:36 +02:00
Magne Sjaastad
6a5b9f7300 Use deleteChildren() when required to avoid memory leak 2022-05-31 15:05:07 +02:00
Magne Sjaastad
c74701b687 Rename several child() and children() functions 2022-05-31 15:05:07 +02:00
jonjenssen
db589c7e32
Show progress bar when appending plots to multiplot (#8976)
* Show progress bar when appending plots to multiplot
* Stop plot manager from going crazy creating plots when filter text is blank
* Speed up plot manager create plot
2022-05-30 11:39:05 +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
b17e3813df #8966 Improve performance when changing multiple field values 2022-05-26 20:43:25 +02:00
jonjenssen
ff57252812 Add support for dropping folders in summary plots and multi summary plots 2022-05-26 02:29:59 +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
Kristian Bendiksen
1aa41968a5 #8787 Summary Multiplot: Fix inversion of axis with axis aggregation. 2022-05-24 07:26:49 +02:00
Magne Sjaastad
01e670a3d8
Add copy/paste of Summary Multi Plot (#8942)
* Guard use of back() on empty vector
* Add "Show Data Sources" to ensemble realizations
* Update summary plot as summary curve collection is not visible in tree view
* Set selection manager root in RiaApplication
* Always close both main windows if present
* Add copy/paste of summary multi plot
* Add test for RiuMainWindow::instance() before use
* Remove duplicated code
* Multiple Tree Views : Use getTreeViewWithItem() to find correct tree view
* Minor UI adjustments
2022-05-23 14:25:53 +02:00
Jon Jenssen
329e1e8b69 Fix crash in ensemble plot duplicate 2022-05-23 13:32:18 +02:00
Magne Sjaastad
26f1387bc6 Improve plot manager behavior
Create plots for vectors with no grouping identifier
Do not invalidate GUI on selection changed
Use same name as in project tree
2022-05-22 21:49:34 +02:00
jonjenssen
886f5e3295 Move duplicate button to the right of the multiplot toolbar 2022-05-20 16:47:44 +02:00
jonjenssen
7c25677d18 Add support for appending curves for summary case and ensemble by stepping 2022-05-20 16:29:26 +02:00
Kristian Bendiksen
954b697e6b #8817 Summary Multiplot: Add filter to control plot visibility 2022-05-20 15:56:43 +02:00
Magne Sjaastad
119367783b
Fix memory leak for data source ensemble summary (#8919)
* Do not create summary case group twice

* Fix memory leak of objects contained in childArrayFields
Use deleteAllChildObjects to delete objects instead of clear()
Rename collection function clear() -> deleteAllChildObjects

* Early exit for empty path

* Reduce redundant calls to refreshMetaData
2022-05-19 11:51:22 +02:00
jonjenssen
3b927e1c09
Split summary plot into multiple plots (#8910)
* Support splitting a summary plot with multiple curves into a new multiplot with one plot per curve
* Make sure the correct plot is deleted if using the plot context menu.
2022-05-13 16:36:30 +02:00
jonjenssen
6f26f8e462
Speed up summary case close/delete for ensembles (#8907)
* Speed up summary case close/delete for ensembles
2022-05-12 22:51:15 +02:00
jonjenssen
65827f9c1c
Improve summary case import performance (#8897)
* Improve summary case import performance
2022-05-11 10:47:12 +02:00
Magne Sjaastad
f52acd9a64 #8893 Rename quantity name -> vector name 2022-05-10 08:17:41 +02:00
Magne Sjaastad
6f1819ba96 MultiPlot: Reorder top level UI
Set Auto Adjust Appearance to default value true
2022-05-10 08:17:41 +02:00
Kristian Bendiksen
4304bbbc48 Grid Calculator: refactor summary curve calculator and add grid calculator. 2022-05-09 15:36:27 +02:00
Magne Sjaastad
74ace7ea44
Summary Multi Plot : Improve default behaviour (#8885)
* Summary Multi Plot : Improve default behaviour

- Perform zoom when stepping to next item
- Set defaults for range aggregation and source stepping dimension based on content when creating a multi summary plot

* Plot Axis Appearance : Do not use bold for text configuration

* Improve how scale factor for legend values are computed

* Improve defaults for range aggregation and step dimension

* Reorder Capability : Get UI item before reordering is issued

Get UI item before reordering is issued, as this operation will invalidate the tree model
2022-05-06 12:09:55 +02:00