Commit Graph

474 Commits

Author SHA1 Message Date
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
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
Kristian Bendiksen
959c9d48fa #10649 ApplicationLibCode: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +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
146412c600 Add support for summary cross plot curves in summary plots 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
magnesj
0cd6cdd67e Fixes by clang-format 2023-09-20 09:58:48 +02:00
Magne Sjaastad
806f367566 Rename to SummaryCategory 2023-09-20 09:58:48 +02:00
Kristian Bendiksen
1899184a41 Janitor: Remove deprecated method. 2023-09-11 17:39:38 +02:00
jonjenssen
a2632982b5 Code updates 2023-09-06 13:51:59 +02:00
Jon Jenssen
3817cea3cf Fix grid generation.
Add model thickness parameter.
Add support for reloading INP files from recent files
Add working directory field to fault reactivation model and put INP export there.
2023-09-06 13:51:59 +02:00
jonjenssen
32326bfa9b Add fault reactivation modeling 2023-09-06 13:51:59 +02:00
Kristian Bendiksen
14c37c4b2c RiaStdStringTools: Add method for removing white space 2023-09-06 13:51:59 +02:00
Magne Sjaastad
7a782cec66
RFT ensemble refactoring
* Compute average MD for intersections with a cell
* Create extractor for simulation well
* Remove rftReader from RifDataSourceForRftPlt
* Add function compute measured depth for RFT cells based on well path geometry
* Move statistics reader to well ensemble curve set
* Make sure both TVD and MD are cached if possible
* Add selection of grid case to use for estimation of measured depth (MD)
Add "Grid Model For MD" where the user can select a grid model. This grid model is propagated to a hidden field in EnsembleCurveSet. The grid model is then applied to RifReaderEnsembleStatisticsRft owned by EnsembleCurveSet
2023-09-04 10:08:30 +02:00
Magne Sjaastad
81809efee9 Add support for grid import using opm-common
Add support for import of geometry and results for main grid. Currently no support for LGR.

Add selection in Preferences to either use libecl or opm-common for grid import.

If RESINSIGHT_DEVEL flag is set, display reader in an Eclipse case to make it possible to compare Eclipse and opm-common in same project.

