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

(#369) Started to use the new selection method in PdmUiTreeView

Browse Source
This commit is contained in:
Jacob Støren
2015-08-13 23:47:04 +02:00
parent 8052a1c672
commit 343e4dcc1c
5 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -1607,50 +1607,50 @@ void RiuMainWindow::selectedObjectsChanged()
if (uiItems.size() == 1)
{
firstSelectedObject = dynamic_cast<caf::PdmObjectHandle*>(uiItems[0]);
}
m_pdmUiPropertyView->showProperties(firstSelectedObject);
RimView* activeReservoirView = RiaApplication::instance()->activeReservoirView();
m_pdmUiPropertyView->showProperties(firstSelectedObject);
// Find the reservoir view that the selected item is within
RimView* activeReservoirView = RiaApplication::instance()->activeReservoirView();
if (!firstSelectedObject)
{
caf::PdmFieldHandle* selectedField = dynamic_cast<caf::PdmFieldHandle*>(uiItems[0]);
if (selectedField) firstSelectedObject = selectedField->ownerObject();
}
// Find the reservoir view that the selected item is within
RimView* selectedReservoirView = dynamic_cast<RimView*>(firstSelectedObject);
if (!selectedReservoirView && firstSelectedObject )
{
firstSelectedObject->firstAncestorOfType(selectedReservoirView);
}
// If current selection is an item within a different reservoir view than active,
// show new reservoir view and set this as activate view
if (selectedReservoirView && selectedReservoirView != activeReservoirView)
{
RiaApplication::instance()->setActiveReservoirView(selectedReservoirView);
// Set focus in MDI area to this window if it exists
if (selectedReservoirView->viewer())
if (!firstSelectedObject)
{
setActiveViewer(selectedReservoirView->viewer());
caf::PdmFieldHandle* selectedField = dynamic_cast<caf::PdmFieldHandle*>(uiItems[0]);
if (selectedField) firstSelectedObject = selectedField->ownerObject();
}
// m_OBSOLETE_treeView->setCurrentIndex(current);
RimView* selectedReservoirView = dynamic_cast<RimView*>(firstSelectedObject);
if (!selectedReservoirView && firstSelectedObject)
{
firstSelectedObject->firstAncestorOfType(selectedReservoirView);
}
refreshDrawStyleActions();
refreshAnimationActions();
slotRefreshFileActions();
slotRefreshEditActions();
slotRefreshViewActions();
// If current selection is an item within a different reservoir view than active,
// show new reservoir view and set this as activate view
// The only way to get to this code is by selection change initiated from the project tree view
// As we are activating an MDI-window, the focus is given to this MDI-window
// Set focus back to the tree view to be able to continue keyboard tree view navigation
m_projectTreeView->treeView()->setFocus();
if (selectedReservoirView && selectedReservoirView != activeReservoirView)
{
RiaApplication::instance()->setActiveReservoirView(selectedReservoirView);
// Set focus in MDI area to this window if it exists
if (selectedReservoirView->viewer())
{
setActiveViewer(selectedReservoirView->viewer());
}
// m_OBSOLETE_treeView->setCurrentIndex(current);
refreshDrawStyleActions();
refreshAnimationActions();
slotRefreshFileActions();
slotRefreshEditActions();
slotRefreshViewActions();
// The only way to get to this code is by selection change initiated from the project tree view
// As we are activating an MDI-window, the focus is given to this MDI-window
// Set focus back to the tree view to be able to continue keyboard tree view navigation
m_projectTreeView->treeView()->setFocus();
}
}
}
@@ -1955,7 +1955,7 @@ void RiuMainWindow::setCurrentObjectInTreeView(caf::PdmObject* object)
}
}
// Todo: m_projectTreeView->setCurrentItemInTreeView(object);
m_projectTreeView->selectAsCurrentItem(object);
}
//--------------------------------------------------------------------------------------------------