Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad bfae28b4b4 Avoid crash when exit from python is called when UI is running 2022-12-14 08:57:08 +01:00
Magne Sjaastad 595806079a Fix typo 2022-12-11 10:15:26 +01:00
Magne Sjaastad cfa9d07d8e #9563 Reorganize how and when objects are deleted when shutting down GRPC 2022-12-11 10:15:26 +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
Magne Sjaastad 1eb44e519e RFT plot: Fix stepping on well
* Rft: Store segment and connection count per well
* Update the segment branch index combo box when well changes
* Bump version number
2022-12-05 18:36:21 +01:00
Magne Sjaastad d3a5355141 #9534 Make sure indexIJK values are computed only once (#9537) 2022-12-02 14:36:32 +01:00
Magne Sjaastad e8f5806e55 Guard use of nullpointer 2022-12-02 07:51:43 +01:00
Magne Sjaastad 2ee228c120 Add more error checking when opening RFT files 2022-12-02 07:51:43 +01:00
Magne Sjaastad 14db528c98 Append property filter to field instead of returned array 2022-11-29 13:46:29 +01:00
Magne Sjaastad 9995af07a1 Support copy of property filters to linked views
* Copy and overwrite property filters when linked
When linking property filters between different cases, the property filter settings are copied and the property filter is evaluated per case. The previous implementation worked only for a single case.

* Move field to private
2022-11-28 14:34:26 +01:00
Magne Sjaastad 86af2b4dfc Export Sector Model: Add file path
* Export Sector Model: Add file path
* Avoid abort if a file cannot be opened
* Add missing return
2022-11-28 11:57:00 +01:00
Magne Sjaastad 2ba3191539 Fix typo 2022-11-28 11:25:44 +01:00
Magne Sjaastad dfa1bc2cd0 Some fixes for new gcc/clang
Minor fixes for newer gcc/clang. These issues were seen when using ubuntu-latest (Ubuntu 22.04) on Github Actions.
2022-11-25 08:59:10 +01:00
Magne Sjaastad 51443d7aa3 #9383 Not able to press resample checkbox
For some unknown reason, the checkbox in a group was not responding to mouse click. Keyboard interaction was possible. Remove the group and reorganize the UI.
2022-11-25 07:40:27 +01:00
Magne Sjaastad 6c7e1423a2 #9489 Make sure well measurements is visible in geo mech view 2022-11-25 07:40:27 +01:00
Magne Sjaastad 82968ca1a9 Support linking of 2D intersection views
* Major refactor from RimGridView to Rim3dView
* Move view linker/controller functions to Rim3dView
* Add bitmask to define the content of a 3D view
* Link views based on matching content
* Enable bit mask operators at global scope
* Make it possible to use 2d intersection views as comparison views
* Fix crash when a view used as comparison view is deleted
* Move unlinking to Rim3dView

* Add options to snapshot only 3D views/plots as part of regression testing
* WBS plot: Improve default name, hide axis for some tracks
2022-11-24 10:46:54 +01:00
Magne Sjaastad a74b168e03 Improve property linking
* Allow linking of property filters across cases with same IJK size
* Recalculate when grid is replaced
Find dependencies between calculations and order them accordingly
2022-11-22 10:22:17 +01:00
Magne Sjaastad 6a859e0860 Fix update issues related to fracture calculations
* Make sure property filter is updated when completion type is cleared
* Clear geometry cache in views to make sure geometry is recreated
* Calculate required input parameters to completion type calculations
* Recompute values when depth changes
2022-11-18 12:50:04 +01:00
Magne Sjaastad e7c864c6d8 Improve grid cell calculator
* Use full name for grid case view
* FIx signed / unsigned issue
* Support drag/drop of file names into Main Window
* Add function to check if two grid cases are of equal size
* Result Info: Show cell result text for all linked views
* Improve how to specify cells to be included in calculation

- move view filter to calculation
- improve how to assign values to non-visible cells
- avoid computation between grids of different size

Closes #9482
2022-11-17 15:51:01 +01:00
Magne Sjaastad 0e5d121993 Forward wellLogTrack::zoomAll to depth track plot 2022-11-16 07:05:52 +01:00
Magne Sjaastad ba8587d6ae Fix depth range for tracks with no data, bump version 2022-11-14 19:11:11 +01:00
Magne Sjaastad 3b67719972 Fix tiling issues for plot window
* Fix tiling for plot windows

