kindred/create
1
1
Fork 0
Code Issues 43 Pull Requests 1 Actions 2 Packages Projects 9 Releases 2 Wiki Activity

Revert "Resolve #11825 - no automatic quantity conversion: App::anyToQuantity"

Browse Source 
This reverts commit 6a54591bac.
This commit is contained in:
Chris Hennes
2024-02-12 15:29:15 -06:00
committed by GitHub
parent a1fcb66536
commit 3df8ae2fab
3 changed files with 0 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/App/Expression.cpp
View File

@@ -37,7 +37,6 @@
#include <sstream>
#include <stack>
#include <string>
#include <regex>
#include <App/Application.h>
#include <App/DocumentObject.h>
@@ -518,29 +517,6 @@ Py::Object pyFromQuantity(const Quantity &quantity) {
}
}
static const std::regex REGEX_QUANTITY(
R"(\s*)"
R"(([-+]?[0-9]*[.]?[0-9]+([eE][-+]?[0-9]+)?))" // value
R"(\s*)"
R"(([^\s]+)?)" // unit
R"(\s*)"
);
// https://github.com/FreeCAD/FreeCAD/issues/11825
Quantity parseQuantityFromText(std::string text) {
std::smatch match;
if (std::regex_match(text, match, REGEX_QUANTITY)) {
std::string value_text = match[1];
std::string unit_text = match[3];
double value = std::stod(value_text);
Unit unit = Unit(QString::fromStdString(unit_text));
return Quantity(value, unit);
} else {
std::string error_message = "Failed to parse to Quantity: text='" + text + "'";
PARSER_THROW(error_message);
}
}
Quantity anyToQuantity(const App::any &value, const char *msg) {
if (is_type(value,typeid(Quantity))) {
return cast<Quantity>(value);
@@ -554,10 +530,6 @@ Quantity anyToQuantity(const App::any &value, const char *msg) {
return Quantity(cast<float>(value));
} else if (is_type(value,typeid(double))) {
return Quantity(cast<double>(value));
} else if (is_type(value,typeid(const char*))) {
return parseQuantityFromText(std::string(cast<const char*>(value)));
} else if (is_type(value,typeid(std::string))) {
return parseQuantityFromText(cast<std::string>(value));
}
if(!msg)
msg = "Failed to convert to Quantity";