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 compare

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-07 13:08:07 +01:00
parent 15dc0e974b
commit 65f4a5e089
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/UserInterface/RiuCellAndNncPickEventHandler.cpp
View File

@ -126,7 +126,7 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
std::array<cvf::Vec3f, 3> intersectionTriangleHit; std::array<cvf::Vec3f, 3> intersectionTriangleHit;
RimGeoMechResultDefinition* geomResDef = nullptr; RimGeoMechResultDefinition* geomResDef = nullptr;
RimEclipseResultDefinition* eclResDef = nullptr; RimEclipseResultDefinition* eclResDef = nullptr;
size_t timestepIndex = -1; size_t timestepIndex = cvf::UNDEFINED_SIZE_T;
// clang-format off // clang-format off
if ( const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() ) ) if ( const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() ) )
@ -245,13 +245,13 @@ bool RiuCellAndNncPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eve
if ( eclipseView ) if ( eclipseView )
{ {
if ( !eclResDef ) eclResDef = eclipseView->cellResult(); if ( !eclResDef ) eclResDef = eclipseView->cellResult();
if ( timestepIndex == -1 ) timestepIndex = eclipseView->currentTimeStep(); if ( timestepIndex == cvf::UNDEFINED_SIZE_T ) timestepIndex = eclipseView->currentTimeStep();
} }
if ( geomView ) if ( geomView )
{ {
if ( !geomResDef ) geomResDef = geomView->cellResult(); if ( !geomResDef ) geomResDef = geomView->cellResult();
if ( timestepIndex == -1 ) timestepIndex = geomView->currentTimeStep(); if ( timestepIndex == cvf::UNDEFINED_SIZE_T ) timestepIndex = geomView->currentTimeStep();
} }
} }

4
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -494,8 +494,8 @@ QString RiuResultTextBuilder::nncResultText()
// clang-format off // clang-format off
if ( fmIndexPair.first >= 0 && if ( fmIndexPair.first >= 0 &&
fmIndexPair.second >= 0 && fmIndexPair.second >= 0 &&
fmNames.size() > fmIndexPair.first && static_cast<int>(fmNames.size()) > fmIndexPair.first &&
fmNames.size() > fmIndexPair.second ) static_cast<int>(fmNames.size()) > fmIndexPair.second )
{ {
resultValueText = fmNames[fmIndexPair.first] + " - " + resultValueText = fmNames[fmIndexPair.first] + " - " +
fmNames[fmIndexPair.second]; fmNames[fmIndexPair.second];