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

#11595 Always return the pick event handler

Browse Source 
Always return the pick event handler to make it possible to deactivate handler. Move the activation logic to pickingEnabled.
This commit is contained in:
Magne Sjaastad 2024-08-15 10:38:30 +02:00
parent e7b3f3cd17
commit bf471b6c73
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp
View File

@ -834,6 +834,8 @@ void RimPolygonFilter::configurePolygonEditor()
m_polygonEditor->setPolygon( polygon ); m_polygonEditor->setPolygon( polygon );
if ( polygon && polygon->isReadOnly() ) m_polygonEditor->enablePicking( false );
// Must connect the signals after polygon is assigned to the polygon editor // Must connect the signals after polygon is assigned to the polygon editor
// When assigning an object to a ptr field, all signals are disconnected // When assigning an object to a ptr field, all signals are disconnected
connectObjectSignals( polygon ); connectObjectSignals( polygon );
@ -891,6 +893,12 @@ std::vector<RimPolylineTarget*> RimPolygonFilter::activeTargets() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimPolygonFilter::pickingEnabled() const bool RimPolygonFilter::pickingEnabled() const
{ {
auto filterColl = firstAncestorOfType<RimCellFilterCollection>();
if ( filterColl && !filterColl->isActive() ) return false;
if ( !isActive() ) return false;
if ( !isPolygonDefinedLocally() && m_cellFilterPolygon && m_cellFilterPolygon()->isReadOnly() ) return false;
return m_polygonEditor->pickingEnabled(); return m_polygonEditor->pickingEnabled();
} }
@ -899,12 +907,6 @@ bool RimPolygonFilter::pickingEnabled() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PickEventHandler* RimPolygonFilter::pickEventHandler() const caf::PickEventHandler* RimPolygonFilter::pickEventHandler() const
{ {
auto filterColl = firstAncestorOfType<RimCellFilterCollection>();
if ( filterColl && !filterColl->isActive() ) return nullptr;
if ( !isActive() ) return nullptr;
if ( !isPolygonDefinedLocally() && m_cellFilterPolygon && m_cellFilterPolygon()->isReadOnly() ) return nullptr;
return m_pickTargetsEventHandler.get(); return m_pickTargetsEventHandler.get();
} }