Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 4da4a222ca Add optional Eclipse case as data source in a view
This option makes it possible to look at data from other cases without creating one view per case.
2023-11-07 19:14:58 +01:00
Magne Sjaastad a61e62707b RFT: Improve text import and make sure visibility based on date is working
Find candidate for the observation file name including measurement ID. Make sure that observations are filtered by date.
2023-11-06 10:20:22 +01:00
Magne Sjaastad 2069ad55cf Refactor RimSummaryAddressModifier
Use std::variant to wrap curve and ensemble curve set.
Move some code into RimSummaryAddressModifier
2023-11-06 10:20:22 +01:00
Magne Sjaastad 12f24af154 Remove obsolete source stepping code
After merging the cross plot with the summary plot, the sources stepping can be simplified. Remove obsolete sources stepping code, to prepare for other source stepping issues.
2023-11-06 10:20:22 +01:00
Magne Sjaastad 4f25fb4463 Create multiple RFT plots based on the selected RFT plot
Show a dialog with all available RFT wells, and let the user select from this list. Create a copy of the RFT plot, and replace well name in the copy.
2023-11-06 10:10:22 +01:00
Magne Sjaastad 7c2df03fc5 Bump version to 2023.10.1-dev.02 2023-11-06 09:43:24 +01:00
Magne Sjaastad b1d1c397d4 Make RimWellPathCompletionSettings scriptable
Support scripting of wellNameForExport, GroupNameForExport, MswLinerDiameter, MswRoutghness, Preferred Fluid Phase scriptable
2023-11-06 09:43:24 +01:00
Magne Sjaastad 508ab90487 Set default values and add getters without unit system 2023-11-06 09:43:24 +01:00
Magne Sjaastad d8b842147b Use action with icon instead of push button
Add action with an icon inside the line edit to clear the content of the line edit.
2023-11-02 15:19:42 +01:00
Magne Sjaastad 43c5705c8b Define and use a common set of content margin sizes 2023-11-01 09:37:52 +01:00
Magne Sjaastad a91afff937 Make sure axis is set correctly when appending plots
The plots are duplicated, and the axis objects are referenced using ptrField. Make sure resolveReferencesRecursively() is called after the plot is inserted into the project tree.
2023-10-30 11:20:21 +01:00
Magne Sjaastad 4ffd11da24 Use a time based summary plot as source for time axis linking
If a summary plot is created with a cross plot curve, the time axis object might not be configured. Always use a time based summary plot as source for linking of time axis.
2023-10-30 11:20:21 +01:00
Magne Sjaastad 184ed5fb65 Call zoomAlll when x-axis type changes
This will ensure that the x-axis range is reset when switching from a cross plot to time plot
2023-10-30 11:20:21 +01:00
Magne Sjaastad 718d40de56 Fix hang when editing regression curve degree
Disable editingFinsished() signal when read-only. Using tab after change of Degree in a regression curve object causes the application to hang.
2023-10-30 11:20:21 +01:00
Magne Sjaastad b5b9ac00fe Update dev branch after release
* Update version to 2023.01.1-dev.01

