From 0fc0b8170cc2a3ff1c663b782c55b5b7210151c9 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 16 Nov 2016 09:21:27 +0100 Subject: [PATCH] #908 Summary : Show grid filename for summary files loaded from grid files --- .../ProjectDataModel/RimProject.cpp | 4 ++-- .../Summary/RimGridSummaryCase.cpp | 18 ++++++++++++++++++ .../Summary/RimGridSummaryCase.h | 9 ++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 5dfe4f2a0b..46dd4fc816 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -35,10 +35,12 @@ #include "RimFormationNamesCollection.h" #include "RimGeoMechCase.h" #include "RimGeoMechModels.h" +#include "RimGridSummaryCase.h" #include "RimIdenticalGridCaseGroup.h" #include "RimMainPlotCollection.h" #include "RimOilField.h" #include "RimScriptCollection.h" +#include "RimSummaryCaseCollection.h" #include "RimSummaryPlotCollection.h" #include "RimView.h" #include "RimViewLinker.h" @@ -58,8 +60,6 @@ #include #include -#include "RimGridSummaryCase.h" -#include "RimSummaryCaseCollection.h" CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject"); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp index 7b3e31aebd..7db50f87be 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp @@ -38,6 +38,14 @@ CAF_PDM_SOURCE_INIT(RimGridSummaryCase,"GridSummaryCase"); RimGridSummaryCase::RimGridSummaryCase() { CAF_PDM_InitFieldNoDefault(&m_eclipseCase, "Associated3DCase", "Main View", "", "", ""); + + CAF_PDM_InitFieldNoDefault(&m_eclipseGridFileName, "Associated3DCaseGridFileName", "Grid File Name", "", "", ""); + m_eclipseGridFileName.registerGetMethod(this, &RimGridSummaryCase::eclipseGridFileName); + m_eclipseGridFileName.uiCapability()->setUiReadOnly(true); + + CAF_PDM_InitFieldNoDefault(&m_eclipseSummaryFileName, "SummaryFileName", "Summary File Name", "", "", ""); + m_eclipseSummaryFileName.registerGetMethod(this, &RimGridSummaryCase::summaryHeaderFilename); + m_eclipseSummaryFileName.uiCapability()->setUiReadOnly(true); } //-------------------------------------------------------------------------------------------------- @@ -91,3 +99,13 @@ QString RimGridSummaryCase::caseName() const return m_eclipseCase()->caseUserDescription(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimGridSummaryCase::eclipseGridFileName() const +{ + if (!m_eclipseCase()) return QString(); + + return m_eclipseCase()->gridFileName(); +} + diff --git a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h index 9f978dc4eb..1f51facd9d 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h @@ -19,6 +19,8 @@ #include "RimSummaryCase.h" +#include "cafPdmProxyValueField.h" + class RimEclipseCase; //================================================================================================== @@ -41,7 +43,12 @@ public: virtual QString caseName() const override; private: - caf::PdmPtrField m_eclipseCase; + QString eclipseGridFileName() const; + +private: + caf::PdmPtrField m_eclipseCase; + caf::PdmProxyValueField m_eclipseGridFileName; + caf::PdmProxyValueField m_eclipseSummaryFileName; };