OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-15 01:42:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3447, #3207, #3448 Polished the target table. Improved insert target commands, Add icons to editable wellpaths and target list.

Browse Source
This commit is contained in:
Jacob Støren committed 2018-10-02 15:55:56 +02:00
1 parent 1dfad4f01d
commit d9e8537974
9 files changed
+116 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Commands/WellPathCommands/RicNewWellPathListTargetFeature.cpp
+65 -7
View File
@@ -57,18 +57,50 @@ bool RicNewWellPathListTargetFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewWellPathListTargetFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPathTarget*> targets;
caf::SelectionManager::instance()->objectsByType(&targets, caf::SelectionManager::FIRST_LEVEL);
if (targets.size() > 0)
std::vector<RimWellPathTarget*> selectedTargets;
caf::SelectionManager::instance()->objectsByType(&selectedTargets, caf::SelectionManager::FIRST_LEVEL);
if (selectedTargets.size() > 0)
{
auto firstTarget = targets.front();
auto firstTarget = selectedTargets.front();
RimWellPathGeometryDef* wellGeomDef = nullptr;
firstTarget->firstAncestorOrThisOfTypeAsserted(wellGeomDef);
RimWellPathTarget* duplicate = dynamic_cast<RimWellPathTarget*>(firstTarget->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
wellGeomDef->insertTarget(firstTarget, duplicate);
auto afterBeforePair = wellGeomDef->findActiveTargetsAroundInsertionPoint(firstTarget);
cvf::Vec3d newPos = cvf::Vec3d::ZERO;
if (!afterBeforePair.first && afterBeforePair.second)
{
newPos = afterBeforePair.second->targetPointXYZ();
newPos.z() = -wellGeomDef->referencePointXyz().z();
}
else if (afterBeforePair.first && afterBeforePair.second)
{
newPos = 0.5*(afterBeforePair.first->targetPointXYZ() + afterBeforePair.second->targetPointXYZ());
}
else if (afterBeforePair.first && !afterBeforePair.second)
{
std::vector<RimWellPathTarget*> activeTargets = wellGeomDef->activeWellTargets();
size_t targetCount = activeTargets.size();
if (targetCount > 1)
{
newPos = activeTargets[targetCount-1]->targetPointXYZ();
cvf::Vec3d nextLastToLast = newPos - activeTargets[targetCount-2]->targetPointXYZ();
newPos += 0.5*nextLastToLast;
}
else
{
newPos = afterBeforePair.first->targetPointXYZ() + cvf::Vec3d(0, 0, 200);
}
}
RimWellPathTarget* newTarget = new RimWellPathTarget;
newTarget->setAsPointTargetXYD({ newPos[0], newPos[1], -newPos[2] });
wellGeomDef->insertTarget(firstTarget, newTarget);
wellGeomDef->updateConnectedEditors();
wellGeomDef->updateWellPathVisualization();
return;
}
@@ -77,8 +109,34 @@ void RicNewWellPathListTargetFeature::onActionTriggered(bool isChecked)
if (geomDefs.size() > 0)
{
RimWellPathGeometryDef* wellGeomDef = geomDefs[0];
std::vector<RimWellPathTarget*> activeTargets = wellGeomDef->activeWellTargets();
size_t targetCount = activeTargets.size();
if ( targetCount == 0 )
{
wellGeomDef->appendTarget();
}
else
{
cvf::Vec3d newPos = cvf::Vec3d::ZERO;
if ( targetCount > 1 )
{
newPos = activeTargets[targetCount-1]->targetPointXYZ();
cvf::Vec3d nextLastToLast = newPos - activeTargets[targetCount-2]->targetPointXYZ();
newPos += 0.5*nextLastToLast;
}
else if ( targetCount > 0 )
{
newPos = activeTargets[targetCount-1]->targetPointXYZ() + cvf::Vec3d(0, 0, 200);
}
RimWellPathTarget* newTarget = new RimWellPathTarget;
newTarget->setAsPointTargetXYD({ newPos[0], newPos[1], -newPos[2] });
wellGeomDef->insertTarget(nullptr, newTarget);
}
wellGeomDef->appendTarget();
wellGeomDef->updateConnectedEditors();
wellGeomDef->updateWellPathVisualization();
}