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

#908 Summary : Show grid filename for summary files loaded from grid files

Browse Source
This commit is contained in:
Magne Sjaastad
2016-11-16 09:21:27 +01:00
parent 595b3bd2dd
commit 0fc0b8170c
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -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 <QDir>
#include <QMenu>
#include "RimGridSummaryCase.h"
#include "RimSummaryCaseCollection.h"
CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");

18
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
View File

@@ -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();
}

9
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h
View File

@@ -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<RimEclipseCase*> m_eclipseCase;
QString eclipseGridFileName() const;
private:
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmProxyValueField<QString> m_eclipseGridFileName;
caf::PdmProxyValueField<QString> m_eclipseSummaryFileName;
};