From 868c90dd0328e9379193ddb6a5610705a4b69283 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 7 Mar 2013 09:49:33 +0100 Subject: [PATCH] Removed checkbox selections for statistical configuration p4#: 20805 --- .../RimStatisticalCalculation.cpp | 46 ------------------- .../RimStatisticalCalculation.h | 11 ----- 2 files changed, 57 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp b/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp index 7045832b0f..c11aa7b19a 100644 --- a/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp +++ b/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp @@ -39,11 +39,6 @@ RimStatisticalCalculation::RimStatisticalCalculation() { CAF_PDM_InitField(&m_resultName, "ResultName", QString("PRESSURE"), "ResultName", "", "", ""); - CAF_PDM_InitField(&statisticsMin, "StatisticsMin", true, "Minimum", "", "" ,""); - CAF_PDM_InitField(&statisticsMax, "StatisticsMax", true, "Maximum", "", "" ,""); - CAF_PDM_InitField(&statisticsMean, "StatisticsMean", true, "Mean", "", "" ,""); - CAF_PDM_InitField(&statisticsStdDev, "StatisticsStdDev", true, "Std dev", "", "" ,""); - m_readerInterface = new RifReaderStatisticalCalculation; openEclipseGridFile(); @@ -96,15 +91,6 @@ bool RimStatisticalCalculation::openEclipseGridFile() //-------------------------------------------------------------------------------------------------- void RimStatisticalCalculation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) const { - // Fields declared in RimCellFilter - uiOrdering.add(&caseName); - - // Fields declared in RimResultDefinition - caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Statistical parameters"); - group1->add(&statisticsMin); - group1->add(&statisticsMax); - group1->add(&statisticsMean); - group1->add(&statisticsStdDev); } @@ -165,38 +151,6 @@ void RimStatisticalCalculation::computeStatistics() stat.evaluateStatistics(RimDefines::DYNAMIC_NATIVE, m_resultName); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimStatisticalCalculation::createAndComputeMin() -{ - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimStatisticalCalculation::createAndComputeMax() -{ - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimStatisticalCalculation::createAndComputeMean() -{ - -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimStatisticalCalculation::createAndComputeStdDev() -{ - -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.h b/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.h index 84aec72d1d..8e8cfc4f5c 100644 --- a/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.h +++ b/ApplicationCode/ProjectDataModel/RimStatisticalCalculation.h @@ -51,11 +51,6 @@ public: caf::PdmField m_resultName; - caf::PdmField statisticsMin; - caf::PdmField statisticsMax; - caf::PdmField statisticsMean; - caf::PdmField statisticsStdDev; - RimStatisticalCollection* parent(); virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) const; @@ -64,14 +59,8 @@ public: private: RimIdenticalGridCaseGroup* caseGroup(); - void createAndComputeMin(); - void createAndComputeMax(); - void createAndComputeMean(); - void createAndComputeStdDev(); - void getSourceCases(cvf::Collection& sourceCases); - private: cvf::ref m_readerInterface;