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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CompletionCommands/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -58,7 +58,7 @@ void RicNewFishbonesSubsAtMeasuredDepthFeature::onActionTriggered(bool isChecked
RicNewFishbonesSubsFeature::askUserToSetUsefulScaling(wellPath->fishbonesCollection()); RicNewFishbonesSubsFeature::askUserToSetUsefulScaling(wellPath->fishbonesCollection());
wellPath->updateConnectedEditors(); wellPath->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(obj); Riu3DMainWindowTools::selectAsCurrentItem(obj);
RimProject* proj; RimProject* proj;
wellPath->firstAncestorOrThisOfTypeAsserted(proj); wellPath->firstAncestorOrThisOfTypeAsserted(proj);

4
ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -62,7 +62,7 @@ void RicNewPerforationIntervalAtMeasuredDepthFeature::onActionTriggered(bool isC
wellPathCollection->uiCapability()->updateConnectedEditors(); wellPathCollection->uiCapability()->updateConnectedEditors();
wellPathCollection->scheduleRedrawAffectedViews(); wellPathCollection->scheduleRedrawAffectedViews();
RiuMainWindow::instance()->selectAsCurrentItem(perforationInterval); Riu3DMainWindowTools::selectAsCurrentItem(perforationInterval);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/CompletionCommands/RicNewPerforationIntervalFeature.cpp
View File

@ -21,7 +21,7 @@
#include "WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h" #include "WellPathCommands/RicWellPathsUnitSystemSettingsImpl.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "RimPerforationInterval.h" #include "RimPerforationInterval.h"
#include "RimPerforationCollection.h" #include "RimPerforationCollection.h"
@ -66,7 +66,7 @@ void RicNewPerforationIntervalFeature::onActionTriggered(bool isChecked)
wellPathCollection->uiCapability()->updateConnectedEditors(); wellPathCollection->uiCapability()->updateConnectedEditors();
wellPathCollection->scheduleRedrawAffectedViews(); wellPathCollection->scheduleRedrawAffectedViews();
RiuMainWindow::instance()->selectAsCurrentItem(perforationInterval); Riu3DMainWindowTools::selectAsCurrentItem(perforationInterval);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@ -25,7 +25,7 @@
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimGridView.h" #include "RimGridView.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "RiuViewer.h" #include "RiuViewer.h"
@ -125,7 +125,7 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
m_intersectionCollection->appendIntersectionAndUpdate(intersection); m_intersectionCollection->appendIntersectionAndUpdate(intersection);
RiuSelectionManager::instance()->deleteAllItems(); RiuSelectionManager::instance()->deleteAllItems();
RiuMainWindow::instance()->selectAsCurrentItem(intersection); Riu3DMainWindowTools::selectAsCurrentItem(intersection);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimGridView.h" #include "RimGridView.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "RiuViewer.h" #include "RiuViewer.h"
@ -116,7 +116,7 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
RiuSelectionManager::instance()->deleteAllItems(); RiuSelectionManager::instance()->deleteAllItems();
RiuMainWindow::instance()->selectAsCurrentItem(intersection); Riu3DMainWindowTools::selectAsCurrentItem(intersection);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

7
ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupExec.cpp
View File

@ -27,7 +27,7 @@
#include "RimOilField.h" #include "RimOilField.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -73,8 +73,9 @@ void RicEclipseCaseNewGroupExec::redo()
analysisModels->caseGroups().push_back(createdObject); analysisModels->caseGroups().push_back(createdObject);
analysisModels->updateConnectedEditors(); analysisModels->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(createdObject);
RiuMainWindow::instance()->setExpanded(createdObject); Riu3DMainWindowTools::selectAsCurrentItem(createdObject);
Riu3DMainWindowTools::setExpanded(createdObject);
} }
} }

12
ApplicationCode/Commands/FlowCommands/RicAddStoredFlowCharacteristicsPlotFeature.cpp
View File