Add more includes to custom-opm-common to be able to support this functionality. opm-common is unchanged.
2023-08-28 13:46:50 +02:00
Magne Sjaastad
3800246b79
Performance: Slow performance for some plot and curve operations
* Performance: Cache registry value
* Performance: Avoid recursive update
Early return if values are identical
updateConnectedEditors is handled by setValueFromUiEditor
Avoid fieldChanged in analyzePlotsAndAdjustAppearanceSettings
2023-08-25 10:39:19 +02:00
Magne Sjaastad
96b3bef878
Reduce memory use for summary address object
* Use one common variable for object name, use three ints
* Move enums to separate file
* Refactor use of enums
* Move implementation to cpp
* Refactor includes
2023-08-21 07:12:08 +02:00
Magne Sjaastad
0bada502fb 9498 Add parsing of network name
Use merged commit
2023-08-14 11:20:01 +02:00
Magne Sjaastad
aafcd2f9b6 Fix console application issue 2023-08-11 21:30:27 +02:00
Magne Sjaastad
3dcb81ebfb Do not create default plot if plot window is hidden
When working in the 3D window, creating a MDI window in a hidden plot window causes flickering.
2023-08-11 13:54:03 +02:00
Magne Sjaastad
d36bf92b55
Adjust value ranges using floor and ceil
* Use regression curve icon in grid cross plot
* #10481 Use ceil and floor when adjusting precision for ranges
2023-08-09 07:51:17 +02:00
jonjenssen
2172199999
Add seismic 3d view (#10472)
* Show seismic, surfaces, annotations and wellpaths in new view not requiring a grid loaded first.
2023-08-07 16:35:59 +02:00
Kristian Bendiksen
5bf2c2a89d #10367 Janitor: Remove unneccessary 'this' pointers 2023-08-07 13:38:27 +02:00
Magne Sjaastad
aaecd846fd
Improve plot titles and layout adjustments 2023-07-06 08:40:09 +02:00
Kristian Bendiksen
fdf4309d82 Grid Cross Plot: Add regression curves. 2023-06-28 21:46:11 +02:00
Magne Sjaastad
59ca0b943c
Add readability-simplify-boolean-expr
* Add readability-simplify-boolean-expr
* Fixes based on review
2023-06-26 13:12:41 +02:00
Magne Sjaastad
fc51bf84a5 Make sure one case is loaded when both SMSPEC and ESMRY is present in same folder 2023-06-02 07:52:35 +02:00
Kristian Bendiksen
06d107c4e6 #10320 Ensemble Summary Import: wrong realization name when importing single realization 2023-06-01 08:49:26 +02:00
Magne Sjaastad
a9f412b1f6
Maintenance fixes
* Remove light mode from theme selection
The light mode is not working well, and was intended to be used when exporting to pdf from dark mode.

* Allow direct edit of summary case name
The name for a summary case can be automatically created. If the user starts to edit the name manually, set the name option to Custom. Make the descriptionField available as not read-only, then it is possible to edit the name directly in the project tree using F2 or double-click.

* Allow drag of ensembles
* Add support for drag/drop of well segments
* Add support for well segment number stepping in toolbar
2023-05-30 15:56:19 +02:00
Magne Sjaastad
b7420ebc70
Use rock type colors when "Facies" is imported 2023-05-26 11:26:22 +02:00
Magne Sjaastad
40080a99de
9978 Improve UI for long drop-down lists, use tree selection more
* Improve tree selection editor
- always call defineEditorAttributes
- use heightHint in editor attributes 
- use tree selection editor as default editor for std::vector

* Use tree selection editor instead of list selection editor
List selection editor must be used when editing std::vector<cvf::vec3d> and similar. Replace other use of list selection editor with tree selection editor.

* Set checked state based on text string for integer only models
For models with only integer values, use text string to define the items to be selected. The full list will always be visible, and the checked state will be updated when editing the filter text.

Example: "1, 5-7" will set items 1, 5, 6, 7 checked and all other items unchecked

* Minor fixes
- Set placeholder text after content is added (to ensure correct data type)
- Fix check of integers. `canConvert<int>()`returns true for both QString and int. Thus convert to string and then check for int conversion.

* Activate filtering when unchecking all items in list with only integers
- Reactivate filtering when uncheck of all items for a list with only integer values (to keep consistency between filter and list)
- Update function name for clarity

---------

Co-authored-by: Jørgen Herje <jorgen.herje@ceetronsolutions.com>
2023-05-22 15:44:37 +02:00
Magne Sjaastad
54f0a832de
Janitor: Remove unused includes 2023-05-15 15:43:01 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
37e29a0f68 Display all data if multiple fractures crosses a cell
- add the operator<=> for QString
- add operator<=> to fracture report item
2023-05-12 16:23:01 +02:00
jonjenssen
1d43e1a948
Specify part id for well extraction from geomech data (#10240)
* Specify part id for well extraction from geomech data
* Make sure we clear curve data if there isn't any valid input data
2023-05-12 08:13:56 +02:00
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00
Magne Sjaastad
f70d2c4949
Add result type and create and use custom legend if possible
* Update submodule
* Use postfix functions and add custom color legend

* Add type to RigEclipseResultAddress
Read types from ROFF and create default legend based on type or custom created legend.

* Use caseId to connect legend configuration to result in a case
2023-05-09 11:41:56 +02:00
Kristian Bendiksen
c8b402651d Add "Decline Curves" functionality.
Adapted from formulas here:
https://petrowiki.spe.org/Production_forecasting_decline_curve_analysis
2023-05-05 15:30:48 +02:00
Magne Sjaastad
0907f57de9
Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00
Kristian Bendiksen
26f13012b4 #10128 Reveal Summary: add ensemble import. 2023-04-25 09:42:18 +02:00
Kristian Bendiksen
9949e84420 #10129 StimPlan Summary Ensemble: Simplify paths 2023-04-24 14:37:22 +02:00
Jørgen Herje
0d8aee8995
GRDECL: Import multiple grid files from dialog (#10142)
Add import of N .GRDECL grid files - as done for roff-files
2023-04-21 10:34:29 +02:00
Kristian Bendiksen
ff209ad7c2
Refactor ensemble import dialog
* #9773 Refactor ensemble import dialog.
* #9773 Add support for ensemble import of StimPlan/Reveal summary data.
* #9773 Add method for finding min and max time steps.
* #9773 Add option for resampling to hour intervals.
* #9773 Add option for resampling to minute intervals.
* #9773 Ensemble statistics: determine sub-sampling period dynamically.
* Use RiaWeightedMeanCalculator for curve resampling.
* Add HOUR and MINUTE to date time app enum.
* #9773 Generate better ensembles for StimPlan summaries.
* #9773 Fix parameters.txt lookup for StimPlan summaries
* Refactor: Improve interface of RicImportSummaryCasesFreature::createSummaryCasesFromFiles

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-04-20 10:16:43 +02:00
Jørgen Herje
67264da0a8
Roff: support import of N grid files and 1 grid file with N property files
* Add utility to check is roff file contains grid data

* Import of multiple grid files or 1 grid file with N property files

* Fix build errors for using RifRoffFileTools from Commands
- Move template implementation to cpp-file
- Add roffcpp to link libraries in CMake for Commands

* Improve/fix import of single grid file with N property files

* Fix missing add of roff case Id
2023-04-19 15:52:57 +02:00
Kristian Bendiksen
eb88cca7e8 #9858 Compute distance to closest fault for each cell (FAULTDIST). 2023-04-19 15:00:56 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +02:00
Magne Sjaastad
6f6dc80bc6
Added more clang-tidy checks
Improved GitHub Action to run clang-format as part of clang-tidy

* Simplify clang-tidy workflow
* Added modernize-use-using, modernize-redundant-void-arg, readability-static-accessed-through-instance
* Add nolint for libecl typedefs
2023-04-14 14:07:45 +02:00
jonjenssen
2e955f2875
Seismic support improvments (#10086)
Adds support for creating seismic sections from well paths and existing intersections.
Adds more stability and user improvements
2023-04-13 13:18:34 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
Jørgen Herje
36e01523cb
Summary table (#9997)
Summary Table for showing summary vectors in table format
- Resampling on date resolution
- Active for group, region and well
- Right click menu option from Summary case tree
2023-03-23 14:10:30 +01:00
Jørgen Herje
535811cc4f
Producer/Injector Connectivity Table (#9928)
- Crated new RimMatrixPlotWidget to show table data
- Create RimWellConnectivityTable for showing Producer/Injector connectivity table data
- Rename RimWellAllocationOverTimeCollection to RigWellAllocationOverTime for well allocation over time data storage
- Created heatmap color palette
- Move utils from RimWellAllocationOverTimePlot to RiaQDateTimeTools
- Create RimFlowDiagnosticsTools for producer/injector well utility functions


---------

Co-authored-by: jorgenherje <jorgenherje@users.noreply.github.com>
2023-03-21 08:32:38 +01:00
Kristian Bendiksen
245d483036
Summary observed data
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
2023-03-15 13:39:57 +01:00
Magne Sjaastad
27959b9d13 Reintroduce RimGridSummaryCase to be able to read existing project files 2023-03-15 06:49:14 +01:00
Magne Sjaastad
40c329f3ac Fix selection of multiple pressure/depth sources in plot
Use spaceship operator to fix issue for multiple pressure/depth curves

It was not possible to show two pressure/drop curves at the same time. This was caused by inconsistent implementation of operator< and operator==. Implement operator <=> to simplify the code.
2023-03-13 16:09:01 +01:00
jonjenssen
e70cc85db6 Add a few more tiny scales. Allow user to input doubles in preferences. 2023-03-10 19:43:37 +01:00
Magne Sjaastad
527743a845
Adjustments for release
* Make sure text for multiple wells in same grid cell is displayed correctly
* Improve selection of result in Advanced Snapshot Export
* Restore the main window that was on top when project was saved
* Trim string to make sure '/' is exported with no space in front
* #9872 RFT-plot: Make colors stable for curves in RFT plots
* Set version to RC_02
2023-03-09 08:54:28 +01:00
Magne Sjaastad
51331facac
Improve how wells are connected during import
When importing new wells, consider all wells when connecting multi segment wells
Make sure that import of individual well paths will give the same ordering as importing all wells in a single operation.
2023-03-07 12:51:14 +01:00
Magne Sjaastad
8f786fed5d #9914 Fix import of single case already present in ensemble 2023-03-06 10:45:49 +01:00
Magne Sjaastad
9bc3659584
Remove special summary case connected to a grid model
* Remove use of RimGridSummaryCase
* Remove unused summary plot filter text
* Delete unused files
2023-03-03 15:28:34 +01:00
Magne Sjaastad
f8c5cf389f
clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Magne Sjaastad
8768e186d8
#9671 summary calculations for summary items
* Summary Calculation: use shorter name in title
* Sort summary addresses to group calculated results last.
* Summary Calculation: add option to distribute calculation to other items.
* Add support for summary calculation for RimGridSummaryCase.
* Use short name for calculations in plot titles.
* Update ensembles in Data Sources when calculation is added.
* Summary Calculation: allow drag-and-drop of ensembles
* Summary Plot: fix axis range aggregation for calculated ensemble addresses.

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2023-02-26 08:08:06 +01:00
Kristian Bendiksen
69a668df50 Simplify RifSummaryReaderInterface timeSteps. 2023-02-24 10:03:16 +01:00
Magne Sjaastad
f0e78f32e8
Minor issues related to release
* Add shortcut for Plot Editor, and modify how command features are triggered
Use Ctrl-E to launch the Plot Editor.

* Add optional use of NOECHO and ECHO keywords in GRDECL files
* Add ECHO keywords to sector model export
* Add Help button to Preferences
2023-02-20 08:18:08 +01:00
Magne Sjaastad
8028444018
GitHub Actions: Add apt mirror to make package download more robust
- Download of Ubuntu packages from Azure is unstable. Add mirror sites to improve reliability.
- Improve use of clang-format and include source code changes
2023-02-07 07:22:57 +01:00
jonjenssen
527be5f644 Add scaling factor 50 2023-02-06 16:50:37 +01:00
Magne Sjaastad
349c88bfeb Use ads forward declares in RiuMainWindowBase 2023-02-02 15:20:34 +01:00
Magne Sjaastad
62ce2b18e0
RFT improvements
* Avoid accessing nullptr
* remove unused function
* Allow RFT data from single summary case to be used in RFT plots
* #9736 Support horizontal plotting of LAS curves
2023-01-27 10:29:11 +01:00
jonjenssen
95f3490acd Remove unnecessary window layout update 2023-01-23 16:12:18 +01:00
Jørgen Herje
50b1820b60
Create depth adjusted LAS files
* Add support for creating depth adjustment LAS files
* Add RiaDefine for LAS file depth property names
* Remove incorrect check in K-index Calculator

Co-authored-by: jorgenherje <jorgenherje@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-01-23 12:46:54 +01:00
Kristian Bendiksen
061e0d4688 RiaDateStringParser: add option for day-first parsing of ambiguous date strings. 2023-01-19 09:00:05 +01:00
Magne Sjaastad
abc9e82ff5 System: Enable and use c++20
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
2023-01-19 08:33:02 +01:00
Magne Sjaastad
28b3f16db1 #9614 Check last write time for ESMRY files and SMSPEC files 2023-01-05 09:29:19 +01:00
Magne Sjaastad
09e05e9996
Fix summary issues
* Add missing time conversion for month
* #9606: FIx wrong usage of function when accessing data from summary file
The result values are aggregated into the destination vector in RimSummaryCaseCollection::computeMinMax(), so make sure the vector is recreated per case.
* #9602 : Make sure the plot is updated correctly for "Time since simulation start"
* Move roundToNumSignificantDigits() to RiaNumericalTools
* Make sure the time axis is consistent when individual time range differs
2023-01-02 10:22:44 +01:00
Magne Sjaastad
984557a46a RegressionTest: Match on full name 2022-12-29 08:45:56 +01:00
Kristian Bendiksen
8b51160ac4
Roff support with submodule
* Roff: Add initial roff support (with roffcpp as submodule).
* Roff: Create viewer when importing roff files.
* Roff: add timing for roff import.
* Roff: precompute active cell indexes.
* Roff: parallelize using OpenMP.
* Roff: Handle exceptions when importing.
* Roff: improvements from review.
* Invert ordering

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-12-19 15:28:26 +01:00
Magne Sjaastad
38bfa9ef1f
#9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Magne Sjaastad
a423ecf95f
Several OpenMP improvements
Several optimizations based on profiling of 20M grid model. These fixes will improve the largest performance issues, but there are still more operations that can be refactored.

* OpenMP: Use in fault geometry generator
* OpenMP: Use when computing statistics for result values
* OpenMP: Use multithreading on fault detection
* Add RiaOpenMPTools
* VizFwk: Use openMP for texture generation
2022-12-19 13:49:03 +01:00
Magne Sjaastad
e4c0b45b15 Improve the help for a calculation
Add help text and plus AND example


Improve help pages for calculator
2022-12-14 08:57:08 +01:00
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
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
Jørgen Herje
278828b08f
Add reference well to well log extraction curve eclipse case (#9516) 2022-11-30 23:13:39 +01:00
Kristian Bendiksen
7065d5eaf4 #7839 Python: fix crash when stopping process 2022-11-28 14:14: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
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
Jon Jenssen
10d5246644 Remove obsolete fault reactivation assessment feature 2022-11-18 16:13:26 +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
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
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
a577545212 Allow well target list to consume available space 2022-10-31 18:52:45 +01:00
Magne Sjaastad
bbd0c5c67e
#4890 Window tiling 2022-10-31 13:26:26 +01: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
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
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
3f9f337e64 #9347 Well Log Plot : Add possibility to show depth axis in all tracks 2022-10-10 15:58:05 +02:00
Magne Sjaastad
89d7dd4561 Show branch ID range in addition to branch index 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
Kristian Bendiksen
d0e9c454d3 #9325 Thermal Fracture: rename injectivity decline to injectivity factor. 2022-10-03 13:19:19 +02:00
Kristian Bendiksen
3dad3c65cb Thermal Fracture: Improve handling of result names and units. 2022-10-03 08:33:55 +02:00
Kristian Bendiksen
c2b5ab8d2c
#9307 Python: avoid assigning same port number to multiple grpc sessions
* Python: avoid assigning same port number to multiple grpc sessions
* Add retry count when checking for port number file
* Use grpc to find and use port number
* Add test used to start several instances of resinsight at the same time
Testing up to 50 instances works well

* Python: allow launch_port == 0 to assign port by GRPC in Instance.launch().
Also allow longer wait before failing the port number file reading:
it can take some time to launch when launching lots of instances at
the same time.
2022-09-26 14:19:21 +02:00
jonjenssen
17a391cdba Fix crash if only plot window is open and you change i.e. the font size in preferences 2022-09-15 17:54:26 +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
f3a3e04e1f
Fix missing update of export well name 2022-09-08 16:14:05 +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
Jon Jenssen
8c835b5568 Fix tile windows command, and make sure logger is reconnected to 3d view if it is closed and reopened 2022-08-23 21:31:16 -07: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
4cd38d7daf
Simplify access to RimMainPlotCollection
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
2022-08-19 14:30:25 +02:00
Magne Sjaastad
c8f642d83a
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-08-18 07:12:23 +02:00
Magne Sjaastad
1f2e9babe6
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-08-16 12:40:25 +02:00
Magne Sjaastad
016216bdb9
Show well completion annotations in horizontal plots (#9193) 2022-08-15 14:55:17 +00:00
Jon Jenssen
013b735a0d Add default dock window layouts and support hiding dock widgets before running tests. 2022-08-11 12:13:25 +02:00
jonjenssen
a3c561b7e5
Get rid of "ghost" windows on startup. (#9171)
* Get rid of "ghost" windows on startup.
Removes hide all docking windows feature for now, to be replaced by a new implementation. Will probably break some tests due to this.
2022-08-09 16:40:50 +02:00
Kristian Bendiksen
a87e05035d #9102 Thermal Fracture: handle field units. 2022-08-05 13:45:31 +02:00
Magne Sjaastad
f102a8b249
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-08-05 13:14:58 +02:00
jonjenssen
82f6dc74c1
Only create and show plot window if we import a summary file. (#9155)
* Only create and show plot window if we import a summary file. If window is already there, no change.
2022-08-04 07:14:12 +02:00
Magne Sjaastad
76edb49e89 #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-07-08 17:54:37 +02:00
jonjenssen
d5269abc6e
New dockingsystem (#9116)
* Use Qt Advanced Docking as forked submodule
* Use new docking system in code
2022-07-07 12:03:02 +02:00
jonjenssen
6105813d28
Allow using scale values less than 1.0 (#9108)
* Change view scale into list of predefined double values in both toolbar and property editor. Add values less than 1.0
2022-07-04 15:48:52 +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
e5cf5f4cf3 Improve history curve color and symbols 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
d854a3d3e7
Merge pull request #9063 from OPM/more-rft-fixes-01
More RFT fixes
2022-06-17 17:24:58 +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
Kristian Bendiksen
5ea621d36f #9033 Grid Property Calculator: fix incorrect filtering when reloading projects
Fixes #9033.
2022-06-10 13:55:51 +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
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
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
jonjenssen
fd7821a10b
Add preferences setting for maximum search depth in script folders. Clean up context menu a bit. (#9012) 2022-06-02 06:53:05 +02:00
Magne Sjaastad
c7cf6d19f8 #8995 Drag drop summary vector : Optionally include history vector 2022-06-01 12:25:36 +02:00
jonjenssen
9f4d242a5d
Plot Template updates (#9002)
* Ensemble plot templates now have .erpt extension and new icon
* Default plot templates are given a checkmark overlay on the icon
* Context menu has been cleaned up a bit
* Old default template is really just the last used template. Rename it.
* Add max. recursive depth setting in preferences for plot template searches
* Only create plots based on correct template type when importing ensembles or single cases
* Support creating new plot from template explorer
* Update last used template when creating a new plot from a template
2022-06-01 10:45:44 +02:00
Magne Sjaastad
c74701b687 Rename several child() and children() functions 2022-05-31 15:05:07 +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
a48ad22d0a Preferences: Avoid calling update on top level RimProject on close 2022-05-27 07:53:51 +02:00
Magne Sjaastad
3545d16fbb Use set to get unique plots for update 2022-05-26 20:43:25 +02:00
jonjenssen
8e3289a432
Default summaryplot improvements (#8950)
* Add summary default plot type selection in preferences
* Create plots as set in preferences when loading summary cases. Allow selecting default plot templates from templates explorer tree
* Do not create plot if data vector setting is empty
2022-05-25 11:01:45 +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
Kristian Bendiksen
c3dfd9ed26 Summary tools: fix crash in when destructing RimStimPlanModel 2022-05-20 14:51:26 +02:00
Kristian Bendiksen
9678b80feb #7778 MainWindow: fix crash when reopening grid case 2022-05-20 14:51:01 +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
fa8ad53981 Regression Test : Add memory usage to regression test logging 2022-05-19 12:48:54 +02:00
jonjenssen
828e8ec440
Show templates as separate project explorer tab. (#8902)
Add templates as separate project explorer tab.
Add support for renaming and editing templates
2022-05-11 19:46:17 +02:00
Magne Sjaastad
f52acd9a64 #8893 Rename quantity name -> vector name 2022-05-10 08:17:41 +02:00
Kristian Bendiksen
b761bb42af Grid Calculator: Fix view updates when calculation is changed or removed. 2022-05-09 15:36:27 +02:00
Kristian Bendiksen
4304bbbc48 Grid Calculator: refactor summary curve calculator and add grid calculator. 2022-05-09 15:36:27 +02:00
magnesj
64c4adf5f0 Fixes by clang-tidy 2022-05-06 06:39: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
jonjenssen
296ddbde42
Merge pull request #8882 from OPM/append_curves
Summary Multiplot: Source Stepping append curves with performance fixes
2022-05-04 13:11:04 +02:00
jonjenssen
3de8010c2b
Source stepping and toolbar updates (#8866)
* Move layout options to separate toolbar
* Enable stepping on quantities, remove special history curve stepping for now
* Allow stepping ensembles and cases
* Add step next/prev and add new sub plot
2022-05-03 11:30:09 +02:00
Magne Sjaastad
46173af8c3
Merge pull request #8865 from OPM/8863-summary-issues 2022-05-03 08:51:26 +02:00
Magne Sjaastad
853b4a26d5 #8822 Summary Axis: Add tick mark count to y-axis 2022-04-22 23:14:48 +02:00
Magne Sjaastad
b6f7dd931e Add option to export to pdf without asking user 2022-04-22 23:14:48 +02:00
Magne Sjaastad
1840a95810 Preferences: Move colorCurvesByPhase and hide Qt Charts settings 2022-04-22 08:08:06 +02:00
Magne Sjaastad
caaca138c0
Curve Colors : Add support for color assignment based on summary phase (oil, gas or water) 2022-04-20 14:29:40 +02:00
Magne Sjaastad
93614ef272
Merge pull request #8791 from OPM/8790-rename-to-group
Rename summary references to "Group"
2022-04-07 21:06:40 +02:00
jonjenssen
3590c52cdc
Deprecate single summary plots and plot collections. (#8777)
* Deprecate single summary plots and plot collections. Replace functionality using summary multi plots. Clean up some code. Fix crash when trying to normalize an empty curve
2022-04-06 17:39:07 +02:00
Magne Sjaastad
6417daf167 #8773 Source Stepping : Realization cases are missing in some cases 2022-04-06 10:05:43 +02:00
jonjenssen
22d6e3f853
Merge pull request #8765 from OPM/summarymultiplot_performance2
Summary Multiplot performance improvements and fixes
2022-04-01 19:23:27 +02:00
Magne Sjaastad
15f17234c8 #8747 MultiPlot : Duplicate and append plots for selected objects 2022-03-31 14:04:33 +02:00
jonjenssen
ebba37a623
Merge pull request #8754 from OPM/multiplot_improvements
Summary Multiplot: add new plot from a single curve in an ensemble plot and improve general plot performance
2022-03-31 12:34:07 +02:00
Jon Jenssen
2eb1713866 Fix mouse wheel not working in 3D view if a plot window is created.
Fix issue with multiplot sometimes being shown incorrectly when switching between fullscreen plots
2022-03-30 16:19:16 +02:00
Magne Sjaastad
9c987855f2 Merge remote-tracking branch 'origin/patch_2021.10.3' into dev 2022-03-28 09:06:38 +02:00
Magne Sjaastad
7c4e81f59f Adaption of #8356 Summary Data : Add support for use of summary summary data from Python 2022-03-28 08:46:10 +02:00
Magne Sjaastad
c48451a532 Summary Import : Support cases with one file per time step (#8493) 2022-03-28 08:46:10 +02:00
Magne Sjaastad
cf4d2c9ad2 Janitor : Support import of stand alone ESMRY files
All import of summary data was previously started from a SMSPEC file. As the ESMRY file is completely independent, it is useful to import these files directly.
2022-03-28 08:46:10 +02:00
jonjenssen
8c27a0f656 Support pausing before running abaqus script to allow input file modifications.
Add option in preferences to enable/disable pause.
2022-03-28 08:46:10 +02:00
Kristian Bendiksen
86ea679871
#8652 Import Surface: Fix ts-file import with properties on Linux (#8730)
The file had DOS line endings (\t\n) which where not properly trimmed on linux.

Fixes #8652.
2022-03-25 14:16:25 +01:00
jonjenssen
8d3f41ded8
Merge pull request #8732 from OPM/summarymultiplot_updates2
Summary Multiplot updates
2022-03-25 11:39:12 +01:00
Jon Jenssen
560917a481 Rename NewSummaryPlot command to what it actually is - OpenSummaryPlotEditor command. Remove unused includes.
Move Single Summary Plots to bottom of tree and show them as Single Summary Plots.
2022-03-21 13:05:57 +01:00
Kristian Bendiksen
001e918238 #8637 3D-view legend: Make integer category for I-, J- and K-indexes 2022-03-17 08:19:16 +01:00
Magne Sjaastad
0ca70249ae
Move defines to RiaDateTimeDefines 2022-03-14 09:18:48 +01:00
Magne Sjaastad
806a149809
Fix several deprecation warnings (#8657)
* Use constructor instead of nullptr for WindowFlags
* Use constructor instead of nullptr for Alignment
* Disable deprecation warning for QProcess
* Add string split method to RaTextStringTools
* Add caf.cpp used to manage Qt function deprecations
* Use position()
2022-03-11 13:24:01 +01:00
jonjenssen
c9b762fb16
Merge pull request #8654 from OPM/filter_wheelevents
Summary Multiplot: page scroll and zoom fixes
2022-03-10 13:13:44 +01:00
jonjenssen
abff06d2d5
Summary multiplot improvements (#8598)
* Create multi summary plot from summary plot(s)
* Rearrange multi summary plot properties
* Enable source stepping toolbar for multi summary plot
* Automatically activate new summary plot when creating from data sources -> data vector tree
* Enable global key controls for switching data in summary and multi summary plots
* Update tooltip texts for summary plot toolbar
2022-03-04 10:52:17 +01:00
Magne Sjaastad
0e57cfe201 Memory Management : Adjustment and fixes
Add release of several static singleton objects
Fix several minor memory leaks
2022-03-03 14:39:41 +01:00
Magne Sjaastad
f154f8c500
Import RFT segment data as well log curve (#8449)
Add reader for RFT data using opm-common
Extend RFT curve with support for RFT segment data
Adjustments related to horizontal well log plots

8581 Well Log Plot : Update of curve appearance does not update plot
2022-02-23 13:57:02 +01:00
jonjenssen
208ae7692b
Merge pull request #8578 from OPM/summaryplot_fromdatavector
Summary Plot: create new plot from data vector tree nodes
2022-02-22 11:32:35 +01:00
Magne Sjaastad
5c72d31cc9
Improve well path target configuration (#8570)
Improve the scripting possibilities for well targets
Added tests and examples
2022-02-19 13:18:49 +01:00
Magne Sjaastad
6c92206893
Make curve drawing more robust (#8537)
* Janitor : Improve robustness

* Guard nullptr access

* Limit the curve points to incoming from/to curve point index range

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2022-02-11 13:18:36 +01:00
Magne Sjaastad
ef4eb63bb9 Janitor: Clean up includes 2022-02-07 09:55:11 +01:00
Magne Sjaastad
15797bd739 Preferences : Add flag for default plot type QtCharts or Qwt 2022-02-07 09:55:11 +01:00
jonjenssen
a3ad9d2c1e
Merge pull request #8524 from OPM/tree_filter
Add Project Tree filter support
2022-02-04 15:49:22 +01:00
jonjenssen
66fd79175c
Project Tree updates (#8490)
Split project tree into multiple dockable tree views for plots, keeping one for 3d views.
2022-01-28 13:19:52 +01:00
Magne Sjaastad
ffc77516e8
Summary Import : Support cases with one file per time step (#8493) 2022-01-28 13:18:46 +01:00
Magne Sjaastad
d5b17976ed
Merge pull request #8459 from OPM/8458-summary-drop-target
Closes #8458
2022-01-21 14:32:51 +01:00
Magne Sjaastad
b0470d38ee #8463 Plotting : Add command line parameter to show 2D main window 2022-01-21 07:48:15 +01:00
Magne Sjaastad
40d59b7bdc Regression Test : Make it possible to override plot engine
Add GUI to override plot engine to either Qwt or QtCharts in regression test dialog
2022-01-20 14:34:34 +01:00
Kristian Bendiksen
258fbddc10
Merge pull request #8387 from OPM/qtcharts-summary-plots
Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
2022-01-17 13:14:21 +01:00
Magne Sjaastad
e203c76099
#8425 Summary Multi Plots: Add grouping on wells, groups, ...
* #8425 Multi Graph : Support grouping on object name
* #8425 Multi Graph : Improve creation of new graphs
* #8425 Multi Graph : Improve default tick mark count
* Handle history and non history as identical headers
* #8425 Multi Graph : Increase space below a graph
2022-01-10 14:51:31 +01:00