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

#4857 Fix RicNewWellPathIntersectionFeature picking.

Browse Source 
Also avoid confusing active view change.
This commit is contained in:
Kristian Bendiksen 2019-10-24 12:46:07 +02:00
parent a51219b1ca
commit 6e43fee396
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@ -53,7 +53,7 @@ bool RicNewWellPathIntersectionFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathIntersectionFeature::onActionTriggered( bool isChecked ) void RicNewWellPathIntersectionFeature::onActionTriggered( bool isChecked )
{ {
RimGridView* activeView = RiaApplication::instance()->activeGridView(); RimGridView* activeView = RiaApplication::instance()->activeMainOrComparisonGridView();
if ( !activeView ) return; if ( !activeView ) return;
std::vector<RimWellPath*> collection; std::vector<RimWellPath*> collection;
@ -113,7 +113,7 @@ void RicNewWellPathIntersectionFeatureCmd::redo()
intersection->type = RimIntersection::CS_WELL_PATH; intersection->type = RimIntersection::CS_WELL_PATH;
intersection->wellPath = m_wellPath; intersection->wellPath = m_wellPath;
m_intersectionCollection->appendIntersectionAndUpdate( intersection ); m_intersectionCollection->appendIntersectionAndUpdate( intersection, false );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@ -198,14 +198,14 @@ void RimIntersectionCollection::recomputeSimWellBranchData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimIntersectionCollection::appendIntersectionAndUpdate( RimIntersection* intersection ) void RimIntersectionCollection::appendIntersectionAndUpdate( RimIntersection* intersection, bool allowActiveViewChange )
{ {
m_intersections.push_back( intersection ); m_intersections.push_back( intersection );
syncronize2dIntersectionViews(); syncronize2dIntersectionViews();
updateConnectedEditors(); updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem( intersection ); Riu3DMainWindowTools::selectAsCurrentItem( intersection, allowActiveViewChange );
Rim3dView* rimView = nullptr; Rim3dView* rimView = nullptr;
firstAncestorOrThisOfType( rimView ); firstAncestorOrThisOfType( rimView );

2
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@ -52,7 +52,7 @@ public:
caf::PdmField<bool> isActive; caf::PdmField<bool> isActive;
void appendIntersectionAndUpdate( RimIntersection* intersection ); void appendIntersectionAndUpdate( RimIntersection* intersection, bool allowActiveViewChange = true );
void appendIntersectionNoUpdate( RimIntersection* intersection ); void appendIntersectionNoUpdate( RimIntersection* intersection );
void appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox ); void appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox );