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

Rename default and max-min calculation function

Browse Source
This commit is contained in:
Jacob Støren 2020-03-23 11:54:27 +01:00
parent 7370aa1bad
commit 7aecce532f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change
auto eParam = selectedEnsembleParameter();
if ( eParam.isNumeric() )
{
setInitialValues( true );
updateMaxMinAndDefaultValues( true );
}
else if ( eParam.isText() )
{
@ -219,7 +219,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilter::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
setInitialValues( false );
updateMaxMinAndDefaultValues( false );
auto eParam = selectedEnsembleParameter();
@ -318,7 +318,7 @@ std::vector<RimSummaryCase*> RimEnsembleCurveFilter::applyFilter( const std::vec
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilter::loadDataAndUpdate()
{
setInitialValues( false );
updateMaxMinAndDefaultValues( false );
}
//--------------------------------------------------------------------------------------------------
@ -352,7 +352,7 @@ RimEnsembleCurveFilterCollection* RimEnsembleCurveFilter::parentCurveFilterColle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilter::setInitialValues( bool forceDefault )
void RimEnsembleCurveFilter::updateMaxMinAndDefaultValues( bool forceDefault )
{
if ( !selectedEnsembleParameter().isValid() )
{

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.h
View File

@ -64,7 +64,7 @@ protected:
private:
RimEnsembleCurveSet* parentCurveSet() const;
RimEnsembleCurveFilterCollection* parentCurveFilterCollection() const;
void setInitialValues( bool forceDefault );
void updateMaxMinAndDefaultValues( bool forceDefault );
private:
caf::PdmField<bool> m_active;