Commit Graph
19427 Commits
Author SHA1 Message Date
jonjenssen 947680fdf9 Do not activate a 3d view that already is active. 2026-06-22 14:16:47 +02:00
dependabot[bot] 3e126ee091 Bump actions/checkout from 6 to 7
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-06-22 14:13:54 +02:00
Magne Sjaastad 033c2e06b0 #14262 Fix missing grid statistics context menu entries
The grid statistics plot and show commands were only added to the context menu when the cursor was inside the overlay info box, so right-clicking on the grid geometry no longer offered them. Always add the create and show commands, and keep only the copy-to-clipboard command gated by the info box position.
2026-06-22 12:13:53 +02:00
Magne Sjaastad df97792cb6 Add workflow to create draft release with binaries on tag
On a tag push, wait for the Windows/Linux build (ResInsightWithCache.yml)
and the macOS build (ResInsightMac.yml) to finish, download their
application artifacts, zip them per platform, and create a draft GitHub
Release with the archives attached for maintainer review.
2026-06-21 09:07:42 +02:00
jonjenssen c4898a4f42 Fix crash when deleting non-visible plot from explorer 2026-06-19 20:41:49 +02:00
magnesj d664851469 Bump to version 2026.06.1-dev.02 2026-06-19 16:41:22 +02:00
Magne Sjaastad 21d3869e44 Pass dock widget to internalCaptureSnapshot from the call site
Take the view's dock widget as a parameter instead of discovering it by walking the widget parent chain, so the caller supplies it directly. Also forward declare QImage in RimViewWindow.h instead of including it, and drop now unused includes in RimViewWindow.cpp.
2026-06-19 16:38:41 +02:00
Magne Sjaastad 8369fad029 Fix crash on project reset when accessing null project during teardown
RimProject::current() can return null while the project is being torn down. Guard the project access in the view-window lookups and valid-comparison-views query with an if-init statement so they return empty instead of dereferencing null.
2026-06-19 16:38:41 +02:00
Magne Sjaastad 3ae102ba6c #14241 MSW: Use valve segment MD for ICV COMPSEGS distances
ICV valve COMPSEGS rows used the cell overlap MD range within the valve coverage instead of the valve segment measured depth. The legacy tree export redirected the perforation intersections onto the ICV segment, so their COMPSEGS Start/End Length reflected the valve segment MD range. Restore that behavior by emitting the ICV COMPSEGS with the valve segment MD range while still selecting the overlapping cells. Fixes test_well_events test_wells_only_appear_at_their_event_dates.
2026-06-19 12:50:14 +02:00
Magne Sjaastad f4a7d2cb4a #14241 MSW: Fix dual-porosity perforation COMPSEGS over-reporting
The geometry-based MSW export emitted a COMPSEGS row for every cell a perforation overlaps in the whole-well geometric intersection. In dual-porosity models this splits a perforation across matrix cells at cell boundaries, producing extra connections that do not match the COMPDAT export. Restrict main-bore perforation COMPSEGS to the cells the perforation actually connects to, computed by clipping the well path to the perforation MD range and re-intersecting the grid, mirroring generatePerforationsCompdatValues. For single-porosity models the cell sets are identical, so this is a no-op.
2026-06-19 12:50:14 +02:00
Magne Sjaastad 3c5c160b93 #14241 MSW: Drop redundant FromGeometry suffix from branch builders
With the legacy tree-based path removed there is only one MSW branch construction approach, so the FromGeometry suffix is no longer needed. Rename buildMainBoreBranchFromGeometry, buildValveBranchesFromGeometry, buildFractureBranchesFromGeometry and buildFishbonesBranchesFromGeometry accordingly, and update the architecture diagrams.
2026-06-19 12:50:14 +02:00
Magne Sjaastad 3e0d2e22ff #14241 MSW: Remove obsolete TODO in buildMswWellExportData
The geometry-based MSW export now handles valve completions, fishbones laterals, fractures and tie-in laterals, so the comment describing these as unimplemented is no longer accurate.
2026-06-19 12:50:14 +02:00
Magne Sjaastad 5afdeac106 #14241 MSW: Update stale comments referencing deleted legacy classes
Remove references to the deleted RicMswItem/RicMswBranch/RicMswSegment tree and the removed collectWelsegsData collection functions from code comments in the geometry-based MSW export path.
2026-06-19 12:50:14 +02:00
Magne Sjaastad 313ed1e4fc #14241 MSW: Remove obsolete legacy MSW code and data structures
Remove the legacy tree-based MSW extraction path now that the geometry-based path is the only supported implementation. This deletes extractSingleWellMsw_Legacy and all unused tree-building helpers in RicWellPathExportMswTableData, trims RicMswTableDataTools to the shared helpers used by the geometry path, and removes the RicMswItem class family (RicMswBranch, RicMswSegment, RicMswCompletions, RicMswExportInfo, RicMswSegmentCellIntersection, RicMswValveAccumulators).

Also remove the useImprovedMswDataStructures preference and its keyword, and delete the obsolete legacy-vs-geometry comparison unit test.
2026-06-19 12:50:14 +02:00
Kristian Bendiksen a489db3e64 #14227 Compute depth-related geometry results once for both porosity models
The depth-related geometry results (DEPTH/DX/DY/DZ/TOPS/BOTTOM) are derived
purely from the shared grid geometry and were computed independently for the
matrix and fracture porosity models. For dual-porosity cases this recomputed the
identical per-cell geometry twice.

