OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 01:13:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5406 NNC results : Allow picking on NNC geo with no other geo

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-29 11:30:32 +01:00
parent 5734f68fe5
commit 4e1bf5f048
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp
View File

@ -116,6 +116,12 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
}
}
}
if ( !firstHitPart && firstNncHitPart )
{
// This happen if we only have NNC geometry in the scene
firstHitPart = firstNncHitPart;
}
}
if ( !firstHitPart ) return false;
@ -207,8 +213,22 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
if ( gridLocalCellIndex == cvf::UNDEFINED_SIZE_T )
{
Riu3dSelectionManager::instance()->deleteAllItems();
return false;
if ( nncIndex != cvf::UNDEFINED_SIZE_T && dynamic_cast<RimEclipseView*>( mainOrComparisonView ) )
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( mainOrComparisonView );
if ( eclipseView )
{
RigMainGrid* mainGrid = eclipseView->eclipseCase()->eclipseCaseData()->mainGrid();
const RigConnection& nncConn = mainGrid->nncData()->connections()[nncIndex];
mainGrid->gridAndGridLocalIdxFromGlobalCellIdx( nncConn.m_c1GlobIdx, &gridLocalCellIndex );
}
}
else
{
Riu3dSelectionManager::instance()->deleteAllItems();
return false;
}
}
bool appendToSelection = false;
@ -287,14 +307,29 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
if (gridLocalCellIndex == c1LocalIdx && gridIndex == c1GridIdx)
{
gridLocalCellIndex = c2LocalIdx;
gridIndex = c2GridIdx;
face = cvf::StructGridInterface::oppositeFace(face);
gridIndex = c2GridIdx;
if (face == cvf::StructGridInterface::NO_FACE)
{
face = nncConn.m_c1Face;
}
else
{
face = cvf::StructGridInterface::oppositeFace(face);
}
}
else if (gridLocalCellIndex == c2LocalIdx && gridIndex == c2GridIdx)
{
gridLocalCellIndex = c1LocalIdx;
gridIndex = c1GridIdx;
face = cvf::StructGridInterface::oppositeFace(face);
if (face == cvf::StructGridInterface::NO_FACE)
{
face = cvf::StructGridInterface::oppositeFace(nncConn.m_c1Face);
}
else
{
face = cvf::StructGridInterface::oppositeFace(face);
}
}
else
{