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

#282 Added category list if category values are present

Browse Source
This commit is contained in:
Magne Sjaastad
2016-08-05 08:31:15 +02:00
parent 261ccd33e5
commit c5d4519eb1
5 changed files with 111 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h
View File

@@ -49,6 +49,7 @@ public:
caf::PdmField<double> lowerBound;
caf::PdmField<double> upperBound;
RimEclipsePropertyFilterCollection* parentContainer();
void setToDefaultValues();
void updateFilterName();
@@ -57,20 +58,27 @@ public:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead();
void updateActiveState();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
private:
friend RimEclipsePropertyFilterCollection;
void updateActiveState();
void updateFieldVisibility();
void updateReadOnlyStateOfAllFields();
bool isPropertyFilterControlled();
private:
double m_minimumResultValue;
caf::PdmField< std::vector<int> > selectedCategoryValues;
caf::PdmField<bool> useRangeInsteadOfCategories;
double m_minimumResultValue;
double m_maximumResultValue;
public:
@@ -82,6 +90,6 @@ public:
};
private:
caf::PdmField< caf::AppEnum< EvaluationRegionType > > obsoleteField_evaluationRegion;
std::vector<int> m_uniqueCellValues;
};