From 6f7432c0e749e1d2ca70b123337f345fd8adf9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 16 Jun 2016 09:50:47 +0200 Subject: [PATCH] #756 Cleaned up after refactoring. --- .../ProjectDataModel/RimSummaryCurve.cpp | 181 ------------------ .../ProjectDataModel/RimSummaryCurve.h | 39 +--- .../RimSummaryCurveFilter.cpp | 137 +------------ .../ProjectDataModel/RimSummaryCurveFilter.h | 14 -- 4 files changed, 2 insertions(+), 369 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp index dfbfab20c4..92e482574f 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp @@ -152,41 +152,6 @@ RimSummaryCurve::RimSummaryCurve() m_summaryFilter = new RimSummaryFilter(); - #if 0 - CAF_PDM_InitFieldNoDefault(&m_filterType,"SummaryFilterType","Filter Type","","",""); - m_filterType.xmlCapability()->setIOWritable(false); - m_filterType.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_completeVarStringFilter, "SummaryCompleteVarStringFilter", "Filter", "", "", ""); - m_completeVarStringFilter.xmlCapability()->setIOWritable(false); - m_completeVarStringFilter.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_filterQuantityName,"SummaryVarQuantityFilter","Quantity","","",""); - m_filterQuantityName.xmlCapability()->setIOWritable(false); - m_filterQuantityName.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_regionNumberFilter ,"SummaryRegionNumberFilter","Region","","",""); - m_regionNumberFilter.xmlCapability()->setIOWritable(false); - m_regionNumberFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_regionNumber2Filter ,"SummaryRegionNumber2Filter","Region 2","","",""); - m_regionNumber2Filter.xmlCapability()->setIOWritable(false); - m_regionNumber2Filter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellGroupNameFilter, "SummaryWellGroupNameFilter", "Well Group", "", "", ""); - m_wellGroupNameFilter.xmlCapability()->setIOWritable(false); - m_wellGroupNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellNameFilter ,"SummaryWellNameFilter","Well","","",""); - m_wellNameFilter.xmlCapability()->setIOWritable(false); - m_wellNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellSegmentNumberFilter ,"SummaryWellSegmentNumberFilter","Segment","","",""); - m_wellSegmentNumberFilter.xmlCapability()->setIOWritable(false); - m_wellSegmentNumberFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_lgrNameFilter ,"SummaryLgrNameFilter","Lgr","","",""); - m_lgrNameFilter.xmlCapability()->setIOWritable(false); - m_lgrNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_cellIJKFilter ,"SummaryCellIJKFilter","I, J, K","","",""); - m_cellIJKFilter.xmlCapability()->setIOWritable(false); - m_cellIJKFilter.xmlCapability()->setIOReadable(false); - #endif CAF_PDM_InitFieldNoDefault(&m_uiFilterResultSelection, "FilterResultSelection", "Filter Result", "", "", ""); m_uiFilterResultSelection.xmlCapability()->setIOWritable(false); m_uiFilterResultSelection.xmlCapability()->setIOReadable(false); @@ -361,153 +326,7 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering.setForgetRemainingFields(true); // For now. } -#if 0 -bool isNumberMatch(QString numericalFilterString, int number) -{ - if(numericalFilterString.isEmpty()) return true; - // Todo: Ranges, and lists - int filterNumber = numericalFilterString.toInt(); - return number == filterNumber; -} - -bool isStringMatch(QString filterString, std::string value) -{ - if(filterString.isEmpty()) return true; - - QRegExp searcher(filterString, Qt::CaseInsensitive, QRegExp::WildcardUnix); - QString qstrValue = QString::fromStdString(value); - return searcher.exactMatch(qstrValue); -} - -bool isIJKMatch(QString filterString, int cellI, int cellJ, int cellK) -{ - if(filterString.isEmpty()) return true; - - // Todo: Ranges, and lists - int filterNumber = filterString.toInt(); - return cellI == filterNumber; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimSummaryCurve::isIncludedByFilter(const RifEclipseSummaryAddress& addr) -{ - if (!isSumVarTypeMatchingFilterType(m_filterType(), addr.category())) return false; - - if(m_filterType() == SUM_FILTER_VAR_STRING) - { - return isStringMatch(m_completeVarStringFilter(), addr.uiText()); - } - - if (!isStringMatch(m_filterQuantityName(), addr.quantityName())) return false; - - if(m_filterType() == SUM_FILTER_ANY) - { - return (isNumberMatch(m_regionNumberFilter(), addr.regionNumber()) - && isNumberMatch(m_regionNumber2Filter(), addr.regionNumber2()) - && isStringMatch(m_wellGroupNameFilter(), addr.wellGroupName()) - && isStringMatch(m_wellNameFilter(), addr.wellName()) - && isStringMatch(m_lgrNameFilter(), addr.lgrName()) - && isNumberMatch(m_wellSegmentNumberFilter(), addr.wellSegmentNumber()) - && isIJKMatch(m_cellIJKFilter(), addr.cellI(), addr.cellJ(), addr.cellK())); - } - - switch (addr.category()) - { - case RifEclipseSummaryAddress::SUMMARY_REGION: - { - return isNumberMatch(m_regionNumberFilter(), addr.regionNumber()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION: - { - return isNumberMatch(m_regionNumberFilter(), addr.regionNumber()) - && isNumberMatch(m_regionNumber2Filter(), addr.regionNumber2()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP: - { - return isStringMatch(m_wellGroupNameFilter(), addr.wellGroupName()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_WELL: - { - return isStringMatch(m_wellNameFilter(), addr.wellName()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION: - { - return isStringMatch(m_wellNameFilter(), addr.wellName()) - && isIJKMatch(m_cellIJKFilter(), addr.cellI(), addr.cellJ(), addr.cellK()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_WELL_LGR: - { - return isStringMatch(m_wellNameFilter(), addr.wellName()) - && isStringMatch(m_lgrNameFilter(), addr.lgrName()); - } - break; - - case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR: - { - return isStringMatch(m_wellNameFilter(), addr.wellName()) - && isStringMatch(m_lgrNameFilter(), addr.lgrName()) - && isIJKMatch(m_cellIJKFilter(), addr.cellI(), addr.cellJ(), addr.cellK()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT: - { - return isStringMatch(m_wellNameFilter(), addr.wellName()) - && isNumberMatch(m_wellSegmentNumberFilter(), addr.wellSegmentNumber()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_BLOCK: - { - return isIJKMatch(m_cellIJKFilter(), addr.cellI(), addr.cellJ(), addr.cellK()); - } - break; - case RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR: - { - return isStringMatch(m_lgrNameFilter(), addr.lgrName()) - && isIJKMatch(m_cellIJKFilter(), addr.cellI(), addr.cellJ(),addr.cellK()); - } - break; - } - - return true; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RimSummaryCurve::isSumVarTypeMatchingFilterType(SummaryFilterType sumFilterType, RifEclipseSummaryAddress::SummaryVarCategory sumVarType) -{ - if (sumVarType == RifEclipseSummaryAddress::SUMMARY_INVALID) return false; - if (sumFilterType == SUM_FILTER_ANY || sumFilterType == SUM_FILTER_VAR_STRING) return true; - - switch(sumVarType) - { - case RifEclipseSummaryAddress::SUMMARY_FIELD: { return (sumFilterType == SUM_FILTER_FIELD); } break; - case RifEclipseSummaryAddress::SUMMARY_AQUIFER: { return (sumFilterType == SUM_FILTER_AQUIFER); } break; - case RifEclipseSummaryAddress::SUMMARY_NETWORK: { return (sumFilterType == SUM_FILTER_NETWORK); } break; - case RifEclipseSummaryAddress::SUMMARY_MISC: { return (sumFilterType == SUM_FILTER_MISC); } break; - case RifEclipseSummaryAddress::SUMMARY_REGION: { return (sumFilterType == SUM_FILTER_REGION); } break; - case RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION: { return (sumFilterType == SUM_FILTER_REGION_2_REGION); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP: { return (sumFilterType == SUM_FILTER_WELL_GROUP); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL: { return (sumFilterType == SUM_FILTER_WELL); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION: { return (sumFilterType == SUM_FILTER_WELL_COMPLETION); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL_LGR: { return (sumFilterType == SUM_FILTER_WELL_LGR); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR: { return (sumFilterType == SUM_FILTER_FIELD); } break; - case RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT: { return (sumFilterType == SUM_FILTER_WELL_SEGMENT); } break; - case RifEclipseSummaryAddress::SUMMARY_BLOCK: { return (sumFilterType == SUM_FILTER_BLOCK); } break; - case RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR: { return (sumFilterType == SUM_FILTER_BLOCK_LGR); } break; - } - - return false; -} -#endif //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCurve.h b/ApplicationCode/ProjectDataModel/RimSummaryCurve.h index 450d838e6f..f14f246a9b 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCurve.h +++ b/ApplicationCode/ProjectDataModel/RimSummaryCurve.h @@ -74,27 +74,7 @@ public: void setSummaryCase(RimSummaryCase* sumCase); void setVariable(QString varName); - #if 0 - enum SummaryFilterType - { - SUM_FILTER_VAR_STRING, - SUM_FILTER_ANY, - SUM_FILTER_FIELD, - SUM_FILTER_AQUIFER, - SUM_FILTER_NETWORK, - SUM_FILTER_MISC, - SUM_FILTER_REGION, - SUM_FILTER_REGION_2_REGION, - SUM_FILTER_WELL_GROUP, - SUM_FILTER_WELL, - SUM_FILTER_WELL_COMPLETION, - SUM_FILTER_WELL_COMPLETION_LGR, - SUM_FILTER_WELL_LGR, - SUM_FILTER_WELL_SEGMENT, - SUM_FILTER_BLOCK, - SUM_FILTER_BLOCK_LGR, - }; - #endif + protected: // RimPlotCurve overrides @@ -119,23 +99,6 @@ private: // Filter fields caf::PdmChildField m_summaryFilter; - #if 0 - bool isIncludedByFilter(const RifEclipseSummaryAddress& addr); - static bool isSumVarTypeMatchingFilterType(SummaryFilterType sumFilterType, RifEclipseSummaryAddress::SummaryVarCategory sumVarType); - - caf::PdmField > - m_filterType; - caf::PdmField m_completeVarStringFilter; - - caf::PdmField m_filterQuantityName; - caf::PdmField m_regionNumberFilter; - caf::PdmField m_regionNumber2Filter; - caf::PdmField m_wellGroupNameFilter; - caf::PdmField m_wellNameFilter; - caf::PdmField m_wellSegmentNumberFilter; - caf::PdmField m_lgrNameFilter; - caf::PdmField m_cellIJKFilter; - #endif caf::PdmField m_uiFilterResultSelection; }; diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp index a18b62b21d..c182c1bf80 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.cpp @@ -68,49 +68,10 @@ RimSummaryCurveFilter::RimSummaryCurveFilter() m_selectedVariableDisplayField.uiCapability()->setUiReadOnly(true); CAF_PDM_InitFieldNoDefault(&m_summaryFilter, "VarListFilter", "Filter", "", "", ""); - m_summaryFilter.xmlCapability()->setIOWritable(true); - m_summaryFilter.xmlCapability()->setIOReadable(true); m_summaryFilter.uiCapability()->setUiChildrenHidden(true); m_summaryFilter.uiCapability()->setUiHidden(true); - m_summaryFilter = new RimSummaryFilter(); - #if 0 - CAF_PDM_InitFieldNoDefault(&m_filterType,"SummaryFilterType","Filter Type","","",""); - m_filterType.xmlCapability()->setIOWritable(false); - m_filterType.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_completeVarStringFilter, "SummaryCompleteVarStringFilter", "Filter", "", "", ""); - m_completeVarStringFilter.xmlCapability()->setIOWritable(false); - m_completeVarStringFilter.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_filterQuantityName,"SummaryVarQuantityFilter","Quantity","","",""); - m_filterQuantityName.xmlCapability()->setIOWritable(false); - m_filterQuantityName.xmlCapability()->setIOReadable(false); - - CAF_PDM_InitFieldNoDefault(&m_regionNumberFilter ,"SummaryRegionNumberFilter","Region","","",""); - m_regionNumberFilter.xmlCapability()->setIOWritable(false); - m_regionNumberFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_regionNumber2Filter ,"SummaryRegionNumber2Filter","Region 2","","",""); - m_regionNumber2Filter.xmlCapability()->setIOWritable(false); - m_regionNumber2Filter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellGroupNameFilter, "SummaryWellGroupNameFilter", "Well Group", "", "", ""); - m_wellGroupNameFilter.xmlCapability()->setIOWritable(false); - m_wellGroupNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellNameFilter ,"SummaryWellNameFilter","Well","","",""); - m_wellNameFilter.xmlCapability()->setIOWritable(false); - m_wellNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_wellSegmentNumberFilter ,"SummaryWellSegmentNumberFilter","Segment","","",""); - m_wellSegmentNumberFilter.xmlCapability()->setIOWritable(false); - m_wellSegmentNumberFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_lgrNameFilter ,"SummaryLgrNameFilter","Lgr","","",""); - m_lgrNameFilter.xmlCapability()->setIOWritable(false); - m_lgrNameFilter.xmlCapability()->setIOReadable(false); - CAF_PDM_InitFieldNoDefault(&m_cellIJKFilter ,"SummaryCellIJKFilter","I, J, K","","",""); - m_cellIJKFilter.xmlCapability()->setIOWritable(false); - m_cellIJKFilter.xmlCapability()->setIOReadable(false); - #endif - CAF_PDM_InitFieldNoDefault(&m_uiFilterResultMultiSelection, "FilterResultSelection", "Filter Result", "", "", ""); m_uiFilterResultMultiSelection.xmlCapability()->setIOWritable(false); m_uiFilterResultMultiSelection.xmlCapability()->setIOReadable(false); @@ -118,11 +79,9 @@ RimSummaryCurveFilter::RimSummaryCurveFilter() m_uiFilterResultMultiSelection.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_uiFilterResultMultiSelection.uiCapability()->setAutoAddingOptionFromValue(false); - CAF_PDM_InitFieldNoDefault(&m_curves, "FilteredCurves", "Filtered Curves", "", "", ""); m_curves.uiCapability()->setUiHidden(true); m_curves.uiCapability()->setUiChildrenHidden(true); - } //-------------------------------------------------------------------------------------------------- @@ -205,100 +164,9 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd curveDataGroup->add(&m_selectedVariableDisplayField); caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup("Variable Selection"); + m_summaryFilter->defineUiOrdering(uiConfigName, *curveVarSelectionGroup); - #if 0 - curveVarSelectionGroup->add(&m_filterType); - caf::PdmUiGroup* curveVarFilterGroup = nullptr; - - if (m_filterType() == RimSummaryFilter::SUM_FILTER_VAR_STRING) - { - curveVarSelectionGroup->add(&m_completeVarStringFilter); - } - else - { - caf::PdmUiGroup* curveVarFilterGroup = curveVarSelectionGroup->addNewGroup("Filter Settings"); - - curveVarFilterGroup->add(&m_filterQuantityName); - - switch (m_filterType()) - { - case RimSummaryFilter::SUM_FILTER_ANY: - { - curveVarFilterGroup->add(&m_wellNameFilter); - curveVarFilterGroup->add(&m_wellGroupNameFilter); - curveVarFilterGroup->add(&m_regionNumberFilter); - curveVarFilterGroup->add(&m_regionNumber2Filter); - curveVarFilterGroup->add(&m_wellSegmentNumberFilter); - curveVarFilterGroup->add(&m_lgrNameFilter); - curveVarFilterGroup->add(&m_cellIJKFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_REGION: - { - curveVarFilterGroup->add(&m_regionNumberFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_REGION_2_REGION: - { - curveVarFilterGroup->add(&m_regionNumberFilter); - curveVarFilterGroup->add(&m_regionNumber2Filter); - - } - break; - case RimSummaryFilter::SUM_FILTER_WELL_GROUP: - { - curveVarFilterGroup->add(&m_wellGroupNameFilter); - - } - break; - case RimSummaryFilter::SUM_FILTER_WELL: - { - curveVarFilterGroup->add(&m_wellNameFilter); - - } - break; - case RimSummaryFilter::SUM_FILTER_WELL_COMPLETION: - { - curveVarFilterGroup->add(&m_wellNameFilter); - curveVarFilterGroup->add(&m_cellIJKFilter); - - } - break; - case RimSummaryFilter::SUM_FILTER_WELL_LGR: - { - curveVarFilterGroup->add(&m_wellNameFilter); - curveVarFilterGroup->add(&m_lgrNameFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_WELL_COMPLETION_LGR: - { - curveVarFilterGroup->add(&m_wellNameFilter); - curveVarFilterGroup->add(&m_lgrNameFilter); - curveVarFilterGroup->add(&m_cellIJKFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_WELL_SEGMENT: - { - curveVarFilterGroup->add(&m_wellNameFilter); - curveVarFilterGroup->add(&m_wellSegmentNumberFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_BLOCK: - { - curveVarFilterGroup->add(&m_cellIJKFilter); - } - break; - case RimSummaryFilter::SUM_FILTER_BLOCK_LGR: - { - curveVarFilterGroup->add(&m_lgrNameFilter); - curveVarFilterGroup->add(&m_cellIJKFilter); - } - break; - - } - } - #endif curveVarSelectionGroup->add(&m_uiFilterResultMultiSelection); uiOrdering.setForgetRemainingFields(true); @@ -310,11 +178,8 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd //-------------------------------------------------------------------------------------------------- void RimSummaryCurveFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) { - if(changedField = &m_uiFilterResultMultiSelection) { - - this->loadDataAndUpdate(); } } diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.h b/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.h index 5ef43b8e61..e573ff7f1f 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.h +++ b/ApplicationCode/ProjectDataModel/RimSummaryCurveFilter.h @@ -71,20 +71,6 @@ private: // Filter fields caf::PdmChildField m_summaryFilter; -#if 0 - caf::PdmField > - m_filterType; - caf::PdmField m_completeVarStringFilter; - - caf::PdmField m_filterQuantityName; - caf::PdmField m_regionNumberFilter; - caf::PdmField m_regionNumber2Filter; - caf::PdmField m_wellGroupNameFilter; - caf::PdmField m_wellNameFilter; - caf::PdmField m_wellSegmentNumberFilter; - caf::PdmField m_lgrNameFilter; - caf::PdmField m_cellIJKFilter; - #endif caf::PdmField > m_uiFilterResultMultiSelection; };