i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-10-11 20:39:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

uNumberToStr(double): added "fixed" param (default false) to fix ros param double/int conversion issue.

Browse Source
This commit is contained in:
matlabbe
2022-11-11 16:20:59 -08:00
parent 16e3314e64
commit 6d713c2ccb
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/src/Graph.cpp
+3 -3
View File
@@ -524,9 +524,9 @@ bool exportGPS(
for(std::map<int, GPS>::const_iterator iter=gpsValues.begin(); iter!=gpsValues.end(); ++iter) for(std::map<int, GPS>::const_iterator iter=gpsValues.begin(); iter!=gpsValues.end(); ++iter)
{ {
values += uFormat("%s,%s,%s ", values += uFormat("%s,%s,%s ",
uReplaceChar(uNumber2Str(iter->second.longitude(), 8), ',', '.').c_str(), uReplaceChar(uNumber2Str(iter->second.longitude(), 8, true), ',', '.').c_str(),
uReplaceChar(uNumber2Str(iter->second.latitude(), 8), ',', '.').c_str(), uReplaceChar(uNumber2Str(iter->second.latitude(), 8, true), ',', '.').c_str(),
uReplaceChar(uNumber2Str(iter->second.altitude(), 8), ',', '.').c_str()); uReplaceChar(uNumber2Str(iter->second.altitude(), 8, true), ',', '.').c_str());
} }
// switch argb (Qt format) -> abgr // switch argb (Qt format) -> abgr
utilite/include/rtabmap/utilite/UConversion.h
+2 -2
View File
@@ -109,13 +109,13 @@ std::string UTILITE_EXP uNumber2Str(int number);
* @param number the number to convert in a string * @param number the number to convert in a string
* @return the string * @return the string
*/ */
std::string UTILITE_EXP uNumber2Str(float number, int precision=6); std::string UTILITE_EXP uNumber2Str(float number, int precision=6, bool fixed = false);
/** /**
* Convert a number (double) to a string. * Convert a number (double) to a string.
* @param number the number to convert in a string * @param number the number to convert in a string
* @return the string * @return the string
*/ */
std::string UTILITE_EXP uNumber2Str(double number, int precision=6); std::string UTILITE_EXP uNumber2Str(double number, int precision=6, bool fixed = false);
/** /**
* Convert a string to an integer. * Convert a string to an integer.
utilite/src/UConversion.cpp
+10 -4
View File
@@ -102,17 +102,23 @@ std::string uNumber2Str(int number)
return s.str(); return s.str();
} }
std::string uNumber2Str(float number, int precision) std::string uNumber2Str(float number, int precision, bool fixed)
{ {
std::stringstream s; std::stringstream s;
s << std::setprecision(precision) << std::fixed << number; s << std::setprecision(precision);
if(fixed)
s << std::fixed;
s << number;
return s.str(); return s.str();
} }
std::string uNumber2Str(double number, int precision) std::string uNumber2Str(double number, int precision, bool fixed)
{ {
std::stringstream s; std::stringstream s;
s << std::setprecision(precision) << std::fixed << number; s << std::setprecision(precision);
if(fixed)
s << std::fixed;
s << number;
return s.str(); return s.str();
} }