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

#2790 Progress bar when importing summary cases.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-04-24 16:02:45 +02:00
parent c5e4bf93a6
commit a7c72b549b
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@@ -28,6 +28,8 @@
#include "RifEclipseSummaryTools.h"
#include "RifReaderEclipseSummary.h"
#include "cafProgressInfo.h"
#include <string>
#include <assert.h>
@@ -166,7 +168,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
m_summaryFileInfos.clear();
m_gridFiles.clear();
m_summaryFileErrors.clear();
caf::ProgressInfo progress(initialFiles.size(), QString("Importing files"));
for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles)
{
RicSummaryCaseRestartDialogResult result = RicSummaryCaseRestartDialog::openDialog(initialFile.summaryFileName(),
@@ -177,8 +180,6 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
m_defaultGridImportMode,
&lastResult);
lastResult = result;
if (result.status == RicSummaryCaseRestartDialogResult::CANCELLED)
{
// Cancel pressed, cancel everything and return early
@@ -206,14 +207,17 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
}
}
if (result.status == RicSummaryCaseRestartDialogResult::OK ||
result.status == RicSummaryCaseRestartDialogResult::SUMMARY_FILE_WARNING)
if (result.status != RicSummaryCaseRestartDialogResult::ERROR)
{
lastResult = result;
for (const QString& gridFile : result.gridFiles)
{
m_gridFiles.push_back(gridFile);
}
}
progress.incrementProgress();
}
}
@@ -228,6 +232,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs(const std::
m_gridFiles.clear();
m_summaryFileErrors.clear();
caf::ProgressInfo progress(initialFiles.size(), QString("Importing files"));
for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles)
{
QString initialSummaryFile = RiaFilePathTools::toInternalSeparator(initialFile.summaryFileName());
@@ -302,7 +307,9 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs(const std::
for (const QString& warning : reader.warnings()) RiaLogging::error(warning);
}
}
}
}
progress.incrementProgress();
}
}