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

#3757 Rename RiuSelectionManager to Riu3dSelectionManager

Browse Source
This commit is contained in:
Jacob Støren 2018-11-30 12:53:46 +01:00
parent c2206abca5
commit 92a45e959e
31 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaApplication.cpp
View File

@ -79,7 +79,7 @@
#include "RiuMainWindow.h"
#include "RiuProcessMonitor.h"
#include "RiuRecentFileActionProvider.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "cafAppEnum.h"
@ -1598,8 +1598,8 @@ bool RiaApplication::enableDevelopmentFeatures()
//--------------------------------------------------------------------------------------------------
void RiaApplication::clearAllSelections()
{
RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_APPLICATION_GLOBAL);
RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_APPLICATION_GLOBAL);
Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_TEMPORARY);
caf::SelectionManager::instance()->clearAll();
}

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

@ -27,7 +27,7 @@
#include "RimWellPath.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafSelectionManager.h"
@ -70,8 +70,8 @@ void RicNewFishbonesSubsAtMeasuredDepthFeature::onActionTriggered(bool isChecked
//--------------------------------------------------------------------------------------------------
RiuWellPathSelectionItem* RicNewFishbonesSubsAtMeasuredDepthFeature::wellPathSelectionItem()
{
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);

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

@ -28,7 +28,7 @@
#include "RimWellPathCollection.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafSelectionManager.h"
@ -70,8 +70,8 @@ void RicNewPerforationIntervalAtMeasuredDepthFeature::onActionTriggered(bool isC
//--------------------------------------------------------------------------------------------------
RiuWellPathSelectionItem* RicNewPerforationIntervalAtMeasuredDepthFeature::wellPathSelectionItem()
{
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);

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

@ -26,7 +26,7 @@
#include "RimGridView.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "cafCmdExecCommandManager.h"
@ -124,7 +124,7 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
m_intersectionCollection->appendIntersectionAndUpdate(intersection);
RiuSelectionManager::instance()->deleteAllItems();
Riu3dSelectionManager::instance()->deleteAllItems();
Riu3DMainWindowTools::selectAsCurrentItem(intersection);
}

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

@ -27,7 +27,7 @@
#include "RimGridView.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "cafCmdExecCommandManager.h"
@ -114,7 +114,7 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
m_intersectionCollection->appendIntersectionAndUpdate(intersection);
RiuSelectionManager::instance()->deleteAllItems();
Riu3dSelectionManager::instance()->deleteAllItems();
Riu3DMainWindowTools::selectAsCurrentItem(intersection);
}

6
ApplicationCode/Commands/FractureCommands/RicNewSimWellFractureAtPosFeature.cpp
View File

@ -35,7 +35,7 @@
#include "RimStimPlanColors.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RivSimWellPipeSourceInfo.h"
#include "cafSelectionManager.h"
@ -57,8 +57,8 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuSimWellSelectionItem* simWellItem = static_cast<RiuSimWellSelectionItem*>(selItem);
if (!simWellItem) return;

6
ApplicationCode/Commands/FractureCommands/RicNewWellPathFractureAtPosFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RimProject.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QAction>
@ -40,8 +40,8 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
RimProject* proj = RiaApplication::instance()->project();
if (proj->allFractureTemplates().empty()) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuWellPathSelectionItem* wellPathItem = dynamic_cast<RiuWellPathSelectionItem*>(selItem);
if (!wellPathItem) return;

