Commit Graph
19405 Commits
Author SHA1 Message Date
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
Jon Jenssen 09ea2e7028 Store dock state in project 2026-06-17 13:55:32 +02:00
jonjenssen 7bd429b937 Plot window default dock states 2026-06-17 13:55:32 +02:00
Jon Jenssen bb2e0d2948 Work in progress 2026-06-17 13:55:32 +02:00
Jon Jenssen a1fe3739d1 Remove last traces of MDI 2026-06-17 13:55:32 +02:00
Jon Jenssen 967975828c Use global event handler for tracking active plot window 2026-06-17 13:55:32 +02:00
jonjenssen ff4a54121f Clean up main window ids 2026-06-17 13:55:32 +02:00
jonjenssen 6fd7888a6d Build fix 2026-06-17 13:55:32 +02:00
jonjenssen 27af39f614 Fix fullscreen in 3d window 2026-06-17 13:55:32 +02:00
jonjenssen 797d9ac2db Work in progress 2026-06-17 13:55:32 +02:00
jonjenssen 650bac4002 Add default layouts for 3d window 2026-06-17 13:55:32 +02:00
jonjenssen 9b93e4addc Minor updates 2026-06-17 13:55:32 +02:00
jonjenssen 3b4a732cb5 Work in progress 2026-06-17 13:55:32 +02:00
Jon Jenssen 551d0d8e55 Minor fix 2026-06-17 13:55:32 +02:00
Jon Jenssen 7fd55a0b91 Active view tracking for 3d window 2026-06-17 13:55:32 +02:00
jonjenssen ad73f8d26c Work in progress 2026-06-17 13:55:32 +02:00
jonjenssen fce05bdb81 Work in progress 2026-06-17 13:55:32 +02:00
jonjenssen ff40662366 Work in progress 2026-06-17 13:55:32 +02:00
Jon Jenssen 122cb01592 Work in progress 2026-06-17 13:55:32 +02:00
jonjenssen 6adb5cb881 Update title in 3d window 2026-06-17 13:55:32 +02:00
Jon Jenssen d2d7c6ac61 First non-MDI version. Still some missing links and features. 2026-06-17 13:55:32 +02:00
jonjenssen fee0599139 Work in progress 2026-06-17 13:55:32 +02:00
Jon Jenssen a28340063f Work in progress 2026-06-17 13:55:32 +02:00