diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 222f30f6f7..4cac45d5e0 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -3,17 +3,17 @@ // Copyright (C) 2011- Statoil ASA // Copyright (C) 2013- Ceetron Solutions AS // Copyright (C) 2011-2012 Ceetron AS -// +// // ResInsight is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// @@ -37,10 +37,6 @@ #include "RigMainGrid.h" #include "RigStatisticsDataCache.h" -#include "RimGeoMechContourMapView.h" -#include "RimEclipseContourMapView.h" -#include "RimGeoMechContourMapProjection.h" -#include "RimEclipseContourMapProjection.h" #include "Rim2dIntersectionView.h" #include "Rim2dIntersectionViewCollection.h" #include "Rim3dView.h" @@ -48,11 +44,15 @@ #include "RimCellEdgeColors.h" #include "RimEclipseCase.h" #include "RimEclipseCellColors.h" +#include "RimEclipseContourMapProjection.h" +#include "RimEclipseContourMapView.h" #include "RimEclipseFaultColors.h" #include "RimEclipsePropertyFilterCollection.h" #include "RimEclipseView.h" #include "RimFaultInViewCollection.h" #include "RimGeoMechCase.h" +#include "RimGeoMechContourMapProjection.h" +#include "RimGeoMechContourMapView.h" #include "RimGeoMechResultDefinition.h" #include "RimGeoMechView.h" #include "RimReservoirCellResultsStorage.h" @@ -61,41 +61,41 @@ #include "RiuViewer.h" -#include #include +#include CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig"); //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- namespace caf { - template<> - void caf::AppEnum::setUp() - { - addItem(Rim3dOverlayInfoConfig::ALL_TIMESTEPS, "ALL_TIMESTEPS", "All Time Steps"); - addItem(Rim3dOverlayInfoConfig::CURRENT_TIMESTEP, "CURRENT_TIMESTEP", "Current Time Step"); - setDefault(Rim3dOverlayInfoConfig::ALL_TIMESTEPS); - } +template<> +void caf::AppEnum::setUp() +{ + addItem(Rim3dOverlayInfoConfig::ALL_TIMESTEPS, "ALL_TIMESTEPS", "All Time Steps"); + addItem(Rim3dOverlayInfoConfig::CURRENT_TIMESTEP, "CURRENT_TIMESTEP", "Current Time Step"); + setDefault(Rim3dOverlayInfoConfig::ALL_TIMESTEPS); } +} // namespace caf //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- namespace caf { - template<> - void caf::AppEnum::setUp() - { - addItem(Rim3dOverlayInfoConfig::ALL_CELLS, "ALL_CELLS", "All Active Cells"); - addItem(Rim3dOverlayInfoConfig::VISIBLE_CELLS, "VISIBLE_CELLS", "Visible Cells"); - setDefault(Rim3dOverlayInfoConfig::ALL_CELLS); - } +template<> +void caf::AppEnum::setUp() +{ + addItem(Rim3dOverlayInfoConfig::ALL_CELLS, "ALL_CELLS", "All Active Cells"); + addItem(Rim3dOverlayInfoConfig::VISIBLE_CELLS, "VISIBLE_CELLS", "Visible Cells"); + setDefault(Rim3dOverlayInfoConfig::ALL_CELLS); } +} // namespace caf //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- Rim3dOverlayInfoConfig::Rim3dOverlayInfoConfig() { @@ -104,16 +104,16 @@ Rim3dOverlayInfoConfig::Rim3dOverlayInfoConfig() CAF_PDM_InitField(&m_active, "Active", true, "Active", "", "", ""); m_active.uiCapability()->setUiHidden(true); - CAF_PDM_InitField(&m_showAnimProgress, "ShowAnimProgress", true, "Animation progress", "", "", ""); - CAF_PDM_InitField(&m_showCaseInfo, "ShowInfoText", true, "Case Info", "", "", ""); - CAF_PDM_InitField(&m_showResultInfo, "ShowResultInfo", true, "Result Info", "", "", ""); - CAF_PDM_InitField(&m_showHistogram, "ShowHistogram", true, "Histogram", "", "", ""); + CAF_PDM_InitField(&m_showAnimProgress, "ShowAnimProgress", true, "Animation progress", "", "", ""); + CAF_PDM_InitField(&m_showCaseInfo, "ShowInfoText", true, "Case Info", "", "", ""); + CAF_PDM_InitField(&m_showResultInfo, "ShowResultInfo", true, "Result Info", "", "", ""); + CAF_PDM_InitField(&m_showHistogram, "ShowHistogram", true, "Histogram", "", "", ""); CAF_PDM_InitField(&m_showVolumeWeightedMean, "ShowVolumeWeightedMean", true, "Mobile Volume Weighted Mean", "", "", ""); - CAF_PDM_InitField(&m_showVersionInfo, "ShowVersionInfo", true, "Version Info", "", "", ""); + CAF_PDM_InitField(&m_showVersionInfo, "ShowVersionInfo", true, "Version Info", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_statisticsTimeRange, "StatisticsTimeRange", "Statistics Time Range", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_statisticsCellRange, "StatisticsCellRange", "Statistics Cell Range", "", "", ""); - //m_statisticsCellRange.uiCapability()->setUiHidden(true); + // m_statisticsCellRange.uiCapability()->setUiHidden(true); m_isVisCellStatUpToDate = false; @@ -121,24 +121,22 @@ Rim3dOverlayInfoConfig::Rim3dOverlayInfoConfig() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -Rim3dOverlayInfoConfig::~Rim3dOverlayInfoConfig() +Rim3dOverlayInfoConfig::~Rim3dOverlayInfoConfig() {} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim3dOverlayInfoConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField, + const QVariant& oldValue, + const QVariant& newValue) { - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void Rim3dOverlayInfoConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) -{ - - if ( hasInvalidStatisticsCombination() ) + if (hasInvalidStatisticsCombination()) { displayPropertyFilteredStatisticsMessage(false); - if ( changedField == &m_statisticsTimeRange ) m_statisticsTimeRange = CURRENT_TIMESTEP; - if ( changedField == &m_statisticsCellRange ) m_statisticsCellRange = ALL_CELLS; + if (changedField == &m_statisticsTimeRange) m_statisticsTimeRange = CURRENT_TIMESTEP; + if (changedField == &m_statisticsCellRange) m_statisticsCellRange = ALL_CELLS; } if (changedField == &m_showResultInfo) @@ -161,11 +159,10 @@ void Rim3dOverlayInfoConfig::fieldChangedByUi(const caf::PdmFieldHandle* changed { m_viewDef->viewer()->update(); } - } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::setPosition(cvf::Vec2ui position) { @@ -173,29 +170,33 @@ void Rim3dOverlayInfoConfig::setPosition(cvf::Vec2ui position) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData() { - auto eclipseView = dynamic_cast(m_viewDef.p()); - auto geoMechView = dynamic_cast(m_viewDef.p()); + auto eclipseView = dynamic_cast(m_viewDef.p()); + auto geoMechView = dynamic_cast(m_viewDef.p()); auto eclipseContourMap = dynamic_cast(eclipseView); auto geoMechContourMap = dynamic_cast(geoMechView); - - if (eclipseContourMap) return histogramData(eclipseContourMap); - else if (geoMechContourMap) return histogramData(geoMechContourMap); - else if (eclipseView) return histogramData(eclipseView); - else if (geoMechView) return histogramData(geoMechView); + + if (eclipseContourMap) + return histogramData(eclipseContourMap); + else if (geoMechContourMap) + return histogramData(geoMechContourMap); + else if (eclipseView) + return histogramData(eclipseView); + else if (geoMechView) + return histogramData(geoMechView); return HistogramData(); } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::timeStepText() { - RimEclipseView * eclipseView = dynamic_cast(m_viewDef.p()); - RimGeoMechView * geoMechView = dynamic_cast(m_viewDef.p()); + RimEclipseView* eclipseView = dynamic_cast(m_viewDef.p()); + RimGeoMechView* geoMechView = dynamic_cast(m_viewDef.p()); if (eclipseView) return timeStepText(eclipseView); if (geoMechView) return timeStepText(geoMechView); @@ -203,7 +204,7 @@ QString Rim3dOverlayInfoConfig::timeStepText() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::caseInfoText() { @@ -216,7 +217,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData) { @@ -229,7 +230,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QImage Rim3dOverlayInfoConfig::statisticsDialogScreenShotImage() { @@ -241,7 +242,7 @@ QImage Rim3dOverlayInfoConfig::statisticsDialogScreenShotImage() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::showAnimProgress() const { @@ -249,7 +250,7 @@ bool Rim3dOverlayInfoConfig::showAnimProgress() const } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::showCaseInfo() const { @@ -257,7 +258,7 @@ bool Rim3dOverlayInfoConfig::showCaseInfo() const } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::showResultInfo() const { @@ -265,7 +266,7 @@ bool Rim3dOverlayInfoConfig::showResultInfo() const } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::isActive() const { @@ -281,7 +282,7 @@ void Rim3dOverlayInfoConfig::setIsActive(bool active) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::showVersionInfo() const { @@ -301,10 +302,10 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE if (isResultsInfoRelevant) { - histData.min = contourMap->contourMapProjection()->minValue(); - histData.max = contourMap->contourMapProjection()->maxValue(); + histData.min = contourMap->contourMapProjection()->minValue(); + histData.max = contourMap->contourMapProjection()->maxValue(); histData.mean = contourMap->contourMapProjection()->meanValue(); - histData.sum = contourMap->contourMapProjection()->sumAllValues(); + histData.sum = contourMap->contourMapProjection()->sumAllValues(); } } return histData; @@ -332,11 +333,10 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimG return histData; } - //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimEclipseView* eclipseView) +Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimEclipseView* eclipseView) { HistogramData histData; @@ -369,13 +369,17 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE currentTimeStep = 0; } - eclipseView->currentGridCellResults()->minMaxCellScalarValues(eclResAddr, currentTimeStep, histData.min, histData.max); - eclipseView->currentGridCellResults()->p10p90CellScalarValues(eclResAddr, currentTimeStep, histData.p10, histData.p90); + eclipseView->currentGridCellResults()->minMaxCellScalarValues( + eclResAddr, currentTimeStep, histData.min, histData.max); + eclipseView->currentGridCellResults()->p10p90CellScalarValues( + eclResAddr, currentTimeStep, histData.p10, histData.p90); eclipseView->currentGridCellResults()->meanCellScalarValues(eclResAddr, currentTimeStep, histData.mean); eclipseView->currentGridCellResults()->sumCellScalarValues(eclResAddr, currentTimeStep, histData.sum); - eclipseView->currentGridCellResults()->mobileVolumeWeightedMean(eclResAddr, currentTimeStep, histData.weightedMean); + eclipseView->currentGridCellResults()->mobileVolumeWeightedMean( + eclResAddr, currentTimeStep, histData.weightedMean); - histData.histogram = &(eclipseView->currentGridCellResults()->cellScalarValuesHistogram(eclResAddr, currentTimeStep)); + histData.histogram = + &(eclipseView->currentGridCellResults()->cellScalarValuesHistogram(eclResAddr, currentTimeStep)); } else { @@ -416,14 +420,15 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE } else if (eclipseView->cellResult()->isFlowDiagOrInjectionFlooding()) { - if (m_statisticsTimeRange == CURRENT_TIMESTEP || m_statisticsTimeRange == ALL_TIMESTEPS) // All timesteps is ignored + if (m_statisticsTimeRange == CURRENT_TIMESTEP || + m_statisticsTimeRange == ALL_TIMESTEPS) // All timesteps is ignored { int currentTimeStep = eclipseView->currentTimeStep(); if (m_statisticsCellRange == ALL_CELLS) { - RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); - RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); + RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); + RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); fldResults->minMaxScalarValues(resAddr, currentTimeStep, &histData.min, &histData.max); fldResults->p10p90ScalarValues(resAddr, currentTimeStep, &histData.p10, &histData.p90); @@ -453,7 +458,7 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimGeoMechView* geoMechView) { @@ -461,9 +466,10 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimG if (geoMechView) { - RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); - RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; - bool isResultsInfoRelevant = caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); + RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); + RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; + bool isResultsInfoRelevant = + caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); if (isResultsInfoRelevant) { @@ -521,7 +527,7 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimG } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::caseInfoText(RimEclipseView* eclipseView) { @@ -534,53 +540,58 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimEclipseView* eclipseView) RimEclipseContourMapView* contourMap = dynamic_cast(eclipseView); if (contourMap && contourMap->contourMapProjection()) { - QString totCellCount = QString::number(contourMap->contourMapProjection()->numberOfCells()); - cvf::uint validCellCount = contourMap->contourMapProjection()->numberOfValidCells(); - QString activeCellCountText = QString::number(validCellCount); - QString iSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().x()); - QString jSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().y()); - QString aggregationType = contourMap->contourMapProjection()->resultAggregationText(); - QString weightingParameterString; + QString totCellCount = QString::number(contourMap->contourMapProjection()->numberOfCells()); + cvf::uint validCellCount = contourMap->contourMapProjection()->numberOfValidCells(); + QString activeCellCountText = QString::number(validCellCount); + QString iSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().x()); + QString jSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().y()); + QString aggregationType = contourMap->contourMapProjection()->resultAggregationText(); + QString weightingParameterString; if (contourMap->contourMapProjection()->weightingParameter() != "None") { - weightingParameterString += QString(" (Weight: %1)").arg(contourMap->contourMapProjection()->weightingParameter()); + weightingParameterString += + QString(" (Weight: %1)").arg(contourMap->contourMapProjection()->weightingParameter()); } - infoText += QString( - "

