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

#2535 Use the MainWindowTools class instead of MainWindow directly (part 3)

Browse Source
This commit is contained in:
Jacob Støren
2018-02-27 16:00:55 +01:00
parent 72013f4ff8
commit 562dfbe9b8
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
View File

@@ -28,7 +28,7 @@
#include "RicSnapshotViewToFileFeature.h"
#include "RicSnapshotFilenameGenerator.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "cafUtils.h"
@@ -123,11 +123,7 @@ void RicSnapshotAllPlotsToFileFeature::onActionTriggered(bool isChecked)
if (currentActiveWidget)
{
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->mainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->setActiveViewer(currentActiveWidget);
}
RiuPlotMainWindowTools::setActiveViewer(currentActiveWidget);
}
}

13
ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
View File

@@ -32,7 +32,7 @@
#include "RicSnapshotViewToFileFeature.h"
#include "RicSnapshotFilenameGenerator.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RiuViewer.h"
#include "RigFemResultPosEnum.h"
@@ -72,9 +72,6 @@ void RicSnapshotAllViewsToFileFeature::saveAllViews()
//--------------------------------------------------------------------------------------------------
void RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(QString snapshotFolderName)
{
RiuMainWindow* mainWnd = RiuMainWindow::instance();
if (!mainWnd) return;
RimProject* project = RiaApplication::instance()->project();
if (project == nullptr) return;
@@ -108,7 +105,7 @@ void RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(QStrin
RiaApplication::instance()->setActiveReservoirView(riv);
RiuViewer* viewer = riv->viewer();
mainWnd->setActiveViewer(viewer->layoutWidget());
Riu3DMainWindowTools::setActiveViewer(viewer->layoutWidget());
RiaViewRedrawScheduler::instance()->clearViewsScheduledForUpdate();
@@ -159,11 +156,7 @@ void RicSnapshotAllViewsToFileFeature::onActionTriggered(bool isChecked)
if (currentActiveWidget)
{
RiuMainWindow* mainWindow = RiuMainWindow::instance();
if (mainWindow)
{
mainWindow->setActiveViewer(currentActiveWidget);
}
Riu3DMainWindowTools::setActiveViewer(currentActiveWidget);
}
}

4
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@@ -37,7 +37,7 @@
#include "RimSimWellInView.h"
#include "RimViewManipulator.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafCmdFeature.h"
#include "cafCmdFeatureManager.h"
@@ -156,7 +156,7 @@ void RicShowContributingWellsFeatureImpl::modifyViewToShowContributingWells(RimE
propertyFilterCollection->updateConnectedEditors();
RiuMainWindow::instance()->setExpanded(propertyFilterCollection);
Riu3DMainWindowTools::setExpanded(propertyFilterCollection);
viewToModify->faultCollection()->showFaultCollection = false;
viewToModify->faultCollection()->updateConnectedEditors();

4
ApplicationCode/Commands/RicNewViewFeature.cpp
View File

@@ -25,7 +25,7 @@
#include "RimGeoMechView.h"
#include "Rim3dView.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "RiaLogging.h"
#include "cafSelectionManager.h"
@@ -43,7 +43,7 @@ void RicNewViewFeature::addReservoirView(RimEclipseCase* eclipseCase, RimGeoMech
if (newView)
{
RiuMainWindow::instance()->setExpanded(newView);
Riu3DMainWindowTools::setExpanded(newView);
}
}

4
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeature.cpp
View File

@@ -29,7 +29,7 @@
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cafPdmUiPropertyViewDialog.h"
@@ -177,7 +177,7 @@ void RicLinkVisibleViewsFeature::linkViews(std::vector<RimGridView*>& views)
proj->viewLinkerCollection.uiCapability()->updateConnectedEditors();
proj->updateConnectedEditors();
RiuMainWindow::instance()->setExpanded(proj->viewLinkerCollection());
Riu3DMainWindowTools::setExpanded(proj->viewLinkerCollection());
}