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

Stop invalid analysis plot filters from removing cases

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-10-02 10:46:10 +02:00 committed by Magne Sjaastad
parent b1c2c56d9e
commit 890b7f8ca5
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,7 +1097,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
{
const std::vector<RiaSummaryCurveDefinition> curveDefsToFilter;
if ( !filter->isActive() ) return;
if ( !filter->isActive() || !filter->isValid() ) return;
std::vector<RiaSummaryCurveDefinition> filteredCurveDefs;
@ -1166,6 +1166,10 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
}
}
}
else
{
casesToKeep = ( *filteredSumCases );
}
}
else
{

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

@ -127,6 +127,23 @@ RimPlotDataFilterItem::~RimPlotDataFilterItem()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPlotDataFilterItem::isValid() const
{
if ( m_filterTarget() == ENSEMBLE_CASE && ensembleParameterName().isEmpty() )
{
return false;
}
else if ( ( m_filterTarget() == SUMMARY_CASE || m_filterTarget() == SUMMARY_ITEM ) && !summaryAddress().isValid() )
{
return false;
}
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@ -90,6 +90,7 @@ public:
bool isActive() const { return m_isActive(); }
FilterTarget filterTarget() const { return m_filterTarget(); }
bool isValid() const;
RifEclipseSummaryAddress summaryAddress() const;