6
ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimIntersection.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafSelectionManagerTools.h"
@ -102,8 +102,8 @@ std::set<RimIntersection*> RicNewIntersectionViewFeature::selectedIntersections(
{
std::set<RimIntersection*> objects;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
if (generalSelectionItem)

2
ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
View File

@ -51,7 +51,7 @@
#include "RimWellPathCompletions.h"
#include "RiuPlotMainWindow.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QAction>
#include <QDir>

10
ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimIntersectionBox.h"
#include "Rim3dView.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QAction>
@ -37,8 +37,8 @@ bool RicHideIntersectionBoxFeature::isCommandEnabled()
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
if (!generalSelectionItem) return false;
@ -59,8 +59,8 @@ void RicHideIntersectionBoxFeature::onActionTriggered(bool isChecked)
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
if (!generalSelectionItem) return;

10
ApplicationCode/Commands/RicHideIntersectionFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimIntersection.h"
#include "Rim3dView.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QAction>
@ -37,8 +37,8 @@ bool RicHideIntersectionFeature::isCommandEnabled()
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return false;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
if (!generalSelectionItem) return false;
@ -59,8 +59,8 @@ void RicHideIntersectionFeature::onActionTriggered(bool isChecked)
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>(selItem);
if (!generalSelectionItem) return;

2
ApplicationCode/Commands/RicReloadCaseFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimEclipseCase.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafPdmObject.h"
#include "cafSelectionManager.h"

8
ApplicationCode/Commands/RicWellLogTools.cpp
View File

@ -36,7 +36,7 @@
#include "RifReaderEclipseRft.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
@ -47,7 +47,7 @@
//--------------------------------------------------------------------------------------------------
RimSimWellInView* RicWellLogTools::selectedSimulationWell(int *branchIndex)
{
RiuSelectionItem* selItem = RiuSelectionManager::instance()->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
RiuSelectionItem* selItem = Riu3dSelectionManager::instance()->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuSimWellSelectionItem* simWellSelItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
if (simWellSelItem)
{
@ -93,8 +93,8 @@ bool RicWellLogTools::wellHasRftData(const QString& wellName)
//--------------------------------------------------------------------------------------------------
bool RicWellLogTools::isWellPathOrSimWellSelectedInView()
{
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuSimWellSelectionItem* simWellSelectionItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
if (simWellSelectionItem) return true;

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

@ -37,7 +37,7 @@
#include "RimSummaryPlotCollection.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafPdmReferenceHelper.h"
#include "cafPdmUiPropertyViewDialog.h"
@ -206,7 +206,7 @@ bool RicNewGridTimeHistoryCurveFeature::isCommandEnabled()
if (RicWellLogTools::isWellPathOrSimWellSelectedInView()) return false;
std::vector<RiuSelectionItem*> items;
RiuSelectionManager::instance()->selectedItems(items);
Riu3dSelectionManager::instance()->selectedItems(items);
if (items.size() > 0)
{
@ -234,7 +234,7 @@ void RicNewGridTimeHistoryCurveFeature::onActionTriggered(bool isChecked)
if (!summaryPlot) return;
std::vector<RiuSelectionItem*> items;
RiuSelectionManager::instance()->selectedItems(items);
Riu3dSelectionManager::instance()->selectedItems(items);
CVF_ASSERT(items.size() > 0);
for (auto item : items)

4
ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
View File

@ -39,7 +39,7 @@
#include "RimEclipseResultCase.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafSelectionManagerTools.h"
@ -152,7 +152,7 @@ RimWellPath* RicNewPltPlotFeature::selectedWellPath() const
//--------------------------------------------------------------------------------------------------
RimSimWellInView* RicNewPltPlotFeature::selectedSimulationWell(int * branchIndex) const
{
RiuSelectionItem* selItem = RiuSelectionManager::instance()->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
RiuSelectionItem* selItem = Riu3dSelectionManager::instance()->selectedItem(Riu3dSelectionManager::RUI_TEMPORARY);
RiuSimWellSelectionItem* simWellSelItem = dynamic_cast<RiuSimWellSelectionItem*>(selItem);
if (simWellSelItem)
{

2
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
View File

@ -38,7 +38,7 @@
#include "RimWellPathCollection.h"
#include "RiuPlotMainWindow.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "cafSelectionManager.h"

2
ApplicationCode/GeoMech/GeoMechDataModel/RimGeoMechGeometrySelectionItem.cpp
View File

@ -22,7 +22,7 @@
#include "RimGeoMechView.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
CAF_PDM_SOURCE_INIT(RimGeoMechGeometrySelectionItem, "GeoMechGeometrySelectionItem");

2
ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
View File

@ -23,7 +23,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
CAF_PDM_SOURCE_INIT(RimEclipseGeometrySelectionItem, "EclipseGeometrySelectionItem");

4
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -67,7 +67,7 @@
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "RivReservoirSimWellsPartMgr.h"
@ -1804,7 +1804,7 @@ bool RimEclipseView::showActiveCellsOnly()
//--------------------------------------------------------------------------------------------------
void RimEclipseView::createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts)
{
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
std::vector<RiuSelectionItem*> items;
riuSelManager->selectedItems(items);

4
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -42,7 +42,7 @@
#include "RimViewLinker.h"
#include "Riu3DMainWindowTools.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "RivGeoMechPartMgr.h"
@ -769,7 +769,7 @@ void RimGeoMechView::calculateCurrentTotalCellVisibility(cvf::UByteArray* totalV
//--------------------------------------------------------------------------------------------------
void RimGeoMechView::createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts)
{
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
Riu3dSelectionManager* riuSelManager = Riu3dSelectionManager::instance();
std::vector<RiuSelectionItem*> items;
riuSelManager->selectedItems(items);
for (size_t i = 0; i < items.size(); i++)

2
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@ -41,7 +41,7 @@
#include "RiuFemTimeHistoryResultAccessor.h"
#include "RiuQwtPlotCurve.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "qwt_plot.h"

4
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@ -46,7 +46,7 @@
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInViewCollection.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QTcpSocket>
@ -599,7 +599,7 @@ public:
std::vector<qint32>& cellK)
{
std::vector<RiuSelectionItem*> items;
RiuSelectionManager::instance()->selectedItems(items);
Riu3dSelectionManager::instance()->selectedItems(items);
for (const RiuSelectionItem* item : items)
{

4
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@ -45,7 +45,7 @@
#include "RiuMainWindow.h"
#include "RiuProcessMonitor.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QErrorMessage>
@ -1296,7 +1296,7 @@ public:
static std::vector< std::pair<size_t, size_t> > getSelectedCellsForCase(const RimCase* reservoirCase)
{
std::vector<RiuSelectionItem*> items;
RiuSelectionManager::instance()->selectedItems(items);
Riu3dSelectionManager::instance()->selectedItems(items);
std::vector< std::pair<size_t, size_t> > selectedCells;

4
ApplicationCode/UserInterface/CMakeLists_files.cmake
View File

@ -34,7 +34,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.h
${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.h
${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.h
${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.h
${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.h
${CMAKE_CURRENT_LIST_DIR}/Riu3dSelectionManager.h
${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.h
${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.h
@ -112,7 +112,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.cpp
${CMAKE_CURRENT_LIST_DIR}/Riu3dSelectionManager.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.cpp

24
ApplicationCode/UserInterface/RiuSelectionManager.cpp → ApplicationCode/UserInterface/Riu3dSelectionManager.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RimGridView.h"
#include "RimEclipseView.h"
@ -35,7 +35,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionManager::RiuSelectionManager()
Riu3dSelectionManager::Riu3dSelectionManager()
: m_notificationCenter(new RiuSelectionChangedHandler)
{
m_selection.resize(2);
@ -44,7 +44,7 @@ RiuSelectionManager::RiuSelectionManager()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionManager::~RiuSelectionManager()
Riu3dSelectionManager::~Riu3dSelectionManager()
{
deleteAllItemsFromSelection(RUI_APPLICATION_GLOBAL);
deleteAllItemsFromSelection(RUI_TEMPORARY);
@ -55,16 +55,16 @@ RiuSelectionManager::~RiuSelectionManager()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionManager* RiuSelectionManager::instance()
Riu3dSelectionManager* Riu3dSelectionManager::instance()
{
static RiuSelectionManager* singleton = new RiuSelectionManager;
static Riu3dSelectionManager* singleton = new Riu3dSelectionManager;
return singleton;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, int role) const
void Riu3dSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, int role) const
{
const std::vector<RiuSelectionItem*>& s = m_selection[role];
@ -75,7 +75,7 @@ void RiuSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items, i
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionItem* RiuSelectionManager::selectedItem(int role /*= RUI_APPLICATION_GLOBAL*/) const
RiuSelectionItem* Riu3dSelectionManager::selectedItem(int role /*= RUI_APPLICATION_GLOBAL*/) const
{
const std::vector<RiuSelectionItem*>& s = m_selection[role];
@ -93,7 +93,7 @@ RiuSelectionItem* RiuSelectionManager::selectedItem(int role /*= RUI_APPLICATION
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role)
void Riu3dSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role)
{
std::vector<RiuSelectionItem*>& s = m_selection[role];
@ -105,7 +105,7 @@ void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item, int role
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
void Riu3dSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
{
deleteAllItemsFromSelection(role);
@ -119,7 +119,7 @@ void RiuSelectionManager::setSelectedItem(RiuSelectionItem* item, int role)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::deleteAllItems(int role)
void Riu3dSelectionManager::deleteAllItems(int role)
{
if (!isEmpty(role))
{
@ -132,7 +132,7 @@ void RiuSelectionManager::deleteAllItems(int role)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiuSelectionManager::isEmpty(int role) const
bool Riu3dSelectionManager::isEmpty(int role) const
{
const std::vector<RiuSelectionItem*>& s = m_selection[role];
@ -142,7 +142,7 @@ bool RiuSelectionManager::isEmpty(int role) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::deleteAllItemsFromSelection(int role)
void Riu3dSelectionManager::deleteAllItemsFromSelection(int role)
{
std::vector<RiuSelectionItem*>& s = m_selection[role];

10
ApplicationCode/UserInterface/RiuSelectionManager.h → ApplicationCode/UserInterface/Riu3dSelectionManager.h
View File

@ -48,7 +48,7 @@ class RivWellPathSourceInfo;
//
//
//==================================================================================================
class RiuSelectionManager
class Riu3dSelectionManager
{
public:
enum SelectionRole
@ -58,7 +58,7 @@ public:
};
public:
static RiuSelectionManager* instance();
static Riu3dSelectionManager* instance();
// Returns selected items
// Selection manager owns the selection items
@ -84,9 +84,9 @@ public:
bool isEmpty(int role = RUI_APPLICATION_GLOBAL) const;
private:
RiuSelectionManager();
~RiuSelectionManager();
RiuSelectionManager(const RiuSelectionManager&) = delete;
Riu3dSelectionManager();
~Riu3dSelectionManager();
Riu3dSelectionManager(const Riu3dSelectionManager&) = delete;
void deleteAllItemsFromSelection(int role);

2
ApplicationCode/UserInterface/RiuMohrsCirclePlot.cpp
View File

@ -20,7 +20,7 @@
#include "RiaColorTables.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuSummaryQwtPlot.h"
#include "RigFemPart.h"

4
ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp
View File

@ -19,7 +19,7 @@
#include "RiuPvtPlotUpdater.h"
#include "RiuPvtPlotPanel.h"
#include "RiuRelativePermeabilityPlotUpdater.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
@ -118,7 +118,7 @@ void RiuPvtPlotUpdater::updateOnTimeStepChanged(Rim3dView* changedView)
}
// Fetch the current global selection and only continue if the selection's view matches the view with time step change
const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(RiuSelectionManager::instance()->selectedItem());
const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(Riu3dSelectionManager::instance()->selectedItem());
if (eclipseSelectionItem && eclipseSelectionItem->m_view == eclipseView)
{
const size_t gridIndex = eclipseSelectionItem->m_gridIndex;

4
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp
View File

@ -18,7 +18,7 @@
#include "RiuRelativePermeabilityPlotUpdater.h"
#include "RiuRelativePermeabilityPlotPanel.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
@ -118,7 +118,7 @@ void RiuRelativePermeabilityPlotUpdater::updateOnTimeStepChanged(Rim3dView* chan
}
// Fetch the current global selection and only continue if the selection's view matches the view with time step change
const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(RiuSelectionManager::instance()->selectedItem());
const RiuEclipseSelectionItem* eclipseSelectionItem = dynamic_cast<const RiuEclipseSelectionItem*>(Riu3dSelectionManager::instance()->selectedItem());
if (eclipseSelectionItem && eclipseSelectionItem->m_view == eclipseView)
{
const size_t gridIndex = eclipseSelectionItem->m_gridIndex;

2
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@ -48,7 +48,7 @@
#include "RiuRelativePermeabilityPlotUpdater.h"
#include "RiuResultQwtPlot.h"
#include "RiuResultTextBuilder.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include <QStatusBar>

20
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -64,7 +64,7 @@
#include "RiuMainWindow.h"
#include "RiuResultTextBuilder.h"
#include "RiuSelectionManager.h"
#include "Riu3dSelectionManager.h"
#include "RiuViewer.h"
#include "RiuPickItemInfo.h"
@ -253,7 +253,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
RiuSelectionItem* selItem = new RiuGeneralSelectionItem(crossSectionSourceInfo->crossSection());
RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
if (gridView)
{
@ -273,7 +273,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
m_currentFaceIndex = cvf::StructGridInterface::NO_FACE;
RiuSelectionItem* selItem = new RiuGeneralSelectionItem(intersectionBoxSourceInfo->intersectionBox());
RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
menuBuilder << "RicHideIntersectionBoxFeature";
menuBuilder.addSeparator();
@ -374,7 +374,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
double measuredDepth = wellPathSourceInfo->measuredDepth(firstPartTriangleIndex, pickedPositionInUTM);
cvf::Vec3d closestPointOnCenterLine = wellPathSourceInfo->closestPointOnCenterLine(firstPartTriangleIndex, pickedPositionInUTM);
RiuSelectionItem* selItem = new RiuWellPathSelectionItem(wellPathSourceInfo, closestPointOnCenterLine, measuredDepth);
RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
}
//TODO: Update so these also use RiuWellPathSelectionItem
@ -431,7 +431,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
caf::SelectionManager::instance()->setSelectedItem(well);
RiuSelectionItem* selItem = new RiuSimWellSelectionItem(eclipseWellSourceInfo->well(), m_currentPickPositionInDomainCoords, eclipseWellSourceInfo->branchIndex());
RiuSelectionManager::instance()->setSelectedItem(selItem, RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->setSelectedItem(selItem, Riu3dSelectionManager::RUI_TEMPORARY);
menuBuilder << "RicNewWellLogCurveExtractionFeature";
menuBuilder << "RicNewWellLogRftCurveFeature";
@ -497,7 +497,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
}
// Delete items in temporary selection
RiuSelectionManager::instance()->deleteAllItems(RiuSelectionManager::RUI_TEMPORARY);
Riu3dSelectionManager::instance()->deleteAllItems(Riu3dSelectionManager::RUI_TEMPORARY);
}
//--------------------------------------------------------------------------------------------------
@ -824,7 +824,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
if (cellIndex == cvf::UNDEFINED_SIZE_T)
{
RiuSelectionManager::instance()->deleteAllItems();
Riu3dSelectionManager::instance()->deleteAllItems();
}
else
{
@ -835,7 +835,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
}
std::vector<RiuSelectionItem*> items;
RiuSelectionManager::instance()->selectedItems(items);
Riu3dSelectionManager::instance()->selectedItems(items);
const caf::ColorTable& colorTable = RiaColorTables::selectionPaletteColors();
@ -874,11 +874,11 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
if (appendToSelection)
{
RiuSelectionManager::instance()->appendItemToSelection(selItem);
Riu3dSelectionManager::instance()->appendItemToSelection(selItem);
}
else if(selItem)
{
RiuSelectionManager::instance()->setSelectedItem(selItem);
Riu3dSelectionManager::instance()->setSelectedItem(selItem);
}
}