Replace the per-model computeDepthRelatedResults() with a single static routine
that traverses the shared main grid once, computing each cell's geometry a single
time and writing it to every porosity model in which the cell is active. The
per-property already-computed guards and the temporary-grid recompute path are
preserved, so the stored values are unchanged. All six matrix+fracture call sites
now go through a thin RigEclipseCaseData::computeDepthRelatedResults() wrapper.
2026-06-19 12:25:55 +02:00
Kristian Bendiksen f50b4d1291 #14227 Add dual-porosity regression test for depth-related results
Add a value-asserting unit test that loads the dual-porosity test model and
verifies that the geometry-derived depth results (DEPTH/DX/DY/DZ/TOPS/BOTTOM)
are identical between the matrix and fracture porosity models for cells active
in both. This guards the upcoming change that computes these results in a
single shared grid traversal.
2026-06-19 12:25:55 +02:00
JJ b187bf85a7 Add context menu to empty plot window area (#14243)
* Add context menu to empty plot window area
Improve drag'n'drop into empty plot window area
2026-06-19 09:25:33 +02:00
Jon Jenssen c1af78a281 Activate plot widgets before snapshotting in regression tests. 2026-06-19 08:27:22 +02:00
Magne Sjaastad 0d929656fa Normalize neutral toolbar icon gray to rgb(128,128,128) 2026-06-19 07:11:06 +02:00
Jon Jenssen 113c39a02e Make sure we track all 3d views when changing active windows in 3d viewer 2026-06-19 02:08:49 +02:00
Jon Jenssen 13fdf40a36 Fix regression test crash 2026-06-18 15:06:29 +02:00
magnesj 2a46109f6b Fixes by clang-tidy 2026-06-18 07:56:15 +02:00
Kristian Bendiksen 8209bd3ecf #14230 Fix deadlock when importing wells from OSDU
The GUI thread deadlocked on a non-recursive QMutex during OSDU well
import. The download-completion slots and DataLoadController::onTaskFinished
held a mutex while triggering progress updates, which call
QApplication::processEvents(). That re-enters the event loop and dispatches
another queued parquet-download-complete event for a different well, whose
handler then blocks trying to lock the same mutex.

Release the mutex before emitting taskDone in the OSDU well path and well
log data loaders, and before calling incrementProgress() in onTaskFinished.
The map access that the mutex protects stays inside the locked scope; the
captured ProgressInfo outlives the call (kept alive by blockUntilDone) and
incrementProgress() is thread-safe via self-marshaling to the GUI thread.

Fixes #14230.
2026-06-18 07:55:04 +02:00
Jon Jenssen 576fb32a6e Build fix 2026-06-17 13:55:32 +02:00
Jon Jenssen 0973dfd62b Some cleanup 2026-06-17 13:55:32 +02:00
Jon Jenssen fa8ed95a37 Make sure to track active 3d view even if it docks in plot window 2026-06-17 13:55:32 +02:00
Jon Jenssen 0c8c3865f1 Show icon marker in explorer if 3d viewer is docked in plot window 2026-06-17 13:55:32 +02:00
Jon Jenssen 789f433d9d Support toggle titlebar on/off for plots and 3d viewers 2026-06-17 13:55:32 +02:00
Jon Jenssen b11727b546 Work in progress- hide/show titlebars 2026-06-17 13:55:32 +02:00
Jon Jenssen b42979c136 Track selection in 3d viewers 2026-06-17 13:55:32 +02:00
Jon Jenssen 82ad7d61f8 Trigger selection update when a new tab is activated 2026-06-17 13:55:32 +02:00
Jon Jenssen 4e2310e424 Update docking to latest version to support wayland 2026-06-17 13:55:32 +02:00
Jon Jenssen 4f270603eb Update python test and example 2026-06-17 13:55:32 +02:00
Jon Jenssen ec9feff950 Whatever 2026-06-17 13:55:32 +02:00
Jon Jenssen 18cf162ce0 Some cleanup 2026-06-17 13:55:32 +02:00
jonjenssen 44488996f3 Clean up PDF snapshots a bit 2026-06-17 13:55:32 +02:00
Jon Jenssen 7c9b9705b7 Fix advanced snapshot export. 2026-06-17 13:55:32 +02:00
Jon Jenssen a88d0824b0 Whatever 2026-06-17 13:55:32 +02:00
Jon Jenssen 255576d53d Clean up delete 3d views and project close/open
Update to latest qtadv docking
2026-06-17 13:55:32 +02:00
jonjenssen 52df6fd283 Snapshot work in progress 2026-06-17 13:55:32 +02:00
Jon Jenssen 361b4bc3db Work in progress: Support capturing snapshots with a given size. 2026-06-17 13:55:32 +02:00
Jon Jenssen c2811b1db8 Minor fixes 2026-06-17 13:55:32 +02:00
Jon Jenssen 9823f9c5a3 Update to latest qt adv docking version
Make sure copied 3d or plot views get a unique id
2026-06-17 13:55:32 +02:00
Jon Jenssen f4b982d3ee Update test data 2026-06-17 13:55:32 +02:00
Jon Jenssen 3b43dac7d4 Use unique id for all 3d and plot dock widgets. 2026-06-17 13:55:32 +02:00
jonjenssen ba5308881b Some fixes 2026-06-17 13:55:32 +02:00
jonjenssen 2faa1cd149 Some cleanup 2026-06-17 13:55:32 +02:00
jonjenssen 41e40e5810 Build fix 2026-06-17 13:55:32 +02:00
jonjenssen 3efc8ba144 Sync plot toolbars with active plot view 2026-06-17 13:55:32 +02:00
jonjenssen a82b8f5753 Fix reading old projects and restore plot views
Fix crash at exit in plot window
2026-06-17 13:55:32 +02:00