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 some warnings

Browse Source
This commit is contained in:
Magne Sjaastad 2018-09-20 07:52:18 +02:00
parent 7e78c77b90
commit 7adf7e1e31
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/Tools/RiaPolyArcLineSampler.cpp
View File

@ -130,7 +130,7 @@ void RiaPolyArcLineSampler::sampleArc(cvf::Vec3d t1, cvf::Vec3d p1, cvf::Vec3d p
// Find arc CS
auto CS_rad = calculateArcCSAndRadius(t1, p1, p2);
double radius = CS_rad.second;
//double radius = CS_rad.second;
//if (radius > 1e)
// Find sampleLength angle

12
ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp
View File

@ -136,13 +136,19 @@ size_t RigCaseRealizationParameters::parameterHash(const QString& name) const
std::hash<std::string> stringHasher;
std::hash<double> doubleHasher;
size_t nameHash;
size_t valueHash;
size_t valueHash = 0;
nameHash = stringHasher(name.toStdString());
auto value = itr->second;
if (value.isNumeric()) valueHash = doubleHasher(value.numericValue());
else if (value.isText()) valueHash = stringHasher(value.textValue().toStdString());
if (value.isNumeric())
{
valueHash = doubleHasher(value.numericValue());
}
else if (value.isText())
{
valueHash = stringHasher(value.textValue().toStdString());
}
QString s = QString::number(nameHash) + QString::number(valueHash);
return stringHasher((QString::number(nameHash) + QString::number(valueHash)).toStdString());