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

#6543 Remove option for absolute value filters.

Browse Source 
* The concept doesn't make sense.
* A range of -1 to +1 becomes +1 to +1 (empty range)
* A range of -0.5 to +1.0 becomes +0.5 to +1.0 excluding all values from +0.0 to +0.5.
This commit is contained in:
Gaute Lindkvist
2020-09-23 08:56:31 +02:00
parent 7fbdbafda6
commit c256b54307
3 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -1132,8 +1132,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
{ {
std::pair<double, double> minMax = filter->filterRangeMinMax(); std::pair<double, double> minMax = filter->filterRangeMinMax();
if ( filter->useAbsoluteValues() ) value = fabs( value );
if ( minMax.first <= value && value <= minMax.second ) if ( minMax.first <= value && value <= minMax.second )
{ {
casesToKeep.insert( sumCase ); casesToKeep.insert( sumCase );
@@ -1142,7 +1140,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
else if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N || else if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N ||
filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N ) filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N )
{ {
if ( filter->useAbsoluteValues() ) value = fabs( value );
bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N; bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N;
auto itIsInsertedPair = casesToKeepWithValue.insert( {sumCase, value} ); auto itIsInsertedPair = casesToKeepWithValue.insert( {sumCase, value} );
@@ -1282,8 +1279,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
// clang-format off // clang-format off
storeResultCoreLambda = [&]( double value ) // clang-format on storeResultCoreLambda = [&]( double value ) // clang-format on
{ {
if ( filter->useAbsoluteValues() ) value = fabs( value );
if ( minMax.first <= value && value <= minMax.second ) if ( minMax.first <= value && value <= minMax.second )
{ {
casesToKeep.insert( sumCaseInEvaluation ); casesToKeep.insert( sumCaseInEvaluation );
@@ -1296,7 +1291,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
// clang-format off // clang-format off
storeResultCoreLambda = [&]( double value ) // clang-format on storeResultCoreLambda = [&]( double value ) // clang-format on
{ {
if ( filter->useAbsoluteValues() ) value = fabs( value );
bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N; bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N;
auto itIsInsertedPair = casesToKeepWithValue.insert( {sumCaseInEvaluation, value} ); auto itIsInsertedPair = casesToKeepWithValue.insert( {sumCaseInEvaluation, value} );
@@ -1336,8 +1330,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
// clang-format off // clang-format off
storeResultCoreLambda = [&]( double value ) // clang-format on storeResultCoreLambda = [&]( double value ) // clang-format on
{ {
if ( filter->useAbsoluteValues() ) value = fabs( value );
if ( minMax.first <= value && value <= minMax.second ) if ( minMax.first <= value && value <= minMax.second )
{ {
sumItemsToKeep.insert( sumItem ); sumItemsToKeep.insert( sumItem );
@@ -1350,7 +1342,6 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
// clang-format off // clang-format off
storeResultCoreLambda = [&]( double value ) // clang-format on storeResultCoreLambda = [&]( double value ) // clang-format on
{ {
if ( filter->useAbsoluteValues() ) value = fabs( value );
bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N; bool useLargest = filter->filterOperation() == RimPlotDataFilterItem::TOP_N;
auto itIsInsertedPair = sumItemsToKeepWithValue.insert( {sumItem, value} ); auto itIsInsertedPair = sumItemsToKeepWithValue.insert( {sumItem, value} );

18
ApplicationCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@@ -103,7 +103,6 @@ RimPlotDataFilterItem::RimPlotDataFilterItem()
caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_filterQuantitySelectButton ); caf::PdmUiActionPushButtonEditor::configureEditorForField( &m_filterQuantitySelectButton );
CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_filterOperation, "FilterOperation", "is", "", "", "" );
CAF_PDM_InitField( &m_useAbsoluteValue, "UseAbsoluteValue", true, "using absolute values", "", "", "" );
CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N", "", "", "" ); CAF_PDM_InitField( &m_topBottomN, "MinTopN", 20, "N", "", "", "" );
m_topBottomN.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_topBottomN.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
@@ -237,10 +236,6 @@ void RimPlotDataFilterItem::fieldChangedByUi( const caf::PdmFieldHandle* changed
{ {
this->updateMaxMinAndDefaultValues( true ); this->updateMaxMinAndDefaultValues( true );
} }
else if ( changedField == &m_useAbsoluteValue )
{
this->updateMaxMinAndDefaultValues( false );
}
else if ( changedField == &m_filterOperation ) else if ( changedField == &m_filterOperation )
{ {
this->updateMaxMinAndDefaultValues( false ); this->updateMaxMinAndDefaultValues( false );
@@ -361,15 +356,12 @@ void RimPlotDataFilterItem::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
if ( m_filterOperation() == RANGE ) if ( m_filterOperation() == RANGE )
{ {
uiOrdering.add( &m_useAbsoluteValue, {false} );
uiOrdering.add( &m_max, {true, -1, 1} ); uiOrdering.add( &m_max, {true, -1, 1} );
uiOrdering.add( &m_min, {true, -1, 1} ); uiOrdering.add( &m_min, {true, -1, 1} );
} }
else if ( m_filterOperation == TOP_N || m_filterOperation == BOTTOM_N ) else if ( m_filterOperation == TOP_N || m_filterOperation == BOTTOM_N )
{ {
uiOrdering.add( &m_topBottomN, {false} ); uiOrdering.add( &m_topBottomN, {false} );
uiOrdering.add( &m_useAbsoluteValue, {true} );
} }
} }
@@ -432,16 +424,16 @@ void RimPlotDataFilterItem::updateMaxMinAndDefaultValues( bool forceDefault )
if ( RiaCurveDataTools::isValidValue( eParam.minValue, false ) ) if ( RiaCurveDataTools::isValidValue( eParam.minValue, false ) )
{ {
m_lowerLimit = eParam.minValue; m_lowerLimit = eParam.minValue;
if ( m_useAbsoluteValue ) m_lowerLimit = fabs( eParam.minValue );
} }
if ( RiaCurveDataTools::isValidValue( eParam.maxValue, false ) ) if ( RiaCurveDataTools::isValidValue( eParam.maxValue, false ) )
{ {
m_upperLimit = eParam.maxValue; m_upperLimit = eParam.maxValue;
if ( m_useAbsoluteValue ) m_upperLimit = fabs( eParam.maxValue );
} }
// Make sure max is > min after doing abs if ( m_upperLimit < m_lowerLimit )
if ( m_upperLimit < m_lowerLimit ) std::swap( m_upperLimit, m_lowerLimit ); {
std::swap( m_upperLimit, m_lowerLimit );
}
} }
} }
else else
@@ -449,7 +441,7 @@ void RimPlotDataFilterItem::updateMaxMinAndDefaultValues( bool forceDefault )
parentPlot->maxMinValueFromAddress( m_filterQuantityUiField, parentPlot->maxMinValueFromAddress( m_filterQuantityUiField,
m_consideredTimestepsType(), m_consideredTimestepsType(),
m_explicitlySelectedTimeSteps(), m_explicitlySelectedTimeSteps(),
m_useAbsoluteValue(), false,
&m_lowerLimit, &m_lowerLimit,
&m_upperLimit ); &m_upperLimit );
} }

2
ApplicationCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
View File

@@ -96,7 +96,6 @@ public:
QString ensembleParameterName() const; QString ensembleParameterName() const;
FilterOperation filterOperation() const { return m_filterOperation(); } FilterOperation filterOperation() const { return m_filterOperation(); }
bool useAbsoluteValues() const { return m_useAbsoluteValue(); }
std::pair<double, double> filterRangeMinMax() const; std::pair<double, double> filterRangeMinMax() const;
int topBottomN() const; int topBottomN() const;
@@ -135,7 +134,6 @@ private:
// Operation and parameters // Operation and parameters
caf::PdmField<caf::AppEnum<FilterOperation>> m_filterOperation; caf::PdmField<caf::AppEnum<FilterOperation>> m_filterOperation;
caf::PdmField<bool> m_useAbsoluteValue;
caf::PdmField<int> m_topBottomN; caf::PdmField<int> m_topBottomN;
caf::PdmField<double> m_max; caf::PdmField<double> m_max;
caf::PdmField<double> m_min; caf::PdmField<double> m_min;