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

Base: expose enum NumberFormat to Python

Browse Source
This commit is contained in:
wmayer
2022-08-15 11:12:53 +02:00
parent d0ee6a46a0
commit b485f7943c
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/QuantityPy.xml
View File

@@ -51,7 +51,7 @@ Quantity(string) -- arbitrary mixture of numbers and chars defining a Quantity
Following parameters are allowed:
getValueAs('m/s') # unit string to parse
getValueAs(2.45,1) # translation value and unit signature
getValueAs(FreeCAD.Units.Pascal) # predefined standard units
getValueAs(FreeCAD.Units.Pascal) # predefined standard units
getValueAs(Qantity('N/m^2')) # a quantity
getValueAs(Unit(0,1,0,0,0,0,0,0)) # a unit
</UserDocu>

25
src/Base/QuantityPyImp.cpp
View File

@@ -628,15 +628,24 @@ void QuantityPy::setFormat(Py::Dict arg)
}
if (arg.hasKey("NumberFormat")) {
Py::Char form(arg.getItem("NumberFormat"));
std::string fmtstr = static_cast<std::string>(Py::String(form));
if (fmtstr.size() != 1)
throw Py::ValueError("Invalid format character");
Py::Object item = arg.getItem("NumberFormat");
if (item.isNumeric()) {
int format = static_cast<int>(Py::Int(item));
if (format < 0 || format > QuantityFormat::Scientific)
throw Py::ValueError("Invalid format value");
fmt.format = static_cast<QuantityFormat::NumberFormat>(format);
}
else {
Py::Char form(item);
std::string fmtstr = static_cast<std::string>(Py::String(form));
if (fmtstr.size() != 1)
throw Py::ValueError("Invalid format character");
bool ok;
fmt.format = Base::QuantityFormat::toFormat(fmtstr[0], &ok);
if (!ok)
throw Py::ValueError("Invalid format character");
bool ok;
fmt.format = Base::QuantityFormat::toFormat(fmtstr[0], &ok);
if (!ok)
throw Py::ValueError("Invalid format character");
}
}
if (arg.hasKey("Denominator")) {