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

Use setter instead of overloaded constructor

Browse Source 
p4#: 21177
This commit is contained in:
Magne Sjaastad 2013-04-08 14:29:43 +02:00
parent fd67c9dc18
commit bd563df02e
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Application/RiaApplication.cpp
View File

@ -500,7 +500,8 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
QFileInfo gridFileName(caseFileName); QFileInfo gridFileName(caseFileName);
QString casePath = gridFileName.absolutePath(); QString casePath = gridFileName.absolutePath();
RimResultCase* rimResultReservoir = new RimResultCase(caseName, caseFileName, casePath); RimResultCase* rimResultReservoir = new RimResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName, casePath);
m_project->reservoirs.push_back(rimResultReservoir); m_project->reservoirs.push_back(rimResultReservoir);
@ -1372,7 +1373,8 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
QString casePath = gridFileName.absolutePath(); QString casePath = gridFileName.absolutePath();
RimResultCase* rimResultReservoir = new RimResultCase(caseName, firstFileName, casePath); RimResultCase* rimResultReservoir = new RimResultCase();
rimResultReservoir->setCaseInfo(caseName, firstFileName, casePath);
if (!rimResultReservoir->openEclipseGridFile()) if (!rimResultReservoir->openEclipseGridFile())
{ {
delete rimResultReservoir; delete rimResultReservoir;
@ -1398,7 +1400,8 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
QString caseName = gridFileName.completeBaseName(); QString caseName = gridFileName.completeBaseName();
QString casePath = gridFileName.absolutePath(); QString casePath = gridFileName.absolutePath();
RimResultCase* rimResultReservoir = new RimResultCase(caseName, caseFileName, casePath); RimResultCase* rimResultReservoir = new RimResultCase();
rimResultReservoir->setCaseInfo(caseName, caseFileName, casePath);
std::vector< std::vector<int> > caseGridDimensions; std::vector< std::vector<int> > caseGridDimensions;
rimResultReservoir->readGridDimensions(caseGridDimensions); rimResultReservoir->readGridDimensions(caseGridDimensions);

21
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -43,17 +43,6 @@ RimResultCase::RimResultCase()
CAF_PDM_InitField(&caseDirectory, "CaseFolder", QString(), "Directory", "", "" ,""); CAF_PDM_InitField(&caseDirectory, "CaseFolder", QString(), "Directory", "", "" ,"");
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimResultCase::RimResultCase(const QString& caseName, const QString& caseFileName, const QString& caseDirectory)
{
RimResultCase();
this->caseName = caseName;
this->caseFileName = caseFileName;
this->caseDirectory = caseDirectory;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -308,3 +297,13 @@ void RimResultCase::updateFilePathsFromProjectPath(const QString& projectPath)
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultCase::setCaseInfo(const QString& caseName, const QString& caseFileName, const QString& caseDirectory)
{
this->caseName = caseName;
this->caseFileName = caseFileName;
this->caseDirectory = caseDirectory;
}

3
ApplicationCode/ProjectDataModel/RimResultCase.h
View File

@ -38,13 +38,14 @@ class RimResultCase : public RimCase
public: public:
RimResultCase(); RimResultCase();
RimResultCase(const QString& caseName, const QString& caseFileName, const QString& caseDirectory);
virtual ~RimResultCase(); virtual ~RimResultCase();
// Fields: // Fields:
caf::PdmField<QString> caseFileName; caf::PdmField<QString> caseFileName;
caf::PdmField<QString> caseDirectory; caf::PdmField<QString> caseDirectory;
void setCaseInfo(const QString& caseName, const QString& caseFileName, const QString& caseDirectory);
virtual bool openEclipseGridFile(); virtual bool openEclipseGridFile();
bool openAndReadActiveCellData(RigCaseData* mainEclipseCase); bool openAndReadActiveCellData(RigCaseData* mainEclipseCase);
void readGridDimensions(std::vector< std::vector<int> >& gridDimensions); void readGridDimensions(std::vector< std::vector<int> >& gridDimensions);