Merge in all changes from main branch
2023-10-23 12:53:04 +02:00
Magne Sjaastad 81929b4a8d Bump to RC_04 2023-10-20 15:43:18 +02:00
Magne Sjaastad cb7fe4fae5 Valve Import: Avoid duplicated import 2023-10-20 15:43:18 +02:00
Magne Sjaastad a67c2733e7 Add field and object keywords for release 2023-10-20 15:43:18 +02:00
Magne Sjaastad 12794f80f2 Area Fill: Fix are fill issue related to stacking of curves 2023-10-20 15:43:18 +02:00
Magne Sjaastad 35d0be6b62 Bump to RC_02 2023-10-20 13:56:11 +02:00
Magne Sjaastad 6357844d5e Make sure Show ensemble curves works when multiple curves are selected 2023-10-20 13:56:11 +02:00
Magne Sjaastad b6f2dbb915 Regression curve: Make sure source curve for regression always is created
The regression curve is using the curve object as data source for regression. Make sure that the source curve is always created, and set uncheck based on curve visibility.
2023-10-20 13:56:11 +02:00
Magne Sjaastad 1b2cae64c7 Add FWPR FOPT to cross plot vector list and reorder 2023-10-20 13:56:11 +02:00
Magne Sjaastad 55400b6ca4 Bump to 2023.10-RC_01 2023-10-19 14:49:42 +02:00
Magne Sjaastad bc7ec5f40c Fishbones : Add support for creating three different parameter sets 2023-10-19 14:49:42 +02:00
Magne Sjaastad bb3380b216 Show warning if no cross plot statistics curves can be computed. 2023-10-19 14:49:42 +02:00
Magne Sjaastad 0ec5913024 Create Cross Plot: Improve text and add menu separator 2023-10-19 14:49:42 +02:00
Magne Sjaastad c10d8561a3 Regression Curve: Remove unit text
As cross plot curves is supported, it will require a bit work to make the unit text correct in all cases. To avoid confusion, remove the unit text.
2023-10-19 14:49:42 +02:00
Magne Sjaastad 9a02958640 Regression Analysis: Remove inf/nan from source data
If inf/nan is present in the input data, the regression analysis is not working.
2023-10-19 14:49:42 +02:00
Magne Sjaastad bf0277aedc Add missing include for MSVC 2023-10-19 07:56:57 +02:00
Magne Sjaastad 5f0f483025 Show Plot Data: Add special handling for well log plots
Well log plots do not derive from RimPlot, add special handling.
2023-10-19 07:50:02 +02:00
Magne Sjaastad 09d6df74bf Hide x-axis group for decline curves 2023-10-19 07:50:02 +02:00
Magne Sjaastad a027febc57 Remove confusing UI elements
- hide selection of data source, set either summary or ensemble based on curve used as source
- only show available statistics curves
2023-10-19 07:50:02 +02:00
Magne Sjaastad f763f73ba3 Regression Curves: Use a contrast color for the regression curves
Use a list of predefined colors, and select the color with the larges RGB difference to the source curve. This will ensure that we avoid ending up with fully white or fully black curves, unable to see.
2023-10-19 07:50:02 +02:00
Magne Sjaastad 2fe290bbce Regression Curve: Clear and hide regression curve if no source data is available 2023-10-19 07:50:02 +02:00
Magne Sjaastad 6858cfe3cf Performance: Update toolbar when required 2023-10-19 07:50:02 +02:00
Magne Sjaastad 18e9ef0558 Make sure seismic file reader is created in RiaApplication::loadProject() 2023-10-17 07:26:52 +02:00
Magne Sjaastad a4428c1271 Regression Test: Guard crash if no seismic data is available 2023-10-17 07:26:52 +02:00
Magne Sjaastad 2368b590dc Bump to dev.15 2023-10-16 08:48:52 +02:00
Magne Sjaastad 6ce456d43e Performance: Make sure the model list is created once
Creating multiple lists during recursion caused a quite large performance penalty.
2023-10-13 16:31:14 +02:00
Magne Sjaastad bd0ef7f63b Performance: Move selectedUiItems outside the for loop
When number of objects is quite large, this causes a huge performance penalty.
2023-10-13 16:31:14 +02:00
Magne Sjaastad f1823da6d7 Performance: Cache the uiCapability to costly dynamic_cast 2023-10-13 16:31:14 +02:00
Magne Sjaastad 57aa033809 Remove call of resolveReferencesRecursively() from initAfterRead
Fixes by clang-format
2023-10-13 16:31:14 +02:00
Magne Sjaastad 69b513bcb1 #10713 Add flag used to detect if resolveReferences is called from initAfterRead 2023-10-13 16:31:14 +02:00
Magne Sjaastad 6a8b72c0c5 Add comment and static keyword 2023-10-13 16:31:14 +02:00
Magne Sjaastad 0a40e24851 Disable IO for RicPasteAsciiDataToSummaryPlotFeatureUi preview text field 2023-10-13 16:31:14 +02:00
Magne Sjaastad 7b28a23668 Improve parsing of units in CSV column headers
Detect units enclosed by both () and []
Avoid duplicate vector name in UI
2023-10-13 16:31:14 +02:00
Magne Sjaastad 545eb57f7d Bump to dev.14 2023-10-13 08:08:35 +02:00
Magne Sjaastad 76d1827742 Performance: Use curve with most addresses to define source stepping addresses
If we have many single curves in one plot, using addresses for all curves destroys performance. Make sure we only use addresses for the curve with most available addresses.
2023-10-13 08:08:35 +02:00
Magne Sjaastad c34d123dee Call zoomAll when curve stacking is changed 2023-10-13 08:08:35 +02:00
Magne Sjaastad a446f874cb Propagate updated object to onChildrenUpdated() 2023-10-13 08:08:35 +02:00
Magne Sjaastad 0f4d2a61f6 Add updateCurveAppearance() to stackable curve 2023-10-13 08:08:35 +02:00
Magne Sjaastad 55cafc64c3 Always enable undo/redo framework to improve performance
It is possible to toggle undo/redo in Preferences. Use this setting to control display of undo/redo items in GUI (undo/redo buttons, undo stack, ..)

