Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 0852f857a0 Not required to process event anymore 2023-11-20 14:13:24 +01:00
Magne Sjaastad f44df76089 Early return if the active view is the same as the activated view
This will make sure that selection in the project tree is stable for focus in events.
2023-11-20 14:13:24 +01:00
Magne Sjaastad 98ce0dc226 Hide deprecation warning starting from MSVC 17.8 2023-11-20 14:13:24 +01:00
Magne Sjaastad f092f18614 Make sure toolbar is updated for when a single plot is present
We try to update the content of the toolbar only when required, as this can take some time to produce the combo box content for large cases. Return false to make sure the UI is rebuild if any invalid text is present.
2023-11-20 14:13:24 +01:00
Magne Sjaastad b981f5f745 Hide deprecation warning starting from MSVC 17.8 2023-11-17 10:43:21 +01:00
Magne Sjaastad ffabebfa53 Fallback to project path for export 2023-11-17 09:53:30 +01:00
Magne Sjaastad a78f8f8982 Use enum instead of string 2023-11-17 09:53:30 +01:00
Magne Sjaastad 401ce4bc18 Guard use of null pointer 2023-11-15 08:39:01 +01:00
Magne Sjaastad 78dc6d1ecc Bump to dev.05 2023-11-14 08:36:43 +01:00
Magne Sjaastad d3a1c80edf Guard null pointer use 2023-11-14 08:36:43 +01:00
Magne Sjaastad 0f56eaed6b Add optional IJK to ResultPoint for easier debugging 2023-11-13 11:08:36 +01:00
Magne Sjaastad 9e65eb3be9 Add helper functions to convert from cellIndex to cafVecIjk 2023-11-13 11:08:36 +01:00
Magne Sjaastad 68a4d54af2 #10754: Exclude COMPDAT for de-activated laterals 2023-11-13 09:17:30 +01:00
Magne Sjaastad 76fdac0b80 Janitor: Remove unused code an move initializers to private 2023-11-13 09:16:58 +01:00
Magne Sjaastad 678a368361 Refactor LayoutOptions to improve readability
* Make it possible to use designated initializer list
- remove default constructor
- move static member to outer scope

* Add helper function to add field on same row
2023-11-10 14:48:56 +01:00
Magne Sjaastad 860f086af6 Add optional support for using visible cells as filter for grid statistics 2023-11-10 12:49:32 +01:00
Magne Sjaastad 1046bcbb94 Disable view filtering when using grid calculations as part of grid statistics
Active cells can be different between cases, and view filter from one specific case is not able to use for other cases.
2023-11-10 12:49:32 +01:00
Magne Sjaastad fb890300c5 Propagate variable changed signal to RicUserDefinedCalculatorUi
- ensure that the UI is updated
- if the grid size is different, set destination case equal to the input variable case
2023-11-10 12:07:26 +01:00
Magne Sjaastad 917fd9b3b5 Move grid size check to calculate()
This move will make it possible to use a calculator expression defined for a different grid size for grid case statistics.
2023-11-10 12:07:26 +01:00
Magne Sjaastad 5ecc43d49f Always release memory during statistics of grid calculations 2023-11-10 10:14:59 +01:00
Magne Sjaastad 69f132ffa5 Add import/export grid calculations to Grid Calculator
Refactoring
2023-11-10 10:14:59 +01:00
Magne Sjaastad f49053c61d Guard null pointer use 2023-11-10 09:01:28 +01:00
Magne Sjaastad 32a878a7ea Select the new view to make sure RiaApplication::setActiveReservoirView() is called 2023-11-10 09:01:28 +01:00
Magne Sjaastad ee4c8362e5 Make sure eclipse case is opened before creating contour map to avoid crash 2023-11-10 09:01:28 +01:00
Magne Sjaastad 64f825e882 Rebuild result addresses when case is read from file 2023-11-10 09:01:28 +01:00
Magne Sjaastad 5f3e0704f1 Make sure that no curves are created when No Plots is set in Preferences 2023-11-09 16:16:01 +01:00
Magne Sjaastad 9af9aa7e66 Append vector name if multiple cases are present 2023-11-09 14:30:26 +01:00
Magne Sjaastad eea56e4818 Add flag to optionally distribute a summary calculation to all cases 2023-11-09 14:30:26 +01:00
Magne Sjaastad 319dc2ab9b Adjust build settings to c++20
Adjust build settings to c++20
Add ifdef for code related to CeeViz, so it is possible to compile AppFwk without CeeViz
2023-11-09 14:17:43 +01:00
Magne Sjaastad 02df80e0cc Bump version 2023-11-08 08:39:04 +01:00
Magne Sjaastad 39fc9d5c36 Add support for grid calculations as data source for statistics
- add data source selection, either Case Property or Grid Calculation
- add Time Step Selection, can be used for both dynamic case properties and Grid Calculations
- optionally release grid calculation data when statistics is computed
- recursive grid calculations is supported
2023-11-08 08:39:04 +01:00
Magne Sjaastad 92d1bd9386 If only one view, set the first result as active 2023-11-07 19:15:51 +01:00
Magne Sjaastad 7eb3e98bb2 Optionally apply a grid calculation on all grids 2023-11-07 19:14:58 +01:00
Magne Sjaastad 3bf81b44d5 Guard null pointer 2023-11-07 19:14:58 +01:00
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