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

(#376) Made new treeview follow window selection

Browse Source
This commit is contained in:
Jacob Støren 2015-08-16 10:06:10 +02:00
parent 6d7bf0ae9e
commit 2f49415d3f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1411,11 +1411,13 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
RiaApplication::instance()->setActiveReservoirView(riv); RiaApplication::instance()->setActiveReservoirView(riv);
if (previousActiveReservoirView && previousActiveReservoirView != riv) if (previousActiveReservoirView && previousActiveReservoirView != riv)
{ {
QModelIndex previousViewModelIndex = m_OBSOLETE_treeModelPdm->getModelIndexFromPdmObject(previousActiveReservoirView); // Try to select the same entry in the new View, as was selected in the previous
QModelIndex newViewModelIndex = m_OBSOLETE_treeModelPdm->getModelIndexFromPdmObject(riv);
QModelIndex previousViewModelIndex = m_projectTreeView->findModelIndex(previousActiveReservoirView);
QModelIndex newViewModelIndex = m_projectTreeView->findModelIndex(riv);
QModelIndex newSelectionIndex = newViewModelIndex; QModelIndex newSelectionIndex = newViewModelIndex;
QModelIndex currentSelectionIndex = m_OBSOLETE_treeView->selectionModel()->currentIndex(); QModelIndex currentSelectionIndex = m_projectTreeView->treeView()->selectionModel()->currentIndex();
if (currentSelectionIndex != newViewModelIndex && if (currentSelectionIndex != newViewModelIndex &&
currentSelectionIndex.isValid()) currentSelectionIndex.isValid())
@ -1439,7 +1441,7 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
QModelIndex tmp = route[i]; QModelIndex tmp = route[i];
if (newSelectionIndex.isValid()) if (newSelectionIndex.isValid())
{ {
newSelectionIndex = m_OBSOLETE_treeModelPdm->index(tmp.row(), tmp.column(), newSelectionIndex); newSelectionIndex = m_projectTreeView->treeView()->model()->index(tmp.row(), tmp.column(), newSelectionIndex);
} }
} }
@ -1450,10 +1452,10 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
} }
} }
m_OBSOLETE_treeView->setCurrentIndex(newSelectionIndex); m_projectTreeView->treeView()->setCurrentIndex(newSelectionIndex);
if (newSelectionIndex != newViewModelIndex) if (newSelectionIndex != newViewModelIndex)
{ {
m_OBSOLETE_treeView->setExpanded(newViewModelIndex, true); m_projectTreeView->treeView()->setExpanded(newViewModelIndex, true);
} }
} }