#1044 - pre-proto - Updating indexing for i j and k in SimWellFracture to follow Eclipse indexing (starting with 1) and updating depth of z position at wellpath for WellPathFractures to be displayed as positive

This commit is contained in:
astridkbjorke
2017-01-04 09:08:10 +01:00
parent a5e8001745
commit 6b58adb91b
9 changed files with 98 additions and 43 deletions

View File

@@ -45,7 +45,6 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
RimView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return;
RiuSelectionManager* riuSelManager = RiuSelectionManager::instance();
RiuSelectionItem* selItem = riuSelManager->selectedItem(RiuSelectionManager::RUI_TEMPORARY);
@@ -56,8 +55,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
if (!simWellItem) return;
}
const RivSimWellPipeSourceInfo* simwellSourceInfo = simWellItem->m_simwellSourceInfo;
RimEclipseWell* simWell = simwellSourceInfo->well();
RimEclipseWell* simWell = simWellItem->m_simWell;
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(simWell);
if (!objHandle) return;
@@ -72,13 +70,9 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
fractureCollection->simwellFractures.push_back(fracture);
fracture->name = "New SimWell Fracture";
fracture->i = static_cast<int>(simWellItem->i);
fracture->j = static_cast<int>(simWellItem->j);
fracture->k = static_cast<int>(simWellItem->k);
fracture->setijk(simWellItem->i, simWellItem->j, simWellItem->k);
fractureCollection->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------

View File

@@ -63,8 +63,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
if (!wellPathItem) return;
}
const RivWellPathSourceInfo* wellpathSourceInfo = wellPathItem->m_wellpathSourceInfo;
RimWellPath* wellPath = wellpathSourceInfo->wellPath();
RimWellPath* wellPath = wellPathItem->m_wellpath;
caf::PdmObjectHandle* objHandle = dynamic_cast<caf::PdmObjectHandle*>(wellPath);
if (!objHandle) return;
@@ -78,10 +77,8 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
fractureCollection->fractures.push_back(fracture);
fracture->name = "New Well Path Fracture";
fracture->positionAtWellpath = wellPathItem->m_currentPickPositionInDomainCoords;
double measuredDepth = wellpathSourceInfo->measuredDepth(wellPathItem->m_firstPartTriangleIndex, wellPathItem->m_currentPickPositionInDomainCoords);
fracture->measuredDepth = measuredDepth;
fracture->positionAtWellpath = wellPathItem->m_pipeCenterlineIntersectionInDomainCoords;
fracture->measuredDepth = wellPathItem->m_measuredDepth;
fractureCollection->updateConnectedEditors();
}