mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Rename of statistics related classes and method names
p4#: 21047
This commit is contained in:
parent
3cd92973af
commit
6c8d5ff631
@ -284,9 +284,9 @@ bool RIApplication::loadProject(const QString& projectFileName)
|
||||
// Add all statistics cases as well
|
||||
for (size_t cgIdx = 0; cgIdx < m_project->caseGroups().size(); ++cgIdx)
|
||||
{
|
||||
if (m_project->caseGroups[cgIdx]->statisticalReservoirCollection())
|
||||
if (m_project->caseGroups[cgIdx]->statisticsCaseCollection())
|
||||
{
|
||||
caf::PdmPointersField<RimStatisticalCalculation*> & statCases = m_project->caseGroups[cgIdx]->statisticalReservoirCollection()->reservoirs();
|
||||
caf::PdmPointersField<RimStatisticsCase*> & statCases = m_project->caseGroups[cgIdx]->statisticsCaseCollection()->cases();
|
||||
for (size_t scIdx = 0; scIdx < statCases.size(); ++scIdx)
|
||||
{
|
||||
casesToLoad.push_back(statCases[scIdx]);
|
||||
|
@ -30,7 +30,7 @@
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigStatistics::addNamedResult(RigReservoirCellResults* destinationCellResults, RimDefines::ResultCatType resultType, const QString& resultName, size_t activeUnionCellCount)
|
||||
void RimStatisticsCaseEvaluator::addNamedResult(RigReservoirCellResults* destinationCellResults, RimDefines::ResultCatType resultType, const QString& resultName, size_t activeUnionCellCount)
|
||||
{
|
||||
// Use time step dates from first result in first source case
|
||||
CVF_ASSERT(m_sourceCases.size() > 0);
|
||||
@ -62,7 +62,7 @@ QString createResultNameDev(const QString& resultName) { return resultName + "_
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigStatistics::buildSourceMetaData(RimDefines::ResultCatType resultType, const QString& resultName)
|
||||
void RimStatisticsCaseEvaluator::buildSourceMetaData(RimDefines::ResultCatType resultType, const QString& resultName)
|
||||
{
|
||||
if (m_sourceCases.size() == 0) return;
|
||||
|
||||
@ -88,7 +88,7 @@ void RigStatistics::buildSourceMetaData(RimDefines::ResultCatType resultType, co
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigStatistics::evaluateStatistics(const QList<QPair<RimDefines::ResultCatType, QString> >& resultSpecification)
|
||||
void RimStatisticsCaseEvaluator::evaluateForResults(const QList<QPair<RimDefines::ResultCatType, QString> >& resultSpecification)
|
||||
{
|
||||
CVF_ASSERT(m_destinationCase);
|
||||
|
||||
@ -246,7 +246,7 @@ void RigStatistics::evaluateStatistics(const QList<QPair<RimDefines::ResultCatTy
|
||||
|
||||
if (foundAnyValidValues)
|
||||
{
|
||||
RigStatisticsEvaluator stat(values);
|
||||
RimStatisticsEvaluator stat(values);
|
||||
stat.getStatistics(min, max, mean, dev);
|
||||
}
|
||||
|
||||
@ -293,7 +293,7 @@ void RigStatistics::evaluateStatistics(const QList<QPair<RimDefines::ResultCatTy
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigStatistics::debugOutput(RimDefines::ResultCatType resultType, const QString& resultName, size_t timeStepIdx)
|
||||
void RimStatisticsCaseEvaluator::debugOutput(RimDefines::ResultCatType resultType, const QString& resultName, size_t timeStepIdx)
|
||||
{
|
||||
CVF_ASSERT(m_destinationCase);
|
||||
|
||||
@ -313,7 +313,7 @@ void RigStatistics::debugOutput(RimDefines::ResultCatType resultType, const QStr
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigStatistics::RigStatistics(const std::vector<RimReservoir*>& sourceCases, const std::vector<size_t>& timeStepIndices, const RigStatisticsConfig& statisticsConfig, RigEclipseCase* destinationCase)
|
||||
RimStatisticsCaseEvaluator::RimStatisticsCaseEvaluator(const std::vector<RimReservoir*>& sourceCases, const std::vector<size_t>& timeStepIndices, const RimStatisticsConfig& statisticsConfig, RigEclipseCase* destinationCase)
|
||||
: m_sourceCases(sourceCases),
|
||||
m_statisticsConfig(statisticsConfig),
|
||||
m_destinationCase(destinationCase),
|
||||
|
@ -34,10 +34,10 @@ class RimReservoir;
|
||||
class RigEclipseCase;
|
||||
class RigReservoirCellResults;
|
||||
|
||||
class RigStatisticsEvaluator
|
||||
class RimStatisticsEvaluator
|
||||
{
|
||||
public:
|
||||
RigStatisticsEvaluator(const std::vector<double>& values)
|
||||
RimStatisticsEvaluator(const std::vector<double>& values)
|
||||
: m_values(values),
|
||||
m_min(HUGE_VAL),
|
||||
m_max(-HUGE_VAL),
|
||||
@ -107,10 +107,10 @@ private:
|
||||
|
||||
|
||||
|
||||
class RigStatisticsConfig
|
||||
class RimStatisticsConfig
|
||||
{
|
||||
public:
|
||||
RigStatisticsConfig()
|
||||
RimStatisticsConfig()
|
||||
: m_min(true),
|
||||
m_max(true),
|
||||
m_mean(true),
|
||||
@ -126,16 +126,16 @@ public:
|
||||
};
|
||||
|
||||
|
||||
class RigStatistics
|
||||
class RimStatisticsCaseEvaluator
|
||||
{
|
||||
public:
|
||||
RigStatistics(const std::vector<RimReservoir*>& sourceCases,
|
||||
const std::vector<size_t>& timeStepIndices,
|
||||
const RigStatisticsConfig& statisticsConfig,
|
||||
RigEclipseCase* destinationCase);
|
||||
RimStatisticsCaseEvaluator(const std::vector<RimReservoir*>& sourceCases,
|
||||
const std::vector<size_t>& timeStepIndices,
|
||||
const RimStatisticsConfig& statisticsConfig,
|
||||
RigEclipseCase* destinationCase);
|
||||
|
||||
|
||||
void evaluateStatistics(const QList<QPair<RimDefines::ResultCatType, QString> >& resultSpecification);
|
||||
void evaluateForResults(const QList<QPair<RimDefines::ResultCatType, QString> >& resultSpecification);
|
||||
|
||||
void debugOutput(RimDefines::ResultCatType resultType, const QString& resultName, size_t timeStepIdx);
|
||||
|
||||
@ -144,13 +144,11 @@ private:
|
||||
void buildSourceMetaData(RimDefines::ResultCatType resultType, const QString& resultName);
|
||||
|
||||
private:
|
||||
std::vector<RimReservoir*> m_sourceCases;
|
||||
std::vector<size_t> m_timeStepIndices;
|
||||
std::vector<RimReservoir*> m_sourceCases;
|
||||
std::vector<size_t> m_timeStepIndices;
|
||||
|
||||
size_t m_globalCellCount;
|
||||
|
||||
RigStatisticsConfig m_statisticsConfig;
|
||||
|
||||
RigEclipseCase* m_destinationCase;
|
||||
size_t m_globalCellCount;
|
||||
RimStatisticsConfig m_statisticsConfig;
|
||||
RigEclipseCase* m_destinationCase;
|
||||
};
|
||||
|
||||
|
@ -43,11 +43,11 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
|
||||
|
||||
CAF_PDM_InitField(&name, "UserDescription", QString("Grid Case Group"), "Name", "", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&statisticalReservoirCollection, "StatisticalReservoirCollection", "Derived Statistics", ":/Histograms16x16.png", "", "");
|
||||
CAF_PDM_InitFieldNoDefault(&statisticsCaseCollection, "StatisticsCaseCollection", "Derived Statistics", ":/Histograms16x16.png", "", "");
|
||||
CAF_PDM_InitFieldNoDefault(&caseCollection, "CaseCollection", "Cases", ":/Cases16x16.png", "", "");
|
||||
|
||||
caseCollection = new RimCaseCollection;
|
||||
statisticalReservoirCollection = new RimStatisticalCollection;
|
||||
statisticsCaseCollection = new RimStatisticsCaseCollection;
|
||||
|
||||
m_mainGrid = NULL;
|
||||
|
||||
@ -65,8 +65,8 @@ RimIdenticalGridCaseGroup::~RimIdenticalGridCaseGroup()
|
||||
delete caseCollection;
|
||||
caseCollection = NULL;
|
||||
|
||||
delete statisticalReservoirCollection;
|
||||
statisticalReservoirCollection = NULL;
|
||||
delete statisticsCaseCollection;
|
||||
statisticsCaseCollection = NULL;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@ -89,9 +89,9 @@ void RimIdenticalGridCaseGroup::addCase(RimReservoir* reservoir)
|
||||
|
||||
caseCollection()->reservoirs().push_back(reservoir);
|
||||
|
||||
if (statisticalReservoirCollection->reservoirs().size() == 0)
|
||||
if (statisticsCaseCollection->cases().size() == 0)
|
||||
{
|
||||
createAndAppendStatisticalCalculation();
|
||||
createAndAppendStatisticsCase();
|
||||
}
|
||||
|
||||
clearActiveCellUnions();
|
||||
@ -174,9 +174,9 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
|
||||
// Check if we need to calculate the union of the active cells
|
||||
|
||||
bool foundResultsInCache = false;
|
||||
for (size_t i = 0; i < statisticalReservoirCollection()->reservoirs.size(); i++)
|
||||
for (size_t i = 0; i < statisticsCaseCollection()->cases.size(); i++)
|
||||
{
|
||||
RimStatisticalCalculation* rimReservoir = statisticalReservoirCollection()->reservoirs[i];
|
||||
RimStatisticsCase* rimReservoir = statisticsCaseCollection()->cases[i];
|
||||
|
||||
// Check if any results are stored in cache
|
||||
if (rimReservoir->results(RifReaderInterface::MATRIX_RESULTS)->storedResultsCount() > 0 ||
|
||||
@ -194,9 +194,9 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
|
||||
|
||||
// "Load" the statistical cases
|
||||
|
||||
for (size_t i = 0; i < statisticalReservoirCollection()->reservoirs.size(); i++)
|
||||
for (size_t i = 0; i < statisticsCaseCollection()->cases.size(); i++)
|
||||
{
|
||||
RimStatisticalCalculation* rimReservoir = statisticalReservoirCollection()->reservoirs[i];
|
||||
RimStatisticsCase* rimReservoir = statisticsCaseCollection()->cases[i];
|
||||
|
||||
rimReservoir->openEclipseGridFile();
|
||||
|
||||
@ -295,12 +295,12 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCalculation* RimIdenticalGridCaseGroup::createAndAppendStatisticalCalculation()
|
||||
RimStatisticsCase* RimIdenticalGridCaseGroup::createAndAppendStatisticsCase()
|
||||
{
|
||||
RimStatisticalCalculation* newObject = new RimStatisticalCalculation;
|
||||
RimStatisticsCase* newObject = new RimStatisticsCase;
|
||||
|
||||
newObject->caseName = QString("Statistics ") + QString::number(statisticalReservoirCollection()->reservoirs.size()+1);
|
||||
statisticalReservoirCollection()->reservoirs.push_back(newObject);
|
||||
newObject->caseName = QString("Statistics ") + QString::number(statisticsCaseCollection()->cases.size()+1);
|
||||
statisticsCaseCollection()->cases.push_back(newObject);
|
||||
|
||||
newObject->openEclipseGridFile();
|
||||
|
||||
@ -312,9 +312,9 @@ RimStatisticalCalculation* RimIdenticalGridCaseGroup::createAndAppendStatistical
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIdenticalGridCaseGroup::updateMainGridAndActiveCellsForStatisticsCases()
|
||||
{
|
||||
for (size_t i = 0; i < statisticalReservoirCollection->reservoirs().size(); i++)
|
||||
for (size_t i = 0; i < statisticsCaseCollection->cases().size(); i++)
|
||||
{
|
||||
RimStatisticalCalculation* rimStaticsCase = statisticalReservoirCollection->reservoirs[i];
|
||||
RimStatisticsCase* rimStaticsCase = statisticsCaseCollection->cases[i];
|
||||
|
||||
rimStaticsCase->reservoirData()->setMainGrid(this->mainGrid());
|
||||
|
||||
@ -330,9 +330,9 @@ void RimIdenticalGridCaseGroup::updateMainGridAndActiveCellsForStatisticsCases()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimIdenticalGridCaseGroup::clearStatisticsResults()
|
||||
{
|
||||
for (size_t i = 0; i < statisticalReservoirCollection->reservoirs().size(); i++)
|
||||
for (size_t i = 0; i < statisticsCaseCollection->cases().size(); i++)
|
||||
{
|
||||
RimStatisticalCalculation* rimStaticsCase = statisticalReservoirCollection->reservoirs[i];
|
||||
RimStatisticsCase* rimStaticsCase = statisticsCaseCollection->cases[i];
|
||||
rimStaticsCase->results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->clearAllResults();
|
||||
rimStaticsCase->results(RifReaderInterface::FRACTURE_RESULTS)->cellResults()->clearAllResults();
|
||||
|
||||
|
@ -49,10 +49,10 @@ public:
|
||||
void removeCase(RimReservoir* reservoir);
|
||||
bool contains(RimReservoir* reservoir) const;
|
||||
|
||||
RimStatisticalCalculation* createAndAppendStatisticalCalculation();
|
||||
RimStatisticsCase* createAndAppendStatisticsCase();
|
||||
|
||||
caf::PdmField<RimCaseCollection*> caseCollection;
|
||||
caf::PdmField<RimStatisticalCollection*> statisticalReservoirCollection;
|
||||
caf::PdmField<RimStatisticsCaseCollection*> statisticsCaseCollection;
|
||||
|
||||
void loadMainCaseAndActiveCellInfo();
|
||||
|
||||
|
@ -23,18 +23,17 @@
|
||||
#include "cafPdmUiOrdering.h"
|
||||
#include "RimIdenticalGridCaseGroup.h"
|
||||
#include "RigEclipseCase.h"
|
||||
#include "RifReaderStatisticalCalculation.h"
|
||||
#include "RigReservoirCellResults.h"
|
||||
#include "RigStatistics.h"
|
||||
#include "RigMainGrid.h"
|
||||
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimStatisticalCalculation, "RimStatisticalCalculation");
|
||||
CAF_PDM_SOURCE_INIT(RimStatisticsCase, "RimStatisticalCalculation");
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCalculation::RimStatisticalCalculation()
|
||||
RimStatisticsCase::RimStatisticsCase()
|
||||
: RimReservoir()
|
||||
{
|
||||
CAF_PDM_InitObject("Case Group Statistics", ":/Histogram16x16.png", "", "");
|
||||
@ -45,7 +44,7 @@ RimStatisticalCalculation::RimStatisticalCalculation()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCalculation::~RimStatisticalCalculation()
|
||||
RimStatisticsCase::~RimStatisticsCase()
|
||||
{
|
||||
|
||||
}
|
||||
@ -54,7 +53,7 @@ RimStatisticalCalculation::~RimStatisticalCalculation()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimStatisticalCalculation::setMainGrid(RigMainGrid* mainGrid)
|
||||
void RimStatisticsCase::setMainGrid(RigMainGrid* mainGrid)
|
||||
{
|
||||
CVF_ASSERT(mainGrid);
|
||||
CVF_ASSERT(this->reservoirData());
|
||||
@ -65,15 +64,15 @@ void RimStatisticalCalculation::setMainGrid(RigMainGrid* mainGrid)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimStatisticalCalculation::openEclipseGridFile()
|
||||
bool RimStatisticsCase::openEclipseGridFile()
|
||||
{
|
||||
if (this->reservoirData()) return true;
|
||||
|
||||
cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
|
||||
|
||||
CVF_ASSERT(parentStatisticalCollection());
|
||||
CVF_ASSERT(parentStatisticsCaseCollection());
|
||||
|
||||
RimIdenticalGridCaseGroup* gridCaseGroup = parentStatisticalCollection()->parentCaseGroup();
|
||||
RimIdenticalGridCaseGroup* gridCaseGroup = parentStatisticsCaseCollection()->parentCaseGroup();
|
||||
CVF_ASSERT(gridCaseGroup);
|
||||
|
||||
RigMainGrid* mainGrid = gridCaseGroup->mainGrid();
|
||||
@ -91,7 +90,7 @@ bool RimStatisticalCalculation::openEclipseGridFile()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimStatisticalCalculation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) const
|
||||
void RimStatisticsCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) const
|
||||
{
|
||||
|
||||
}
|
||||
@ -99,9 +98,9 @@ void RimStatisticalCalculation::defineUiOrdering(QString uiConfigName, caf::PdmU
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCollection* RimStatisticalCalculation::parentStatisticalCollection()
|
||||
RimStatisticsCaseCollection* RimStatisticsCase::parentStatisticsCaseCollection()
|
||||
{
|
||||
std::vector<RimStatisticalCollection*> parentObjects;
|
||||
std::vector<RimStatisticsCaseCollection*> parentObjects;
|
||||
this->parentObjectsOfType(parentObjects);
|
||||
|
||||
if (parentObjects.size() > 0)
|
||||
@ -115,7 +114,7 @@ RimStatisticalCollection* RimStatisticalCalculation::parentStatisticalCollection
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimStatisticalCalculation::computeStatistics()
|
||||
void RimStatisticsCase::computeStatistics()
|
||||
{
|
||||
if (this->reservoirData() == NULL)
|
||||
{
|
||||
@ -139,7 +138,7 @@ void RimStatisticalCalculation::computeStatistics()
|
||||
// Use this information for all cases in the case group
|
||||
size_t timeStepCount = sourceCases.at(0)->results(RifReaderInterface::MATRIX_RESULTS)->cellResults()->maxTimeStepCount();
|
||||
|
||||
RigStatisticsConfig statisticsConfig;
|
||||
RimStatisticsConfig statisticsConfig;
|
||||
|
||||
std::vector<size_t> timeStepIndices;
|
||||
for (size_t i = 0; i < timeStepCount; i++)
|
||||
@ -171,8 +170,8 @@ void RimStatisticalCalculation::computeStatistics()
|
||||
}
|
||||
|
||||
|
||||
RigStatistics stat(sourceCases, timeStepIndices, statisticsConfig, resultCase);
|
||||
stat.evaluateStatistics(resultSpecification);
|
||||
RimStatisticsCaseEvaluator stat(sourceCases, timeStepIndices, statisticsConfig, resultCase);
|
||||
stat.evaluateForResults(resultSpecification);
|
||||
|
||||
for (size_t i = 0; i < reservoirViews().size(); i++)
|
||||
{
|
||||
@ -188,7 +187,7 @@ void RimStatisticalCalculation::computeStatistics()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimStatisticalCalculation::getSourceCases(std::vector<RimReservoir*>& sourceCases)
|
||||
void RimStatisticsCase::getSourceCases(std::vector<RimReservoir*>& sourceCases)
|
||||
{
|
||||
RimIdenticalGridCaseGroup* gridCaseGroup = caseGroup();
|
||||
if (gridCaseGroup)
|
||||
@ -209,9 +208,9 @@ void RimStatisticalCalculation::getSourceCases(std::vector<RimReservoir*>& sourc
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIdenticalGridCaseGroup* RimStatisticalCalculation::caseGroup()
|
||||
RimIdenticalGridCaseGroup* RimStatisticsCase::caseGroup()
|
||||
{
|
||||
RimStatisticalCollection* parentCollection = parentStatisticalCollection();
|
||||
RimStatisticsCaseCollection* parentCollection = parentStatisticsCaseCollection();
|
||||
if (parentCollection)
|
||||
{
|
||||
return parentCollection->parentCaseGroup();
|
||||
|
@ -27,8 +27,7 @@
|
||||
|
||||
class RimIdenticalGridCaseGroup;
|
||||
class RimResultDefinition;
|
||||
class RifReaderStatisticalCalculation;
|
||||
class RimStatisticalCollection;
|
||||
class RimStatisticsCaseCollection;
|
||||
class RigMainGrid;
|
||||
|
||||
|
||||
@ -37,13 +36,13 @@ class RigMainGrid;
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
class RimStatisticalCalculation : public RimReservoir
|
||||
class RimStatisticsCase : public RimReservoir
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
RimStatisticalCalculation();
|
||||
virtual ~RimStatisticalCalculation();
|
||||
RimStatisticsCase();
|
||||
virtual ~RimStatisticsCase();
|
||||
|
||||
void setMainGrid(RigMainGrid* mainGrid);
|
||||
|
||||
@ -51,7 +50,7 @@ public:
|
||||
|
||||
caf::PdmField<QString> m_resultName;
|
||||
|
||||
RimStatisticalCollection* parentStatisticalCollection();
|
||||
RimStatisticsCaseCollection* parentStatisticsCaseCollection();
|
||||
|
||||
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) const;
|
||||
void computeStatistics();
|
||||
@ -61,7 +60,4 @@ private:
|
||||
|
||||
void getSourceCases(std::vector<RimReservoir*>& sourceCases);
|
||||
|
||||
private:
|
||||
cvf::ref<RifReaderStatisticalCalculation> m_readerInterface;
|
||||
|
||||
};
|
||||
|
@ -24,31 +24,31 @@
|
||||
#include "RimIdenticalGridCaseGroup.h"
|
||||
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimStatisticalCollection, "RimStatisticalCollection");
|
||||
CAF_PDM_SOURCE_INIT(RimStatisticsCaseCollection, "RimStatisticalCollection");
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCollection::RimStatisticalCollection()
|
||||
RimStatisticsCaseCollection::RimStatisticsCaseCollection()
|
||||
: PdmObject()
|
||||
{
|
||||
CAF_PDM_InitObject("Derived Statistics", "", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&reservoirs, "Reservoirs", "", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault(&cases, "Reservoirs", "", "", "", "");
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCollection::~RimStatisticalCollection()
|
||||
RimStatisticsCaseCollection::~RimStatisticsCaseCollection()
|
||||
{
|
||||
reservoirs.deleteAllChildObjects();
|
||||
cases.deleteAllChildObjects();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimIdenticalGridCaseGroup* RimStatisticalCollection::parentCaseGroup()
|
||||
RimIdenticalGridCaseGroup* RimStatisticsCaseCollection::parentCaseGroup()
|
||||
{
|
||||
std::vector<RimIdenticalGridCaseGroup*> parentObjects;
|
||||
this->parentObjectsOfType(parentObjects);
|
||||
|
@ -32,15 +32,15 @@
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
class RimStatisticalCollection : public caf::PdmObject
|
||||
class RimStatisticsCaseCollection : public caf::PdmObject
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
RimStatisticalCollection();
|
||||
virtual ~RimStatisticalCollection();
|
||||
RimStatisticsCaseCollection();
|
||||
virtual ~RimStatisticsCaseCollection();
|
||||
|
||||
caf::PdmPointersField<RimStatisticalCalculation*> reservoirs;
|
||||
caf::PdmPointersField<RimStatisticsCase*> cases;
|
||||
|
||||
RimIdenticalGridCaseGroup* parentCaseGroup();
|
||||
|
||||
|
@ -475,7 +475,7 @@ void RimUiTreeModelPdm::deleteInputProperty(const QModelIndex& itemIndex)
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimStatisticalCalculation* RimUiTreeModelPdm::addStatisticalCalculation(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex)
|
||||
RimStatisticsCase* RimUiTreeModelPdm::addStatisticalCalculation(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex)
|
||||
{
|
||||
caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);
|
||||
|
||||
@ -484,17 +484,17 @@ RimStatisticalCalculation* RimUiTreeModelPdm::addStatisticalCalculation(const QM
|
||||
caf::PdmUiTreeItem* parentCollectionItem = NULL;
|
||||
int position = 0;
|
||||
|
||||
if (dynamic_cast<RimStatisticalCalculation*>(currentItem->dataObject().p()))
|
||||
if (dynamic_cast<RimStatisticsCase*>(currentItem->dataObject().p()))
|
||||
{
|
||||
RimStatisticalCalculation* currentObject = dynamic_cast<RimStatisticalCalculation*>(currentItem->dataObject().p());
|
||||
caseGroup = currentObject->parentStatisticalCollection()->parentCaseGroup();
|
||||
RimStatisticsCase* currentObject = dynamic_cast<RimStatisticsCase*>(currentItem->dataObject().p());
|
||||
caseGroup = currentObject->parentStatisticsCaseCollection()->parentCaseGroup();
|
||||
parentCollectionItem = currentItem->parent();
|
||||
position = itemIndex.row();
|
||||
collectionIndex = itemIndex.parent();
|
||||
}
|
||||
else if (dynamic_cast<RimStatisticalCollection*>(currentItem->dataObject().p()))
|
||||
else if (dynamic_cast<RimStatisticsCaseCollection*>(currentItem->dataObject().p()))
|
||||
{
|
||||
RimStatisticalCollection* statColl = dynamic_cast<RimStatisticalCollection*>(currentItem->dataObject().p());
|
||||
RimStatisticsCaseCollection* statColl = dynamic_cast<RimStatisticsCaseCollection*>(currentItem->dataObject().p());
|
||||
caseGroup = statColl->parentCaseGroup();
|
||||
parentCollectionItem = currentItem;
|
||||
position = parentCollectionItem->childCount();
|
||||
@ -503,7 +503,7 @@ RimStatisticalCalculation* RimUiTreeModelPdm::addStatisticalCalculation(const QM
|
||||
|
||||
beginInsertRows(collectionIndex, position, position);
|
||||
|
||||
RimStatisticalCalculation* createdObject = caseGroup->createAndAppendStatisticalCalculation();
|
||||
RimStatisticsCase* createdObject = caseGroup->createAndAppendStatisticsCase();
|
||||
caf::PdmUiTreeItem* childItem = new caf::PdmUiTreeItem(parentCollectionItem, position, createdObject);
|
||||
|
||||
endInsertRows();
|
||||
|
@ -32,7 +32,7 @@ class RimCellRangeFilter;
|
||||
class RimReservoir;
|
||||
class RimReservoirView;
|
||||
class RimInputProperty;
|
||||
class RimStatisticalCalculation;
|
||||
class RimStatisticsCase;
|
||||
class RimIdenticalGridCaseGroup;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@ -113,7 +113,7 @@ public:
|
||||
void addInputProperty(const QModelIndex& itemIndex, const QStringList& fileNames);
|
||||
void addObjects(const QModelIndex& itemIndex, caf::PdmObjectGroup& pdmObjects);
|
||||
|
||||
RimStatisticalCalculation* addStatisticalCalculation(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
|
||||
RimStatisticsCase* addStatisticalCalculation(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
|
||||
RimIdenticalGridCaseGroup* addCaseGroup(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex);
|
||||
|
||||
bool deleteObjectFromPdmPointersField(const QModelIndex& itemIndex);
|
||||
|
@ -160,17 +160,17 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
|
||||
menu.addAction(QString("Save Property To File"), this, SLOT(slotWriteBinaryResultAsInputProperty()));
|
||||
menu.exec(event->globalPos());
|
||||
}
|
||||
else if (dynamic_cast<RimStatisticalCollection*>(uiItem->dataObject().p()))
|
||||
else if (dynamic_cast<RimStatisticsCaseCollection*>(uiItem->dataObject().p()))
|
||||
{
|
||||
QMenu menu;
|
||||
menu.addAction(QString("New Statistical Case"), this, SLOT(slotNewStatisticalCase()));
|
||||
menu.addAction(QString("New Statistcs Case"), this, SLOT(slotNewStatisticsCase()));
|
||||
menu.exec(event->globalPos());
|
||||
}
|
||||
else if (dynamic_cast<RimStatisticalCalculation*>(uiItem->dataObject().p()))
|
||||
else if (dynamic_cast<RimStatisticsCase*>(uiItem->dataObject().p()))
|
||||
{
|
||||
QMenu menu;
|
||||
menu.addAction(QString("New View"), this, SLOT(slotAddView()));
|
||||
menu.addAction(QString("Compute"), this, SLOT(slotComputeStatisticalCases()));
|
||||
menu.addAction(QString("Compute"), this, SLOT(slotComputeStatistics()));
|
||||
menu.addAction(QString("Close"), this, SLOT(slotCloseCase()));
|
||||
menu.exec(event->globalPos());
|
||||
}
|
||||
@ -817,13 +817,13 @@ void RimUiTreeView::slotCloseCase()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimUiTreeView::slotNewStatisticalCase()
|
||||
void RimUiTreeView::slotNewStatisticsCase()
|
||||
{
|
||||
RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());
|
||||
if (myModel)
|
||||
{
|
||||
QModelIndex insertedIndex;
|
||||
RimStatisticalCalculation* newObject = myModel->addStatisticalCalculation(currentIndex(), insertedIndex);
|
||||
RimStatisticsCase* newObject = myModel->addStatisticalCalculation(currentIndex(), insertedIndex);
|
||||
setCurrentIndex(insertedIndex);
|
||||
}
|
||||
}
|
||||
@ -831,18 +831,18 @@ void RimUiTreeView::slotNewStatisticalCase()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimUiTreeView::slotComputeStatisticalCases()
|
||||
void RimUiTreeView::slotComputeStatistics()
|
||||
{
|
||||
QModelIndex index = currentIndex();
|
||||
RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());
|
||||
caf::PdmUiTreeItem* uiItem = myModel->getTreeItemFromIndex(currentIndex());
|
||||
|
||||
RimStatisticalCalculation* statisticalObject = dynamic_cast<RimStatisticalCalculation*>(uiItem->dataObject().p());
|
||||
if (!statisticalObject) return;
|
||||
RimStatisticsCase* statisticsCase = dynamic_cast<RimStatisticsCase*>(uiItem->dataObject().p());
|
||||
if (!statisticsCase) return;
|
||||
|
||||
statisticalObject->computeStatistics();
|
||||
statisticsCase->computeStatistics();
|
||||
|
||||
if (statisticalObject->reservoirViews.size() == 0)
|
||||
if (statisticsCase->reservoirViews.size() == 0)
|
||||
{
|
||||
slotAddView();
|
||||
}
|
||||
|
@ -74,8 +74,8 @@ private slots:
|
||||
|
||||
void slotCloseCase();
|
||||
|
||||
void slotNewStatisticalCase();
|
||||
void slotComputeStatisticalCases();
|
||||
void slotNewStatisticsCase();
|
||||
void slotComputeStatistics();
|
||||
|
||||
void slotAddCaseGroup();
|
||||
void slotDeleteObjectFromPdmPointersField();
|
||||
|
Loading…
Reference in New Issue
Block a user