Renamed from setCurrentObjectInTreeView to selectAsCurrentItem

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;

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp

@@ -146,7 +146,7 @@ void RicNewPolylineCrossSectionFeatureCmd::redo()
 
     RiuSelectionManager::instance()->deleteAllItems();
 
-    RiuMainWindow::instance()->setCurrentObjectInTreeView(crossSection);
+    RiuMainWindow::instance()->selectAsCurrentItem(crossSection);
 }
 
 //--------------------------------------------------------------------------------------------------

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);
     }
 }

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);
 }
 
 //--------------------------------------------------------------------------------------------------

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);
 
 }
 

ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp

@@ -29,7 +29,6 @@
 #include "RiuMainWindow.h"
 
 #include "cafSelectionManager.h"
-#include "cafPdmUiTreeView.h"
 
 #include <QAction>
 
@@ -54,7 +53,7 @@ void RicNewStatisticsCaseFeature::onActionTriggered(bool isChecked)
         RimEclipseStatisticsCase* newCase = addStatisticalCalculation(uiItem);
         if (newCase)
         {
-            RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(newCase);
+            RiuMainWindow::instance()->selectAsCurrentItem(newCase);
         }
     }
 }

ApplicationCode/Commands/RicRangeFilterInsertExec.cpp

@@ -69,7 +69,7 @@ void RicRangeFilterInsertExec::redo()
 
         m_cellRangeFilterCollection->updateConnectedEditors();
 
-        RiuMainWindow::instance()->setCurrentObjectInTreeView(rangeFilter);
+        RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter);
     }
 }
 

ApplicationCode/Commands/RicRangeFilterNewExec.cpp

@@ -72,7 +72,7 @@ void RicRangeFilterNewExec::redo()
 
         m_cellRangeFilterCollection->updateConnectedEditors();
 
-        RiuMainWindow::instance()->setCurrentObjectInTreeView(rangeFilter);
+        RiuMainWindow::instance()->selectAsCurrentItem(rangeFilter);
     }
 }
 

ApplicationCode/Commands/ViewLink/RicShowLinkOptionsFeature.cpp

@@ -27,7 +27,6 @@
 #include "RiuMainWindow.h"
 
 #include "cafSelectionManager.h"
-#include "cafPdmUiTreeView.h"
 
 #include <QAction>
 
@@ -62,7 +61,7 @@ void RicShowLinkOptionsFeature::onActionTriggered(bool isChecked)
 
     RimViewController* viewController = activeView->viewController();
 
-    RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(viewController);
+    RiuMainWindow::instance()->selectAsCurrentItem(viewController);
 }
 
 //--------------------------------------------------------------------------------------------------

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(selection.back());
-    {
-        RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(uiItem);
-    }
 }
 
 //--------------------------------------------------------------------------------------------------

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;
 }

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;
 }

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

ApplicationCode/ProjectDataModel/RimView.cpp

@@ -875,6 +875,6 @@ bool RimView::showActiveCellsOnly()
 //--------------------------------------------------------------------------------------------------
 void RimView::selectOverlayInfoConfig()
 {
-    RiuMainWindow::instance()->setCurrentObjectInTreeView(m_overlayInfoConfig);
+    RiuMainWindow::instance()->selectAsCurrentItem(m_overlayInfoConfig);
 }
 

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);
 }

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<RimCase*>& cases);
 

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;
         }

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 <QWheelEvent>
-#include <QMouseEvent>
 #include <QFont>
+#include <QMouseEvent>
+#include <QScrollArea>
+#include <QWheelEvent>
 
 #include <float.h>
-#include <QScrollArea>
 
 #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);
         }
     }
 }