-- Contour Map: %1 --

" - "Sample Count. Total: %2 Valid Results: %3
" - "Projection Type: %4%5
").arg(caseName, totCellCount, activeCellCountText, aggregationType, weightingParameterString); + infoText += QString("

-- Contour Map: %1 --

" + "Sample Count. Total: %2 Valid Results: %3
" + "Projection Type: %4%5
") + .arg(caseName, totCellCount, activeCellCountText, aggregationType, weightingParameterString); } else if (eclipseView->mainGrid()) { - QString totCellCount = QString::number(eclipseView->mainGrid()->globalCellArray().size()); - size_t mxActCellCount = eclipseView->eclipseCase()->eclipseCaseData()->activeCellInfo(RiaDefines::MATRIX_MODEL)->reservoirActiveCellCount(); - size_t frActCellCount = eclipseView->eclipseCase()->eclipseCaseData()->activeCellInfo(RiaDefines::FRACTURE_MODEL)->reservoirActiveCellCount(); - + QString totCellCount = QString::number(eclipseView->mainGrid()->globalCellArray().size()); + size_t mxActCellCount = eclipseView->eclipseCase() + ->eclipseCaseData() + ->activeCellInfo(RiaDefines::MATRIX_MODEL) + ->reservoirActiveCellCount(); + size_t frActCellCount = eclipseView->eclipseCase() + ->eclipseCaseData() + ->activeCellInfo(RiaDefines::FRACTURE_MODEL) + ->reservoirActiveCellCount(); + QString activeCellCountText; - if (frActCellCount > 0) activeCellCountText += "Matrix : "; + if (frActCellCount > 0) activeCellCountText += "Matrix : "; activeCellCountText += QString::number(mxActCellCount); - if (frActCellCount > 0) activeCellCountText += " Fracture : " + QString::number(frActCellCount); + if (frActCellCount > 0) activeCellCountText += " Fracture : " + QString::number(frActCellCount); QString iSize = QString::number(eclipseView->mainGrid()->cellCountI()); QString jSize = QString::number(eclipseView->mainGrid()->cellCountJ()); QString kSize = QString::number(eclipseView->mainGrid()->cellCountK()); QString zScale = QString::number(eclipseView->scaleZ()); - infoText += QString( - "

