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

#2018 CSV import. Fix decimal point/locale

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-24 09:57:03 +01:00
parent 11100fb6e0
commit 28db4c6e22
7 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Application/Tools/RiaStdStringTools.cpp
View File

@@ -32,15 +32,17 @@ std::string RiaStdStringTools::trimString(const std::string& s)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaStdStringTools::isNumber(const std::string& s)
bool RiaStdStringTools::isNumber(const std::string& s, char decimalPoint)
{
if (s.size() == 0) return false;
if (findCharMatchCount(s, '.') > 1) return false;
if (findCharMatchCount(s, decimalPoint) > 1) return false;
if (findCharMatchCount(s, '-') > 1) return false;
if (findCharMatchCount(s, 'e') > 1) return false;
if (findCharMatchCount(s, 'E') > 1) return false;
return (s.find_first_not_of("0123456789.eE-") == std::string::npos);
std::string matchChars("0123456789eE-");
matchChars.append(1, decimalPoint);
return (s.find_first_not_of(matchChars) == std::string::npos);
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Application/Tools/RiaStdStringTools.h
View File

@@ -31,7 +31,7 @@ class RiaStdStringTools
{
public:
static std::string trimString(const std::string& s);
static bool isNumber(const std::string& s);
static bool isNumber(const std::string& s, char decimalPoint);
static int toInt(const std::string& s);
static double toDouble(const std::string& s);