OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4240 Project Tree : Make sure setActiveReservoirView is called

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-29 12:36:00 +01:00
parent 16540f6607
commit 8c1c4ea767
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1240,12 +1240,6 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
if (!proj) return; if (!proj) return;
if (!caf::SelectionManager::instance()->selectedItemAncestorOfType<Rim3dView>())
{
// Do not try to manipulate the tree selection if no object part of a 3D view is currently selected
return;
}
// Find the activated 3D view // Find the activated 3D view
Rim3dView* activatedView = nullptr; Rim3dView* activatedView = nullptr;
@ -1276,12 +1270,21 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
Rim3dView* previousActiveReservoirView = RiaApplication::instance()->activeReservoirView(); Rim3dView* previousActiveReservoirView = RiaApplication::instance()->activeReservoirView();
RiaApplication::instance()->setActiveReservoirView(activatedView); RiaApplication::instance()->setActiveReservoirView(activatedView);
if (previousActiveReservoirView != activatedView) bool is3dViewCurrentlySelected = false;
if (caf::SelectionManager::instance()->selectedItem())
{
if (caf::SelectionManager::instance()->selectedItemAncestorOfType<Rim3dView>())
{
is3dViewCurrentlySelected = true;
}
}
if (is3dViewCurrentlySelected && (previousActiveReservoirView != activatedView))
{ {
QModelIndex newViewModelIndex = m_projectTreeView->findModelIndex(activatedView); QModelIndex newViewModelIndex = m_projectTreeView->findModelIndex(activatedView);
QModelIndex newSelectionIndex = newViewModelIndex; QModelIndex newSelectionIndex = newViewModelIndex;
if (previousActiveReservoirView) if (previousActiveReservoirView && is3dViewCurrentlySelected)
{ {
// Try to select the same entry in the new View, as was selected in the previous // Try to select the same entry in the new View, as was selected in the previous