diff --git a/src/importexport/mei/thirdparty/libmei/att.cpp b/src/importexport/mei/thirdparty/libmei/att.cpp index c9571f199b584..1dade667921f0 100644 --- a/src/importexport/mei/thirdparty/libmei/att.cpp +++ b/src/importexport/mei/thirdparty/libmei/att.cpp @@ -44,7 +44,7 @@ std::string Att::IntToStr(int data) const std::string Att::VUToStr(data_VU data) const { - return StringFormat("%fvu", data); + return DblToStr(data) + "vu"; } // Basic converters for reading @@ -416,7 +416,7 @@ std::string Att::MeasurementsignedToStr(data_MEASUREMENTSIGNED data) const value = StringFormat("%dpx", data.GetPx() / DEFINITION_FACTOR); } else if (data.GetType() == MEASUREMENTTYPE_vu) { - value = StringFormat("%.4fvu", data.GetVu()); + value = VUToStr(data.GetVu()); } return value; @@ -631,7 +631,7 @@ data_ORIENTATION Att::StrToOrientation(const std::string &value, bool logWarning std::string Att::PercentToStr(data_PERCENT data) const { - return StringFormat("%.2f%%", data); + return DblToStr(data) + "%"; } data_PERCENT Att::StrToPercent(const std::string &value, bool logWarning) const @@ -644,11 +644,6 @@ data_PERCENT Att::StrToPercent(const std::string &value, bool logWarning) const return atof(value.substr(0, value.find("%")).c_str()); } -std::string Att::PercentLimitedToStr(data_PERCENT_LIMITED data) const -{ - return StringFormat("%.2f%%", data); -} - data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool logWarning) const { static const std::regex test("[0-9]+(\\.?[0-9]*)?%"); @@ -659,16 +654,11 @@ data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool log return atof(value.substr(0, value.find("%")).c_str()); } -std::string Att::PercentLimitedSignedToStr(data_PERCENT_LIMITED_SIGNED data) const -{ - return StringFormat("%.2f%%", data); -} - data_PERCENT_LIMITED_SIGNED Att::StrToPercentLimitedSigned(const std::string &value, bool logWarning) const { static const std::regex test("(+|-)?[0-9]+(\\.?[0-9]*)?%"); if (!std::regex_match(value, test)) { - if (logWarning) LogWarning("Unsupported data.PERCENT.LIMITED.SIGNEd '%s'", value.c_str()); + if (logWarning) LogWarning("Unsupported data.PERCENT.LIMITED.SIGNED '%s'", value.c_str()); return 0; } return atof(value.substr(0, value.find("%")).c_str()); diff --git a/src/importexport/mei/thirdparty/libmei/att.h b/src/importexport/mei/thirdparty/libmei/att.h index 2e708e1743ecb..644392a17f2f5 100644 --- a/src/importexport/mei/thirdparty/libmei/att.h +++ b/src/importexport/mei/thirdparty/libmei/att.h @@ -90,7 +90,10 @@ class Att : public AttConverterBase { std::string MeasurementsignedToStr(data_MEASUREMENTSIGNED data) const; data_MEASUREMENTSIGNED StrToMeasurementsigned(const std::string &value, bool logWarning = true) const; - std::string MeasurementunsignedToStr(data_MEASUREMENTUNSIGNED data) const { return MeasurementsignedToStr(data); } + std::string MeasurementunsignedToStr(data_MEASUREMENTUNSIGNED data) const + { + return MeasurementsignedToStr(data); + } data_MEASUREMENTUNSIGNED StrToMeasurementunsigned(const std::string &value, bool logWarning = true) const { return StrToMeasurementsigned(value, logWarning); @@ -132,10 +135,10 @@ class Att : public AttConverterBase { std::string PercentToStr(data_PERCENT data) const; data_PERCENT StrToPercent(const std::string &value, bool logWarning = true) const; - std::string PercentLimitedToStr(data_PERCENT_LIMITED_SIGNED data) const; + std::string PercentLimitedToStr(data_PERCENT_LIMITED_SIGNED data) const { return PercentToStr(data); } data_PERCENT_LIMITED StrToPercentLimited(const std::string &value, bool logWarning = true) const; - std::string PercentLimitedSignedToStr(data_PERCENT_LIMITED data) const; + std::string PercentLimitedSignedToStr(data_PERCENT_LIMITED data) const { return PercentToStr(data); } data_PERCENT_LIMITED_SIGNED StrToPercentLimitedSigned(const std::string &value, bool logWarning = true) const; std::string PitchnameToStr(data_PITCHNAME data) const;