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

#3723 Annotations. Remove commented code. Minor code fixes

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-12-07 09:52:10 +01:00
parent e677778ddd
commit a6e9d463f4
1 changed files with 4 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
View File

@ -64,72 +64,24 @@ bool RicPolylineTargetsPickEventHandler::handlePickEvent(const Ric3DPickEvent& e
{
if (!caf::SelectionManager::instance()->isSelected(m_polylineDef.p(), 0))
{
//m_geometryToAddTargetsTo->enableTargetPointPicking(false);
return false;
}
if (m_polylineDef)
{
Rim3dView* rimView = eventObject.m_view;
cvf::Vec3d targetPointInDomain = cvf::Vec3d::ZERO;
// If clicked on an other well path, snap target point to well path center line
auto firstPickItem = eventObject.m_pickItemInfos.front();
auto wellPathSourceInfo = dynamic_cast<const RivPolylinesAnnotationSourceInfo*>(firstPickItem.sourceInfo());
auto intersectionPointInDomain =
rimView->displayCoordTransform()->transformToDomainCoord(firstPickItem.globalPickedPoint());
bool doSetAzimuthAndInclination = false;
double azimuth = 0.0;
double inclination = 0.0;
if (wellPathSourceInfo)
{
//targetPointInDomain =
// wellPathSourceInfo->closestPointOnCenterLine(firstPickItem.faceIdx(), intersectionPointInDomain);
//double md = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain);
//doSetAzimuthAndInclination = calculateAzimuthAndInclinationAtMd(
// md, wellPathSourceInfo->wellPath()->wellPathGeometry(), &azimuth, &inclination);
}
else
{
targetPointInDomain = intersectionPointInDomain;
doSetAzimuthAndInclination = false;
}
//if (!m_polylineDef->firstActiveTarget())
//{
// m_geometryToAddTargetsTo->setReferencePointXyz(targetPointInDomain);
// if (wellPathSourceInfo)
// {
// double mdrkbAtFirstTarget = wellPathSourceInfo->measuredDepth(firstPickItem.faceIdx(), intersectionPointInDomain);
// RimModeledWellPath* modeledWellPath = dynamic_cast<RimModeledWellPath*>(wellPathSourceInfo->wellPath());
// if (modeledWellPath)
// {
// mdrkbAtFirstTarget += modeledWellPath->geometryDefinition()->mdrkbAtFirstTarget();
// }
// m_geometryToAddTargetsTo->setMdrkbAtFirstTarget(mdrkbAtFirstTarget);
// }
//}
//cvf::Vec3d referencePoint = m_polylineDef->referencePointXyz();
//cvf::Vec3d relativeTagetPoint = targetPointInDomain - referencePoint;
auto firstPickItem = eventObject.m_pickItemInfos.front();
auto targetPointInDomain = rimView->displayCoordTransform()->transformToDomainCoord(firstPickItem.globalPickedPoint());
auto* newTarget = new RimPolylineTarget();
newTarget->setAsPointTargetXYD(cvf::Vec3d(intersectionPointInDomain.x(), intersectionPointInDomain.y(), -intersectionPointInDomain.z()));
newTarget->setAsPointTargetXYD(cvf::Vec3d(targetPointInDomain.x(), targetPointInDomain.y(), -targetPointInDomain.z()));
m_polylineDef->insertTarget(nullptr, newTarget);
m_polylineDef->updateConnectedEditors();
m_polylineDef->updateVisualization();
return true; // Todo: See if we really should eat the event instead
return true;
}
return false;