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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-16 11:38:35 +01:00
parent 3c3bb153ac
commit 76abf0fe01
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,19 +23,19 @@
#include "RigWellPath.h" #include "RigWellPath.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimModeledWellPath.h"
#include "RimWellPath.h"
#include "RimWellPathGeometryDef.h" #include "RimWellPathGeometryDef.h"
#include "RimWellPathTarget.h" #include "RimWellPathTarget.h"
#include "RimWellPath.h"
#include "RiuViewerCommands.h"
#include "RivWellPathSourceInfo.h" #include "RivWellPathSourceInfo.h"
#include "cafSelectionManager.h"
#include "cafDisplayCoordTransform.h" #include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h"
#include <vector> #include <vector>
#include "RiuViewerCommands.h"
#include "RimModeledWellPath.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -43,16 +43,12 @@
RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef) RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef)
: m_geometryToAddTargetsTo(wellGeometryDef) : m_geometryToAddTargetsTo(wellGeometryDef)
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() {}
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -83,17 +79,20 @@ bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent&
auto firstPickItem = eventObject.m_pickItemInfos.front(); auto firstPickItem = eventObject.m_pickItemInfos.front();
auto wellPathSourceInfo = dynamic_cast<const RivWellPathSourceInfo*>(firstPickItem.sourceInfo()); auto wellPathSourceInfo = dynamic_cast<const RivWellPathSourceInfo*>(firstPickItem.sourceInfo());
auto intersectionPointInDomain = rimView->displayCoordTransform()->transformToDomainCoord(firstPickItem.globalPickedPoint()); auto intersectionPointInDomain =
rimView->displayCoordTransform()->transformToDomainCoord(firstPickItem.globalPickedPoint());
bool doSetAzimuthAndInclination = false; bool doSetAzimuthAndInclination = false;
double azimuth = 0.0; double azimuth = 0.0;
double inclination = 0.0; double inclination = 0.0;
if (wellPathSourceInfo) if (wellPathSourceInfo)
{ {
targetPointInDomain = wellPathSourceInfo->closestPointOnCenterLine(firstPickItem.faceIdx(), intersectionPointInDomain); targetPointInDomain =
wellPathSourceInfo->closestPointOnCenterLine(firstPickItem.faceIdx(), intersectionPointInDomain);
double md = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain); double md = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain);
doSetAzimuthAndInclination = calculateAzimuthAndInclinationAtMd(md, wellPathSourceInfo->wellPath()->wellPathGeometry(), &azimuth, &inclination); doSetAzimuthAndInclination = calculateAzimuthAndInclinationAtMd(
md, wellPathSourceInfo->wellPath()->wellPathGeometry(), &azimuth, &inclination);
} }
else else
{ {
@ -126,7 +125,8 @@ bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent&
if (doSetAzimuthAndInclination) if (doSetAzimuthAndInclination)
{ {
newTarget->setAsPointXYZAndTangentTarget(cvf::Vec3d(relativeTagetPoint.x(), relativeTagetPoint.y(), relativeTagetPoint.z()), azimuth, inclination); newTarget->setAsPointXYZAndTangentTarget(
cvf::Vec3d(relativeTagetPoint.x(), relativeTagetPoint.y(), relativeTagetPoint.z()), azimuth, inclination);
} }
else else
{ {

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

@ -35,8 +35,6 @@ public:
~RicCreateWellTargetsPickEventHandler(); ~RicCreateWellTargetsPickEventHandler();
protected: protected:
caf::PdmPointer<RimWellPathGeometryDef> m_geometryToAddTargetsTo;
bool handlePickEvent(const Ric3DPickEvent& eventObject) override; bool handlePickEvent(const Ric3DPickEvent& eventObject) override;
void notifyUnregistered() override; void notifyUnregistered() override;
@ -45,5 +43,7 @@ private:
const RigWellPath* wellPathGeometry, const RigWellPath* wellPathGeometry,
double* azimuth, double* azimuth,
double* inclination) const; double* inclination) const;
};
private:
caf::PdmPointer<RimWellPathGeometryDef> m_geometryToAddTargetsTo;
};