@ -25,7 +25,7 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimFlowCharacteristicsPlot.h" #include "RimFlowCharacteristicsPlot.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -79,12 +79,10 @@ void RicAddStoredFlowCharacteristicsPlotFeature::onActionTriggered(bool isChecke
flowPlotColl->updateConnectedEditors(); flowPlotColl->updateConnectedEditors();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->mainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
if (mainPlotWindow)
{ RiuPlotMainWindowTools::selectAsCurrentItem(flowCharacteristicsPlot);
mainPlotWindow->selectAsCurrentItem(flowCharacteristicsPlot); RiuPlotMainWindowTools::setExpanded(flowCharacteristicsPlot);
mainPlotWindow->setExpanded(flowCharacteristicsPlot);
}
} }
} }
} }

10
ApplicationCode/Commands/FlowCommands/RicAddStoredWellAllocationPlotFeature.cpp
View File

@ -25,7 +25,7 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimWellAllocationPlot.h" #include "RimWellAllocationPlot.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -79,12 +79,8 @@ void RicAddStoredWellAllocationPlotFeature::onActionTriggered(bool isChecked)
flowPlotColl->updateConnectedEditors(); flowPlotColl->updateConnectedEditors();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->mainPlotWindow(); RiuPlotMainWindowTools::selectAsCurrentItem(wellAllocationPlot);
if (mainPlotWindow) RiuPlotMainWindowTools::setExpanded(wellAllocationPlot);
{
mainPlotWindow->selectAsCurrentItem(wellAllocationPlot);
mainPlotWindow->setExpanded(wellAllocationPlot);
}
} }
} }
} }

1
ApplicationCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -41,7 +41,6 @@
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RiuMainPlotWindow.h" #include "RiuMainPlotWindow.h"
#include "RiuMainWindow.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"

6
ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp
View File

@ -32,7 +32,7 @@
#include "RimProject.h" #include "RimProject.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include <QAction> #include <QAction>
@ -91,13 +91,13 @@ void RicShowFlowCharacteristicsPlotFeature::onActionTriggered(bool isChecked)
RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection(); RimFlowPlotCollection* flowPlotColl = RiaApplication::instance()->project()->mainPlotCollection->flowPlotCollection();
if (flowPlotColl) if (flowPlotColl)
{ {
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
flowPlotColl->defaultFlowCharacteristicsPlot()->setFromFlowSolution(eclCase->defaultFlowDiagSolution()); flowPlotColl->defaultFlowCharacteristicsPlot()->setFromFlowSolution(eclCase->defaultFlowDiagSolution());
flowPlotColl->defaultFlowCharacteristicsPlot()->updateConnectedEditors(); flowPlotColl->defaultFlowCharacteristicsPlot()->updateConnectedEditors();
// Make sure the summary plot window is created and visible // Make sure the summary plot window is created and visible
plotwindow->selectAsCurrentItem(flowPlotColl->defaultFlowCharacteristicsPlot()); RiuPlotMainWindowTools::selectAsCurrentItem(flowPlotColl->defaultFlowCharacteristicsPlot());
} }
} }
} }

6
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
View File

@ -28,7 +28,7 @@
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimWellAllocationPlot.h" #include "RimWellAllocationPlot.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -110,8 +110,8 @@ void RicShowWellAllocationPlotFeature::onActionTriggered(bool isChecked)
flowPlotColl->defaultWellAllocPlot()->updateConnectedEditors(); flowPlotColl->defaultWellAllocPlot()->updateConnectedEditors();
// Make sure the summary plot window is created and visible // Make sure the summary plot window is created and visible
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
plotwindow->selectAsCurrentItem(flowPlotColl->defaultWellAllocPlot()); RiuPlotMainWindowTools::selectAsCurrentItem(flowPlotColl->defaultWellAllocPlot());
} }
} }
} }

