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

#756 Refactoring the filter data into a separate object as a PdmChild

Browse Source
This commit is contained in:
Jacob Støren
2016-06-15 17:31:50 +02:00
parent e1fa9aa9f3
commit ce2112fbc6
7 changed files with 479 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimSummaryCurve.h
View File

@@ -32,6 +32,7 @@
class RimSummaryCase;
class RifReaderEclipseSummary;
class RiuLineSegmentQwtPlotCurve;
class RimSummaryFilter;
class RimSummaryAddress: public caf::PdmObject
{
@@ -46,7 +47,7 @@ public:
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> >
m_category;
m_category;
caf::PdmField<QString> m_quantityName;
caf::PdmField<int> m_regionNumber;
caf::PdmField<int> m_regionNumber2;
@@ -73,7 +74,7 @@ public:
void setSummaryCase(RimSummaryCase* sumCase);
void setVariable(QString varName);
#if 0
enum SummaryFilterType
{
SUM_FILTER_VAR_STRING,
@@ -93,7 +94,7 @@ public:
SUM_FILTER_BLOCK,
SUM_FILTER_BLOCK_LGR,
};
#endif
protected:
// RimPlotCurve overrides
@@ -117,8 +118,10 @@ private:
caf::PdmField<QString> m_selectedVariableDisplayField;
// Filter fields
caf::PdmChildField<RimSummaryFilter*> m_summaryFilter;
#if 0
bool isIncludedByFilter(const RifEclipseSummaryAddress& addr);
bool isSumVarTypeMatchingFilterType(SummaryFilterType sumFilterType, RifEclipseSummaryAddress::SummaryVarCategory sumVarType);
static bool isSumVarTypeMatchingFilterType(SummaryFilterType sumFilterType, RifEclipseSummaryAddress::SummaryVarCategory sumVarType);
caf::PdmField<caf::AppEnum<SummaryFilterType> >
m_filterType;
@@ -132,7 +135,7 @@ private:
caf::PdmField<QString> m_wellSegmentNumberFilter;
caf::PdmField<QString> m_lgrNameFilter;
caf::PdmField<QString> m_cellIJKFilter;
#endif
caf::PdmField<int> m_uiFilterResultSelection;
};