Rename of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree

p4#: 20963
This commit is contained in:
Jacob Støren
2013-03-19 10:29:34 +01:00
parent 051710b82f
commit 75fc89e67a
10 changed files with 46 additions and 44 deletions

View File

@@ -119,7 +119,7 @@ size_t RimResultDefinition::gridScalarIndex() const
{
if (m_gridScalarResultIndex == cvf::UNDEFINED_SIZE_T)
{
const RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults();
const RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (gridCellResults) m_gridScalarResultIndex = gridCellResults->cellResults()->findScalarResultIndex(resultType(), resultVariable());
}
return m_gridScalarResultIndex;
@@ -130,7 +130,7 @@ size_t RimResultDefinition::gridScalarIndex() const
//--------------------------------------------------------------------------------------------------
void RimResultDefinition::loadResult()
{
RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults();
RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (gridCellResults)
{
m_gridScalarResultIndex = gridCellResults->findOrLoadScalarResult(resultType(), resultVariable);
@@ -148,7 +148,7 @@ void RimResultDefinition::loadResult()
//--------------------------------------------------------------------------------------------------
bool RimResultDefinition::hasStaticResult() const
{
const RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults();
const RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (hasResult() && gridCellResults->cellResults()->timeStepCount(m_gridScalarResultIndex) == 1 )
{
return true;