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

#7892 Basic support for display of surface lines and bands on intersections

Browse Source 
Guard divide by zero issues
2D Intersection View: Do not add parts with wrong coordinates
Add bounding box search tree
Add support display of intersection lines for selected surfaces
Show band between two first intersection lines
This commit is contained in:
Magne Sjaastad
2021-08-26 08:13:03 +02:00
committed by GitHub
parent 61ea190920
commit 2fc65a3b62
32 changed files with 826 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@@ -110,8 +110,7 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
intersection->setName( "Azimuth and Dip" );
intersection->type = RimExtrudedCurveIntersection::CS_AZIMUTHLINE;
intersection->inputTwoAzimuthPointsFromViewerEnabled = true;
intersection->configureForAzimuthLine();
RimCase* rimCase;
m_intersectionCollection->firstAncestorOrThisOfTypeAsserted( rimCase );

3
ApplicationLibCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@@ -109,8 +109,7 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
intersection->setName( "Polyline" );
intersection->type = RimExtrudedCurveIntersection::CS_POLYLINE;
intersection->inputPolyLineFromViewerEnabled = true;
intersection->configureForPolyLine();
m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );

3
ApplicationLibCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
View File

@@ -105,8 +105,7 @@ void RicNewSimWellIntersectionCmd::redo()
RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
intersection->setName( m_simWell->name );
intersection->type = RimExtrudedCurveIntersection::CS_SIMULATION_WELL;
intersection->simulationWell = m_simWell;
intersection->configureForSimulationWell( m_simWell );
m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );
}

3
ApplicationLibCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@@ -114,8 +114,7 @@ void RicNewWellPathIntersectionFeatureCmd::redo()
RimExtrudedCurveIntersection* intersection = new RimExtrudedCurveIntersection();
intersection->setName( m_wellPath->name() );
intersection->type = RimExtrudedCurveIntersection::CS_WELL_PATH;
intersection->wellPath = m_wellPath;
intersection->configureForWellPath( m_wellPath );
m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );
}

2
ApplicationLibCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp
View File

@@ -62,7 +62,7 @@ void RicNewIntersectionViewFeature::onActionTriggered( bool isChecked )
intersection->firstAncestorOrThisOfType( rimCase );
if ( rimCase )
{
if ( intersection->direction() != RimExtrudedCurveIntersection::CS_VERTICAL )
if ( intersection->direction() != RimExtrudedCurveIntersection::CrossSectionDirEnum::CS_VERTICAL )
{
QString text = QString( "The intersection view only supports vertical intersections.\n"
"The intersection '%1' is not vertical but a converted version will be shown "

5
ApplicationLibCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
View File

@@ -22,6 +22,7 @@
#include "RigWellPath.h"
#include "Rim2dIntersectionView.h"
#include "Rim3dView.h"
#include "RimCase.h"
#include "RimModeledWellPath.h"
@@ -75,6 +76,10 @@ void RicWellTarget3dEditor::configureAndUpdateUi( const QString& uiConfigName )
auto* ownerRiuViewer = dynamic_cast<RiuViewer*>( ownerViewer() );
Rim3dView* view = mainOrComparisonView();
// TODO: The location of the well target must be updated before displayed in the 2D intersection view. Currently
// disabled.
if ( dynamic_cast<Rim2dIntersectionView*>( view ) ) return;
if ( !target || !target->isEnabled() || !view )
{
if ( m_cvfModel.notNull() ) m_cvfModel->removeAllParts();