OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 04:00:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2787 Import summary case does not work on linux

Browse Source 
* Make sure summary files are added to class member in getFilesToImportUsingPrefs.
* The code used to return a vector of summary files, now just a boolean and the files
   are meant to be added to the vector for later retrieval.
This commit is contained in:
Gaute Lindkvist 2018-04-23 14:50:12 +02:00
parent 517a557efe
commit 51fb8a6935
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -173,7 +173,6 @@ bool RifSummaryCaseRestartSelector::getFilesToImportByAskingUser(const std::vect
//--------------------------------------------------------------------------------------------------
bool RifSummaryCaseRestartSelector::getFilesToImportUsingPrefs(const std::vector<std::pair<QString /*sum*/, QString /*grid*/>>& initialFiles)
{
std::vector<RifSummaryCaseFileInfo> filesToImport;
RicSummaryCaseRestartDialogResult lastResult;
m_gridFiles.clear();
@ -186,15 +185,15 @@ bool RifSummaryCaseRestartSelector::getFilesToImportUsingPrefs(const std::vector
if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::IMPORT_ALL)
{
filesToImport.push_back(RifSummaryCaseFileInfo(initialSummaryFile, true));
m_summaryFileInfos.push_back(RifSummaryCaseFileInfo(initialSummaryFile, true));
}
else if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::NOT_IMPORT)
{
filesToImport.push_back(RifSummaryCaseFileInfo(initialSummaryFile, false));
m_summaryFileInfos.push_back(RifSummaryCaseFileInfo(initialSummaryFile, false));
}
else if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES)
{
filesToImport.push_back(RifSummaryCaseFileInfo(initialSummaryFile, false));
m_summaryFileInfos.push_back(RifSummaryCaseFileInfo(initialSummaryFile, false));
RifReaderEclipseSummary reader;
bool hasWarnings = false;
@ -202,9 +201,9 @@ bool RifSummaryCaseRestartSelector::getFilesToImportUsingPrefs(const std::vector
for (const auto& rfi : restartFileInfos)
{
RifSummaryCaseFileInfo fi(rfi.fileName, false);
if (!vectorContains(filesToImport, fi))
if (!vectorContains(m_summaryFileInfos, fi))
{
filesToImport.push_back(fi);
m_summaryFileInfos.push_back(fi);
}
}
}