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

#5147 RimEclipseResultCase::caseFileName -> PdmField<caf::FilePath>

Browse Source
This commit is contained in:
Jacob Støren
2019-12-10 16:19:39 +01:00
parent 18cf59530f
commit d19c87c23a
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@@ -24,6 +24,7 @@
#include "RimEclipseCase.h"
#include "cafFilePath.h"
#include <cafPdmProxyValueField.h>
class RifReaderEclipseRft;
@@ -65,7 +66,7 @@ public:
QString locationOnDisc() const override;
QString gridFileName() const override
{
return caseFileName();
return caseFileName().path();
}
void updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath ) override;
@@ -98,7 +99,7 @@ private:
cvf::ref<RifReaderEclipseRft> m_readerEclipseRft;
// Fields:
caf::PdmField<QString> caseFileName;
caf::PdmField<caf::FilePath> caseFileName;
caf::PdmProxyValueField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName;