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

#2801 Fix Cotire build.

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-04-25 14:07:24 +02:00
parent a0e4f71138
commit 3a670d94a2
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@ -214,7 +214,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
{
if (failOnSummaryImportError)
{
return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::ERROR);
return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::SUMMARY_ERROR);
}
}
else
@ -228,11 +228,11 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
// If only grid file is present, return
if (!handleSummaryFile && !initialGridFile.isEmpty())
{
RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::OK;
RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::SUMMARY_OK;
if (!initialSummaryFile.isEmpty())
{
// We were meant to have a summary file but due to an error we don't.
status = RicSummaryCaseRestartDialogResult::SUMMARY_FILE_WARNING;
status = RicSummaryCaseRestartDialogResult::SUMMARY_WARNING;
}
return RicSummaryCaseRestartDialogResult(status,
defaultSummaryImportOption,
@ -251,7 +251,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
// If no restart files are found and no warnings, do not show dialog
if (originFileInfos.empty() &&!hasWarnings)
{
return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::OK, NOT_IMPORT, NOT_IMPORT, QStringList({ initialSummaryFile }), QStringList({ initialGridFile }), false);
return RicSummaryCaseRestartDialogResult(RicSummaryCaseRestartDialogResult::SUMMARY_OK, NOT_IMPORT, NOT_IMPORT, QStringList({ initialSummaryFile }), QStringList({ initialGridFile }), false);
}
RicSummaryCaseRestartDialogResult dialogResult;
@ -332,11 +332,11 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
dialog.resize(DEFAULT_DIALOG_WIDTH, DEFAULT_DIALOG_INIT_HEIGHT);
dialog.exec();
RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::OK;
RicSummaryCaseRestartDialogResult::Status status = RicSummaryCaseRestartDialogResult::SUMMARY_OK;
if (dialog.result() == QDialog::Rejected)
{
status = RicSummaryCaseRestartDialogResult::CANCELLED;
status = RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED;
}
dialogResult = RicSummaryCaseRestartDialogResult(status,
@ -347,7 +347,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
dialog.applyToAllSelected());
}
if (dialogResult.status != RicSummaryCaseRestartDialogResult::OK)
if (dialogResult.status != RicSummaryCaseRestartDialogResult::SUMMARY_OK)
{
return RicSummaryCaseRestartDialogResult(dialogResult.status, NOT_IMPORT, NOT_IMPORT, QStringList(), QStringList(), false);
}

10
ApplicationCode/Commands/RicSummaryCaseRestartDialog.h
View File

@ -106,12 +106,12 @@ class RicSummaryCaseRestartDialogResult
public:
enum Status
{
OK = 0,
CANCELLED = 1,
SUMMARY_FILE_WARNING = 2,
ERROR = 3
SUMMARY_OK = 0,
SUMMARY_CANCELLED,
SUMMARY_WARNING,
SUMMARY_ERROR
};
RicSummaryCaseRestartDialogResult(Status _status = ERROR) :
RicSummaryCaseRestartDialogResult(Status _status = SUMMARY_ERROR) :
status(_status),
summaryImportOption(RicSummaryCaseRestartDialog::IMPORT_ALL),
gridImportOption(RicSummaryCaseRestartDialog::NOT_IMPORT),

8
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -180,7 +180,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
m_defaultGridImportMode,
&lastResult);
if (result.status == RicSummaryCaseRestartDialogResult::CANCELLED)
if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED)
{
// Cancel pressed, cancel everything and return early
m_summaryFileInfos.clear();
@ -189,8 +189,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
return;
}
if (result.status == RicSummaryCaseRestartDialogResult::ERROR ||
result.status == RicSummaryCaseRestartDialogResult::SUMMARY_FILE_WARNING)
if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_ERROR ||
result.status == RicSummaryCaseRestartDialogResult::SUMMARY_WARNING)
{
// A summary import failure occurred with one of the files. The others may still have worked.
m_summaryFileErrors.push_back(initialFile.summaryFileName());
@ -207,7 +207,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
}
}
if (result.status != RicSummaryCaseRestartDialogResult::ERROR)
if (result.status != RicSummaryCaseRestartDialogResult::SUMMARY_ERROR)
{
lastResult = result;