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

Merge branch '2018.01.01-patch' into dev

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-09 09:58:39 +01:00
commit 68b5a0e019
5 changed files with 9 additions and 16 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.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&caseName, "CaseName", QString(), "Obsolete", "", "" ,"");
caseName.xmlCapability()->setIOWritable(false);
caseName.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,"");
m_caseName_OBSOLETE.xmlCapability()->setIOWritable(false);
m_caseName_OBSOLETE.uiCapability()->setUiHidden(true);
// Init
@ -210,9 +210,9 @@ void RimEclipseCase::initAfterRead()
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
protected:
caf::PdmField<QString> caseName;
caf::PdmField<QString> m_caseName_OBSOLETE;
private:
caf::PdmField<std::vector<QString> > m_filesContainingFaults_OBSOLETE;

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -92,8 +92,6 @@ RimEclipseResultCase::RimEclipseResultCase()
m_activeCellInfoIsReadFromFile = false;
m_gridAndWellDataIsReadFromFile = false;
m_caseName = "";
}
//--------------------------------------------------------------------------------------------------
@ -574,9 +572,9 @@ void RimEclipseResultCase::initAfterRead()
// Convert from old (9.0.2) way of storing the case file
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";
}
}
}

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@ -65,8 +65,6 @@ public:
RifReaderEclipseRft* rftReader();
QString caseName() const { return m_caseName; }
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
@ -90,12 +88,9 @@ private:
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName;
QString m_caseName;
// Obsolete field
caf::PdmField<QString> caseDirectory;
bool m_gridAndWellDataIsReadFromFile;
bool m_activeCellInfoIsReadFromFile;
};

2
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@ -258,7 +258,7 @@ QString RimWellLogRftCurve::createCurveAutoName()
if (m_eclipseResultCase)
{
name.push_back(m_eclipseResultCase->caseName());
name.push_back(m_eclipseResultCase->caseUserDescription());
}
if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::text(RifEclipseRftAddress::NONE))
{