OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1751 Rename RimSummaryCaseCollection to RimSummaryCaseMainCollection

Browse Source
This commit is contained in:
Rebecca Cox
2017-09-06 16:32:46 +02:00
parent 078a84dbf4
commit dd845e3dc7
17 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@@ -9,7 +9,7 @@ ${CEE_CURRENT_LIST_DIR}RimAsciiDataCurve.h
${CEE_CURRENT_LIST_DIR}RimFileSummaryCase.h
${CEE_CURRENT_LIST_DIR}RimGridSummaryCase.h
${CEE_CURRENT_LIST_DIR}RimSummaryCase.h
${CEE_CURRENT_LIST_DIR}RimSummaryCaseCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryCaseMainCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryCurve.h
${CEE_CURRENT_LIST_DIR}RimSummaryCurveAppearanceCalculator.h
${CEE_CURRENT_LIST_DIR}RimSummaryCurveAutoName.h
@@ -27,7 +27,7 @@ ${CEE_CURRENT_LIST_DIR}RimAsciiDataCurve.cpp
${CEE_CURRENT_LIST_DIR}RimFileSummaryCase.cpp
${CEE_CURRENT_LIST_DIR}RimGridSummaryCase.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCase.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCaseCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCaseMainCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCurve.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCurveAppearanceCalculator.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCurveAutoName.cpp

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

@@ -20,7 +20,7 @@
#include "RigSummaryCaseData.h"
#include "RimEclipseCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include <QFileInfo>
#include "RimProject.h"
@@ -147,11 +147,11 @@ void RimSummaryCase::updateAutoShortName()
{
if(m_useAutoShortName)
{
RimSummaryCaseCollection* summaryCaseCollection = NULL;
this->firstAncestorOrThisOfType(summaryCaseCollection);
CVF_ASSERT(summaryCaseCollection);
RimSummaryCaseMainCollection* summaryCaseMainCollection = NULL;
this->firstAncestorOrThisOfType(summaryCaseMainCollection);
CVF_ASSERT(summaryCaseMainCollection);
m_shortName = summaryCaseCollection->uniqueShortNameForCase(this);
m_shortName = summaryCaseMainCollection->uniqueShortNameForCase(this);
updateTreeItemName();
}
else if (m_shortName() == QString("Display Name"))

30
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp → ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -15,7 +15,7 @@
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RifEclipseSummaryTools.h"
#include "RimEclipseResultCase.h"
@@ -28,12 +28,12 @@
#include <QDir>
CAF_PDM_SOURCE_INIT(RimSummaryCaseCollection,"SummaryCaseCollection");
CAF_PDM_SOURCE_INIT(RimSummaryCaseMainCollection,"SummaryCaseCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection::RimSummaryCaseCollection()
RimSummaryCaseMainCollection::RimSummaryCaseMainCollection()
{
CAF_PDM_InitObject("Summary Cases",":/Cases16x16.png","","");
@@ -45,7 +45,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection::~RimSummaryCaseCollection()
RimSummaryCaseMainCollection::~RimSummaryCaseMainCollection()
{
m_cases.deleteAllChildObjects();
}
@@ -53,7 +53,7 @@ RimSummaryCaseCollection::~RimSummaryCaseCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::createSummaryCasesFromRelevantEclipseResultCases()
void RimSummaryCaseMainCollection::createSummaryCasesFromRelevantEclipseResultCases()
{
RimProject* proj = nullptr;
firstAncestorOrThisOfType(proj);
@@ -96,7 +96,7 @@ void RimSummaryCaseCollection::createSummaryCasesFromRelevantEclipseResultCases(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseCollection::findSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclipseResultCase) const
RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclipseResultCase) const
{
for (RimSummaryCase* summaryCase : m_cases)
{
@@ -116,7 +116,7 @@ RimSummaryCase* RimSummaryCaseCollection::findSummaryCaseFromEclipseResultCase(R
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseCollection::findSummaryCaseFromFileName(const QString& fileName) const
RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromFileName(const QString& fileName) const
{
// Use QFileInfo object to compare two file names to avoid mix of / and \\
@@ -141,7 +141,7 @@ RimSummaryCase* RimSummaryCaseCollection::findSummaryCaseFromFileName(const QStr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::deleteCase(RimSummaryCase* summaryCase)
void RimSummaryCaseMainCollection::deleteCase(RimSummaryCase* summaryCase)
{
m_cases.removeChildObject(summaryCase);
}
@@ -149,7 +149,7 @@ void RimSummaryCaseCollection::deleteCase(RimSummaryCase* summaryCase)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseCollection::summaryCase(size_t idx)
RimSummaryCase* RimSummaryCaseMainCollection::summaryCase(size_t idx)
{
return m_cases[idx];
}
@@ -157,7 +157,7 @@ RimSummaryCase* RimSummaryCaseCollection::summaryCase(size_t idx)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RimSummaryCaseCollection::summaryCaseCount()
size_t RimSummaryCaseMainCollection::summaryCaseCount()
{
return m_cases.size();
}
@@ -165,7 +165,7 @@ size_t RimSummaryCaseCollection::summaryCaseCount()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::loadAllSummaryCaseData()
void RimSummaryCaseMainCollection::loadAllSummaryCaseData()
{
for (RimSummaryCase* sumCase: m_cases)
{
@@ -176,7 +176,7 @@ void RimSummaryCaseCollection::loadAllSummaryCaseData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase)
RimSummaryCase* RimSummaryCaseMainCollection::createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase)
{
QString gridFileName = eclResCase->gridFileName();
if(RifEclipseSummaryTools::hasSummaryFiles(QDir::toNativeSeparators(gridFileName).toStdString()))
@@ -193,7 +193,7 @@ RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromEclipseResu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromFileName(const QString& fileName)
RimSummaryCase* RimSummaryCaseMainCollection::createAndAddSummaryCaseFromFileName(const QString& fileName)
{
RimFileSummaryCase* newSumCase = new RimFileSummaryCase();
@@ -207,7 +207,7 @@ RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromFileName(co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryCaseCollection::uniqueShortNameForCase(RimSummaryCase* summaryCase)
QString RimSummaryCaseMainCollection::uniqueShortNameForCase(RimSummaryCase* summaryCase)
{
std::set<QString> allAutoShortNames;
@@ -267,7 +267,7 @@ QString RimSummaryCaseCollection::uniqueShortNameForCase(RimSummaryCase* summary
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::updateFilePathsFromProjectPath(const QString & newProjectPath, const QString & oldProjectPath)
void RimSummaryCaseMainCollection::updateFilePathsFromProjectPath(const QString & newProjectPath, const QString & oldProjectPath)
{
for (auto summaryCase : m_cases)
{

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h → ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
View File

@@ -23,12 +23,12 @@
class RimSummaryCase;
class RimEclipseResultCase;
class RimSummaryCaseCollection : public caf::PdmObject
class RimSummaryCaseMainCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimSummaryCaseCollection();
virtual ~RimSummaryCaseCollection();
RimSummaryCaseMainCollection();
virtual ~RimSummaryCaseMainCollection();
RimSummaryCase* summaryCase(size_t idx);
size_t summaryCaseCount();