The use of undo/redo framework will speed up several multi-object operations significantly.
2023-10-13 08:08:35 +02:00
Magne Sjaastad 3b372109ec Only show cross plot group for cross plots 2023-10-13 08:08:35 +02:00
Magne Sjaastad 9537d8afc1 Use time steps from source summary curve 2023-10-12 11:00:42 +02:00
Magne Sjaastad 3dd406e170 Bump version number 2023-10-12 10:45:37 +02:00
Magne Sjaastad 6469888626 Valve Import: Make sure default values are handled correctly 2023-10-12 10:45:37 +02:00
Magne Sjaastad 4a3cdc4e94 Avoid use of time_t when using sliders in GUI
* Avoid use of time_t when using sliders in GUI
Sliders use int as internal representation of values, and time_t can cause overflow
2023-10-12 10:02:58 +02:00
Magne Sjaastad cdda7480f3 Show Plot Data missing for some plots
* Add plotContentAsText() to bar chart builder
* Add show plot data to analysis plot
* Refactor analysis plot
* Enable context menu in Analysis Plot
* Add show plot data for general RimPlots
* Show plot data for correlation report in three separate text dialogs
2023-10-11 08:54:52 +02:00
Magne Sjaastad 51fe80b897 Create cross plot menu from list of addresses in preferences 2023-10-09 13:28:36 +02:00
Magne Sjaastad ececc3ae47 Add a proxy field Show Ensemble Curves
Create a proxy field to invert the logic in m_hideEnsembleCurves, and avoid adding obsolete field and conversion code in initAfterRead()
2023-10-09 13:28:36 +02:00
Magne Sjaastad 6e41ef8af9 Use vector instead of set to make to avoid sorting of quantities
The plot title for cross plots should use insertion order to make sure the title is displayed correctly
2023-10-09 13:28:36 +02:00
Magne Sjaastad 445672cbb2 Remove use of obsolete cross plot code
Remove obsolete summary cross plot classes and features
2023-10-05 07:47:47 +02:00
Magne Sjaastad f1514f2f3a Fix regression introduced in https://github.com/OPM/ResInsight/pull/10680 2023-10-05 07:47:47 +02:00
Magne Sjaastad b43e6e2e8a Guard null pointer use 2023-10-03 09:08:16 +02: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
Magne Sjaastad 21843820e6 Update clang-tidy.yml
* Make sure clang-tidy action use .clang-tidy config file
Use add-paths to instruct create-pull-request to a sub folder to avoid diff from Qt and vcpkg

* Use empty() in macro to avoid clang-tidy warning
* Add NOLINT to CAF_ASSERT
* Add NOLINT to cvfAssert
2023-10-03 09:04:08 +02:00
Magne Sjaastad 263e39b97b Add regression curves to ensemble statistics curves
* Add statistics enum
* Support ensemble statistics curve as data source for regression curves
* Allow creation of regression curves from statistics curves
* Make sure regression curves are updated after source curves
* Add state to use full or user defined range for regression source data
* Add isRegressionCurve
* Make sure source stepping works when regression curves are present
2023-09-30 11:07:23 +02:00
Magne Sjaastad 40803581dd Add line style and symbol type to ensemble curves 2023-09-28 14:33:05 +02:00
Magne Sjaastad d34bb8a64c Improve ensemble cross plot statistics
* Support cross plot in plot templates
* Fix source stepping for cross plots
* Show cross plot data in "Show Plot Data"
* Use bin size and realization count when computing cross plot statistics
2023-09-28 14:32:32 +02:00
Magne Sjaastad 1b1984e216 Adjustments related to cross plot curves
* Verify vector size only for cross plot regression curves
* Add filtering on axis orientation
Makes it possible to show only horizontal or vertical axes when selecting an axis to attach a curve to.

* Send curvesChanged signal to trigger multi plot updates
This signal will trigger update of axes and set correct scaling factor

