Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 30921a158b Simplify RiuPlotMainWindowTools (#9211)
* Janitor: Add and use onObjectAppended()
* Janitor: Simplify API
2022-09-15 08:19:41 +02:00
Magne Sjaastad a268e6ff3a #9210 New Ensemble Curve Set : Missing update in Plots panel 2022-09-15 08:19:41 +02:00
Magne Sjaastad acaea8de81 Renaming of features 2022-09-15 08:19:41 +02:00
Magne Sjaastad df16e1fe5c 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-09-15 08:19:41 +02:00
Magne Sjaastad a36c07dd64 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-09-15 08:19:41 +02:00
Magne Sjaastad 4cb26f69c5 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-09-15 08:19:41 +02:00
Magne Sjaastad 37d6a44b2a #9194 Area Fill : Area filled curves should use zero as base line 2022-09-15 08:19:41 +02:00
Magne Sjaastad 4b1a6b48a5 Show well completion annotations in horizontal plots (#9193) 2022-09-15 08:19:41 +02:00
Magne Sjaastad 98df56280e #9183 Do not use undo/redo for GeoMech result definition 2022-09-15 08:19:41 +02:00
Magne Sjaastad d3330cff90 Avoid setting summaryCaseX, as this will cause issues for RimSummaryPlotNameHelper
In summary plots, we only use summary case for Y-axis
2022-09-15 08:19:41 +02:00
Magne Sjaastad 3fe6022c33 Plot Manager: Activate individual sub plots per data source 2022-09-15 08:19:41 +02:00
Magne Sjaastad 69f7c23ce4 Make sure curve names and plot titles are updated using Plot Editor 2022-09-15 08:19:41 +02:00
Magne Sjaastad b5708424e2 Guard pointer before use 2022-09-15 08:19:41 +02:00
Magne Sjaastad d2d6e61271 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-09-15 08:19:41 +02:00
Magne Sjaastad 0cfdaab720 #9156 Use PdmPointer to avoid dangling pointer in Plot Editor 2022-09-15 08:19:41 +02:00
Magne Sjaastad dbc4aef384 Set minimum CMake version to 3.15 to avoid warnings on MSVC
Set CMake version on top level to avoid warnings on MSVC when warning level is set to something else than the default.

https://stackoverflow.com/questions/58708772/cmake-project-in-visual-studio-gives-flag-override-warnings-command-line-warnin
2022-09-15 08:19:41 +02:00
Magne Sjaastad f80fde85ca #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-09-15 08:19:41 +02:00
Magne Sjaastad ee715a86e0 #9125 Do not reset user defined axis range when stepping data source 2022-09-15 08:19:41 +02:00
Magne Sjaastad 614bb147f2 Use updated version of opm-common as submodule
* Adjustments to build system for opm-common
* Add opm-common as submodule
* Disable use of unity build for opm-common
2022-09-15 08:19:41 +02:00
Magne Sjaastad 09f9269cfa Unity build requires global unique variable names 2022-09-15 08:19:41 +02:00
Magne Sjaastad a3a71d6379 Update actions to latest and remove artifact upload for Linux
Artifact upload failed for Linux -> remove as these are not used
2022-09-15 08:19:41 +02:00
Magne Sjaastad 3a55db15e5 Added field and object keywords 2022-09-15 08:19:41 +02:00
Magne Sjaastad 7e0e160196 Update version on dev-branch after release 2022-09-15 08:19:41 +02:00
Magne Sjaastad d90b1cda99 Merge pull request #9107 from OPM/release-2022-06
Release 2022.06
2022-07-01 13:10:56 +02:00
Magne Sjaastad 5ac0bc3e6e Set version to 2022.06.0 2022-07-01 13:03:16 +02:00
Magne Sjaastad d4edc15215 Regression test fixes (#9105)
* Do not show Open Summary Plot in 3D view Property Editor
* Regression Test: Fix missing update of correlation report plot
A fix was introduced in 73d598ee7e to avoid a crash when deleting a multi plot. This had a unintended side effect causing the sub plots in correlation report plot to not be inserted properly.

* Bump release version
2022-07-01 11:36:49 +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
Magne Sjaastad 3d53c9de1e Do not create curve for empty history vector 2022-06-29 12:42:22 +02:00
Magne Sjaastad aeab09eceb Minor restructure of summary preferences 2022-06-28 14:06:32 +02:00
Magne Sjaastad 7534a219b5 Set version to 2022.06.0-RC-01 2022-06-27 19:25:27 +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 a86abab3cb Regression Test: Guard null pointer access 2022-06-27 19:25:27 +02:00
Magne Sjaastad 55966ef6e8 RFT : Fix several update issues 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
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 36e43ae85b Performance: Move bool outside cell loop 2022-06-15 19:22:36 +02:00
Magne Sjaastad 34a05ec5f4 Bump version to 2021.10.3-dev.07 2022-06-13 17:30:07 +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 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 7d246c1535 Add missing link library 2022-06-13 13:52:05 +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
Magne Sjaastad 5eafa98038 #9023 Performance : Optionally avoid emitting update signals during update
Do not notify editors when building tree in PdmUiTreeViewQModel::setPdmItemRoot()
2022-06-10 06:25:41 +02:00
Magne Sjaastad d146ada592 #9037 RFT import: Missing data in RFT file caused crash 2022-06-09 11:44:21 +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
Magne Sjaastad 6931d46b75 Bump version to 2021.10.3-dev.06 2022-06-03 15:26:27 +02:00
Magne Sjaastad 2472f4697c Improve summary category detection for opm-common reader (#9018)
* Move code to quantitynameinforprovider
* Use some region-to-region helper function from opm-common
* Add more fallbacks
2022-06-03 13:54:15 +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 a28cecd19b #8961 Auto scale factor : Do not use scale factor for some value ranges 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
Magne Sjaastad bf8ca66132 #8983 Improve default dock window layout 2022-06-01 12:25:36 +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 950ec38a14 Add userInterface unit tests 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
Magne Sjaastad c199f960e3 #8949 Plot Update: Improve visual stability when clicking on curves
adjustSize() causes the plot to resize twice which is annoying. Cache the last child count to avoid calls to adjustSize().
2022-05-31 14:20:38 +02:00
Magne Sjaastad fe1acc93a6 #8938 Sub Plot : Fix visibility of legend
Make sure legends are set visible if any items are present in the legend
2022-05-31 14:20:38 +02:00
Magne Sjaastad 787d3ae379 #8868 Well Log Plot: Appearance update not working 2022-05-31 07:29:59 +02:00
Magne Sjaastad 17f169e513 RegressionTests: Add missing show() to mainwindow 2022-05-29 13:25:53 +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 5c224241e1 #8892 Allan Diagram: Show formation data for all time steps 2022-05-27 12:10:58 +02:00
Magne Sjaastad a48ad22d0a Preferences: Avoid calling update on top level RimProject on close 2022-05-27 07:53:51 +02:00
Magne Sjaastad ad66b4674a Bump version to 2021.10.3-dev.05 2022-05-26 21:24:03 +02:00
Magne Sjaastad 247d1bb338 Allow PropertyView panels to be resized horizontally 2022-05-26 21:17:21 +02:00
Magne Sjaastad ab2a7254f8 #8964 Avoid message box for PVT and Rel Perm issues
Log warning message to log window instead of a dialog
Improve text
2022-05-26 20:47:23 +02:00
Magne Sjaastad a511bfd722 #8952 Only include fields to be modified for sub items on/off
Only one fieldChanged is issued, and make sure that all fields in the selection will change state. If state is not changed for the last field, no notification will happen.
2022-05-26 20:47:23 +02:00
Magne Sjaastad b17e3813df #8966 Improve performance when changing multiple field values 2022-05-26 20:43:25 +02:00
Magne Sjaastad 3545d16fbb Use set to get unique plots for update 2022-05-26 20:43:25 +02:00
Magne Sjaastad 4a1a2fe2be #8634 Improve performance when deleting multiple wells
Disable general framework delete function, and use special well path delete function
2022-05-26 20:43:25 +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 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
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
Magne Sjaastad ccfc0e25bc #7778 Check for valid pointer to main window before use 2022-05-22 11:35:40 +02:00
Magne Sjaastad 402f738abd Regression Test: Make sure all text is redirected to standard out
Call RiaApplication::initialize() to recreate project and preferences. Do not call virtual method initialize(), as RiaGuiApplication::initialize() creates a new logger causing console text to disappear.
2022-05-19 13:58:01 +02:00
Magne Sjaastad f3cfa0ab94 Bump version number 2022-05-19 12:50:47 +02:00
Magne Sjaastad fa8ad53981 Regression Test : Add memory usage to regression test logging 2022-05-19 12:48:54 +02:00
Magne Sjaastad 89d42fec88 Regression Test: Fix null pointer access (#8922)
* #8921 : Guard null pointer access

* #8921 Fix memory leak

Fix similar memory leak as reported in #8918
2022-05-19 11:51:52 +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
Magne Sjaastad 558d675d44 Merge pull request #8920 remove mac build 2022-05-19 11:47:41 +02:00
Magne Sjaastad 7d440a9c2f Performance: Avoid calling allSummaryCases
allSummaryCases() is potentially a heavy CPU call for large ensembles. Always show the curve calculator button.
2022-05-10 10:24:52 +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
Magne Sjaastad df1bb06f09 Support delete of multiple sub plots in one operation 2022-05-10 08:17:41 +02:00
Magne Sjaastad 621100f0cf Bump version 2022-05-06 16:38:41 +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
Magne Sjaastad 74075cc9ab Merge pull request #8888 from OPM/8887-fix-reorder-capability
Fix reorder capability
2022-05-06 10:52:08 +02:00
Magne Sjaastad cc397efe3e Performance : Simplify use of update schedulers
Extract code to RiaScheduler
Add PlotCollectionScheduler
2022-05-05 14:15:45 +02:00
Magne Sjaastad 8daf25ffb3 Performance : Cache result of some string manipulation functions
These functions get called quite often, and popped up based on profiling.
2022-05-05 14:15:45 +02:00
Magne Sjaastad e426364fd5 Toggle Action Performance : Send fieldChanged() only once
fieldChanged() can potentially do much work. When toggling objects in the project tree, make sure that fieldChanged is called only once for a toggle operation. This will make sure that we have the best possible performance in all use cases.
2022-05-05 14:15:45 +02:00
Magne Sjaastad bb6ca0848d #8859 Add drop target for calculation variables 2022-05-04 09:10:32 +02:00
Magne Sjaastad feb1c417c5 #8859 AppFwk : Enable TableView as optional drop target
A TableView can receive drag/drop data. The drop operations finds the PdmObject for a row, and delegates handling of the drop operation to this object.
2022-05-04 09:10:32 +02:00