mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#2202 Geomech: Avoid visibility calculation for unvalid property filters
This commit is contained in:
@@ -112,6 +112,7 @@ void RivFemElmVisibilityCalculator::computePropertyVisibility(cvf::UByteArray* c
|
|||||||
for (size_t i = 0; i < propFilterColl->propertyFilters().size(); i++)
|
for (size_t i = 0; i < propFilterColl->propertyFilters().size(); i++)
|
||||||
{
|
{
|
||||||
RimGeoMechPropertyFilter* propertyFilter = propFilterColl->propertyFilters()[i];
|
RimGeoMechPropertyFilter* propertyFilter = propFilterColl->propertyFilters()[i];
|
||||||
|
if (!propertyFilter->isActiveAndHasResult()) continue;
|
||||||
|
|
||||||
const RimCellFilter::FilterModeType filterType = propertyFilter->filterMode();
|
const RimCellFilter::FilterModeType filterType = propertyFilter->filterMode();
|
||||||
|
|
||||||
|
|||||||
@@ -217,6 +217,19 @@ void RimGeoMechPropertyFilter::updateActiveState()
|
|||||||
isActive.uiCapability()->setUiReadOnly(isPropertyFilterControlled());
|
isActive.uiCapability()->setUiReadOnly(isPropertyFilterControlled());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
bool RimGeoMechPropertyFilter::isActiveAndHasResult()
|
||||||
|
{
|
||||||
|
if (this->isActive() && this->resultDefinition->hasResult())
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public:
|
|||||||
void computeResultValueRange();
|
void computeResultValueRange();
|
||||||
|
|
||||||
void updateActiveState();
|
void updateActiveState();
|
||||||
|
bool isActiveAndHasResult();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
|
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
|
||||||
|
|||||||
Reference in New Issue
Block a user