4
ApplicationCode/Commands/FractureCommands/RicNewEllipseFractureTemplateFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RimOilField.h" #include "RimOilField.h"
#include "RimProject.h" #include "RimProject.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -59,7 +59,7 @@ void RicNewEllipseFractureTemplateFeature::selectFractureTemplateAndUpdate(RimFr
} }
} }
RiuMainWindow::instance()->selectAsCurrentItem(fractureTemplate); Riu3DMainWindowTools::selectAsCurrentItem(fractureTemplate);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RimIntersectionBox.h" #include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimGridView.h" #include "RimGridView.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "cafCmdExecCommandManager.h" #include "cafCmdExecCommandManager.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -61,7 +61,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered(bool isChecked)
intersectionBox->setToDefaultSizeBox(); intersectionBox->setToDefaultSizeBox();
coll->updateConnectedEditors(); coll->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); Riu3DMainWindowTools::selectAsCurrentItem(intersectionBox);
RimGridView* rimView = nullptr; RimGridView* rimView = nullptr;
coll->firstAncestorOrThisOfTypeAsserted(rimView); coll->firstAncestorOrThisOfTypeAsserted(rimView);

5
ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RimSummaryCaseCollection.h" #include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h" #include "RimSummaryCaseMainCollection.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -71,7 +71,8 @@ void RicCreateSummaryCaseCollectionFeature::onActionTriggered(bool isChecked)
summaryCaseMainCollection->addCaseCollection(selection); summaryCaseMainCollection->addCaseCollection(selection);
summaryCaseMainCollection->updateConnectedEditors(); summaryCaseMainCollection->updateConnectedEditors();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(summaryCaseMainCollection->summaryCaseCollections().back()->allSummaryCases().front()); RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(summaryCaseMainCollection->summaryCaseCollections().back()->allSummaryCases().front());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
View File

@ -25,7 +25,7 @@
#include "RimGeoMechView.h" #include "RimGeoMechView.h"
#include "RimGeoMechResultDefinition.h" #include "RimGeoMechResultDefinition.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -66,7 +66,7 @@ void RicGeoMechPropertyFilterFeatureImpl::addPropertyFilter(RimGeoMechPropertyFi
propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw(); propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw();
propertyFilterCollection->updateConnectedEditors(); propertyFilterCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); Riu3DMainWindowTools::selectAsCurrentItem(propertyFilter);
} }
@ -83,7 +83,7 @@ void RicGeoMechPropertyFilterFeatureImpl::insertPropertyFilter(RimGeoMechPropert
propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw(); propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw();
propertyFilterCollection->updateConnectedEditors(); propertyFilterCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); Riu3DMainWindowTools::selectAsCurrentItem(propertyFilter);
} }

4
ApplicationCode/Commands/RicRangeFilterInsertExec.cpp
View File

@ -22,7 +22,7 @@
#include "RimCellRangeFilter.h" #include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h" #include "RimCellRangeFilterCollection.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -69,7 +69,7 @@ void RicRangeFilterInsertExec::redo()
m_cellRangeFilterCollection->updateConnectedEditors(); m_cellRangeFilterCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter); Riu3DMainWindowTools::selectAsCurrentItem(rangeFilter);
} }
} }

4
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -25,7 +25,7 @@
#include "RimCellRangeFilterCollection.h" #include "RimCellRangeFilterCollection.h"
#include "RimGridView.h" #include "RimGridView.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -75,7 +75,7 @@ void RicRangeFilterNewExec::redo()
m_cellRangeFilterCollection->updateConnectedEditors(); m_cellRangeFilterCollection->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter); Riu3DMainWindowTools::selectAsCurrentItem(rangeFilter);
RimGridView* view = nullptr; RimGridView* view = nullptr;
m_cellRangeFilterCollection->firstAncestorOrThisOfTypeAsserted(view); m_cellRangeFilterCollection->firstAncestorOrThisOfTypeAsserted(view);

