Whitespace

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

View File

@@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2018- Statoil ASA // Copyright (C) 2018- Statoil ASA
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@@ -23,39 +23,35 @@
#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"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef) RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler(RimWellPathGeometryDef* wellGeometryDef)
: m_geometryToAddTargetsTo(wellGeometryDef) : m_geometryToAddTargetsTo(wellGeometryDef)
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() {}
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicCreateWellTargetsPickEventHandler::notifyUnregistered() void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
{ {
@@ -63,7 +59,7 @@ void RicCreateWellTargetsPickEventHandler::notifyUnregistered()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject) bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent& eventObject)
{ {
@@ -74,37 +70,40 @@ bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent&
return false; return false;
} }
if ( m_geometryToAddTargetsTo ) if (m_geometryToAddTargetsTo)
{ {
Rim3dView* rimView = eventObject.m_view; Rim3dView* rimView = eventObject.m_view;
cvf::Vec3d targetPointInDomain = cvf::Vec3d::ZERO; cvf::Vec3d targetPointInDomain = cvf::Vec3d::ZERO;
// If clicked on an other well path, snap target point to well path center line // If clicked on an other well path, snap target point to well path center line
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 =
bool doSetAzimuthAndInclination = false; rimView->displayCoordTransform()->transformToDomainCoord(firstPickItem.globalPickedPoint());
double azimuth = 0.0; bool doSetAzimuthAndInclination = false;
double inclination = 0.0; double azimuth = 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
{ {
targetPointInDomain = intersectionPointInDomain; targetPointInDomain = intersectionPointInDomain;
doSetAzimuthAndInclination = false; doSetAzimuthAndInclination = false;
} }
if (!m_geometryToAddTargetsTo->firstActiveTarget()) if (!m_geometryToAddTargetsTo->firstActiveTarget())
{ {
m_geometryToAddTargetsTo->setReferencePointXyz(targetPointInDomain); m_geometryToAddTargetsTo->setReferencePointXyz(targetPointInDomain);
if (wellPathSourceInfo) if (wellPathSourceInfo)
{ {
double mdrkbAtFirstTarget = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain); double mdrkbAtFirstTarget = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain);
@@ -114,19 +113,20 @@ bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent&
{ {
mdrkbAtFirstTarget += modeledWellPath->geometryDefinition()->mdrkbAtFirstTarget(); mdrkbAtFirstTarget += modeledWellPath->geometryDefinition()->mdrkbAtFirstTarget();
} }
m_geometryToAddTargetsTo->setMdrkbAtFirstTarget(mdrkbAtFirstTarget); m_geometryToAddTargetsTo->setMdrkbAtFirstTarget(mdrkbAtFirstTarget);
} }
} }
cvf::Vec3d referencePoint = m_geometryToAddTargetsTo->referencePointXyz(); cvf::Vec3d referencePoint = m_geometryToAddTargetsTo->referencePointXyz();
cvf::Vec3d relativeTagetPoint = targetPointInDomain - referencePoint; cvf::Vec3d relativeTagetPoint = targetPointInDomain - referencePoint;
RimWellPathTarget* newTarget = new RimWellPathTarget; RimWellPathTarget* newTarget = new RimWellPathTarget;
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
{ {
@@ -145,15 +145,15 @@ bool RicCreateWellTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent&
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicCreateWellTargetsPickEventHandler::calculateAzimuthAndInclinationAtMd(double measuredDepth, bool RicCreateWellTargetsPickEventHandler::calculateAzimuthAndInclinationAtMd(double measuredDepth,
const RigWellPath* wellPathGeometry, const RigWellPath* wellPathGeometry,
double *azimuth, double* azimuth,
double *inclination) const double* inclination) const
{ {
int mdIndex = -1; int mdIndex = -1;
auto mdList = wellPathGeometry->measureDepths(); auto mdList = wellPathGeometry->measureDepths();
for (int i = 0; i < (int)mdList.size(); i++) for (int i = 0; i < (int)mdList.size(); i++)
{ {
@@ -184,15 +184,15 @@ bool RicCreateWellTargetsPickEventHandler::calculateAzimuthAndInclinationAtMd(do
auto v24mean = (v32 + v43) / 2; auto v24mean = (v32 + v43) / 2;
double weight = (measuredDepth - mdList[mdIndex]) / (mdList[mdIndex + 1] - mdList[mdIndex]); double weight = (measuredDepth - mdList[mdIndex]) / (mdList[mdIndex + 1] - mdList[mdIndex]);
auto vTan = v13mean * weight + v24mean * (1 - weight); auto vTan = v13mean * weight + v24mean * (1 - weight);
RiaOffshoreSphericalCoords coords(vTan); RiaOffshoreSphericalCoords coords(vTan);
*azimuth = coords.azi(); *azimuth = coords.azi();
*inclination = coords.inc(); *inclination = coords.inc();
return true; return true;
} }
*azimuth = 0.0; *azimuth = 0.0;
*inclination = 0.0; *inclination = 0.0;
return false; return false;
} }

View File

@@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2017- Statoil ASA // Copyright (C) 2017- Statoil ASA
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@ class RimWellPathGeometryDef;
class RigWellPath; class RigWellPath;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicCreateWellTargetsPickEventHandler : public RicPickEventHandler class RicCreateWellTargetsPickEventHandler : public RicPickEventHandler
{ {
@@ -35,15 +35,15 @@ 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;
private: private:
bool calculateAzimuthAndInclinationAtMd(double measuredDepth, bool calculateAzimuthAndInclinationAtMd(double measuredDepth,
const RigWellPath* wellPathGeometry, const RigWellPath* wellPathGeometry,
double *azimuth, double* azimuth,
double *inclination) const; double* inclination) const;
};
private:
caf::PdmPointer<RimWellPathGeometryDef> m_geometryToAddTargetsTo;
};