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

#2555 Open summary restart dialog if necessary when opening egrid files

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-03-20 14:32:24 +01:00
parent 95a9744241
commit 148d058d88
6 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@@ -32,6 +32,19 @@
#include <QDir>
//--------------------------------------------------------------------------------------------------
/// Internal function
//--------------------------------------------------------------------------------------------------
template<typename T>
bool vectorContains(const std::vector<T>& vector, T item)
{
for (const auto& i : vector)
{
if (i == item) return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -76,7 +89,7 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImportByAskingUser(const QStringList& initialFiles,
bool enableApplyToAllField)
{
std::set<RifSummaryCaseFileInfo> filesToImport;
std::vector<RifSummaryCaseFileInfo> filesToImport;
RicSummaryCaseRestartDialogResult lastResult;
for (const QString& file : initialFiles)
@@ -87,9 +100,9 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
for (const QString& file : result.files)
{
RifSummaryCaseFileInfo fi(file, result.option == RicSummaryCaseRestartDialog::READ_ALL);
if (filesToImport.count(fi) == 0)
if (!vectorContains(filesToImport, fi))
{
filesToImport.insert(fi);
filesToImport.push_back(fi);
}
}
}