diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/String.cpp | 29 | ||||
| -rw-r--r-- | src/ui/mapper/ThicknessMapper.cpp | 25 |
2 files changed, 51 insertions, 3 deletions
diff --git a/src/common/String.cpp b/src/common/String.cpp index 48705d3b..3721eed3 100644 --- a/src/common/String.cpp +++ b/src/common/String.cpp @@ -13,8 +13,7 @@ namespace cru { double_conversion::StringToDoubleConverter String::kDefaultStringToDoubleConverter( - double_conversion::StringToDoubleConverter::ALLOW_TRAILING_JUNK | - double_conversion::StringToDoubleConverter::ALLOW_LEADING_SPACES | + double_conversion::StringToDoubleConverter::ALLOW_LEADING_SPACES | double_conversion::StringToDoubleConverter::ALLOW_TRAILING_SPACES | double_conversion::StringToDoubleConverter:: ALLOW_CASE_INSENSIBILITY, @@ -454,6 +453,32 @@ double String::ParseToDouble(Index* processed_characters_count) const { return result; } +std::vector<float> String::ParseToFloatList(value_type separator) { + std::vector<float> result; + auto list = Split(separator); + for (auto& item : list) { + auto value = ParseToFloat(); + if (std::isnan(value)) { + throw Exception(u"Invalid double value."); + } + result.push_back(value); + } + return result; +} + +std::vector<double> String::ParseToDoubleList(value_type separator) { + std::vector<double> result; + auto list = Split(separator); + for (auto& item : list) { + auto value = ParseToDouble(); + if (std::isnan(value)) { + throw Exception(u"Invalid double value."); + } + result.push_back(value); + } + return result; +} + StringView StringView::substr(Index pos) { Expects(pos >= 0 && pos < size_); return StringView(ptr_ + pos, size_ - pos); diff --git a/src/ui/mapper/ThicknessMapper.cpp b/src/ui/mapper/ThicknessMapper.cpp index 684d0a4b..11f0be0d 100644 --- a/src/ui/mapper/ThicknessMapper.cpp +++ b/src/ui/mapper/ThicknessMapper.cpp @@ -2,10 +2,33 @@ #include "cru/xml/XmlNode.hpp" namespace cru::ui::mapper { -bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) { +bool ThicknessMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) { if (node->GetTag() == u"Thickness") { return true; } return false; } + +std::unique_ptr<Thickness> ThicknessMapper::DoMapFromString(String str) { + std::vector<float> values = str.ParseToFloatList(); + if (values.size() == 4) { + return std::make_unique<Thickness>(values[0], values[1], values[2], + values[3]); + } else if (values.size() == 2) { + return std::make_unique<Thickness>(values[0], values[1], values[0], + values[1]); + } else if (values.size() == 1) { + return std::make_unique<Thickness>(values[0], values[0], values[0], + values[0]); + } else { + throw Exception(u"Invalid Thickness string."); + } +} + +std::unique_ptr<Thickness> ThicknessMapper::DoMapFromXml( + xml::XmlElementNode* node) { + auto value_attr = node->GetOptionalAttribute(u"value"); + if (!value_attr) return std::make_unique<Thickness>(); + return DoMapFromString(*value_attr); +} } // namespace cru::ui::mapper |