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

#5707 Delta Summary Case : Add user option to select time step

Browse Source
This commit is contained in:
Magne Sjaastad 2020-03-29 14:01:05 +02:00
parent ff5cc86935
commit 8e89015cd5
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp
View File

@ -361,17 +361,49 @@ void RimDerivedSummaryCase::clearData( const RifEclipseSummaryAddress& address )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimDerivedSummaryCase::updateDisplayNameFromCases() void RimDerivedSummaryCase::updateDisplayNameFromCases()
{ {
QString timeStepString;
{
RimSummaryCase* sourceEnsemble = nullptr;
if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 )
{
sourceEnsemble = m_summaryCase1;
}
else if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_2 )
{
sourceEnsemble = m_summaryCase2;
}
if ( sourceEnsemble )
{
auto summaryReader = sourceEnsemble->summaryReader();
if ( summaryReader )
{
const std::vector<time_t>& timeSteps = summaryReader->timeSteps( RifEclipseSummaryAddress() );
if ( m_fixedTimeStepIndex >= 0 && m_fixedTimeStepIndex < timeSteps.size() )
{
time_t selectedTime = timeSteps[m_fixedTimeStepIndex];
QDateTime dt = RiaQDateTimeTools::fromTime_t( selectedTime );
QString formatString = RiaQDateTimeTools::createTimeFormatStringFromDates( {dt} );
timeStepString = RiaQDateTimeTools::toStringUsingApplicationLocale( dt, formatString );
}
}
}
}
QString case1Name = "None"; QString case1Name = "None";
QString case2Name = "None"; QString case2Name = "None";
if ( m_summaryCase1 ) if ( m_summaryCase1 )
{ {
case1Name = m_summaryCase1->displayCaseName(); case1Name = m_summaryCase1->displayCaseName();
if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 ) case1Name += "@" + timeStepString;
} }
if ( m_summaryCase2 ) if ( m_summaryCase2 )
{ {
case2Name = m_summaryCase2->displayCaseName(); case2Name = m_summaryCase2->displayCaseName();
if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_2 ) case2Name += "@" + timeStepString;
} }
QString operatorText; QString operatorText;
@ -380,7 +412,9 @@ void RimDerivedSummaryCase::updateDisplayNameFromCases()
else if ( m_operator() == DerivedSummaryOperator::DERIVED_OPERATOR_ADD ) else if ( m_operator() == DerivedSummaryOperator::DERIVED_OPERATOR_ADD )
operatorText = "Sum"; operatorText = "Sum";
m_shortName = QString( "%1 (%2, %3)" ).arg( operatorText ).arg( case1Name ).arg( case2Name ); QString name = operatorText + QString( "(%1 , %2)" ).arg( case1Name, case2Name );
m_shortName = name;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------