-- %1 --

" - "Cell count. Total: %2 Active: %3
" - "Main Grid I,J,K: %4, %5, %6 Z-Scale: %7
").arg(caseName, totCellCount, activeCellCountText, iSize, jSize, kSize, zScale); - + infoText += QString("

-- %1 --

" + "Cell count. Total: %2 Active: %3
" + "Main Grid I,J,K: %4, %5, %6 Z-Scale: %7
") + .arg(caseName, totCellCount, activeCellCountText, iSize, jSize, kSize, zScale); } - } return infoText; } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::caseInfoText(RimGeoMechView* geoMechView) { @@ -589,37 +600,36 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimGeoMechView* geoMechView) if (geoMechView) { RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); - RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; - RigFemPartCollection* femParts = caseData ? caseData->femParts() : nullptr; + RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; + RigFemPartCollection* femParts = caseData ? caseData->femParts() : nullptr; if (femParts) { - QString caseName = geoMechCase->caseUserDescription(); + QString caseName = geoMechCase->caseUserDescription(); RimGeoMechContourMapView* contourMap = dynamic_cast(geoMechView); if (contourMap && contourMap->contourMapProjection()) { - QString totCellCount = QString::number(contourMap->contourMapProjection()->numberOfCells()); - cvf::uint validCellCount = contourMap->contourMapProjection()->numberOfValidCells(); + QString totCellCount = QString::number(contourMap->contourMapProjection()->numberOfCells()); + cvf::uint validCellCount = contourMap->contourMapProjection()->numberOfValidCells(); QString activeCellCountText = QString::number(validCellCount); - QString iSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().x()); - QString jSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().y()); - QString aggregationType = contourMap->contourMapProjection()->resultAggregationText(); + QString iSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().x()); + QString jSize = QString::number(contourMap->contourMapProjection()->numberOfElementsIJ().y()); + QString aggregationType = contourMap->contourMapProjection()->resultAggregationText(); infoText += QString("

-- Contour Map: %1 --

" - "Sample Count. Total: %2 Valid Results: %3
" - "Projection Type: %4
") - .arg(caseName, totCellCount, activeCellCountText, aggregationType); + "Sample Count. Total: %2 Valid Results: %3
" + "Projection Type: %4
") + .arg(caseName, totCellCount, activeCellCountText, aggregationType); } else { - QString cellCount = QString("%1").arg(femParts->totalElementCount()); - QString zScale = QString::number(geoMechView->scaleZ()); + QString zScale = QString::number(geoMechView->scaleZ()); - infoText = QString( - "

-- %1 --

" - "Cell count: %2 Z-Scale: %3
").arg(caseName, cellCount, zScale); + infoText = QString("

-- %1 --

" + "Cell count: %2 Z-Scale: %3
") + .arg(caseName, cellCount, zScale); } } } @@ -627,9 +637,11 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimGeoMechView* geoMechView) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, RimEclipseView* eclipseView, bool showVolumeWeightedMean) +QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, + RimEclipseView* eclipseView, + bool showVolumeWeightedMean) { QString infoText; @@ -640,7 +652,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri bool isResultsInfoRelevant = contourMap->contourMapProjection()->numberOfValidCells() > 0u; if (isResultsInfoRelevant) { - QString propName = eclipseView->cellResult()->resultVariableUiShortName(); + QString propName = eclipseView->cellResult()->resultVariableUiShortName(); QString diffResString = eclipseView->cellResult()->diffResultUiName(); if (!contourMap->contourMapProjection()->isColumnResult()) { @@ -652,9 +664,13 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri } infoText += QString("
Statistics: Current Time Step and Visible Cells"); infoText += QString("" - "" - "" - "
Min Mean Max Sum
%1 %2 %3 %4
").arg(histData.min).arg(histData.mean).arg(histData.max).arg(histData.sum); + " Min Mean Max Sum " + " %1 %2 %3 %4 " + "") + .arg(histData.min) + .arg(histData.mean) + .arg(histData.max) + .arg(histData.sum); } } else if (eclipseView) @@ -669,7 +685,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri if (isResultsInfoRelevant) { - QString propName = eclipseView->cellResult()->resultVariableUiShortName(); + QString propName = eclipseView->cellResult()->resultVariableUiShortName(); QString diffResString = eclipseView->cellResult()->diffResultUiName(); QString timeRangeText = m_statisticsTimeRange().uiText(); if (eclipseView->cellResult()->isFlowDiagOrInjectionFlooding()) @@ -686,12 +702,18 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri infoText += QString("" "" "" - "
Min P90 Mean P10 Max Sum
%1 %2 %3 %4 %5 %6
").arg(histData.min).arg(histData.p10).arg(histData.mean).arg(histData.p90).arg(histData.max).arg(histData.sum); + "") + .arg(histData.min) + .arg(histData.p10) + .arg(histData.mean) + .arg(histData.p90) + .arg(histData.max) + .arg(histData.sum); if (eclipseView->faultResultSettings()->hasValidCustomResult()) { QString faultMapping; - bool isShowingGrid = eclipseView->faultCollection()->isGridVisualizationMode(); + bool isShowingGrid = eclipseView->faultCollection()->isGridVisualizationMode(); if (!isShowingGrid) { if (eclipseView->faultCollection()->faultResult() == RimFaultInViewCollection::FAULT_BACK_FACE_CULLING) @@ -713,20 +735,23 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri } infoText += QString("Fault results: %1
").arg(faultMapping); - infoText += QString("Fault Property: %1
").arg(eclipseView->faultResultSettings()->customFaultResult()->resultVariableUiShortName()); + infoText += QString("Fault Property: %1
") + .arg(eclipseView->faultResultSettings()->customFaultResult()->resultVariableUiShortName()); } } if (eclipseView->hasUserRequestedAnimation() && eclipseView->cellEdgeResult()->hasResult()) { - double min, max; + double min, max; QString cellEdgeName = eclipseView->cellEdgeResult()->resultVariableUiShortName(); eclipseView->cellEdgeResult()->minMaxCellEdgeValues(min, max); infoText += QString("Cell Edge Property: %1 ").arg(cellEdgeName); infoText += QString("" "" "" - "
Min Max
%1 %2
").arg(min).arg(max); + "") + .arg(min) + .arg(max); } if (showVolumeWeightedMean && histData.weightedMean != HUGE_VAL) @@ -738,7 +763,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, RimGeoMechView* geoMechView) { @@ -746,9 +771,10 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri if (geoMechView) { - RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); - RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; - bool isResultsInfoRelevant = caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); + RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); + RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; + bool isResultsInfoRelevant = + caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); if (isResultsInfoRelevant) { @@ -758,23 +784,23 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri QString diffResString = geoMechView->cellResultResultDefinition()->diffResultUiName(); switch (geoMechView->cellResultResultDefinition()->resultPositionType()) { - case RIG_NODAL: - resultPos = "Nodal"; - break; + case RIG_NODAL: + resultPos = "Nodal"; + break; - case RIG_ELEMENT_NODAL: - resultPos = "Element nodal"; - break; + case RIG_ELEMENT_NODAL: + resultPos = "Element nodal"; + break; - case RIG_INTEGRATION_POINT: - resultPos = "Integration point"; - break; - - case RIG_ELEMENT: - resultPos = "Element"; - break; - default: - break; + case RIG_INTEGRATION_POINT: + resultPos = "Integration point"; + break; + + case RIG_ELEMENT: + resultPos = "Element"; + break; + default: + break; } if (compName == "") { @@ -784,16 +810,23 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri { infoText += QString("Cell result: %1, %2, %3
").arg(resultPos).arg(fieldName).arg(compName); } - + if (!diffResString.isEmpty()) { infoText += QString("%1
").arg(diffResString); } - infoText += QString("
Statistics: ") + m_statisticsTimeRange().uiText() + " and " + m_statisticsCellRange().uiText(); + infoText += QString("
Statistics: ") + m_statisticsTimeRange().uiText() + " and " + + m_statisticsCellRange().uiText(); infoText += QString("" "" "" - "
Min P90 Mean P10 Max Sum
%1 %2 %3 %4 %5 %6
").arg(histData.min).arg(histData.p10).arg(histData.mean).arg(histData.p90).arg(histData.max).arg(histData.sum); + "") + .arg(histData.min) + .arg(histData.p10) + .arg(histData.mean) + .arg(histData.p90) + .arg(histData.max) + .arg(histData.sum); } else { @@ -804,7 +837,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, Ri } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::showStatisticsInfoDialog(bool raise) { @@ -825,7 +858,7 @@ void Rim3dOverlayInfoConfig::showStatisticsInfoDialog(bool raise) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::update3DInfo() { @@ -858,7 +891,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() m_statisticsTimeRange = CURRENT_TIMESTEP; } - RimEclipseView * reservoirView = dynamic_cast(m_viewDef.p()); + RimEclipseView* reservoirView = dynamic_cast(m_viewDef.p()); if (reservoirView) { updateEclipse3DInfo(reservoirView); @@ -867,7 +900,7 @@ void Rim3dOverlayInfoConfig::update3DInfo() m_gridStatisticsDialog->updateFromRimView(reservoirView); } - RimGeoMechView * geoMechView = dynamic_cast(m_viewDef.p()); + RimGeoMechView* geoMechView = dynamic_cast(m_viewDef.p()); if (geoMechView) { m_showVolumeWeightedMean = false; @@ -882,24 +915,23 @@ void Rim3dOverlayInfoConfig::update3DInfo() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- caf::PdmFieldHandle* Rim3dOverlayInfoConfig::objectToggleField() { return &m_active; } - //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { caf::PdmUiGroup* visGroup = uiOrdering.addNewGroup("Visibility"); - RimEclipseView * eclipseView = dynamic_cast(m_viewDef.p()); - RimEclipseContourMapView* contourMap = dynamic_cast(eclipseView); - RimGeoMechView * geoMechView = dynamic_cast(m_viewDef.p()); + RimEclipseView* eclipseView = dynamic_cast(m_viewDef.p()); + RimEclipseContourMapView* contourMap = dynamic_cast(eclipseView); + RimGeoMechView* geoMechView = dynamic_cast(m_viewDef.p()); visGroup->add(&m_showAnimProgress); visGroup->add(&m_showCaseInfo); @@ -913,7 +945,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr { visGroup->add(&m_showHistogram); } - + visGroup->add(&m_showVersionInfo); if (contourMap) @@ -935,7 +967,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::setReservoirView(RimGridView* ownerReservoirView) { @@ -943,9 +975,9 @@ void Rim3dOverlayInfoConfig::setReservoirView(RimGridView* ownerReservoirView) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) +void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView* eclipseView) { HistogramData histData; @@ -974,7 +1006,7 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) if (m_showHistogram()) { bool isResultsInfoRelevant = eclipseView->hasUserRequestedAnimation() && eclipseView->cellResult()->hasResult(); - + if (isResultsInfoRelevant && histData.histogram) { eclipseView->viewer()->showHistogram(true); @@ -985,9 +1017,9 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- -void Rim3dOverlayInfoConfig::updateGeoMech3DInfo(RimGeoMechView * geoMechView) +void Rim3dOverlayInfoConfig::updateGeoMech3DInfo(RimGeoMechView* geoMechView) { HistogramData histData; @@ -1019,9 +1051,10 @@ void Rim3dOverlayInfoConfig::updateGeoMech3DInfo(RimGeoMechView * geoMechView) if (m_showHistogram()) { - RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); - RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; - bool isResultsInfoRelevant = caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); + RimGeoMechCase* geoMechCase = geoMechView->geoMechCase(); + RigGeoMechCaseData* caseData = geoMechCase ? geoMechCase->geoMechData() : nullptr; + bool isResultsInfoRelevant = + caseData && geoMechView->hasUserRequestedAnimation() && geoMechView->cellResultResultDefinition()->hasResult(); if (isResultsInfoRelevant) { @@ -1033,7 +1066,7 @@ void Rim3dOverlayInfoConfig::updateGeoMech3DInfo(RimGeoMechView * geoMechView) } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const { @@ -1049,12 +1082,12 @@ void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView) { - int currTimeStepIndex = eclipseView->currentTimeStep(); - std::vector timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); + int currTimeStepIndex = eclipseView->currentTimeStep(); + std::vector timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); QString dateTimeString; if (currTimeStepIndex >= 0 && currTimeStepIndex < (int)timeSteps.size()) @@ -1063,17 +1096,16 @@ QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView) QString dateString = RiaQDateTimeTools::toStringUsingApplicationLocale(timeSteps[currTimeStepIndex], dateFormat); - dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex), - QString::number(timeSteps.size() - 1), - dateString); + dateTimeString = QString("Time Step: %1/%2 %3") + .arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), dateString); } return QString("

