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

Ensemble Curve Filter : Set filter unchecked as default

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-13 09:12:03 +02:00
parent c50e7cdd51
commit d9cf453c1a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -23,6 +23,7 @@
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveFilterCollection.h" #include "RimEnsembleCurveFilterCollection.h"
#include "RimEnsembleCurveSet.h" #include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h" #include "RimEnsembleCurveSetCollection.h"
@ -66,7 +67,7 @@ std::vector<RimEnsembleCurveSet*>
std::vector<RimEnsembleCurveSet*> curveSets; std::vector<RimEnsembleCurveSet*> curveSets;
for ( const auto& addr : addrs ) for ( const auto& addr : addrs )
{ {
for ( auto filter : curveFilters ) for ( const auto& filter : curveFilters )
{ {
if ( addr.isUiTextMatchingFilterText( filter ) ) if ( addr.isUiTextMatchingFilterText( filter ) )
{ {
@ -80,7 +81,8 @@ std::vector<RimEnsembleCurveSet*>
curveSet->setSummaryCaseCollection( ensemble ); curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryAddress( addr ); curveSet->setSummaryAddress( addr );
curveSet->filterCollection()->addFilter(); auto filter = curveSet->filterCollection()->addFilter();
filter->setActive( false );
plot->ensembleCurveSetCollection()->addCurveSet( curveSet ); plot->ensembleCurveSetCollection()->addCurveSet( curveSet );
curveSets.push_back( curveSet ); curveSets.push_back( curveSet );

8
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@ -134,6 +134,14 @@ bool RimEnsembleCurveFilter::isActive() const
return ( !coll || coll->isActive() ) && m_active; return ( !coll || coll->isActive() ) && m_active;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilter::setActive( bool active )
{
m_active = active;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.h
View File

@ -56,6 +56,7 @@ public:
RimEnsembleCurveFilter( const QString& ensembleParameterName ); RimEnsembleCurveFilter( const QString& ensembleParameterName );
bool isActive() const; bool isActive() const;
void setActive( bool active );
double minValue() const; double minValue() const;
double maxValue() const; double maxValue() const;
std::set<QString> categories() const; std::set<QString> categories() const;