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

#2795 Summary Case Import: When importing grids keep going even if summary file import fails.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-04-24 15:55:51 +02:00
parent f456911c80
commit e953d6800c
4 changed files with 148 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.h
View File

@@ -26,10 +26,9 @@
#include <string>
#include <vector>
#include <map>
class RifSummaryCaseFileInfo;
class RifSummaryCaseFileImportInfo;
//==================================================================================================
//
@@ -56,19 +55,17 @@ public:
static QString getSummaryFileFromGridFile(const QString& gridFile);
private:
void determineFilesToImport(const std::vector<std::pair<QString /*sum*/, QString /*grid*/>>& initialFiles);
void determineFilesToImport(const std::vector<RifSummaryCaseFileImportInfo>& initialFiles);
void determineFilesToImportByAskingUser(const std::vector<RifSummaryCaseFileImportInfo>& initialFiles, bool enableApplyToAllField);
void determineFilesToImportUsingPrefs(const std::vector<RifSummaryCaseFileImportInfo>& initialFiles);
void determineFilesToImportByAskingUser(const std::vector<std::pair<QString /*sum*/, QString /*grid*/>>& initialFiles,
bool enableApplyToAllField);
void determineFilesToImportUsingPrefs(const std::vector<std::pair<QString /*sum*/, QString /*grid*/>>& initialFiles);
bool m_showDialog;
RicSummaryCaseRestartDialog::ImportOptions m_defaultSummaryImportMode;
RicSummaryCaseRestartDialog::ImportOptions m_defaultGridImportMode;
bool m_showDialog;
RicSummaryCaseRestartDialog::ImportOptions m_defaultSummaryImportMode;
RicSummaryCaseRestartDialog::ImportOptions m_defaultGridImportMode;
std::vector<RifSummaryCaseFileInfo> m_summaryFileInfos;
QStringList m_gridFiles;
QStringList m_summaryFileErrors;
std::vector<RifSummaryCaseFileInfo> m_summaryFileInfos;
QStringList m_gridFiles;
QStringList m_summaryFileErrors;
};
//==================================================================================================
@@ -86,3 +83,21 @@ public:
bool operator<(const RifSummaryCaseFileInfo& other) const { return fileName < other.fileName; }
bool operator==(const RifSummaryCaseFileInfo& other) const { return fileName == other.fileName; }
};
//==================================================================================================
///
//==================================================================================================
class RifSummaryCaseFileImportInfo
{
public:
RifSummaryCaseFileImportInfo(const QString& summaryFileName, const QString& gridFileName, bool failOnSummaryFileImportError = false);
const QString& summaryFileName() const;
const QString& gridFileName() const;
bool failOnSummaryFileError() const;
private:
QString m_summaryFileName;
QString m_gridFileName;
bool m_failOnSummaryFileImportError;
};