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 RicPickEventHandler hierarchy

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-02-06 09:45:30 +01:00
parent 4ec8869743
commit dbe21b7809
20 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -112,7 +112,7 @@
// RiaViewerCommands
//
//==================================================================================================
RicPickEventHandler* RiuViewerCommands::sm_overridingPickHandler = nullptr;
Ric3dViewPickEventHandler* RiuViewerCommands::sm_overridingPickHandler = nullptr;
std::vector<RicDefaultPickEventHandler*> RiuViewerCommands::sm_defaultPickEventHandlers;
//--------------------------------------------------------------------------------------------------
@@ -551,7 +551,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
for (size_t i = 0; i < sm_defaultPickEventHandlers.size(); i++)
{
if (sm_defaultPickEventHandlers[i]->handlePickEvent(viewerEventObject))
if (sm_defaultPickEventHandlers[i]->handle3dPickEvent(viewerEventObject))
{
return;
}
@@ -926,7 +926,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::setPickEventHandler(RicPickEventHandler* pickEventHandler)
void RiuViewerCommands::setPickEventHandler(Ric3dViewPickEventHandler* pickEventHandler)
{
if (sm_overridingPickHandler) sm_overridingPickHandler->notifyUnregistered();
@@ -936,7 +936,7 @@ void RiuViewerCommands::setPickEventHandler(RicPickEventHandler* pickEventHandle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::removePickEventHandlerIfActive(RicPickEventHandler* pickEventHandler)
void RiuViewerCommands::removePickEventHandlerIfActive(Ric3dViewPickEventHandler* pickEventHandler)
{
if (sm_overridingPickHandler == pickEventHandler)
{

8
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -26,7 +26,7 @@
#include <QPointer>
class RicDefaultPickEventHandler;
class RicPickEventHandler;
class Ric3dViewPickEventHandler;
class RimEclipseView;
class RimGeoMechView;
class RimIntersection;
@@ -60,8 +60,8 @@ public:
void displayContextMenu(QMouseEvent* event);
void handlePickAction(int winPosX, int winPosY, Qt::KeyboardModifiers keyboardModifiers);
static void setPickEventHandler(RicPickEventHandler* pickEventHandler);
static void removePickEventHandlerIfActive(RicPickEventHandler* pickEventHandler);
static void setPickEventHandler(Ric3dViewPickEventHandler* pickEventHandler);
static void removePickEventHandlerIfActive(Ric3dViewPickEventHandler* pickEventHandler);
cvf::Vec3d lastPickPositionInDomainCoords() const;
private:
@@ -87,7 +87,7 @@ private:
caf::PdmPointer<Rim3dView> m_reservoirView;
QPointer<RiuViewer> m_viewer;
static RicPickEventHandler* sm_overridingPickHandler;
static Ric3dViewPickEventHandler* sm_overridingPickHandler;
static std::vector<RicDefaultPickEventHandler*> sm_defaultPickEventHandlers;
void handleTextPicking(int winPosX, int winPosY, cvf::HitItemCollection* hitItems);
};