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

#2487 Avoid switching view when clicking objs in the intersectino view. Some minor refactoring of the MainWindows

Browse Source
This commit is contained in:
Jacob Støren
2018-02-27 11:23:43 +01:00
parent 599909a9e8
commit 6a3b43ec7c
7 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -149,6 +149,14 @@ RiuMainWindow* RiuMainWindow::instance()
return sm_mainWindowInstance;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuMainWindow::mainWindowName()
{
return "RiuMainWindow";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1297,7 +1305,7 @@ void RiuMainWindow::selectedObjectsChanged()
m_pdmUiPropertyView->showProperties(firstSelectedObject);
if (uiItems.size() == 1)
if (uiItems.size() == 1 && m_allowActiveViewChangeFromSelection)
{
// Find the reservoir view or the Plot that the selected item is within
@@ -1619,14 +1627,6 @@ void RiuMainWindow::showProcessMonitorDockPanel()
showDockPanel(DOCK_PANEL_NAME_PROCESS_MONITOR);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::selectAsCurrentItem(const caf::PdmObject* object)
{
m_projectTreeView->selectAsCurrentItem(object);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------