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

#6408 2D Intersections View: Fix cell selection

Browse Source
This commit is contained in:
Magne Sjaastad 2020-09-01 10:34:03 +02:00
parent dd1b5fa7f1
commit 08b2c32053
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp
View File

@ -252,8 +252,6 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
RiuSelectionItem* selItem = nullptr; RiuSelectionItem* selItem = nullptr;
{ {
Rim2dIntersectionView* intersectionView = dynamic_cast<Rim2dIntersectionView*>( mainOrComparisonView ); Rim2dIntersectionView* intersectionView = dynamic_cast<Rim2dIntersectionView*>( mainOrComparisonView );
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( mainOrComparisonView );
RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>( mainOrComparisonView );
RimGridView* associatedGridView = dynamic_cast<RimGridView*>( mainOrComparisonView ); RimGridView* associatedGridView = dynamic_cast<RimGridView*>( mainOrComparisonView );
@ -266,6 +264,21 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
if ( !eclResDef && !geomResDef ) if ( !eclResDef && !geomResDef )
{ {
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( mainOrComparisonView );
RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>( mainOrComparisonView );
if ( !geomView && !eclipseView && associatedGridView )
{
if ( dynamic_cast<RimGeoMechView*>( associatedGridView ) )
{
geomView = dynamic_cast<RimGeoMechView*>( associatedGridView );
}
else if ( dynamic_cast<RimEclipseView*>( associatedGridView ) )
{
eclipseView = dynamic_cast<RimEclipseView*>( associatedGridView );
}
}
if ( eclipseView ) if ( eclipseView )
{ {
if ( !eclResDef ) eclResDef = eclipseView->cellResult(); if ( !eclResDef ) eclResDef = eclipseView->cellResult();
@ -289,7 +302,9 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
{ {
auto selectedItem = dynamic_cast<RiuEclipseSelectionItem*>( Riu3dSelectionManager::instance()->selectedItem() ); auto selectedItem = dynamic_cast<RiuEclipseSelectionItem*>( Riu3dSelectionManager::instance()->selectedItem() );
if ( selectedItem && RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(mainOrComparisonView);
if ( selectedItem && eclipseView &&
selectedItem->m_gridIndex == gridIndex && selectedItem->m_gridIndex == gridIndex &&
selectedItem->m_gridLocalCellIndex == gridLocalCellIndex && selectedItem->m_gridLocalCellIndex == gridLocalCellIndex &&
selectedItem->m_nncIndex == nncIndex ) selectedItem->m_nncIndex == nncIndex )