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

Simplify RifSummaryReaderInterface timeSteps.

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-02-13 12:40:08 +01:00
committed by Magne Sjaastad
parent 5c5e460025
commit 69a668df50
32 changed files with 62 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -1226,7 +1226,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
if ( !historyAddr.isHistoryVector() )
historyAddr.setVectorName( addrToFilterValue.vectorName() + "H" );
const std::vector<time_t>& historyTimesteps = reader->timeSteps( historyAddr );
std::vector<time_t> historyTimesteps = reader->timeSteps( historyAddr );
if ( historyTimesteps.size() )
{
selectedTimestepIndices =
@@ -1459,9 +1459,8 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
// items are wells, then:
/// use color from eclCase->defaultWellColor( wellName );
std::vector<time_t> timeStepStorage;
const std::vector<time_t>* timeStepsPtr = &timeStepStorage;
std::vector<double> values;
std::vector<time_t> timeSteps;
std::vector<double> values;
if ( referenceCaseReader )
{
@@ -1472,19 +1471,17 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
-1,
DerivedSummaryOperator::DERIVED_OPERATOR_SUB,
curveDef.summaryAddress() );
timeStepStorage.swap( timeAndValues.first );
timeSteps.swap( timeAndValues.first );
values.swap( timeAndValues.second );
}
else
{
timeStepsPtr = &( reader->timeSteps( curveDef.summaryAddress() ) );
timeSteps = reader->timeSteps( curveDef.summaryAddress() );
reader->values( curveDef.summaryAddress(), &values );
}
const std::vector<time_t>& timesteps = *timeStepsPtr;
if ( !( timesteps.size() && values.size() ) ) continue;
if ( !( timeSteps.size() && values.size() ) ) continue;
// Find selected timestep indices
@@ -1492,9 +1489,9 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
for ( time_t tt : selectedTimesteps )
{
for ( int timestepIdx = 0; static_cast<unsigned>( timestepIdx ) < timesteps.size(); ++timestepIdx )
for ( int timestepIdx = 0; static_cast<unsigned>( timestepIdx ) < timeSteps.size(); ++timestepIdx )
{
if ( timesteps[timestepIdx] == tt )
if ( timeSteps[timestepIdx] == tt )
{
selectedTimestepIndices.push_back( timestepIdx );
break;
@@ -1506,7 +1503,7 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
{
double sortValue = std::numeric_limits<double>::infinity();
QDateTime dateTime = RiaQDateTimeTools::fromTime_t( timesteps[timestepIdx] );
QDateTime dateTime = RiaQDateTimeTools::fromTime_t( timeSteps[timestepIdx] );
QString formatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat() );
QString timestepString = dateTime.toString( formatString );