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

Cleaned up PropertyFilter classes.

Browse Source
This commit is contained in:
Jacob Støren
2015-06-24 15:03:55 +02:00
parent 5b17c27b51
commit 1cdd5262f8
8 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
View File

@@ -31,7 +31,7 @@
namespace caf
{
{ // Obsolete stuff
template<>
void caf::AppEnum< RimCellPropertyFilter::EvaluationRegionType>::setUp()
{
@@ -52,9 +52,9 @@ RimCellPropertyFilter::RimCellPropertyFilter()
{
CAF_PDM_InitObject("Cell Property Filter", ":/CellFilter_Values.png", "", "");
CAF_PDM_InitFieldNoDefault(&evaluationRegion, "EvaluationRegion", "Evaluation region", "", "", "");
evaluationRegion.setUiHidden(true);
evaluationRegion.setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&obsoleteField_evaluationRegion, "EvaluationRegion", "Evaluation region", "", "", "");
obsoleteField_evaluationRegion.setUiHidden(true);
obsoleteField_evaluationRegion.setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&resultDefinition, "ResultDefinition", "Result definition", "", "", "");
resultDefinition = new RimResultDefinition();
@@ -108,13 +108,13 @@ void RimCellPropertyFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedF
if ( &(resultDefinition->m_resultVariableUiField) == changedField )
{
resultDefinition->fieldChangedByUi(changedField, oldValue, newValue);
setDefaultValues();
setToDefaultValues();
m_parentContainer->fieldChangedByUi(changedField, oldValue, newValue);
}
if ( &lowerBound == changedField
|| &upperBound == changedField
|| &evaluationRegion == changedField
|| &obsoleteField_evaluationRegion == changedField
|| &isActive == changedField
|| &filterMode == changedField)
{
@@ -171,7 +171,7 @@ RimCellPropertyFilterCollection* RimCellPropertyFilter::parentContainer()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellPropertyFilter::setDefaultValues()
void RimCellPropertyFilter::setToDefaultValues()
{
CVF_ASSERT(m_parentContainer);

55
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
View File

@@ -37,38 +37,41 @@ class RigCaseCellResultsData;
class RimCellPropertyFilter : public RimCellFilter
{
CAF_PDM_HEADER_INIT;
public:
RimCellPropertyFilter();
virtual ~RimCellPropertyFilter();
caf::PdmField<RimResultDefinition*> resultDefinition;
caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound;
void setParentContainer(RimCellPropertyFilterCollection* parentContainer);
RimCellPropertyFilterCollection* parentContainer();
void setToDefaultValues();
void computeResultValueRange();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
private:
RimCellPropertyFilterCollection* m_parentContainer;
double m_minimumResultValue;
double m_maximumResultValue;
public:
// Obsolete stuff
enum EvaluationRegionType
{
RANGE_FILTER_REGION,
GLOBAL_REGION
};
public:
RimCellPropertyFilter();
virtual ~RimCellPropertyFilter();
void setParentContainer(RimCellPropertyFilterCollection* parentContainer);
RimCellPropertyFilterCollection* parentContainer();
void setDefaultValues();
void computeResultValueRange();
caf::PdmField<RimResultDefinition*> resultDefinition;
caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound;
caf::PdmField< caf::AppEnum< EvaluationRegionType > > evaluationRegion;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
private:
RimCellPropertyFilterCollection* m_parentContainer;
double m_minimumResultValue, m_maximumResultValue;
caf::PdmField< caf::AppEnum< EvaluationRegionType > > obsoleteField_evaluationRegion;
};

2
ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
View File

@@ -98,7 +98,7 @@ RimCellPropertyFilter* RimCellPropertyFilterCollection::createAndAppendPropertyF
propertyFilter->resultDefinition->setPorosityModel(m_reservoirView->cellResult->porosityModel());
propertyFilter->resultDefinition->setResultType(m_reservoirView->cellResult->resultType());
propertyFilter->resultDefinition->loadResult();
propertyFilter->setDefaultValues();
propertyFilter->setToDefaultValues();
propertyFilter->name = QString("New Filter (%1)").arg(propertyFilters().size());

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@@ -184,7 +184,7 @@ void RimEclipseCase::removeResult(const QString& resultName)
{
propertyFilter->resultDefinition->setResultVariable(RimDefines::undefinedResultName());
propertyFilter->resultDefinition->loadResult();
propertyFilter->setDefaultValues();
propertyFilter->setToDefaultValues();
rebuildDisplayModel = true;
}

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@@ -103,7 +103,7 @@ RimGeoMechPropertyFilterCollection* RimGeoMechPropertyFilter::parentContainer()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechPropertyFilter::updateDefaultValues()
void RimGeoMechPropertyFilter::setToDefaultValues()
{
CVF_ASSERT(m_parentContainer);

34
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h
View File

@@ -33,36 +33,28 @@ class RimGeoMechPropertyFilter : public RimCellFilter
{
CAF_PDM_HEADER_INIT;
enum EvaluationRegionType
{
RANGE_FILTER_REGION,
GLOBAL_REGION
};
public:
RimGeoMechPropertyFilter();
virtual ~RimGeoMechPropertyFilter();
void setParentContainer(RimGeoMechPropertyFilterCollection* parentContainer);
RimGeoMechPropertyFilterCollection* parentContainer();
void updateDefaultValues();
void computeResultValueRange();
caf::PdmField<RimGeoMechResultDefinition*> resultDefinition;
caf::PdmField<RimGeoMechResultDefinition*> resultDefinition;
caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound;
caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound;
void setParentContainer(RimGeoMechPropertyFilterCollection* parentContainer);
RimGeoMechPropertyFilterCollection* parentContainer();
void setToDefaultValues();
void computeResultValueRange();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
private:
RimGeoMechPropertyFilterCollection* m_parentContainer;
double m_minimumResultValue, m_maximumResultValue;
RimGeoMechPropertyFilterCollection* m_parentContainer;
double m_minimumResultValue;
double m_maximumResultValue;
};

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
View File

@@ -97,7 +97,7 @@ RimGeoMechPropertyFilter* RimGeoMechPropertyFilterCollection::createAndAppendPro
propertyFilter->resultDefinition->setResultAddress(m_reservoirView->cellResult()->resultAddress());
propertyFilter->resultDefinition->loadResult();
propertyFilter->updateDefaultValues();
propertyFilter->setToDefaultValues();
propertyFilter->name = QString("New Filter (%1)").arg(propertyFilters().size());

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -188,7 +188,7 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (m_propertyFilter)
{
m_propertyFilter->updateDefaultValues();
m_propertyFilter->setToDefaultValues();
((RimView*)reservoirView())->scheduleGeometryRegen(PROPERTY_FILTERED);
}