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

Move findActiveTargetsAroundInsertionPoint to base class

Browse Source
This commit is contained in:
Magne Sjaastad
2024-02-08 10:07:42 +01:00
parent d0a9b7cd0b
commit dc1e675b37
6 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
ApplicationLibCode/Commands/WellPathCommands/RicNewPolylineTargetFeature.cpp
View File

@@ -21,21 +21,23 @@ CAF_CMD_SOURCE_INIT( RicNewPolylineTargetFeature, "RicNewPolylineTargetFeature"
#include "RimCase.h"
#include "RimGridView.h"
#include "RimPolylinePickerInterface.h"
#include "RimPolylineTarget.h"
#include "RimProject.h"
#include "RimUserDefinedPolylinesAnnotation.h"
#include "cafSelectionManager.h"
#include <QAction>
#include "cvfBoundingBox.h"
#include <QAction>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewPolylineTargetFeature::isCommandEnabled() const
{
{
std::vector<RimUserDefinedPolylinesAnnotation*> objects;
std::vector<RimPolylinePickerInterface*> objects;
caf::SelectionManager::instance()->objectsByType( &objects );
if ( !objects.empty() )
@@ -66,7 +68,7 @@ void RicNewPolylineTargetFeature::onActionTriggered( bool isChecked )
if ( !selectedTargets.empty() )
{
auto firstTarget = selectedTargets.front();
RimUserDefinedPolylinesAnnotation* polylineDef = firstTarget->firstAncestorOrThisOfTypeAsserted<RimUserDefinedPolylinesAnnotation>();
auto polylineDef = firstTarget->firstAncestorOrThisOfTypeAsserted<RimPolylinePickerInterface>();
auto afterBeforePair = polylineDef->findActiveTargetsAroundInsertionPoint( firstTarget );
@@ -109,49 +111,40 @@ void RicNewPolylineTargetFeature::onActionTriggered( bool isChecked )
return;
}
std::vector<RimUserDefinedPolylinesAnnotation*> polylineDefs;
std::vector<RimPolylinePickerInterface*> polylineDefs;
caf::SelectionManager::instance()->objectsByType( &polylineDefs );
if ( !polylineDefs.empty() )
{
auto* polylineDef = polylineDefs[0];
std::vector<RimPolylineTarget*> activeTargets = polylineDef->activeTargets();
cvf::Vec3d newPos = cvf::Vec3d::ZERO;
size_t targetCount = activeTargets.size();
if ( targetCount == 0 )
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 );
}
else
{
auto defaultPos = cvf::Vec3d::ZERO;
// Set decent position
std::vector<RimGridView*> gridViews;
RimProject::current()->allVisibleGridViews( gridViews );
if ( !gridViews.empty() )
{
auto minPos = gridViews.front()->ownerCase()->allCellsBoundingBox().min();
defaultPos = minPos;
newPos = minPos;
}
polylineDef->appendTarget( defaultPos );
}
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 );
}
auto* newTarget = new RimPolylineTarget;
newTarget->setAsPointTargetXYD( { newPos[0], newPos[1], -newPos[2] } );
polylineDef->insertTarget( nullptr, newTarget );
}
auto* newTarget = new RimPolylineTarget;
newTarget->setAsPointTargetXYD( { newPos[0], newPos[1], -newPos[2] } );
polylineDef->insertTarget( nullptr, newTarget );
polylineDef->updateEditorsAndVisualization();
}