Remove activation history restore related to a bug that was fixed in 5.12
https://bugreports.qt.io/browse/QTBUG-51761
2022-11-14 18:50:07 +01:00
Magne Sjaastad 647e248e04 Bump version number 2022-11-14 10:56:17 +01:00
Magne Sjaastad d36ab7e2d7 Fix RFT segment plot issues
* RFT curves: Disable auto color by default
* RFT curves: Fix wiggling legend caused by too many plot updates
* RFT Curves: Search multiple layers for CONFAC data
* Move plot orientation to Depth Axis, Advanced group
2022-11-14 10:55:08 +01:00
Magne Sjaastad 46b364d0b0 RFT file improvements
* Guard null pointer access
* Delay open of RFT files until data is requested
When opening ensemble summary cases, the opening of RFT files can take some time. Avoid this by delaying the file open operation.

* Fix infinite update loop for RFT plots
* Avoid moving the tracker line when clicking in the plot
2022-11-11 10:07:27 +01:00
Magne Sjaastad daa8d7305b #9455 libecl: Fix summary restart absolute path issues
Test for absolute path before other logic during extraction of summary restart file path.
2022-11-10 11:08:30 +01:00
Magne Sjaastad 4fea00afbf Fix some signed/unsigned compare issues 2022-11-10 08:37:20 +01:00
Magne Sjaastad 3a99c039be Result Info: Add support for multiple properties when clicking on a cell
* Result Info: Use monospace font
* #9447 Result Info: Add support for multiple properties when clicking on a cell
* Improve alignment in generated text
2022-11-10 07:21:41 +01:00
Magne Sjaastad b1b0fd9d35 libecl: Fix for more data in summary restart path
Allocate 17 words of 8 characters each, add 1 for zero terminated string.
2022-11-09 17:11:21 +01:00
Magne Sjaastad f44eb6324e Bump to version 2022.06.2-dev.03 2022-11-08 09:17:56 +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 8dfaae512f Do not block sub window activation by default
If blocking is set on by default, clicking on MDI windows does not select the corresponding item in project tree.
2022-11-04 15:53:54 +01:00
Magne Sjaastad d4086ee371 Allow linking of contour map views
* Place copy of contour map in correct collection
* Allow linking of contour maps
* Improve handling of contour views and 3D views
* Guard nullptr
* Guard assert seen on Linux
* Zoom all on contour map when unlinked to reset zoom
If a contour map is linked to a 3D view, the view can get distorted. Call ZoomAll to reset to sensible defaults.

* Remove default rainbow legend
2022-11-04 15:48:25 +01:00
Magne Sjaastad f77b3673b0 Well path import improvements
* #9432 Clean file cache when all wells are deleted
* Key Events: Avoid eating Delete key events 
Do not use a key short cut on menu actions that are always enabled. Will eat events from other actions.

