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

Renames in RicPickEvent

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-05 16:07:24 +01:00
parent 0e52426071
commit 8400e4ea02
19 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
View File

@@ -46,7 +46,7 @@ RicMeasurementPickEventHandler* RicMeasurementPickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicMeasurementPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicMeasurementPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
auto measurement = RiaApplication::instance()->project()->measurement();

2
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.h
View File

@@ -29,7 +29,7 @@ public:
static RicMeasurementPickEventHandler* instance();
protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
};

2
ApplicationCode/Commands/RicContourMapPickEventHandler.cpp
View File

@@ -43,7 +43,7 @@ RicContourMapPickEventHandler* RicContourMapPickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicContourMapPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicContourMapPickEventHandler::handlePickEvent(const Ric3dPickEvent& eventObject)
{
if (eventObject.m_pickItemInfos.empty()) return false;

2
ApplicationCode/Commands/RicContourMapPickEventHandler.h
View File

@@ -29,6 +29,6 @@ public:
static RicContourMapPickEventHandler* instance();
protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handlePickEvent(const Ric3dPickEvent& eventObject) override;
};

4
ApplicationCode/Commands/RicPickEventHandler.cpp
View File

@@ -43,8 +43,8 @@ bool RicPickEventHandler::handlePickEvent(const caf::PickEvent& eventObject)
{
try
{
const Ric3DPickEvent& eventObject3d = dynamic_cast<const Ric3DPickEvent&>(eventObject);
return handlePickEvent(eventObject3d);
const Ric3dPickEvent& eventObject3d = dynamic_cast<const Ric3dPickEvent&>(eventObject);
return handle3dPickEvent(eventObject3d);
}
catch (const std::bad_cast&)
{

8
ApplicationCode/Commands/RicPickEventHandler.h
View File

@@ -38,10 +38,10 @@ class Rim3dView;
//==================================================================================================
///
//==================================================================================================
class Ric3DPickEvent : public caf::PickEvent
class Ric3dPickEvent : public caf::PickEvent
{
public:
Ric3DPickEvent(const std::vector<RiuPickItemInfo>& pickItemInfos,
Ric3dPickEvent(const std::vector<RiuPickItemInfo>& pickItemInfos,
Rim3dView* view)
: m_pickItemInfos(pickItemInfos)
, m_view(view)
@@ -59,7 +59,7 @@ public:
class RicDefaultPickEventHandler
{
public:
virtual bool handlePickEvent(const Ric3DPickEvent& eventObject) = 0;
virtual bool handlePickEvent(const Ric3dPickEvent& eventObject) = 0;
};
//==================================================================================================
@@ -72,6 +72,6 @@ public:
void registerAsPickEventHandler() override;
void unregisterAsPickEventHandler() override;
bool handlePickEvent(const caf::PickEvent& eventObject) override;
virtual bool handlePickEvent(const Ric3DPickEvent& eventObject) = 0;
virtual bool handle3dPickEvent(const Ric3dPickEvent& eventObject) = 0;
};

2
ApplicationCode/Commands/RicVec3dPickEventHandler.cpp
View File

@@ -32,7 +32,7 @@ RicVec3dPickEventHandler::RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* ve
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicVec3dPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicVec3dPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
const Rim3dView* rimView = eventObject.m_view;

2
ApplicationCode/Commands/RicVec3dPickEventHandler.h
View File

@@ -30,7 +30,7 @@ class RicVec3dPickEventHandler : public RicPickEventHandler
{
public:
RicVec3dPickEventHandler(caf::PdmField<cvf::Vec3d>* vectorField);
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
private:

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

@@ -39,7 +39,7 @@ Ric3dWellLogCurvePickEventHandler* Ric3dWellLogCurvePickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Ric3dWellLogCurvePickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool Ric3dWellLogCurvePickEventHandler::handlePickEvent(const Ric3dPickEvent& eventObject)
{
if (eventObject.m_pickItemInfos.empty()) return false;

2
ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurvePickEventHandler.h
View File

@@ -29,5 +29,5 @@ class Ric3dWellLogCurvePickEventHandler : public RicDefaultPickEventHandler
public:
static Ric3dWellLogCurvePickEventHandler* instance();
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handlePickEvent(const Ric3dPickEvent& eventObject) override;
};

2
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
View File

@@ -75,7 +75,7 @@ void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicCreateWellTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!caf::SelectionManager::instance()->isSelected(m_geometryToAddTargetsTo.p(), 0))
{

2
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.h
View File

@@ -35,7 +35,7 @@ public:
~RicCreateWellTargetsPickEventHandler();
protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
private:

2
ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp
View File

@@ -39,7 +39,7 @@ RicIntersectionPickEventHandler* RicIntersectionPickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicIntersectionPickEventHandler::handlePickEvent(const Ric3dPickEvent& eventObject)
{
std::vector<RimIntersection*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);

2
ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.h
View File

@@ -29,6 +29,6 @@ public:
static RicIntersectionPickEventHandler* instance();
protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handlePickEvent(const Ric3dPickEvent& eventObject) override;
};

2
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
View File

@@ -60,7 +60,7 @@ void RicPolylineTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicPolylineTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicPolylineTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!caf::SelectionManager::instance()->isSelected(m_polylineDef.p(), 0))
{

2
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.h
View File

@@ -34,7 +34,7 @@ public:
~RicPolylineTargetsPickEventHandler();
protected:
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handle3dPickEvent(const Ric3dPickEvent& eventObject) override;
void notifyUnregistered() override;
private:

2
ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.cpp
View File

@@ -53,7 +53,7 @@ RicWellPathPickEventHandler* RicWellPathPickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicWellPathPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
bool RicWellPathPickEventHandler::handlePickEvent(const Ric3dPickEvent& eventObject)
{
if (eventObject.m_pickItemInfos.empty()) return false;

2
ApplicationCode/Commands/WellPathCommands/RicWellPathPickEventHandler.h
View File

@@ -30,6 +30,6 @@ class RicWellPathPickEventHandler : public RicDefaultPickEventHandler
public:
static RicWellPathPickEventHandler* instance();
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
bool handlePickEvent(const Ric3dPickEvent& eventObject) override;
};