Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad 3f9f337e64 #9347 Well Log Plot : Add possibility to show depth axis in all tracks 2022-10-10 15:58:05 +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 f155da0179 #9312 Return line edit instead of placeholder widget if auto value is not supported 2022-10-06 10:32:44 +02:00
Magne Sjaastad 89d7dd4561 Show branch ID range in addition to branch index 2022-10-06 10:32:44 +02:00
Magne Sjaastad f1139f5f14 Well Log Plot: Make sure curves with constant property value is visible 2022-10-06 10:32:44 +02:00
Magne Sjaastad 4a673b7cd5 Avoid crash when adding a grid case multiple times 2022-10-04 18:43:36 +02:00
Magne Sjaastad 587f700ae4 Add requirements.txt with version tagging 2022-09-23 09:06:53 +02:00
Magne Sjaastad 57d3f7dd55 Update ResInsightWithCache.yml
Avoid setup-python called as part of install-qt-action
2022-09-20 08:33:46 +02:00
Magne Sjaastad d096a67eb0 Set version to 2022.06.1-dev 2022-09-19 15:24:59 +02:00
Magne Sjaastad 8bfb505ca0 Merge branch 'main' into dev 2022-09-19 15:23:52 +02:00
Magne Sjaastad 8f9cd55d66 Set version to 2022.06.1 2022-09-15 08:19:41 +02:00
Magne Sjaastad a0d0e48953 Minor issues when preparing user course
* Grid Cross Plot: Always show grouping icons with color
* Grid Cross Plot: Make sure the info box text content is updated
* Bump version to RC_05
2022-09-15 08:19:41 +02:00
Magne Sjaastad 53646865a6 #9295 Make sure grid cross plot is updated when grouping objects are toggled 2022-09-15 08:19:41 +02:00
Magne Sjaastad f010e5060e Add license notice for Qt-Advanced-Docking-System 2022-09-15 08:19:41 +02:00
Magne Sjaastad c55fdb2a7d #9292 Update project tree when new fracture is added 2022-09-15 08:19:41 +02:00
Magne Sjaastad b5993a0c0c Bump version to RC_04 2022-09-15 08:19:41 +02:00
Magne Sjaastad 60aeda1e6f 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-15 08:19:41 +02:00
Magne Sjaastad 8dc04d00e1 Add missing update of curve legend text 2022-09-15 08:19:41 +02:00
Magne Sjaastad 5eccff93c9 Fix typo for StimPlanFileName keyword 2022-09-15 08:19:41 +02:00
Magne Sjaastad 333cac84a6 Bump version info to RC03 2022-09-15 08:19:41 +02:00
Magne Sjaastad d1a8de0aa8 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-15 08:19:41 +02:00
Magne Sjaastad 437f26698d 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-15 08:19:41 +02:00
Magne Sjaastad a8fbb4f70e Fix missing update of export well name 2022-09-15 08:19:41 +02:00
Magne Sjaastad 129c4a0e34 Unit test to export xyz coordinates for N timesteps for a thermal fracture 2022-09-15 08:19:41 +02:00
Magne Sjaastad e1dda4c6b3 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-15 08:19:41 +02:00
Magne Sjaastad 54ac7568cb Set version to RC_01 2022-09-15 08:19:41 +02:00
Magne Sjaastad 72c070c3a9 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-15 08:19:41 +02:00
Magne Sjaastad 69cc36b3bc Add framework support for editor auto values
Add support for a field to be linked to a value updated by code outside the object itself. Mark the linked field by using a background color and icons for linked/unlinked state.
The auto value states is set as attributes in the project xml file. 
Add reference implementation in cafTestApplication, see Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp

* Tree View Editor: Avoid sending notification if selection is unchanged
* Use std++17 in test solution
* Move icons to icon factory
* add support for creating QIcon from SVG text string
2022-09-15 08:19:41 +02:00
Magne Sjaastad b2db9a66a7 Scale length threshold based on average DZ 2022-09-15 08:19:41 +02:00
Magne Sjaastad 8e627e46a3 Improve error message when grid dimensions are not matching 2022-09-15 08:19:41 +02:00
Magne Sjaastad edaaf4242a #9260 Guard pointer access and update tree view when plot is created
Guard access to plot curve
Update tree view when object is created
Use zoomAll to update x value range
2022-09-15 08:19:41 +02:00
Magne Sjaastad 723e047365 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-15 08:19:41 +02:00
Magne Sjaastad d806c5225b #9251 Cell Edge : Add more tests on valid cell edge result 2022-09-15 08:19:41 +02:00
Magne Sjaastad 43e38d8aff Remove unused members and remove includes 2022-09-15 08:19:41 +02:00
Magne Sjaastad 6fb376156a Add multiple selected cell edge results 2022-09-15 08:19:41 +02:00
Magne Sjaastad 8f9fbab7e0 #9231 Contour Map: Fix crash when adding formations after a view is created 2022-09-15 08:19:41 +02:00
Magne Sjaastad b7e2e5e3c2 Regression Test: Do not access RimWellLogPlotCollection directly from desctructors
Regression tests are calling RimProject::reset(), and this function deletes the RimProject object.
2022-09-15 08:19:41 +02:00
Magne Sjaastad 6ac6b5a795 Depth Axis : Improve visibility logic 2022-09-15 08:19:41 +02:00
Magne Sjaastad 7e31e6e55a Regression Test: Add timeout to command object processing
When Octave scripts fails, the application ends up in a deadlock. Add timing to be able to process next regression tests.
2022-09-15 08:19:41 +02:00
Magne Sjaastad ffc14e2b2e RFT: Add connection data as segment results 2022-09-15 08:19:41 +02:00
Magne Sjaastad 375caf2f2d Add Export Property to right-click menu in 3D view 2022-09-15 08:19:41 +02:00
Magne Sjaastad b910275886 Show log message when data from WSEGLINK is imported 2022-09-15 08:19:41 +02:00
Magne Sjaastad 947de3ffb1 Simplify access to RimMainPlotCollection
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
2022-09-15 08:19:41 +02:00
Magne Sjaastad 9f9e29ff8c Remove control flag in setCollapsedByDefault
* Remove control flag in setCollapsedByDefault
* Set regions/annotations collapsed by default
2022-09-15 08:19:41 +02:00
Magne Sjaastad 07f0362298 Add sample count to grid property statistics 2022-09-15 08:19:41 +02:00
Magne Sjaastad 0b74be6c5e Preferences : Set initial selection when selecting plot templates 2022-09-15 08:19:41 +02:00
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 c90bb020af Set version to 2022.06.1 2022-09-15 08:18:34 +02:00
Magne Sjaastad 2973127363 Minor issues when preparing user course
* Grid Cross Plot: Always show grouping icons with color
* Grid Cross Plot: Make sure the info box text content is updated
* Bump version to RC_05
2022-09-14 16:10:52 +02:00
Magne Sjaastad 7b81490f90 #9295 Make sure grid cross plot is updated when grouping objects are toggled 2022-09-14 08:47:52 +02:00
Magne Sjaastad 3b5b661949 Add license notice for Qt-Advanced-Docking-System 2022-09-14 08:16:02 +02:00
Magne Sjaastad 976168562b #9292 Update project tree when new fracture is added 2022-09-13 18:04:59 +02:00
Magne Sjaastad 42565119eb Bump version to RC_04 2022-09-13 17:46:53 +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 58852781c3 Add missing update of curve legend text 2022-09-13 15:20:48 +02:00
Magne Sjaastad 3cdc69d1a7 Fix typo for StimPlanFileName keyword 2022-09-12 08:58:09 +02:00
Magne Sjaastad b544c0f48f Bump version info to RC03 2022-09-12 07:47:14 +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 f3a3e04e1f Fix missing update of export well name 2022-09-08 16:14:05 +02:00
Magne Sjaastad 5dc020ccb7 Unit test to export xyz coordinates for N timesteps for a thermal fracture 2022-09-07 09:57:20 +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
Magne Sjaastad 983fce3d98 Set version to RC_01 2022-09-05 14:16:38 +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 e97a476d85 Add framework support for editor auto values
Add support for a field to be linked to a value updated by code outside the object itself. Mark the linked field by using a background color and icons for linked/unlinked state.
The auto value states is set as attributes in the project xml file. 
Add reference implementation in cafTestApplication, see Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp

* Tree View Editor: Avoid sending notification if selection is unchanged
* Use std++17 in test solution
* Move icons to icon factory
* add support for creating QIcon from SVG text string
2022-09-02 13:20:52 +02:00
Magne Sjaastad 30c3fe3a5c Scale length threshold based on average DZ 2022-09-02 10:27:11 +02:00
Magne Sjaastad 1a9fb26153 Improve error message when grid dimensions are not matching 2022-09-01 21:35:07 +02:00
Magne Sjaastad 0a3b42fa80 #9260 Guard pointer access and update tree view when plot is created
Guard access to plot curve
Update tree view when object is created
Use zoomAll to update x value range
2022-09-01 10:55:44 +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
Magne Sjaastad 9bf4365fb2 #9251 Cell Edge : Add more tests on valid cell edge result 2022-08-31 10:05:23 +02:00
Magne Sjaastad 3ff5d238b1 Remove unused members and remove includes 2022-08-25 13:56:53 +02:00
Magne Sjaastad c31bc3e50e Add multiple selected cell edge results 2022-08-25 12:51:56 +02:00
Magne Sjaastad d28fcbfe21 #9231 Contour Map: Fix crash when adding formations after a view is created 2022-08-24 01:17:13 -07:00
Magne Sjaastad c2ab9e6fe0 Regression Test: Do not access RimWellLogPlotCollection directly from desctructors
Regression tests are calling RimProject::reset(), and this function deletes the RimProject object.
2022-08-24 08:58:03 +02:00
Magne Sjaastad 4d244bc848 Depth Axis : Improve visibility logic 2022-08-24 08:55:40 +02:00
Magne Sjaastad 000605bd99 Regression Test: Add timeout to command object processing
When Octave scripts fails, the application ends up in a deadlock. Add timing to be able to process next regression tests.
2022-08-23 05:06:52 -07:00
Magne Sjaastad b6973a3644 RFT: Add connection data as segment results 2022-08-22 04:51:46 -07:00
Magne Sjaastad 418c4df7b3 Add Export Property to right-click menu in 3D view 2022-08-22 04:51:46 -07:00