* #9433 Well Path Import: Keep prefix when trying to match existing well path
2022-11-04 10:11:08 +01:00
Magne Sjaastad 68c72c85cf Curve legend: Use widget size to determine the column count 2022-11-02 18:06:30 +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 a577545212 Allow well target list to consume available space 2022-10-31 18:52:45 +01:00
Magne Sjaastad 4d5ceb0441 Skip duplicate well target locations to avoid numerical issues in curve generator 2022-10-31 18:52:45 +01:00
Magne Sjaastad bbd0c5c67e #4890 Window tiling 2022-10-31 13:26:26 +01:00
Magne Sjaastad 9b61ebcac2 Maintenance october
* Hide contour plot collection when empty
* Update the project tree when a linked view is removed
* Make sure the window title is in sync with link state
* Do not use link state to find window tile ordering
2022-10-31 10:41:50 +01:00
Magne Sjaastad ed8fa08b13 Bump version number after RFT project 2022-10-28 15:42:40 +02:00
Magne Sjaastad 0d3347d4d7 RFT plot improvements
* Make curve selection optional to avoid flickering in depth plots
* Replace undefined with zero for some curves
* Add spacing factor for min and max depth
2022-10-28 15:37:45 +02:00
Magne Sjaastad 4c3e1c3fe8 RFT Curves: Add more segment curves
- add CONGRAT
- add pressure track
- add CONFAC
- fix some plot layout issues
- Fix bug for first segment MD location
- Add default scale factor 1e-3 for gas curves
- Avoid inf values in some curves, seen in PRESSURE and CONFAC
- Use assignment in statements instead of std::get
2022-10-27 12:43:46 +02:00
Magne Sjaastad f6bde92d81 Remove unused space caused by bottom margin 2022-10-27 12:43:46 +02:00
Magne Sjaastad a33f651bcc Depth Track Plots: Optionally show a line in all tracks
* #9378 Depth Track Plots: Optionally show a line in all tracks
* Use RiaDefines::Orientation
2022-10-24 16:24:51 +02:00
Magne Sjaastad fa83d17818 GHA: Fix timestamp 2022-10-24 10:42:57 +02:00
Magne Sjaastad 0fa001fc70 Opm Parser: Include PATHS when importing WSEGLINK
* Opm Parser: Include PATHS when importing WSEGLINK
Add PATHS to supported keywords to be able to use include files with alias in file path.
* Move opm-parser-tests into OPM solution folder
2022-10-21 07:47:27 +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 0b7700024f GHA: Use GITHUB_OUTPUT 2022-10-19 14:30:47 +02:00
Magne Sjaastad a52c8c9342 Install: Avoid installing QtAdvancedDocking as part of Resinsight install 2022-10-19 11:26:14 +02:00
Magne Sjaastad c46bd16064 Fix error related to static_cast 2022-10-18 10:13:02 +02:00
Magne Sjaastad 760bfaeec2 #9369 Curve Probing: Show data from other curves in tooltip text
Optionally show data from other curves in tooltip text when hoovering over a curve point
2022-10-18 07:22:56 +02:00
Magne Sjaastad 7c2941aedd #9366 RFT: Show all results with supported item count 2022-10-18 07:22:56 +02:00
Magne Sjaastad c8d6e29447 #9364 Well Log Plot and Track: Activate and improve Show Plot Data 2022-10-18 07:22:56 +02:00
Magne Sjaastad 905b2abe53 Update clang-tidy.yml 2022-10-14 08:50:00 +02:00
Magne Sjaastad 2cd7576413 Update files 2022-10-13 20:09:08 +02:00
Magne Sjaastad 1d23e8f5c9 Show packer in RFT topology track
* Show packers in topology track
* Support optional display of property axis values
* Add legend item clickable option to RimPlotWindow
2022-10-13 13:03:55 +02:00
Magne Sjaastad 8c03fb1b36 Merge branch 'main' into dev 2022-10-13 10:56:29 +02:00
Magne Sjaastad 7591b480a3 #9357 StimPlanModelPlot: Plot visibility and logic updates
- update project tree after plot is generated
- set default text tracker orientation to vertical
- call base class fieldChangedByUi to handle hiding of Stimplan plot
2022-10-13 09:03:56 +02:00
Magne Sjaastad e7a486c802 Improve curve naming for plot and use in RFT segment plots
* Improve plot naming for depth track plots
* Move template text replace to string tools
* More data available for object template text
* Set plot visible and define default object name template text
2022-10-12 12:41:08 +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 05d7eac52c Add Multi Phase Rft Segment Plot action 2022-10-10 15:58:05 +02:00
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 1f1cf69530 Bump version to 2022.6.2 2022-10-05 14:26:39 +02:00
Magne Sjaastad b93cc21a84 Bump version 2022-10-05 12:28:03 +02:00
Magne Sjaastad 26fdf6af21 Avoid crash when adding a grid case multiple times 2022-10-05 12:28:03 +02:00
Magne Sjaastad 4a673b7cd5 Avoid crash when adding a grid case multiple times 2022-10-04 18:43:36 +02:00
Magne Sjaastad cce0693b68 Bump version to 2022.06.2-RC_02 2022-09-29 08:50:02 +02:00
Magne Sjaastad 809cb84d5e Add requirements.txt with version tagging 2022-09-27 11:56:30 +02:00
Magne Sjaastad d326149652 Update ResInsightWithCache.yml
Avoid setup-python called as part of install-qt-action
2022-09-27 11:56:30 +02:00
Magne Sjaastad 967b1b4f94 Bump version number 2022-09-27 11:56:30 +02:00
Magne Sjaastad dba447e3b8 #9312 Return line edit instead of placeholder widget if auto value is not supported 2022-09-27 11:56:30 +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