* Use object name for axis object
* Use address for both x and y axis to create ensemble curve name
* Fix bug for drag/drop of ensemble object into plot
* Add RiaSummaryCurveAddress to RiaSummaryCurveDefinition
* Remove SummaryDataSource
* Use childFieldChangedByUi to trigger update of curves and titles
2023-09-27 10:18:52 +02:00
Magne Sjaastad fb288f602d Support ensemble cross plot curves
* Remove use of RifEnsembleStatisticsReader
* Add RimSummaryAddressSelector and RimEnsembleCrossPlotStatisticsCase
* Remove RifEnsembleStatisticsReader
* Add support for cross plot x-axis selection
* Support source stepping on ensemble cross plot curves
* Add isXAxisSummaryVector
2023-09-25 12:45:47 +02:00
Magne Sjaastad 55687c4e3e Fix conversion into new cross plot structure
* Fix conversion into new cross plot structure
* Guard null pointer
* Create one multi plot per cross plot
2023-09-25 12:23:39 +02:00
Magne Sjaastad 4dd4ddc604 Add value range filtering to cross plot regression curves 2023-09-22 15:35:33 +02:00
Magne Sjaastad e9b95ae740 Convert cross plots into summary plots 2023-09-22 15:35:33 +02:00
Magne Sjaastad a0d696e596 Add Value Range editor backed by std::pair<double, double> 2023-09-22 09:30:08 +02:00
Magne Sjaastad 6f845f0d42 Add flag to constructor of LineEditor 2023-09-22 09:30:08 +02:00
Magne Sjaastad cde05458f2 Reorder curve calculator to use more of available screen space 2023-09-20 15:20:56 +02:00
Magne Sjaastad 146412c600 Add support for summary cross plot curves in summary plots 2023-09-20 13:58:22 +02:00
Magne Sjaastad b87fa0bc74 Support cross plot curves in plot templates 2023-09-20 13:58:22 +02:00
Magne Sjaastad f07a5db559 Use post fix Y in RiaSummaryCurveDefinition 2023-09-20 09:58:48 +02:00
Magne Sjaastad 471790eebd Add data source for x-values
Default data source for x-values is RifEclipseSummaryAddress::timeAddress()
2023-09-20 09:58:48 +02:00
Magne Sjaastad 806f367566 Rename to SummaryCategory 2023-09-20 09:58:48 +02:00
Magne Sjaastad c06cda3883 Add summary category time
To be able to represent the time in a RifEclipseSummaryAddress object we add time as a category
2023-09-20 09:58:48 +02:00
Magne Sjaastad ae4a856343 Add isHorizontal and isVertical 2023-09-20 09:58:48 +02:00
Magne Sjaastad e8aada80c5 Rename to plotAxis() 2023-09-20 09:58:48 +02:00
Magne Sjaastad 7d7442c3f8 Sort AICD templates based on ID 2023-09-19 19:58:08 +02:00
Magne Sjaastad cc59eba6e0 Add multi axis zoom class
Add class used to zoom all axis in a plot based on a screen rectangle.
2023-09-15 13:59:58 +02:00
Magne Sjaastad 70dcb48830 Fix Import Summary Cases Recursively
Make sure that the loaded summary cases are added to the project.
2023-09-15 13:59:37 +02:00
Magne Sjaastad 5add6f5bef Set version to 2023.06.1-dev.07 2023-09-15 09:56:39 +02:00
Magne Sjaastad 6f6f77322b Guard null pointer 2023-09-14 15:19:01 +02:00
Magne Sjaastad c22b8b2e1f Remove duplicated code
* Use annotation tools from part manager
* Set version to 2023.06.01-dev.06
2023-09-13 09:43:03 +02:00
Magne Sjaastad f4c61c9edb Changes based on review 2023-09-13 08:29:15 +02:00
Magne Sjaastad f18eb29552 Add optional measured depth labels to well path 2023-09-13 08:29:15 +02:00
Magne Sjaastad 3e340361e8 Add annotation label support to surface intersection lines 2023-09-13 08:29:15 +02:00
Magne Sjaastad 4475f7b0f4 Add annotation label data structures 2023-09-13 08:29:15 +02:00
Magne Sjaastad 94c1b110fb Compute measured depth at the first visible well path geometry 2023-09-13 08:29:15 +02:00
Magne Sjaastad 13b4c19bbb Import of AICD valve definition from text file
* Add readKeywordContentFromFile
* Add import of AICD values from Completor and Eclipse
2023-09-12 19:45:32 +02:00
Magne Sjaastad 2e94bd8e5e Set version to 2023.06.01-dev.05 2023-09-11 17:49:17 +02:00
Magne Sjaastad 98203f10a6 Set version to 2023.06.01-dev.04 2023-09-11 09:31:30 +02:00