OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix several issues related to signed/unsigned compare

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-14 07:50:41 +02:00
parent 981333bcd4
commit 66adff30a0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp
View File

@ -134,7 +134,7 @@ void RicDeleteSummaryCaseCollectionFeature::setupActionLook(QAction* actionToSet
void RicDeleteSummaryCaseCollectionFeature::moveAllCasesToMainSummaryCollection(RimSummaryCaseCollection* summaryCaseCollection)
{
std::vector<RimSummaryCase*> summaryCases = summaryCaseCollection->allSummaryCases();
if (summaryCases.size() < 0) return;
if (summaryCases.size() == 0) return;
RimSummaryCaseMainCollection* summaryCaseMainCollection = nullptr;
summaryCaseCollection->firstAncestorOrThisOfType(summaryCaseMainCollection);

14
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@ -172,16 +172,16 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
QStringList columnHeaders = header.split('\t');
for (size_t i = 1; i < columnHeaders.size(); ++i)
for (int i = 1; i < columnHeaders.size(); ++i)
{
headers.push_back(columnHeaders[static_cast<int>(i)]);
headers.push_back(columnHeaders[i]);
}
// No columns found
if (headers.empty()) return curves;
}
size_t numColumns = headers.size();
int numColumns = static_cast<int>(headers.size());
std::vector<QDateTime> timeSteps;
std::vector< std::vector<double> > values;
values.resize(numColumns);
@ -211,13 +211,13 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
}
timeSteps.push_back(date);
for (size_t col = 1; col < columns.size(); ++col)
for (int col = 1; col < columns.size(); ++col)
{
bool ok;
values[col - 1].push_back(settings.decimalLocale().toDouble(columns[static_cast<int>(col)], &ok));
values[col - 1].push_back(settings.decimalLocale().toDouble(columns[col], &ok));
if (!ok)
{
RiaLogging::warning(QString("Could not parse value at row %1 column %2 as double: %3. Defaulting to 0.0").arg(row).arg(col).arg(columns[static_cast<int>(col)]));
RiaLogging::warning(QString("Could not parse value at row %1 column %2 as double: %3. Defaulting to 0.0").arg(row).arg(col).arg(columns[col]));
}
}
}
@ -249,7 +249,7 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
for (auto& it : curveToTypeMap)
{
for (int i = 0; i < it.second.size(); ++i)
for (int i = 0; i < static_cast<int>(it.second.size()); ++i)
{
cvf::Color3f color;
switch (it.first)

2
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@ -603,7 +603,7 @@ public:
{
size_t i, j, k;
size_t gridIndex;
size_t caseId;
int caseId;
if (item->type() == RiuSelectionItem::ECLIPSE_SELECTION_OBJECT)
{
const RiuEclipseSelectionItem* eclipseItem = static_cast<const RiuEclipseSelectionItem*>(item);