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

System : Postfix with _OBSOLETE

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-09 09:57:54 +01:00
parent 09d776dd73
commit 472aa87265
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -91,9 +91,9 @@ RimEclipseCase::RimEclipseCase()
m_filesContainingFaults_OBSOLETE.xmlCapability()->setIOWritable(false); m_filesContainingFaults_OBSOLETE.xmlCapability()->setIOWritable(false);
m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden(true); m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&caseName, "CaseName", QString(), "Obsolete", "", "" ,""); CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,"");
caseName.xmlCapability()->setIOWritable(false); m_caseName_OBSOLETE.xmlCapability()->setIOWritable(false);
caseName.uiCapability()->setUiHidden(true); m_caseName_OBSOLETE.uiCapability()->setUiHidden(true);
// Init // Init
@ -210,9 +210,9 @@ void RimEclipseCase::initAfterRead()
riv->setEclipseCase(this); riv->setEclipseCase(this);
} }
if (caseUserDescription().isEmpty() && !caseName().isEmpty()) if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty())
{ {
caseUserDescription = caseName; caseUserDescription = m_caseName_OBSOLETE;
} }
} }

2
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@ -135,7 +135,7 @@ private:
// Obsolete fields // Obsolete fields
protected: protected:
caf::PdmField<QString> caseName; caf::PdmField<QString> m_caseName_OBSOLETE;
private: private:
caf::PdmField<std::vector<QString> > m_filesContainingFaults_OBSOLETE; caf::PdmField<std::vector<QString> > m_filesContainingFaults_OBSOLETE;

4
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -572,9 +572,9 @@ void RimEclipseResultCase::initAfterRead()
// Convert from old (9.0.2) way of storing the case file // Convert from old (9.0.2) way of storing the case file
if (caseFileName().isEmpty()) if (caseFileName().isEmpty())
{ {
if (!this->caseName().isEmpty() && !caseDirectory().isEmpty()) if (!this->m_caseName_OBSOLETE().isEmpty() && !caseDirectory().isEmpty())
{ {
caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + caseName() + ".EGRID"; caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + m_caseName_OBSOLETE() + ".EGRID";
} }
} }
} }