From 7c6fa6ff77cc61ca7f3620c5d2481609b7d94f79 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 30 Apr 2025 07:52:23 +0200 Subject: [PATCH] #12436 Read and display date for summary restart files --- .../Commands/RicSummaryCaseRestartDialog.cpp | 3 ++- .../FileInterface/RifEclipseSummaryTools.cpp | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.cpp b/ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.cpp index 7a91e3a6f1..da782f75d9 100644 --- a/ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.cpp +++ b/ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.cpp @@ -318,7 +318,8 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog( const currentFileInfos.push_back( currentFileInfo ); for ( const auto& fileName : restartFileNames ) { - originSummaryFileInfos.push_back( RifRestartFileInfo( fileName, 0, 0 ) ); + auto fileInfo = RifEclipseSummaryTools::getFileInfoAndTimeSteps( fileName ); + originSummaryFileInfos.push_back( fileInfo ); } if ( hideSplitCases ) diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp b/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp index e47134a4b7..96ba43bbba 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp @@ -260,16 +260,19 @@ QString RifEclipseSummaryTools::getRestartFilePath( const QString& headerFileNam //-------------------------------------------------------------------------------------------------- RifRestartFileInfo RifEclipseSummaryTools::getFileInfoAndTimeSteps( const QString& headerFileName ) { - RifRestartFileInfo fileInfo; - ecl_sum_type* ecl_sum = openEclSum( headerFileName, false ); - std::vector timeSteps = getTimeSteps( ecl_sum ); - if ( !timeSteps.empty() ) + RifRestartFileInfo fileInfo; + fileInfo.fileName = headerFileName; + + if ( ecl_sum_type* ecl_sum = openEclSum( headerFileName, false ) ) { - fileInfo.fileName = headerFileName; - fileInfo.startDate = timeSteps.front(); - fileInfo.endDate = timeSteps.back(); + std::vector timeSteps = getTimeSteps( ecl_sum ); + if ( !timeSteps.empty() ) + { + fileInfo.startDate = timeSteps.front(); + fileInfo.endDate = timeSteps.back(); + } + closeEclSum( ecl_sum ); } - closeEclSum( ecl_sum ); return fileInfo; }