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 Guarding for nullptr and some minor fixes

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-03-21 14:47:07 +01:00
parent 203677e837
commit 1369b11e6e
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@ -132,6 +132,11 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog(const
RicSummaryCaseRestartDialog dialog(parent);
RifRestartFileInfo currentFileInfo = dialog.getFileInfo(summaryHeaderFile);
if (!currentFileInfo.valid())
{
return RicSummaryCaseRestartDialogResult();
}
dialog.appendFileInfoToGridLayout(*dialog.m_currentFileGridLayout, currentFileInfo);
std::vector<RifRestartFileInfo> fileInfos = dialog.getRestartFiles(summaryHeaderFile);

10
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -40,10 +40,14 @@
std::vector<time_t> getTimeSteps(ecl_sum_type* ecl_sum)
{
std::vector<time_t> timeSteps;
for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum); time_index++)
if (ecl_sum)
{
time_t sim_time = ecl_sum_iget_sim_time(ecl_sum, time_index);
timeSteps.push_back(sim_time);
for (int time_index = 0; time_index < ecl_sum_get_data_length(ecl_sum); time_index++)
{
time_t sim_time = ecl_sum_iget_sim_time(ecl_sum, time_index);
timeSteps.push_back(sim_time);
}
}
return timeSteps;
}

1
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@ -38,6 +38,7 @@ class RifRestartFileInfo
{
public:
RifRestartFileInfo() : startDate(0), endDate(0) {}
bool valid() { return !fileName.isEmpty(); }
QString fileName;
time_t startDate;

2
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -105,8 +105,8 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
filesToImport.push_back(fi);
}
}
lastResult = result;
}
lastResult = result;
}
return std::vector<RifSummaryCaseFileInfo>(filesToImport.begin(), filesToImport.end());
}