From dc6a50ec3c38ae5e03fadc521a7cfc7ea7eb2658 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 7 Dec 2015 10:07:51 +0100 Subject: [PATCH] Renamed from setCurrentObjectInTreeView to selectAsCurrentItem --- ApplicationCode/Application/RiaApplication.cpp | 8 ++++---- .../RicNewPolylineCrossSectionFeature.cpp | 2 +- .../Commands/RicEclipseCaseNewGroupExec.cpp | 2 +- .../RicEclipsePropertyFilterFeatureImpl.cpp | 4 ++-- .../RicGeoMechPropertyFilterFeatureImpl.cpp | 4 ++-- .../Commands/RicNewStatisticsCaseFeature.cpp | 3 +-- .../Commands/RicRangeFilterInsertExec.cpp | 2 +- .../Commands/RicRangeFilterNewExec.cpp | 2 +- .../ViewLink/RicShowLinkOptionsFeature.cpp | 3 +-- .../RicAddWellLogToPlotFeature.cpp | 10 +--------- .../RicNewWellLogCurveExtractionFeature.cpp | 2 +- .../RicNewWellLogFileCurveFeature.cpp | 2 +- .../RimCrossSectionCollection.cpp | 2 +- ApplicationCode/ProjectDataModel/RimView.cpp | 2 +- .../UserInterface/RiuMainWindow.cpp | 2 +- ApplicationCode/UserInterface/RiuMainWindow.h | 2 +- .../UserInterface/RiuViewerCommands.cpp | 5 ++--- .../UserInterface/RiuWellLogTrack.cpp | 18 ++++++++---------- 18 files changed, 31 insertions(+), 44 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index faf12ad20f..b000edc340 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -759,7 +759,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas analysisModels->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(riv->cellResult()); + RiuMainWindow::instance()->selectAsCurrentItem(riv->cellResult()); return true; @@ -795,7 +795,7 @@ bool RiaApplication::openInputEclipseCaseFromFileNames(const QStringList& fileNa analysisModels->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(riv->cellResult()); + RiuMainWindow::instance()->selectAsCurrentItem(riv->cellResult()); return true; } @@ -841,7 +841,7 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName) m_project->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(riv->cellResult()); + RiuMainWindow::instance()->selectAsCurrentItem(riv->cellResult()); return true; } @@ -1965,7 +1965,7 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames) if (gridCaseGroup->statisticsCaseCollection()->reservoirs.size() > 0) { - RiuMainWindow::instance()->setCurrentObjectInTreeView(gridCaseGroup->statisticsCaseCollection()->reservoirs[0]); + RiuMainWindow::instance()->selectAsCurrentItem(gridCaseGroup->statisticsCaseCollection()->reservoirs[0]); } return true; diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp index 502fc11703..f0f4da36ae 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp +++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp @@ -146,7 +146,7 @@ void RicNewPolylineCrossSectionFeatureCmd::redo() RiuSelectionManager::instance()->deleteAllItems(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(crossSection); + RiuMainWindow::instance()->selectAsCurrentItem(crossSection); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicEclipseCaseNewGroupExec.cpp b/ApplicationCode/Commands/RicEclipseCaseNewGroupExec.cpp index 902085ad10..e18f409d79 100644 --- a/ApplicationCode/Commands/RicEclipseCaseNewGroupExec.cpp +++ b/ApplicationCode/Commands/RicEclipseCaseNewGroupExec.cpp @@ -73,7 +73,7 @@ void RicEclipseCaseNewGroupExec::redo() analysisModels->caseGroups().push_back(createdObject); analysisModels->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(createdObject); + RiuMainWindow::instance()->selectAsCurrentItem(createdObject); RiuMainWindow::instance()->setExpanded(createdObject, true); } } diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp index 8864b9613a..6124ffde97 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp @@ -65,7 +65,7 @@ void RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(RimEclipsePropertyFi propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED); propertyFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(propertyFilter); + RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); } @@ -81,7 +81,7 @@ void RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(RimEclipsePropert propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED); propertyFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(propertyFilter); + RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp index 312b260336..388a637f7f 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp @@ -66,7 +66,7 @@ void RicGeoMechPropertyFilterFeatureImpl::addPropertyFilter(RimGeoMechPropertyFi propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw(); propertyFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(propertyFilter); + RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); } @@ -83,7 +83,7 @@ void RicGeoMechPropertyFilterFeatureImpl::insertPropertyFilter(RimGeoMechPropert propertyFilterCollection->reservoirView()->scheduleCreateDisplayModelAndRedraw(); propertyFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(propertyFilter); + RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter); } diff --git a/ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp b/ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp index abd3d73b37..6361893a40 100644 --- a/ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp +++ b/ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp @@ -29,7 +29,6 @@ #include "RiuMainWindow.h" #include "cafSelectionManager.h" -#include "cafPdmUiTreeView.h" #include @@ -54,7 +53,7 @@ void RicNewStatisticsCaseFeature::onActionTriggered(bool isChecked) RimEclipseStatisticsCase* newCase = addStatisticalCalculation(uiItem); if (newCase) { - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(newCase); + RiuMainWindow::instance()->selectAsCurrentItem(newCase); } } } diff --git a/ApplicationCode/Commands/RicRangeFilterInsertExec.cpp b/ApplicationCode/Commands/RicRangeFilterInsertExec.cpp index 67b89745e1..1e06760071 100644 --- a/ApplicationCode/Commands/RicRangeFilterInsertExec.cpp +++ b/ApplicationCode/Commands/RicRangeFilterInsertExec.cpp @@ -69,7 +69,7 @@ void RicRangeFilterInsertExec::redo() m_cellRangeFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(rangeFilter); + RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter); } } diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp index a5cd784b73..9e9b50f6ce 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp @@ -72,7 +72,7 @@ void RicRangeFilterNewExec::redo() m_cellRangeFilterCollection->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(rangeFilter); + RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter); } } diff --git a/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp b/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp index 14d8522fb4..0c958d247c 100644 --- a/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp +++ b/ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp @@ -27,7 +27,6 @@ #include "RiuMainWindow.h" #include "cafSelectionManager.h" -#include "cafPdmUiTreeView.h" #include @@ -62,7 +61,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked) RimViewController* viewController = activeView->viewController(); - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(viewController); + RiuMainWindow::instance()->selectAsCurrentItem(viewController); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp index 7e46439643..84ddd94df9 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp @@ -105,11 +105,6 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked) curve->setWellLogChannelName(wellLog->name()); curve->updatePlotData(); - - if (wlIdx == selection.size() - 1) - { - uiItem = curve; - } } } @@ -119,10 +114,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked) RiaApplication::instance()->project()->updateConnectedEditors(); - if (uiItem) - { - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(uiItem); - } + RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(selection.back()); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp index 012e825ecb..2b2d1ff1b3 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp @@ -136,7 +136,7 @@ RimWellLogExtractionCurve* RicNewWellLogCurveExtractionFeature::addCurve(RimWell plotTrack->addCurve(curve); plotTrack->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(curve); + RiuMainWindow::instance()->selectAsCurrentItem(curve); return curve; } diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp index 95300e49e9..d0d47f1bbd 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp @@ -152,7 +152,7 @@ RimWellLogFileCurve* RicNewWellLogFileCurveFeature::addCurve(RimWellLogTrack* pl plotTrack->updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(curve); + RiuMainWindow::instance()->selectAsCurrentItem(curve); return curve; } diff --git a/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp b/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp index c3a9cc7823..850e7840af 100644 --- a/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp @@ -118,7 +118,7 @@ void RimCrossSectionCollection::appendCrossSection(RimCrossSection* crossSection m_crossSections.push_back(crossSection); updateConnectedEditors(); - RiuMainWindow::instance()->setCurrentObjectInTreeView(crossSection); + RiuMainWindow::instance()->selectAsCurrentItem(crossSection); RimView* rimView = NULL; firstAnchestorOrThisOfType(rimView); diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp index b83dca6e41..93b98ab50d 100644 --- a/ApplicationCode/ProjectDataModel/RimView.cpp +++ b/ApplicationCode/ProjectDataModel/RimView.cpp @@ -875,6 +875,6 @@ bool RimView::showActiveCellsOnly() //-------------------------------------------------------------------------------------------------- void RimView::selectOverlayInfoConfig() { - RiuMainWindow::instance()->setCurrentObjectInTreeView(m_overlayInfoConfig); + RiuMainWindow::instance()->selectAsCurrentItem(m_overlayInfoConfig); } diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index a58bdacac3..c89a57062b 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -1990,7 +1990,7 @@ void RiuMainWindow::restoreTreeViewState() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuMainWindow::setCurrentObjectInTreeView(caf::PdmObject* object) +void RiuMainWindow::selectAsCurrentItem(caf::PdmObject* object) { m_projectTreeView->selectAsCurrentItem(object); } diff --git a/ApplicationCode/UserInterface/RiuMainWindow.h b/ApplicationCode/UserInterface/RiuMainWindow.h index adccc5412c..c4215b4229 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.h +++ b/ApplicationCode/UserInterface/RiuMainWindow.h @@ -93,7 +93,7 @@ public: void loadWinGeoAndDockToolBarLayout(); void showWindow(); - void setCurrentObjectInTreeView(caf::PdmObject* object); + void selectAsCurrentItem(caf::PdmObject* object); void selectedCases(std::vector& cases); diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 359aa07e8b..ece612544b 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -62,7 +62,6 @@ #include "cafCmdExecCommandManager.h" #include "cafCmdFeatureManager.h" -#include "cafPdmUiTreeView.h" #include "cafSelectionManager.h" #include "cvfDrawableGeo.h" @@ -720,7 +719,7 @@ void RiuViewerCommands::updateSelectionFromPickedPart(cvf::Part* part) RimWellPath* wellPath = wellPathSourceInfo->wellPath(); if (wellPath) { - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(wellPath); + RiuMainWindow::instance()->selectAsCurrentItem(wellPath); } } } @@ -766,7 +765,7 @@ bool RiuViewerCommands::handleOverlayItemPicking(int winPosX, int winPosY) if (objToSelect) { - RiuMainWindow::instance()->setCurrentObjectInTreeView(objToSelect); + RiuMainWindow::instance()->selectAsCurrentItem(objToSelect); return true; } diff --git a/ApplicationCode/UserInterface/RiuWellLogTrack.cpp b/ApplicationCode/UserInterface/RiuWellLogTrack.cpp index 4447a3af8b..a9652590d7 100644 --- a/ApplicationCode/UserInterface/RiuWellLogTrack.cpp +++ b/ApplicationCode/UserInterface/RiuWellLogTrack.cpp @@ -25,22 +25,20 @@ #include "RiuMainWindow.h" -#include "cafPdmUiTreeView.h" - -#include "qwt_plot_grid.h" #include "qwt_legend.h" -#include "qwt_scale_engine.h" +#include "qwt_plot_curve.h" +#include "qwt_plot_grid.h" #include "qwt_plot_layout.h" #include "qwt_scale_draw.h" +#include "qwt_scale_engine.h" #include "qwt_text.h" -#include "qwt_plot_curve.h" -#include -#include #include +#include +#include +#include #include -#include #define RIU_SCROLLWHEEL_ZOOMFACTOR 1.1 #define RIU_SCROLLWHEEL_PANFACTOR 0.1 @@ -222,7 +220,7 @@ void RiuWellLogTrack::focusInEvent(QFocusEvent* event) { if (m_plotTrackDefinition) { - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(m_plotTrackDefinition); + RiuMainWindow::instance()->selectAsCurrentItem(m_plotTrackDefinition); clearFocus(); } } @@ -256,7 +254,7 @@ void RiuWellLogTrack::selectClosestCurve(const QPoint& pos) RimWellLogCurve* selectedCurve = m_plotTrackDefinition->curveDefinitionFromCurve(closestCurve); if (selectedCurve) { - RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(selectedCurve); + RiuMainWindow::instance()->selectAsCurrentItem(selectedCurve); } } }