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

Fixed missing min/max value range for property filters when loading from project file

Browse Source 
p4#: 22105
This commit is contained in:
Magne Sjaastad 2013-08-07 09:00:09 +02:00
parent 9910480538
commit fea95940bf
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
View File

@ -148,27 +148,10 @@ void RimCellPropertyFilter::setDefaultValues()
{ {
CVF_ASSERT(m_parentContainer); CVF_ASSERT(m_parentContainer);
double min = 0.0; computeResultValueRange();
double max = 0.0;
size_t scalarIndex = resultDefinition->gridScalarIndex(); lowerBound = m_minimumResultValue;
if (scalarIndex != cvf::UNDEFINED_SIZE_T) upperBound = m_maximumResultValue;
{
RimReservoirCellResultsStorage* results = resultDefinition->currentGridCellResults();
if (results)
{
results->cellResults()->minMaxCellScalarValues(scalarIndex, min, max);
}
}
lowerBound = min;
lowerBound.setUiName(QString("Min (%1)").arg(min));
upperBound = max;
upperBound.setUiName(QString("Max (%1)").arg(max));
m_maximumResultValue = max;
m_minimumResultValue = min;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -218,3 +201,30 @@ void RimCellPropertyFilter::defineEditorAttribute(const caf::PdmFieldHandle* fie
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellPropertyFilter::computeResultValueRange()
{
CVF_ASSERT(m_parentContainer);
double min = 0.0;
double max = 0.0;
size_t scalarIndex = resultDefinition->gridScalarIndex();
if (scalarIndex != cvf::UNDEFINED_SIZE_T)
{
RimReservoirCellResultsStorage* results = resultDefinition->currentGridCellResults();
if (results)
{
results->cellResults()->minMaxCellScalarValues(scalarIndex, min, max);
}
}
m_maximumResultValue = max;
m_minimumResultValue = min;
lowerBound.setUiName(QString("Min (%1)").arg(min));
upperBound.setUiName(QString("Max (%1)").arg(max));
}

1
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
View File

@ -60,6 +60,7 @@ public:
void setParentContainer(RimCellPropertyFilterCollection* parentContainer); void setParentContainer(RimCellPropertyFilterCollection* parentContainer);
RimCellPropertyFilterCollection* parentContainer(); RimCellPropertyFilterCollection* parentContainer();
void setDefaultValues(); void setDefaultValues();
void computeResultValueRange();
caf::PdmField<RimResultDefinition*> resultDefinition; caf::PdmField<RimResultDefinition*> resultDefinition;

1
ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
View File

@ -128,6 +128,7 @@ void RimCellPropertyFilterCollection::loadAndInitializePropertyFilters()
propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p()); propertyFilter->resultDefinition->setReservoirView(m_reservoirView.p());
propertyFilter->resultDefinition->loadResult(); propertyFilter->resultDefinition->loadResult();
propertyFilter->updateIconState(); propertyFilter->updateIconState();
propertyFilter->computeResultValueRange();
} }
} }