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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Commands/RicViewerEventInterface.h
View File

@ -35,17 +35,17 @@ class Rim3dView;
//==================================================================================================
///
//==================================================================================================
class RicViewerEventObject
class Ric3DPickEvent
{
public:
RicViewerEventObject(const std::vector<RiuPickItemInfo>& partAndTriangleIndexPairs,
Rim3dView* view)
: m_partAndTriangleIndexPairs(partAndTriangleIndexPairs)
Ric3DPickEvent(const std::vector<RiuPickItemInfo>& pickItemInfos,
Rim3dView* view)
: m_pickItemInfos(pickItemInfos)
, m_view(view)
{
}
std::vector<RiuPickItemInfo> m_partAndTriangleIndexPairs;
std::vector<RiuPickItemInfo> m_pickItemInfos;
Rim3dView* m_view;
};
@ -53,9 +53,9 @@ public:
//==================================================================================================
///
//==================================================================================================
class RicViewerEventInterface
class RicPickEventHandler
{
public:
virtual bool handleEvent(const RicViewerEventObject& eventObject) = 0;
virtual bool handlePickEvent(const Ric3DPickEvent& eventObject) = 0;
};

12
ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveViewerEventHandler.cpp
View File

@ -39,16 +39,16 @@ Ric3dWellLogCurveViewerEventHandler* Ric3dWellLogCurveViewerEventHandler::instan
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Ric3dWellLogCurveViewerEventHandler::handleEvent(const RicViewerEventObject& eventObject)
bool Ric3dWellLogCurveViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
if (eventObject.m_partAndTriangleIndexPairs.empty()) return false;
if (eventObject.m_pickItemInfos.empty()) return false;
cvf::uint triangleIndex = cvf::UNDEFINED_UINT;
const auto& partAndTriangleIndexPair = eventObject.m_partAndTriangleIndexPairs.front();
const cvf::Part* part = partAndTriangleIndexPair.pickedPart();
const auto& firstPickedItem = eventObject.m_pickItemInfos.front();
const cvf::Part* firstPickedPart = firstPickedItem.pickedPart();
const RivObjectSourceInfo* sourceInfo = dynamic_cast<const RivObjectSourceInfo*>(part->sourceInfo());
const RivObjectSourceInfo* sourceInfo = dynamic_cast<const RivObjectSourceInfo*>(firstPickedPart->sourceInfo());
if (sourceInfo)
{
Rim3dWellLogCurveCollection* curveCollection = dynamic_cast<Rim3dWellLogCurveCollection*>(sourceInfo->object());
@ -60,7 +60,7 @@ bool Ric3dWellLogCurveViewerEventHandler::handleEvent(const RicViewerEventObject
cvf::Vec3d closestPoint;
double measuredDepthAtPoint;
double valueAtPoint;
Rim3dWellLogCurve* curve = curveCollection->checkForCurveIntersection( eventObject.m_partAndTriangleIndexPairs.front().globalPickedPoint(),
Rim3dWellLogCurve* curve = curveCollection->checkForCurveIntersection( firstPickedItem.globalPickedPoint(),
&closestPoint,
&measuredDepthAtPoint,
&valueAtPoint);

4
ApplicationCode/Commands/WellLogCommands/Ric3dWellLogCurveViewerEventHandler.h
View File

@ -24,10 +24,10 @@
//==================================================================================================
///
//==================================================================================================
class Ric3dWellLogCurveViewerEventHandler : public RicViewerEventInterface
class Ric3dWellLogCurveViewerEventHandler : public RicPickEventHandler
{
public:
static Ric3dWellLogCurveViewerEventHandler* instance();
bool handleEvent(const RicViewerEventObject& eventObject) override;
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
};

4
ApplicationCode/Commands/WellPathCommands/RicIntersectionViewerEventHandler.cpp
View File

@ -37,7 +37,7 @@ RicIntersectionViewerEventHandler* RicIntersectionViewerEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicIntersectionViewerEventHandler::handleEvent(const RicViewerEventObject& eventObject)
bool RicIntersectionViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
std::vector<RimIntersection*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
@ -52,7 +52,7 @@ bool RicIntersectionViewerEventHandler::handleEvent(const RicViewerEventObject&
CVF_ASSERT(rimView);
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d domainCoord = transForm->transformToDomainCoord(eventObject.m_partAndTriangleIndexPairs.front().globalPickedPoint());
cvf::Vec3d domainCoord = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
if (intersection->inputPolyLineFromViewerEnabled())
{

4
ApplicationCode/Commands/WellPathCommands/RicIntersectionViewerEventHandler.h
View File

@ -23,12 +23,12 @@
//==================================================================================================
///
//==================================================================================================
class RicIntersectionViewerEventHandler : public RicViewerEventInterface
class RicIntersectionViewerEventHandler : public RicPickEventHandler
{
public:
static RicIntersectionViewerEventHandler* instance();
protected:
virtual bool handleEvent(const RicViewerEventObject& eventObject) override;
virtual bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
};

30
ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.cpp
View File

@ -50,33 +50,33 @@ RicWellPathViewerEventHandler* RicWellPathViewerEventHandler::instance()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicWellPathViewerEventHandler::handleEvent(const RicViewerEventObject& eventObject)
bool RicWellPathViewerEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{
if (eventObject.m_partAndTriangleIndexPairs.empty()) return false;
if (eventObject.m_pickItemInfos.empty()) return false;
const caf::PdmObject* objectToSelect = nullptr;
cvf::uint wellPathTriangleIndex = cvf::UNDEFINED_UINT;
const RivWellPathSourceInfo* wellPathSourceInfo = nullptr;
if(!eventObject.m_partAndTriangleIndexPairs.empty())
if(!eventObject.m_pickItemInfos.empty())
{
const auto & partAndTriangleIndexPair = eventObject.m_partAndTriangleIndexPairs.front();
const cvf::Part* part = partAndTriangleIndexPair.pickedPart();
const auto & firstPickedItem = eventObject.m_pickItemInfos.front();
const cvf::Part* firstPickedPart = firstPickedItem.pickedPart();
if (part)
if (firstPickedPart)
{
const RivObjectSourceInfo* sourceInfo = dynamic_cast<const RivObjectSourceInfo*>(part->sourceInfo());
const RivObjectSourceInfo* sourceInfo = dynamic_cast<const RivObjectSourceInfo*>(firstPickedPart->sourceInfo());
if (sourceInfo)
{
if (dynamic_cast<RimPerforationInterval*>(sourceInfo->object()))
{
objectToSelect = sourceInfo->object();
if (eventObject.m_partAndTriangleIndexPairs.size() > 1)
if (eventObject.m_pickItemInfos.size() > 1)
{
const auto& secondPair = eventObject.m_partAndTriangleIndexPairs[1];
const cvf::Part* secondPickedPart = secondPair.pickedPart();
const auto& secondPickedItem = eventObject.m_pickItemInfos[1];
const cvf::Part* secondPickedPart = secondPickedItem.pickedPart();
if (secondPickedPart)
{
auto wellPathSourceCandidate =
@ -89,7 +89,7 @@ bool RicWellPathViewerEventHandler::handleEvent(const RicViewerEventObject& even
{
wellPathSourceInfo =
dynamic_cast<const RivWellPathSourceInfo*>(secondPickedPart->sourceInfo());
wellPathTriangleIndex = secondPair.faceIdx();
wellPathTriangleIndex = secondPickedItem.faceIdx();
}
}
}
@ -97,10 +97,10 @@ bool RicWellPathViewerEventHandler::handleEvent(const RicViewerEventObject& even
}
}
if (dynamic_cast<const RivWellPathSourceInfo*>(part->sourceInfo()))
if (dynamic_cast<const RivWellPathSourceInfo*>(firstPickedPart->sourceInfo()))
{
wellPathSourceInfo = dynamic_cast<const RivWellPathSourceInfo*>(part->sourceInfo());
wellPathTriangleIndex = partAndTriangleIndexPair.faceIdx();
wellPathSourceInfo = dynamic_cast<const RivWellPathSourceInfo*>(firstPickedPart->sourceInfo());
wellPathTriangleIndex = firstPickedItem.faceIdx();
}
}
}
@ -111,7 +111,7 @@ bool RicWellPathViewerEventHandler::handleEvent(const RicViewerEventObject& even
if (!rimView) return false;
cvf::ref<caf::DisplayCoordTransform> transForm = rimView->displayCoordTransform();
cvf::Vec3d pickedPositionInUTM = transForm->transformToDomainCoord(eventObject.m_partAndTriangleIndexPairs.front().globalPickedPoint());
cvf::Vec3d pickedPositionInUTM = transForm->transformToDomainCoord(eventObject.m_pickItemInfos.front().globalPickedPoint());
if (auto intersectionView = dynamic_cast<Rim2dIntersectionView*>(rimView))
{

4
ApplicationCode/Commands/WellPathCommands/RicWellPathViewerEventHandler.h
View File

@ -25,11 +25,11 @@
//==================================================================================================
///
//==================================================================================================
class RicWellPathViewerEventHandler : public RicViewerEventInterface
class RicWellPathViewerEventHandler : public RicPickEventHandler
{
public:
static RicWellPathViewerEventHandler* instance();
bool handleEvent(const RicViewerEventObject& eventObject) override;
bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
};

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;
};