14
ApplicationCode/Commands/RicWellLogTools.cpp
View File

@ -35,7 +35,7 @@
#include "RifReaderEclipseRft.h" #include "RifReaderEclipseRft.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h" #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
@ -206,11 +206,11 @@ RimWellLogExtractionCurve* RicWellLogTools::addExtractionCurve(RimWellLogTrack*
plotTrack->updateConnectedEditors(); plotTrack->updateConnectedEditors();
// Make sure the summary plot window is created and visible // Make sure the summary plot window is created and visible
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();
plotwindow->selectAsCurrentItem(curve); RiuPlotMainWindowTools::selectAsCurrentItem(curve);
return curve; return curve;
} }
@ -254,11 +254,11 @@ RimWellLogRftCurve* RicWellLogTools::addRftCurve(RimWellLogTrack* plotTrack, con
plotTrack->setFormationTrajectoryType(RimWellLogTrack::SIMULATION_WELL); plotTrack->setFormationTrajectoryType(RimWellLogTrack::SIMULATION_WELL);
plotTrack->updateConnectedEditors(); plotTrack->updateConnectedEditors();
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();
plotwindow->selectAsCurrentItem(curve); RiuPlotMainWindowTools::selectAsCurrentItem(curve);
return curve; return curve;
} }
@ -279,8 +279,8 @@ RimWellLogFileCurve* RicWellLogTools::addFileCurve(RimWellLogTrack* plotTrack)
plotTrack->updateConnectedEditors(); plotTrack->updateConnectedEditors();
RiuMainPlotWindow* plotwindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
plotwindow->selectAsCurrentItem(curve); RiuPlotMainWindowTools::selectAsCurrentItem(curve);
return curve; return curve;
} }

5
ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@ -36,7 +36,7 @@
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "cafPdmReferenceHelper.h" #include "cafPdmReferenceHelper.h"
@ -71,7 +71,8 @@ void RicNewGridTimeHistoryCurveFeature::createCurveFromSelectionItem(const RiuSe
plot->updateConnectedEditors(); plot->updateConnectedEditors();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(newCurve); RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(newCurve);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -41,7 +41,7 @@
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
#include "RimSummaryCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "RiuSummaryCurveDefSelection.h" #include "RiuSummaryCurveDefSelection.h"
#include "RiuSummaryQwtPlot.h" #include "RiuSummaryQwtPlot.h"
#include "RiuTools.h" #include "RiuTools.h"
@ -193,9 +193,10 @@ void RicSummaryCurveCreator::fieldChangedByUi(const caf::PdmFieldHandle* changed
if (changedField == &m_okButtonField) if (changedField == &m_okButtonField)
{ {
m_closeButtonField = true; m_closeButtonField = true;
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
mainPlotWindow->selectAsCurrentItem(m_targetPlot); RiuPlotMainWindowTools::showPlotMainWindow();
mainPlotWindow->setExpanded(m_targetPlot); RiuPlotMainWindowTools::selectAsCurrentItem(m_targetPlot);
RiuPlotMainWindowTools::setExpanded(m_targetPlot);
} }
m_applyButtonField = false; m_applyButtonField = false;

6
ApplicationCode/Commands/ViewLink/RicSetMasterViewFeature.cpp
View File

@ -27,7 +27,7 @@
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "RimViewLinkerCollection.h" #include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include <QAction> #include <QAction>
#include <QTreeView> #include <QTreeView>
@ -81,8 +81,8 @@ void RicSetMasterViewFeature::onActionTriggered(bool isChecked)
proj->updateConnectedEditors(); proj->updateConnectedEditors();
// Set managed view collection to selected and expanded in project tree // Set managed view collection to selected and expanded in project tree
RiuMainWindow::instance()->selectAsCurrentItem(viewLinker); Riu3DMainWindowTools::selectAsCurrentItem(viewLinker);
RiuMainWindow::instance()->setExpanded(viewLinker); Riu3DMainWindowTools::setExpanded(viewLinker);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@ -24,7 +24,7 @@
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimViewController.h" #include "RimViewController.h"
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
@ -61,7 +61,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
RimViewController* viewController = activeView->viewController(); RimViewController* viewController = activeView->viewController();
RiuMainWindow::instance()->selectAsCurrentItem(viewController); Riu3DMainWindowTools::selectAsCurrentItem(viewController);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
View File

@ -32,7 +32,7 @@
#include "RimWellLogTrack.h" #include "RimWellLogTrack.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "RigWellLogFile.h" #include "RigWellLogFile.h"
@ -109,8 +109,10 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
plotTrack->viewer()->replot(); plotTrack->viewer()->replot();
RiaApplication::instance()->project()->updateConnectedEditors(); RiaApplication::instance()->project()->updateConnectedEditors();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(plot);
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->setExpanded(plotTrack); RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(plot);
RiuPlotMainWindowTools::setExpanded(plotTrack);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

11
ApplicationCode/Commands/WellLogCommands/RicNewRftPlotFeature.cpp
View File

@ -29,7 +29,7 @@
#include "RimWellPath.h" #include "RimWellPath.h"
#include "RimWellRftPlot.h" #include "RimWellRftPlot.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
@ -84,12 +84,9 @@ void RicNewRftPlotFeature::onActionTriggered(bool isChecked)
rftPlot->loadDataAndUpdate(); rftPlot->loadDataAndUpdate();
rftPlotColl->updateConnectedEditors(); rftPlotColl->updateConnectedEditors();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
if (mainPlotWindow) RiuPlotMainWindowTools::setExpanded(plotTrack);
{ RiuPlotMainWindowTools::selectAsCurrentItem(rftPlot);
mainPlotWindow->setExpanded(plotTrack);
mainPlotWindow->selectAsCurrentItem(rftPlot);
}
} }
} }

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

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

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

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

