OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2555 Handle import to separate cases

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-03-20 14:32:55 +01:00
parent 8889bdf6d4
commit 2a84cb6ddf
10 changed files with 186 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
+11 -10
View File
@@ -39,17 +39,10 @@ CAF_PDM_SOURCE_INIT(RimFileSummaryCase,"FileSummaryCase");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFileSummaryCase::RimFileSummaryCase() : m_includeRestartFiles(false)
RimFileSummaryCase::RimFileSummaryCase()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFileSummaryCase::RimFileSummaryCase(bool includeRestartFiles)
{
m_includeRestartFiles = includeRestartFiles;
CAF_PDM_InitField(&m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "");
m_includeRestartFiles.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -119,3 +112,11 @@ RifSummaryReaderInterface* RimFileSummaryCase::summaryReader()
{
return m_summaryFileReader.p();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::setIncludeRestartFiles(bool includeRestartFiles)
{
m_includeRestartFiles = includeRestartFiles;
}
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
+4 -3
View File
@@ -20,7 +20,7 @@
#include "RimSummaryCase.h"
#include "cvfObject.h"
#include "cafPdmField.h"
class RifReaderEclipseSummary;
@@ -34,7 +34,6 @@ class RimFileSummaryCase: public RimSummaryCase
CAF_PDM_HEADER_INIT;
public:
RimFileSummaryCase();
RimFileSummaryCase(bool includeRestartFiles);
virtual ~RimFileSummaryCase();
virtual QString summaryHeaderFilename() const override;
@@ -44,9 +43,11 @@ public:
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
void setIncludeRestartFiles(bool includeRestartFiles);
static RifReaderEclipseSummary* findRelatedFilesAndCreateReader(const QString& headerFileName, bool includeRestartFiles);
private:
cvf::ref<RifReaderEclipseSummary> m_summaryFileReader;
bool m_includeRestartFiles;
caf::PdmField<bool> m_includeRestartFiles;
};
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
+2 -1
View File
@@ -284,9 +284,10 @@ RimSummaryCase* RimSummaryCaseMainCollection::createAndAddSummaryCaseFromEclipse
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseMainCollection::createAndAddSummaryCaseFromFileName(const QString& fileName, bool includeRestartFiles)
{
RimFileSummaryCase* newSumCase = new RimFileSummaryCase(includeRestartFiles);
RimFileSummaryCase* newSumCase = new RimFileSummaryCase();
this->m_cases.push_back(newSumCase);
newSumCase->setIncludeRestartFiles(includeRestartFiles);
newSumCase->setSummaryHeaderFileName(fileName);
newSumCase->createSummaryReaderInterface();
newSumCase->updateOptionSensitivity();