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

Fix signed/unsigned comparison.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-04-24 19:55:54 +02:00 committed by Magne Sjaastad
parent b93b92cae2
commit 92f4e6278c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@ -1130,7 +1130,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
if ( filter->consideredTimeStepsType() == RimPlotDataFilterItem::ALL_TIMESTEPS ) if ( filter->consideredTimeStepsType() == RimPlotDataFilterItem::ALL_TIMESTEPS )
{ {
for ( int tIdx = 0; tIdx < timesteps.size(); ++tIdx ) for ( size_t tIdx = 0; tIdx < timesteps.size(); ++tIdx )
{ {
double value = values[tIdx]; double value = values[tIdx];
@ -1310,7 +1310,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N ) if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N )
{ {
size_t count = 0; int count = 0;
for ( auto it = valueSortedSumItems.rbegin(); for ( auto it = valueSortedSumItems.rbegin();
count < filter->topBottomN() && it != valueSortedSumItems.rend(); count < filter->topBottomN() && it != valueSortedSumItems.rend();
++it ) ++it )
@ -1321,7 +1321,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
} }
else if ( filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N ) else if ( filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N )
{ {
size_t count = 0; int count = 0;
for ( auto it = valueSortedSumItems.begin(); for ( auto it = valueSortedSumItems.begin();
count < filter->topBottomN() && it != valueSortedSumItems.end(); count < filter->topBottomN() && it != valueSortedSumItems.end();
++it ) ++it )
@ -1341,7 +1341,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N ) if ( filter->filterOperation() == RimPlotDataFilterItem::TOP_N )
{ {
size_t count = 0; int count = 0;
for ( auto it = valueSortedSumCases.rbegin(); for ( auto it = valueSortedSumCases.rbegin();
count < filter->topBottomN() && it != valueSortedSumCases.rend(); count < filter->topBottomN() && it != valueSortedSumCases.rend();
++it ) ++it )
@ -1352,7 +1352,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
} }
else if ( filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N ) else if ( filter->filterOperation() == RimPlotDataFilterItem::BOTTOM_N )
{ {
size_t count = 0; int count = 0;
for ( auto it = valueSortedSumCases.begin(); for ( auto it = valueSortedSumCases.begin();
count < filter->topBottomN() && it != valueSortedSumCases.end(); count < filter->topBottomN() && it != valueSortedSumCases.end();
++it ) ++it )

2
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@ -479,7 +479,7 @@ void RimDerivedEnsembleCaseCollection::updateAutoName()
if ( summaryReader ) if ( summaryReader )
{ {
const std::vector<time_t>& timeSteps = summaryReader->timeSteps( RifEclipseSummaryAddress() ); const std::vector<time_t>& timeSteps = summaryReader->timeSteps( RifEclipseSummaryAddress() );
if ( m_fixedTimeStepIndex >= 0 && m_fixedTimeStepIndex < timeSteps.size() ) if ( m_fixedTimeStepIndex >= 0 && m_fixedTimeStepIndex < static_cast<int>( timeSteps.size() ) )
{ {
time_t selectedTime = timeSteps[m_fixedTimeStepIndex]; time_t selectedTime = timeSteps[m_fixedTimeStepIndex];
QDateTime dt = RiaQDateTimeTools::fromTime_t( selectedTime ); QDateTime dt = RiaQDateTimeTools::fromTime_t( selectedTime );

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

@ -379,7 +379,7 @@ void RimDerivedSummaryCase::updateDisplayNameFromCases()
if ( summaryReader ) if ( summaryReader )
{ {
const std::vector<time_t>& timeSteps = summaryReader->timeSteps( RifEclipseSummaryAddress() ); const std::vector<time_t>& timeSteps = summaryReader->timeSteps( RifEclipseSummaryAddress() );
if ( m_fixedTimeStepIndex >= 0 && m_fixedTimeStepIndex < timeSteps.size() ) if ( m_fixedTimeStepIndex >= 0 && m_fixedTimeStepIndex < static_cast<int>( timeSteps.size() ) )
{ {
time_t selectedTime = timeSteps[m_fixedTimeStepIndex]; time_t selectedTime = timeSteps[m_fixedTimeStepIndex];
QDateTime dt = RiaQDateTimeTools::fromTime_t( selectedTime ); QDateTime dt = RiaQDateTimeTools::fromTime_t( selectedTime );