-- %1 --
").arg(dateTimeString) + - QString("
------------------------------------------------
"); + QString("
------------------------------------------------
"); } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::timeStepText(RimGeoMechView* geoMechView) { @@ -1085,22 +1117,22 @@ QString Rim3dOverlayInfoConfig::timeStepText(RimGeoMechView* geoMechView) QString dateTimeString; if (currTimeStepIndex >= 0 && currTimeStepIndex < timeSteps.size()) { - dateTimeString = QString("Time Step: %1/%2 %3").arg(QString::number(currTimeStepIndex), - QString::number(timeSteps.size() - 1), - timeSteps[currTimeStepIndex]); + dateTimeString = + QString("Time Step: %1/%2 %3") + .arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), timeSteps[currTimeStepIndex]); } return QString("

-- %1 --
").arg(dateTimeString) + - QString("
------------------------------------------------
"); + QString("
------------------------------------------------
"); } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded() { - RimEclipseView * eclipseView = dynamic_cast(m_viewDef.p()); - RimGeoMechView * geoMechView = dynamic_cast(m_viewDef.p()); + RimEclipseView* eclipseView = dynamic_cast(m_viewDef.p()); + RimGeoMechView* geoMechView = dynamic_cast(m_viewDef.p()); if (!m_isVisCellStatUpToDate) { @@ -1108,28 +1140,22 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded() if (geoMechView) { RigFemResultAddress resAddress = geoMechView->cellResultResultDefinition()->resultAddress(); - calc = new RigFemNativeVisibleCellsStatCalc(geoMechView->geoMechCase()->geoMechData(), - resAddress, - geoMechView->currentTotalCellVisibility().p()); - + calc = new RigFemNativeVisibleCellsStatCalc( + geoMechView->geoMechCase()->geoMechData(), resAddress, geoMechView->currentTotalCellVisibility().p()); } else if (eclipseView) { if (eclipseView->cellResult()->isFlowDiagOrInjectionFlooding()) { - RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); - RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); - calc = new RigFlowDiagVisibleCellsStatCalc(fldResults, - resAddr, - eclipseView->currentTotalCellVisibility().p()); - + RigFlowDiagResultAddress resAddr = eclipseView->cellResult()->flowDiagResAddress(); + RigFlowDiagResults* fldResults = eclipseView->cellResult()->flowDiagSolution()->flowDiagResults(); + calc = new RigFlowDiagVisibleCellsStatCalc(fldResults, resAddr, eclipseView->currentTotalCellVisibility().p()); } else { RigEclipseResultAddress scalarIndex = eclipseView->cellResult()->eclipseResultAddress(); - calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults(), - scalarIndex, - eclipseView->currentTotalCellVisibility().p()); + calc = new RigEclipseNativeVisibleCellsStatCalc( + eclipseView->currentGridCellResults(), scalarIndex, eclipseView->currentTotalCellVisibility().p()); } } @@ -1139,7 +1165,7 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void Rim3dOverlayInfoConfig::displayPropertyFilteredStatisticsMessage(bool showSwitchToCurrentTimestep) { @@ -1149,35 +1175,36 @@ void Rim3dOverlayInfoConfig::displayPropertyFilteredStatisticsMessage(bool showS if (showSwitchToCurrentTimestep) { switchString = QString("
" - "Switching to statistics for Current Time Step"); + "Switching to statistics for Current Time Step"); } if (!isShowing) { isShowing = true; - QMessageBox::information(m_viewDef->viewer()->layoutWidget(), + QMessageBox::information( + m_viewDef->viewer()->layoutWidget(), QString("ResInsight"), QString("Statistics not available
" - "
" - "Statistics calculations of Visible Cells for All Time Steps is not supported
" - "when you have an active Property filter on a time varying result.
") - + switchString); + "
" + "Statistics calculations of Visible Cells for All Time Steps is not supported
" + "when you have an active Property filter on a time varying result.
") + + switchString); isShowing = false; } } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- bool Rim3dOverlayInfoConfig::hasInvalidStatisticsCombination() { - if (m_viewDef->propertyFilterCollection() - && m_viewDef->propertyFilterCollection()->hasActiveDynamicFilters() - && m_statisticsCellRange() == VISIBLE_CELLS - && m_statisticsTimeRange() == ALL_TIMESTEPS ) + if (m_viewDef->propertyFilterCollection() && m_viewDef->propertyFilterCollection()->hasActiveDynamicFilters() && + m_statisticsCellRange() == VISIBLE_CELLS && m_statisticsTimeRange() == ALL_TIMESTEPS) { - RimEclipseView * eclipseView = dynamic_cast(m_viewDef.p()); - if (!(eclipseView && eclipseView->cellResult()->isFlowDiagOrInjectionFlooding())) // If isFlowDiagOrInjFlooding then skip this check as ALL_TIMESTEPS is overridden to CURRENT behind the scenes + RimEclipseView* eclipseView = dynamic_cast(m_viewDef.p()); + if (!(eclipseView && eclipseView->cellResult() + ->isFlowDiagOrInjectionFlooding())) // If isFlowDiagOrInjFlooding then skip this check as + // ALL_TIMESTEPS is overridden to CURRENT behind the scenes { return true; } diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h index 4e308a9f60..6b1f9a1194 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h @@ -27,6 +27,7 @@ #include "cvfObject.h" #include "cvfVector2.h" + #include #include @@ -102,49 +103,44 @@ public: VISIBLE_CELLS }; -protected: - void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; - caf::PdmFieldHandle* objectToggleField() override; +private: + void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; + caf::PdmFieldHandle* objectToggleField() override; + void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + void updateEclipse3DInfo(RimEclipseView* reservoirView); + void updateGeoMech3DInfo(RimGeoMechView* geoMechView); + void update3DInfoIn2dViews() const; + QString timeStepText(RimEclipseView* eclipseView); + QString timeStepText(RimGeoMechView* geoMechView); + HistogramData histogramData(RimEclipseContourMapView* contourMap); + HistogramData histogramData(RimGeoMechContourMapView* contourMap); + HistogramData histogramData(RimEclipseView* eclipseView); + HistogramData histogramData(RimGeoMechView* geoMechView); + QString caseInfoText(RimEclipseView* eclipseView); + QString caseInfoText(RimGeoMechView* geoMechView); + QString resultInfoText(const HistogramData& histData, RimEclipseView* eclipseView, bool showVolumeWeightedMean); + QString resultInfoText(const HistogramData& histData, RimGeoMechView* geoMechView); - void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + void updateVisCellStatsIfNeeded(); + void displayPropertyFilteredStatisticsMessage(bool showSwitchToCurrentTimestep); + bool hasInvalidStatisticsCombination(); private: - void updateEclipse3DInfo(RimEclipseView * reservoirView); - void updateGeoMech3DInfo(RimGeoMechView * geoMechView); - - void update3DInfoIn2dViews() const; - - QString timeStepText(RimEclipseView* eclipseView); - QString timeStepText(RimGeoMechView* geoMechView); - HistogramData histogramData(RimEclipseContourMapView* contourMap); - HistogramData histogramData(RimGeoMechContourMapView* contourMap); - HistogramData histogramData(RimEclipseView* eclipseView); - HistogramData histogramData(RimGeoMechView* geoMechView); - QString caseInfoText(RimEclipseView* eclipseView); - QString caseInfoText(RimGeoMechView* geoMechView); - QString resultInfoText(const HistogramData& histData, RimEclipseView* eclipseView, bool showVolumeWeightedMean); - QString resultInfoText(const HistogramData& histData, RimGeoMechView* geoMechView); - - caf::PdmField m_active; - caf::PdmField m_showAnimProgress; - caf::PdmField m_showCaseInfo; - caf::PdmField m_showResultInfo; - caf::PdmField m_showVolumeWeightedMean; - caf::PdmField m_showHistogram; - caf::PdmField m_showVersionInfo; + caf::PdmField m_active; + caf::PdmField m_showAnimProgress; + caf::PdmField m_showCaseInfo; + caf::PdmField m_showResultInfo; + caf::PdmField m_showVolumeWeightedMean; + caf::PdmField m_showHistogram; + caf::PdmField m_showVersionInfo; caf::PdmField > m_statisticsTimeRange; caf::PdmField > m_statisticsCellRange; - caf::PdmPointer m_viewDef; - - cvf::Vec2ui m_position; - - void updateVisCellStatsIfNeeded(); - void displayPropertyFilteredStatisticsMessage(bool showSwitchToCurrentTimestep); - bool hasInvalidStatisticsCombination(); - bool m_isVisCellStatUpToDate; - cvf::ref m_visibleCellStatistics; + caf::PdmPointer m_viewDef; + cvf::Vec2ui m_position; + bool m_isVisCellStatUpToDate; + cvf::ref m_visibleCellStatistics; std::unique_ptr m_gridStatisticsDialog; };