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

#3249 Refactoring: Rename of classes to PickEventHandler

Browse Source
This commit is contained in:
Jacob Støren 2018-08-27 15:49:57 +02:00
parent cbb7f4b0c9
commit 0a2b68348f
13 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@ -45,6 +45,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicExportFeatureImpl.h
${CMAKE_CURRENT_LIST_DIR}/RicSelectOrCreateViewFeatureImpl.h
${CMAKE_CURRENT_LIST_DIR}/RicPickEventHandler.h
# General delete of any object in a child array field
${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemExec.h

2
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.h
View File

@ -18,7 +18,7 @@
#pragma once
#include "RicViewerEventInterface.h"
#include "RicPickEventHandler.h"
#include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h"

2
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.h
View File

@ -19,7 +19,7 @@
#pragma once
#include "RicViewerEventInterface.h"
#include "RicPickEventHandler.h"
#include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h"

0
ApplicationCode/Commands/RicViewerEventInterface.h → ApplicationCode/Commands/RicPickEventHandler.h
View File

4
ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake
View File

@ -26,7 +26,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogFileCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogRftCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurveDeleteFeature.h
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurveViewerEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurvePickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicNewWellBoreStabilityPlotFeature.h
)
@ -57,7 +57,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogFileCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicAdd3dWellLogRftCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurveDeleteFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurveViewerEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/Ric3dWellLogCurvePickEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewWellBoreStabilityPlotFeature.cpp
)

8
ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveViewerEventHandler.cpp → ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurvePickEventHandler.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "Ric3dWellLogCurveViewerEventHandler.h"
#include "Ric3dWellLogCurvePickEventHandler.h"
#include "Rim3dWellLogCurve.h"
#include "Rim3dWellLogCurveCollection.h"
@ -30,16 +30,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Ric3dWellLogCurveViewerEventHandler* Ric3dWellLogCurveViewerEventHandler::instance()
Ric3dWellLogCurvePickEventHandler* Ric3dWellLogCurvePickEventHandler::instance()
{
static Ric3dWellLogCurveViewerEventHandler* singleton = new Ric3dWellLogCurveViewerEventHandler;
static Ric3dWellLogCurvePickEventHandler* singleton = new Ric3dWellLogCurvePickEventHandler;
return singleton;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Ric3dWellLogCurveViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool Ric3dWellLogCurvePickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
if (eventObject.m_pickItemInfos.empty()) return false;

6
ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveViewerEventHandler.h → ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurvePickEventHandler.h
View File

@ -19,15 +19,15 @@
#pragma once
#include "RicViewerEventInterface.h"
#include "RicPickEventHandler.h"
//==================================================================================================
///
//==================================================================================================
class Ric3dWellLogCurveViewerEventHandler : public RicPickEventHandler
class Ric3dWellLogCurvePickEventHandler : public RicPickEventHandler
{
public:
static Ric3dWellLogCurveViewerEventHandler* instance();
static Ric3dWellLogCurvePickEventHandler* instance();
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
};

8
ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
View File

@ -10,8 +10,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellPathTargetFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellPathAttributeFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsImpl.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathViewerEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicIntersectionViewerEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicIntersectionPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPointTangentManipulator.h
)
@ -27,8 +27,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellPathTargetFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellPathAttributeFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsImpl.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathViewerEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RicIntersectionViewerEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathPickEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RicIntersectionPickEventHandler.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPointTangentManipulator.cpp
)

8
ApplicationCode/Commands/WellPathCommands/RicIntersectionViewerEventHandler.cpp → ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicIntersectionViewerEventHandler.h"
#include "RicIntersectionPickEventHandler.h"
#include "RimIntersection.h"
#include "Rim3dView.h"
@ -28,16 +28,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicIntersectionViewerEventHandler* RicIntersectionViewerEventHandler::instance()
RicIntersectionPickEventHandler* RicIntersectionPickEventHandler::instance()
{
static RicIntersectionViewerEventHandler* singleton = new RicIntersectionViewerEventHandler;
static RicIntersectionPickEventHandler* singleton = new RicIntersectionPickEventHandler;
return singleton;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicIntersectionViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
std::vector<RimIntersection*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);

6
ApplicationCode/Commands/WellPathCommands/RicIntersectionViewerEventHandler.h → ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.h
View File

@ -18,15 +18,15 @@
#pragma once
#include "RicViewerEventInterface.h"
#include "RicPickEventHandler.h"
//==================================================================================================
///
//==================================================================================================
class RicIntersectionViewerEventHandler : public RicPickEventHandler
class RicIntersectionPickEventHandler : public RicPickEventHandler
{
public:
static RicIntersectionViewerEventHandler* instance();
static RicIntersectionPickEventHandler* instance();
protected:
virtual bool handlePickEvent(const Ric3DPickEvent& eventObject) override;

8
ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp → ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicWellPathViewerEventHandler.h"
#include "RicWellPathPickEventHandler.h"
#include "RiaApplication.h"
@ -41,16 +41,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicWellPathViewerEventHandler* RicWellPathViewerEventHandler::instance()
RicWellPathPickEventHandler* RicWellPathPickEventHandler::instance()
{
static RicWellPathViewerEventHandler* singleton = new RicWellPathViewerEventHandler;
static RicWellPathPickEventHandler* singleton = new RicWellPathPickEventHandler;
return singleton;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicWellPathViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicWellPathPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
if (eventObject.m_pickItemInfos.empty()) return false;

6
ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.h → ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.h
View File

@ -19,16 +19,16 @@
#pragma once
#include "RicViewerEventInterface.h"
#include "RicPickEventHandler.h"
//==================================================================================================
///
//==================================================================================================
class RicWellPathViewerEventHandler : public RicPickEventHandler
class RicWellPathPickEventHandler : public RicPickEventHandler
{
public:
static RicWellPathViewerEventHandler* instance();
static RicWellPathPickEventHandler* instance();
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
};

14
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -25,10 +25,10 @@
#include "RicEclipsePropertyFilterNewExec.h"
#include "RicGeoMechPropertyFilterNewExec.h"
#include "RicViewerEventInterface.h"
#include "WellLogCommands/Ric3dWellLogCurveViewerEventHandler.h"
#include "WellPathCommands/RicIntersectionViewerEventHandler.h"
#include "WellPathCommands/RicWellPathViewerEventHandler.h"
#include "RicPickEventHandler.h"
#include "WellLogCommands/Ric3dWellLogCurvePickEventHandler.h"
#include "WellPathCommands/RicIntersectionPickEventHandler.h"
#include "WellPathCommands/RicWellPathPickEventHandler.h"
#include "RigEclipseCaseData.h"
#include "RigFault.h"
@ -120,15 +120,15 @@ RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer)
, m_viewer(ownerViewer)
{
{
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicIntersectionViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicIntersectionPickEventHandler::instance()));
}
{
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(Ric3dWellLogCurveViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(Ric3dWellLogCurvePickEventHandler::instance()));
}
{
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicWellPathViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicWellPathPickEventHandler::instance()));
}
}