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 ViewerEvent to PickEvent

Browse Source
This commit is contained in:
Jacob Støren
2018-08-27 14:42:15 +02:00
parent ad9864240c
commit 58617b7510
9 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -120,15 +120,15 @@ RiuViewerCommands::RiuViewerCommands(RiuViewer* ownerViewer)
, m_viewer(ownerViewer)
{
{
m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(RicIntersectionViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicIntersectionViewerEventHandler::instance()));
}
{
m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(Ric3dWellLogCurveViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(Ric3dWellLogCurveViewerEventHandler::instance()));
}
{
m_viewerEventHandlers.push_back(dynamic_cast<RicViewerEventInterface*>(RicWellPathViewerEventHandler::instance()));
m_pickEventHandlers.push_back(dynamic_cast<RicPickEventHandler*>(RicWellPathViewerEventHandler::instance()));
}
}
@@ -530,12 +530,12 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
{
std::vector<RiuPickItemInfo> pickItemInfos = RiuPickItemInfo::convertToPickItemInfos(hitItems);
RicViewerEventObject viewerEventObject(pickItemInfos,
m_reservoirView);
Ric3DPickEvent viewerEventObject(pickItemInfos,
m_reservoirView);
for (size_t i = 0; i < m_viewerEventHandlers.size(); i++)
for (size_t i = 0; i < m_pickEventHandlers.size(); i++)
{
if (m_viewerEventHandlers[i]->handleEvent(viewerEventObject))
if (m_pickEventHandlers[i]->handlePickEvent(viewerEventObject))
{
return;
}

4
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -25,7 +25,7 @@
#include <QObject>
#include <QPointer>
class RicViewerEventInterface;
class RicPickEventHandler;
class RimEclipseView;
class RimGeoMechView;
class RimIntersection;
@@ -79,5 +79,5 @@ private:
cvf::Vec3d m_currentPickPositionInDomainCoords;
caf::PdmPointer<Rim3dView> m_reservoirView;
QPointer<RiuViewer> m_viewer;
std::vector<RicViewerEventInterface*> m_viewerEventHandlers;
std::vector<RicPickEventHandler*> m_pickEventHandlers;
};