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 1)

Browse Source
This commit is contained in:
Jacob Støren
2018-02-27 15:21:14 +01:00
parent 43dc25eca0
commit d74807d669
29 changed files with 90 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@@ -28,7 +28,7 @@
#include "RifWellPathImporter.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
CAF_PDM_SOURCE_INIT(RimFishboneWellPathCollection, "WellPathCompletionCollection");
@@ -133,7 +133,7 @@ void RimFishboneWellPathCollection::appendCompletion(RimFishboneWellPath* comple
m_wellPaths.push_back(completion);
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(completion);
Riu3DMainWindowTools::selectAsCurrentItem(completion);
uiCapability()->setUiHidden(!m_wellPaths.empty());

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@@ -27,7 +27,7 @@
#include "RifWellPathImporter.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
CAF_PDM_SOURCE_INIT(RimPerforationCollection, "PerforationCollection");
@@ -81,7 +81,7 @@ void RimPerforationCollection::appendPerforation(RimPerforationInterval* perfora
perforation->setUnitSystemSpecificDefaults();
updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(perforation);
Riu3DMainWindowTools::selectAsCurrentItem(perforation);
RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj);

4
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@@ -30,7 +30,7 @@
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h"
#include "Riu3DMainWindowTools.h"
#include "cvfModel.h"
#include "cvfScene.h"
@@ -331,7 +331,7 @@ void RimGridView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
//--------------------------------------------------------------------------------------------------
void RimGridView::selectOverlayInfoConfig()
{
RiuMainWindow::instance()->selectAsCurrentItem(m_overlayInfoConfig);
Riu3DMainWindowTools::selectAsCurrentItem(m_overlayInfoConfig);
}
//--------------------------------------------------------------------------------------------------

20
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@@ -31,7 +31,7 @@
#include "RimObservedEclipseUserData.h"
#include "RimSummaryObservedDataFile.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "cafUtils.h"
#include "cafPdmSettings.h"
@@ -130,12 +130,9 @@ RimObservedData* RimObservedDataCollection::createAndAddRsmObservedDataFromFile(
errorText->append(observedData->errorMessagesFromReader());
}
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(observedData);
mainPlotWindow->setExpanded(observedData);
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(observedData);
RiuPlotMainWindowTools::setExpanded(observedData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
@@ -192,12 +189,9 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
return nullptr;
}
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(userData);
mainPlotWindow->setExpanded(userData);
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(userData);
RiuPlotMainWindowTools::setExpanded(userData);
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -34,7 +34,7 @@
#include "RimSummaryPlotNameHelper.h"
#include "RimSummaryTimeAxisProperties.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuSummaryQwtPlot.h"
#include "cvfBase.h"
@@ -176,24 +176,24 @@ RimSummaryTimeAxisProperties* RimSummaryPlot::timeAxisProperties()
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::selectAxisInPropertyEditor(int axis)
{
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
RiuPlotMainWindowTools::showPlotMainWindow();
if (axis == QwtPlot::yLeft)
{
plotwindow->selectAsCurrentItem(m_leftYAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_leftYAxisProperties);
}
else if (axis == QwtPlot::yRight)
{
plotwindow->selectAsCurrentItem(m_rightYAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_rightYAxisProperties);
}
else if (axis == QwtPlot::xBottom)
{
if (m_isCrossPlot)
{
plotwindow->selectAsCurrentItem(m_bottomAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_bottomAxisProperties);
}
else
{
plotwindow->selectAsCurrentItem(m_timeAxisProperties);
RiuPlotMainWindowTools::selectAsCurrentItem(m_timeAxisProperties);
}
}
}