OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-04 13:16:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

Browse Source
This commit is contained in:
Magne Sjaastad committed 2017-01-20 16:25:05 +01:00
1 parent 94f94af325
commit cebe5428be
15 files changed
+74 -205
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/RimMdiWindowController.cpp
+4 -22
View File
@@ -17,9 +17,10 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimMdiWindowController.h"
#include "RiuMainWindowBase.h"
#include "RiaApplication.h"
#include "RimViewWindow.h"
#include "RiuMainWindowBase.h"
CAF_PDM_XML_SOURCE_INIT(RimMdiWindowController, "MdiWindowController");
@@ -79,7 +80,7 @@ RimMdiWindowGeometry RimMdiWindowController::mdiWindowGeometry()
//--------------------------------------------------------------------------------------------------
void RimMdiWindowController::handleViewerDeletion()
{
showWindowField() = false;
viewPdmObject()->m_showWindow = false;
uiCapability()->updateUiIconFromToggleField();
updateConnectedEditors();
@@ -94,16 +95,6 @@ void RimMdiWindowController::removeWindowFromMDI()
if (mainWin && viewWidget()) mainWin->removeViewer(viewWidget());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimMdiWindowController::showWindowFieldChangedByUi()
{
updateViewerWidget();
viewPdmObject()->uiCapability()->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -114,14 +105,6 @@ RimViewWindow* RimMdiWindowController::viewPdmObject()
return viewWindowObj;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmField<bool>& RimMdiWindowController::showWindowField()
{
return *(viewPdmObject()->getShowWindowField());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -157,11 +140,10 @@ void RimMdiWindowController::updateViewerWidget()
RiuMainWindowBase* mainWindow = getMainWindow();
if ( !mainWindow ) return;
if ( showWindowField() )
if ( viewPdmObject()->m_showWindow() )
{
if ( !viewWidget() )
{
// m_wellAllocationPlotWidget = new RiuWellAllocationPlot(this, mainPlotWindow);
QWidget * viewWidget = viewPdmObject()->createViewWidget(mainWindow);
mainWindow->addViewer(viewWidget, this->mdiWindowGeometry());