OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 07:26:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1918 Observed Data : Removed RigCase RigSummaryCaseData from RimSummaryCase

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-22 08:23:50 +02:00
parent 2bad74b4aa
commit 32fa6d4920
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -289,7 +289,7 @@ RimSummaryCurve* RicPlotProductionRateFeature::addSummaryCurve( RimSummaryPlot*
-1,
-1);
if (!gridSummaryCase->caseData()->summaryReader()->hasAddress(addr))
if (!gridSummaryCase->summaryReader()->hasAddress(addr))
{
return nullptr;
}

8
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -668,7 +668,7 @@ std::set<RifEclipseSummaryAddress> RicSummaryCurveCreator::findPossibleSummaryAd
for (RimSummaryCase* currCase : selectedCases)
{
RifSummaryReaderInterface* reader = nullptr;
if (currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader();
if (currCase) reader = currCase->summaryReader();
if (reader)
{
const std::vector<RifEclipseSummaryAddress>& allAddresses = reader->allResultAddresses();
@ -852,7 +852,7 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection()
for (RimSummaryCase* currCase : m_selectedCases)
{
RifSummaryReaderInterface* reader = nullptr;
if (currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader();
if (currCase) reader = currCase->summaryReader();
if (reader)
{
const std::vector<RifEclipseSummaryAddress>& allAddresses = reader->allResultAddresses();
@ -976,9 +976,9 @@ std::set<std::string> RicSummaryCurveCreator::getAllSummaryWellNames()
for (RimSummaryCase* rimCase : cases)
{
RifSummaryReaderInterface* reader = nullptr;
if (rimCase && rimCase->caseData())
if (rimCase)
{
reader = rimCase->caseData()->summaryReader();
reader = rimCase->summaryReader();
}
if (reader)

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@ -77,9 +77,14 @@ void RimSummaryCase::reloadCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigSummaryCaseData* RimSummaryCase::caseData()
RifSummaryReaderInterface* RimSummaryCase::summaryReader()
{
return m_summaryCaseData.p();
if (m_summaryCaseData.notNull())
{
return m_summaryCaseData->summaryReader();
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@ -24,6 +24,7 @@
#include "cafPdmPtrField.h"
class RigSummaryCaseData;
class RifSummaryReaderInterface;
//==================================================================================================
//
@ -47,7 +48,7 @@ public:
void loadCase();
void reloadCase();
RigSummaryCaseData* caseData();
RifSummaryReaderInterface* summaryReader();
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) = 0;

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -549,9 +549,7 @@ RifSummaryReaderInterface* RimSummaryCurve::summaryReader() const
{
if (!m_summaryCase()) return nullptr;
if (!m_summaryCase->caseData()) return nullptr;
return m_summaryCase()->caseData()->summaryReader();
return m_summaryCase()->summaryReader();
}
//--------------------------------------------------------------------------------------------------

14
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@ -361,9 +361,9 @@ void RimSummaryCurveFilter::syncCurvesFromUiSelection()
for (RimSummaryCase* currentCase: m_selectedSummaryCases)
{
if (!currentCase || !currentCase->caseData() || !currentCase->caseData()->summaryReader()) continue;
if (!currentCase || !currentCase->summaryReader()) continue;
RifSummaryReaderInterface* reader = currentCase->caseData()->summaryReader();
RifSummaryReaderInterface* reader = currentCase->summaryReader();
for(const RifEclipseSummaryAddress& addr: m_uiFilterResultMultiSelection.v())
{
@ -524,9 +524,9 @@ void RimSummaryCurveFilter::createSetOfCasesAndResultAdresses(
{
for (RimSummaryCase* currentCase : cases)
{
if (!currentCase || !currentCase->caseData() || !currentCase->caseData()->summaryReader()) continue;
if (!currentCase || !currentCase->summaryReader()) continue;
RifSummaryReaderInterface* reader = currentCase->caseData()->summaryReader();
RifSummaryReaderInterface* reader = currentCase->summaryReader();
const std::vector<RifEclipseSummaryAddress> allAddresses = reader->allResultAddresses();
int addressCount = static_cast<int>(allAddresses.size());
@ -683,7 +683,7 @@ std::set<RifEclipseSummaryAddress> RimSummaryCurveFilter::findPossibleSummaryAdd
for(RimSummaryCase* currCase: m_selectedSummaryCases)
{
RifSummaryReaderInterface* reader = nullptr;
if(currCase && currCase->caseData()) reader = currCase->caseData()->summaryReader();
if(currCase) reader = currCase->summaryReader();
if(reader)
{
@ -734,9 +734,9 @@ std::set<std::string> RimSummaryCurveFilter::getAllSummaryWellNames()
for (RimSummaryCase* rimCase : cases)
{
RifSummaryReaderInterface* reader = nullptr;
if (rimCase && rimCase->caseData())
if (rimCase)
{
reader = rimCase->caseData()->summaryReader();
reader = rimCase->summaryReader();
}
if (reader)