4
ApplicationCode/ProjectDataModel/RimGridView.cpp
View File

@ -30,7 +30,7 @@
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "RimViewLinkerCollection.h" #include "RimViewLinkerCollection.h"
#include "RiuMainWindow.h" #include "Riu3DMainWindowTools.h"
#include "cvfModel.h" #include "cvfModel.h"
#include "cvfScene.h" #include "cvfScene.h"
@ -331,7 +331,7 @@ void RimGridView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridView::selectOverlayInfoConfig() 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 "RimObservedEclipseUserData.h"
#include "RimSummaryObservedDataFile.h" #include "RimSummaryObservedDataFile.h"
#include "RiuMainPlotWindow.h" #include "RiuPlotMainWindowTools.h"
#include "cafUtils.h" #include "cafUtils.h"
#include "cafPdmSettings.h" #include "cafPdmSettings.h"
@ -130,12 +130,9 @@ RimObservedData* RimObservedDataCollection::createAndAddRsmObservedDataFromFile(
errorText->append(observedData->errorMessagesFromReader()); errorText->append(observedData->errorMessagesFromReader());
} }
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
if (mainPlotWindow) RiuPlotMainWindowTools::selectAsCurrentItem(observedData);
{ RiuPlotMainWindowTools::setExpanded(observedData);
mainPlotWindow->selectAsCurrentItem(observedData);
mainPlotWindow->setExpanded(observedData);
}
this->updateConnectedEditors(); this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors(); caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
@ -192,12 +189,9 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
return nullptr; return nullptr;
} }
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); RiuPlotMainWindowTools::showPlotMainWindow();
if (mainPlotWindow) RiuPlotMainWindowTools::selectAsCurrentItem(userData);
{ RiuPlotMainWindowTools::setExpanded(userData);
mainPlotWindow->selectAsCurrentItem(userData);
mainPlotWindow->setExpanded(userData);
}
this->updateConnectedEditors(); this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors(); caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();

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

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