Commit Graph

1614 Commits

Author SHA1 Message Date
Magne Sjaastad
71b0ae1a16 Remove duplicated code in RiaPlotWindowRedrawScheduler 2024-11-04 17:34:49 +01:00
Magne Sjaastad
275526a64a Remove unused includes
Remove unused includes, mostly AppEnum.h
2024-11-04 09:54:23 +01:00
Magne Sjaastad
7fe945e68d #11842 Fix drag/drop of VFP plot into multiplot
Remove the deprecated plot collection
Make sure the dropped plot is visible in the multi plot
2024-11-04 08:47:21 +01:00
Magne Sjaastad
a05645e966 #11844 Quick Access adjustments
Show the Quick Access menu only for objects that implements RimFieldQuickAccessInterface
Show the fields made available by RimFieldQuickAccessInterface
2024-11-04 08:46:55 +01:00
Magne Sjaastad
4cf6a26083
Improve draw performance for active cell grid
* Show timing for geoBuilder.generateSurface()
* Check state of element vector result before geometry is created

* Improve performance for isFaceVisible
Avoid calling costly function cell() when possible
Remove check on fault geometry as this does not affect the visualization

* Performance: Avoid traversal of all cells when computing visibility
When we have an active cell grid, we can skip checking for inactive and invalid state.
Use the list of active grid cells when looping through cells.
2024-11-03 13:38:03 +01:00
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
jonjenssen
f21d1545f8 Some cleanup 2024-10-29 18:17:31 +01:00
jonjenssen
88118ee4e1 Privatize grid cell array 2024-10-29 18:17:31 +01:00
Magne Sjaastad
2814b92055
Qt6: Adjustments (#11804)
* Qt6: Avoid insertWidget, use addWidget
In Qt6, the insertWidget function checks if the index parameter is valid based on current widgets present in the layout. This is error prone, and use addWidget to avoid manual counting of index.

* Disable use of Qt keyword foreach

* Replace use of QRegExp with QRegularExpression
Replace use of QRegExp with QRegularExpression
Remove dependency on qt5compat module
Simplify an expression based on review

* Remove Qt5 ifdefs

* Guard access out of bounds seen in debug build

* Avoid reuse of string variable

* Disconnect all signals from the QOpenGLContext
The call stack when this assert happens indicates that there are more signals to be disconnected from the object. Crash is fixed by disconnecting all signals.

Assert seen in debug build:

ASSERT failure in caf::Viewer: "Called object is not of the correct type (class destructor may have already run)", file C:\Qt\6.6.3\msvc2019_64\include\QtCore/qobjectdefs_impl.h, line 130

* Fix issue related to delete of a linked view
Guard null pointer use in view linker. Remove complicated cleanup in destructor in Rim3dVew.
2024-10-28 13:09:18 +01:00
Magne Sjaastad
1f2b180ab7 #11812 Multi-segment RFT plot: Make sure reservoir Pressure is plotted 2024-10-24 12:18:35 +02:00
Magne Sjaastad
a9ea615bf0 Add support for increase of serial number when data is assigned to a SUMO case 2024-10-24 08:50:26 +02:00
Kristian Bendiksen
293e19d820 Refactor: make contour map calculation easier to reuse. 2024-10-23 14:46:52 +02:00
Magne Sjaastad
581b268928 Use hash of input do control if calculation is required
Add hash functions
Add serial number to SummaryReaderInterface
Add hash for RimSummaryCase

Use hash based on input parameters to control caching of data in RimEnsembleStatisticsCase::calculate  and RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses
2024-10-23 12:38:22 +02:00
Magne Sjaastad
df091336e0 Move summary tools into separate folder 2024-10-22 07:28:43 +02:00
Magne Sjaastad
95b2f2bbd1 Add icons 2024-10-21 14:11:22 +02:00
Magne Sjaastad
2befcf6417 Create quick access objects when opening project and some objects
Create quick access for Eclipse view, IJK slice filters and property filters
Create quick access objects for existing projects automatically
2024-10-21 14:11:22 +02:00
Magne Sjaastad
4ff5aaf381 Add quick access data model objects 2024-10-21 14:11:22 +02:00
Magne Sjaastad
5ffd7f3f61 Move Show Disks from Visibility group into Disk group 2024-10-21 12:52:42 +02:00
Magne Sjaastad
c3d60869bd Improve support for network vectors
Show all text if summary address contains multiple : for network addresses
Consolidate replace of tokens in summary address
2024-10-21 09:38:33 +02:00
Magne Sjaastad
2aaea1e6db Fix crash when curve data is missing 2024-10-21 09:38:33 +02:00
Kristian Bendiksen
ebc805ab65 Refactor: Extractor contour polygon tools. 2024-10-17 13:45:18 +02:00
Kristian Bendiksen
c636a80fe2 Refactor: simplify conditionals. 2024-10-17 08:23:22 +02:00
Kristian Bendiksen
4c3fb3cc47 Janitor: clean up includes. 2024-10-17 08:23:22 +02:00
Kristian Bendiksen
a8d56417f6 Refactor: Extract RigContourMapGrid object. 2024-10-17 08:23:22 +02:00
Magne Sjaastad
da321830a7 Janitor: Fix some minor GUI issues
Use appendMenu instead of context command builder
Remove case name from import grid feature
Fix shortcut for feature
2024-10-16 14:32:36 +02:00
Magne Sjaastad
4fd9edc7a5 Select realization in Data Sources when clicking on curve 2024-10-16 14:32:36 +02:00
Magne Sjaastad
42d700ff7d Remove unused code 2024-10-16 14:32:36 +02:00
Magne Sjaastad
2619f1a33a #11771 Highlight all curves for a realization when picking
When selecting a single curve in an ensemble, select and highlight all curves connected to this realization.
2024-10-16 14:32:36 +02:00
jonjenssen
2fe432b43d Make sure launching external processes works after switch to qt6 2024-10-15 14:58:48 +02:00
Magne Sjaastad
0330c3cacd #11761 Add special parsing of SLAVES keyword as the default parsing fails 2024-10-10 11:41:40 +02:00
Magne Sjaastad
ca4a7b9000
Remove obsolete code related to Qt5
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
2024-10-07 10:16:48 +02:00
Kristian Bendiksen
c75990551a #11746 Simplify layout to silence warning from Qt.
Fixes #11746
2024-10-04 16:47:06 +02:00
Magne Sjaastad
f43ecd5e92 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 15:20:27 +02:00
Kristian Bendiksen
b760fcebe2 #11689 Well Target Candidates: generate on well target clusters for single case. 2024-09-30 13:42:28 +02:00
Magne Sjaastad
212f5bf5ae
Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Magne Sjaastad
360a635cda Guard null pointer access 2024-09-27 10:38:10 +02:00
Magne Sjaastad
67adab8ad3 Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:38:10 +02:00
Magne Sjaastad
a870fceb42 Intersection: Make sure property filtered geometry is visible
When an intersection geometry is filtered by property filters, make sure that the static geometry is hidden.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
19354ac7b2 Revert "Make sure intersection calculations are done before legend update"
This reverts commit a0997821c6.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
a0997821c6 Make sure intersection calculations are done before legend update
The legend categories can be filtered to only visible categories. This requires the geometry generators to do intersection calculations, as the legend is created based on intersected cells.
2024-09-24 07:45:10 +02:00
Magne Sjaastad
9b150ca38a Make sure statistics cases are displayed in an Eclipse view 2024-09-24 07:45:10 +02:00
Magne Sjaastad
c65e15fad1 #11693 Add enum to control zoom operation when case is changed 2024-09-19 13:54:23 +02:00
Magne Sjaastad
80b112f4ce #11713 Polygon filter: Use a ray from point in polygon both up and down
Make sure that a polygon defined below the grid can be used to filter grid cells
2024-09-19 12:47:19 +02:00
Magne Sjaastad
2c98438528 #11708 Summary: Improve robustness for statistics calculations
There can be incomplete realizations in an ensemble. Make sure that the calculation is robust for all variants of incomplete curves.

Use RiaTimeHistoryCurveMerger to ensure one definition of time steps and extraction of curve values to be used to compute ensemble statistics.

Remove unused function.
2024-09-19 10:23:02 +02:00
Magne Sjaastad
48070f6539 #11706 Use connection depths when plotting connection data
The plotting of curve values for connections to a segment fails in some cases. The current implementation finds the segment a connection is attached to, and use the depth (both MD and TVD) information from this segment. This method is not working in all cases.

Use the reported location of connections attached to segments based on CONLENST and CONLENEN. When measured depth is requested, use these values. There might be gaps in the reported segment sequence.

Use CONDEPTH when TVD depth is requested.

Use CONBRNO to find the branch number, and then use lookup table branchIdsAndOneBasedBranchIndices to find the branch index. Use the branch index to filter the results for requested branch.

The number of values in CON* result values is different to result values for SEG* results.
2024-09-19 10:21:58 +02:00
jonjenssen
e006fe52c9
2d intersection view filter support (#11711)
Enable filters in 2d intersection view. Controlled by "Use Cell Filters for Intersections" setting in Intersection Collection properties
2024-09-19 08:41:57 +02:00
Magne Sjaastad
89bd3a8c90 #11357 Reorganize menu in 3D view
Simplify menu text for range filter
Reorganize to improve readability
Simplify cell filter menu in Project Tree
2024-09-16 09:53:23 +02:00
Magne Sjaastad
9d66e6195e
Release adjustments
* Use appendMenuItems instead of ContextCommandBuilder
* Specify RimEclipseCaseCollection menu features once
* Add function to enable up/down arrows for combo box
* Guard crash when closing project
* Improve UI for grid case ensemble
- Create a view for the first case in the ensemble
- Show case name in view title
- Enable up/down buttons to Eclipse case
* Make sure 3D views in grid ensemble are created on project load
2024-09-16 09:49:22 +02:00
Magne Sjaastad
1f80503f01 #9405 Update window title when required 2024-09-14 17:28:04 +02:00
Magne Sjaastad
d8b8c86b8f SUMO: Improve user interface
- set fields read only
- make sure custom case name is used in other UI items
- use two buttons to create data source and ensemble for selected cloud ensembles
2024-09-14 15:08:15 +02:00
Magne Sjaastad
a4159cd11e Set fields read-only and make sure custom name is propagated 2024-09-14 15:08:15 +02:00
Magne Sjaastad
f4da2d748f #11693 Store camera position for each associated case
A top level view can change the connected grid case. Add option to store the camera position for each grid case. Add option Store View Settings for Case , default off.
2024-09-13 15:06:32 +02:00
Kristian Bendiksen
281706e2eb Fix missing grid ensemble cases in RimProject::allGridCases. 2024-09-13 15:06:14 +02:00
Magne Sjaastad
9e41db33f5 Progress: optionally call QApplication::processEvents on progress updates
Add ProgressInfoEventProcessingBlocker

Co-authored-by: Kristian Bendiksen kristian.bendiksen@gmail.com
2024-09-11 12:48:54 +02:00
Magne Sjaastad
cfc97bb615 Revert "Progress: optionally call QApplication::processEvents on progress updates."
This reverts commit eb762fd122.
2024-09-10 08:18:37 +02:00
Kristian Bendiksen
58c73debe0 Add project tree for cloud data. 2024-09-09 14:32:32 +02:00
Kristian Bendiksen
eb762fd122 Progress: optionally call QApplication::processEvents on progress updates.
Fixes the missing updates of UI when running long tasks in main thread.
2024-09-09 14:15:28 +02:00
Magne Sjaastad
a00bfea40b #11663 Make sure non-Darcy data is computed
The computation of non-Darcy properties is expensive, so we cache the results. Make sure that the calling function calls this function before using the properties.
2024-09-05 08:41:06 +02:00
magnesj
fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen
d8eb34c00d Janitor: fix memory leaks. 2024-09-02 13:58:00 +02:00
Magne Sjaastad
33188f3d6e Improve robustness when importing incomplete project file
Avoid assert, and return empty curve definition if both summary case and ensemble is undefined.
2024-09-02 13:57:41 +02:00
jonjenssen
0572069511
Support for loading only active cell geometry (#11624)
* Only load active cells for main grid, skip LGRs for now
* Handle wells with inactive cells
* Validate mapaxes transform before using it.
* Add log message
* Additional guarding when trying to find the geometrical location of a simulation cell
* Add extra safeguarding for init/restart file access in opm common. Only support unified restart files.
2024-08-28 18:22:57 +02:00
Magne Sjaastad
27c46a65fd
Improve user control on resampling operations
Allow user to specify Accumulated or Rate for a summary curve. Default setting is Auto, and summary address is used to derive Accumulated/Rate. User can set curve type explicitly.
2024-08-28 15:23:07 +02:00
Magne Sjaastad
64a559756f Improve visual appearance for depth surface
- disable intersection geometry with cell property colors
- allow opacity
- set default color to blue, as most user use this plane for oil-water contact
2024-08-28 09:22:55 +02:00
Magne Sjaastad
0fd27a3a8d Add [BETA] as postfix to user interface
Add postfix to SUMO and OSDU cloud import features.
2024-08-28 09:22:55 +02:00
Magne Sjaastad
a89fe80de3 Use sliders to manipulate surface plane extent 2024-08-28 09:22:55 +02:00
Kristian Bendiksen
0518e594ce Improve caching. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
48e32668ec Sumo ensemble parameters: handle string properties. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
44076f4911 Sumo: load parameter sensitivities (i.e. "parameters.txt") for ensembles. 2024-08-28 08:33:44 +02:00
Magne Sjaastad
bc9db44fe0 Use 1 as default size for fault mesh lines 2024-08-23 17:07:48 +02:00
Kristian Bendiksen
c322ba62bb #11636 Fix missing well path creation when importing LAS file without a well path file
Fixes #11636.
2024-08-23 17:07:48 +02:00
Magne Sjaastad
1b509c0384 Use mutex when import well paths
A shared data structure (RifWellPathImporter) is used when importing well paths. Add mutex to ensure single use of shared data structure.
2024-08-23 17:07:48 +02:00
Kristian Bendiksen
ef9a397188 Sumo: improve logging and remove some unused code. 2024-08-23 12:18:05 +02:00
Magne Sjaastad
141484f8a7 Improve error handling when trying to access OSDU data
Show more details when support for SSL is missing.

Move connection of signal/slot away from constructor. This makes it possible to use ResInsight even if SSL is not available.
2024-08-19 16:33:19 +02:00
Kristian Bendiksen
b324fdb26b Close project if cancelling well path loading. 2024-08-16 15:46:22 +02:00
Kristian Bendiksen
9bea739252 Parallelize initial import of OSDU well path. 2024-08-16 15:46:22 +02:00
Kristian Bendiksen
bf2a852b4d Add cancellation of well path collection loading. 2024-08-16 15:46:22 +02:00
Magne Sjaastad
f561973319 #11618 Add menu to create filter from existing polygons 2024-08-16 14:17:33 +02:00
Magne Sjaastad
bf471b6c73 #11595 Always return the pick event handler
Always return the pick event handler to make it possible to deactivate handler. Move the activation logic to pickingEnabled.
2024-08-16 14:17:33 +02:00
Kristian Bendiksen
76a1d43b0e Osdu: make sure token is valid before background loading. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
2651ca91b6 Add well log loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
694d2eda66 Add background data loader framework and well path loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
e9c46c5cec Rename RimSummaryCaseCollection to RimSummaryEnsemble. 2024-07-30 08:55:12 +02:00
Kristian Bendiksen
1d7b40fbdd Remove SSIHUB-related classes. 2024-07-29 12:24:58 +02:00
Kristian Bendiksen
4aadf6e801 Correct or remove ssihub references. 2024-07-29 12:24:58 +02:00
Magne Sjaastad
6fb74654a1 Improve interface for string operations
Trim incoming string before converting to number
Remove use of std::strtod and std::stoi
Use std::string_view instead of std::string when possible
2024-07-25 21:21:53 +02:00
Magne Sjaastad
33ffa10ec9
Janitor: Remove obsolete deleteChildren
Remove obsolete deleteChildren() in destructors. deleteChildren() is called in the destructor of PdmChildArrayField
2024-07-25 13:58:31 +02:00
Magne Sjaastad
34e30b38d3 #11372 Make sure regression curves can be resampled
Make sure a regression curve based on observed data can be resampled. Split display of curves, one section for resampled curves and one section for observed curves without resampling.
2024-07-25 10:29:16 +02:00
Magne Sjaastad
3164b39225 Allow hiding of category name in color legend item 2024-07-25 10:29:16 +02:00
Magne Sjaastad
736bfd9a96 Add Depth Surface
Add Depth surface and initialize the location of the surface based on the first available grid model. Add feature to create Depth surface.
2024-07-24 15:42:25 +02:00
Magne Sjaastad
337584025c Add convenience function to set number format to fixed with two decimals 2024-07-24 15:42:25 +02:00
Magne Sjaastad
a77f50e3a8
SUMO connector adjustments
Disable SUMO connector object when running regression tests to avoid request for credentials
2024-07-22 11:33:38 +02:00
Kristian Bendiksen
734a84956e Osdu Well Log: use channel "CurveId" instead of "Mnemonic". 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
9316715063 Osdu Well Log: Save well log channels and names to xml. 2024-07-10 20:24:58 +02:00
Kristian Bendiksen
44daecac9a Refactor: move RiaOsduConnector to Tools/Cloud. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
ed7a3e98da Osdu Well Log: cache channel meta data from Osdu. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
0d845938b6 Osdu Well Log: show more values in filter. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
122b724a83 Osdu: Split blocking and non-blocking api, and fix race condition on parquet data. 2024-07-10 18:57:15 +02:00
Magne Sjaastad
1c2b8f4118 Updated icons 2024-07-05 15:55:24 +02:00
Magne Sjaastad
31d653bce7 Add Sumo summary ensemble and summary case
Add feature to create ensemble from a sumo data source
2024-07-05 12:47:54 +02:00