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

Gui: do not misuse UnitApi to format numbers in property editor

Browse Source
This commit is contained in:
Ladislav Michl
2025-08-25 20:31:39 +02:00
parent 1d597a789b
commit 9cfd5c7f48
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Gui/propertyeditor/PropertyItem.cpp
View File

@@ -1796,12 +1796,8 @@ void PropertyVectorDistanceItem::setValue(const QVariant& variant)
return;
}
const Base::Vector3d& value = variant.value<Base::Vector3d>();
Base::QuantityFormat format(Base::QuantityFormat::Default, highPrec);
std::string val = fmt::format("({}, {}, {})",
Base::UnitsApi::toNumber(value.x, format),
Base::UnitsApi::toNumber(value.y, format),
Base::UnitsApi::toNumber(value.z, format));
std::string val = fmt::format("({:.{}g}, {:.{}g}, {:.{}g})",
value.x, highPrec, value.y, highPrec, value.z, highPrec);
setPropertyValue(val);
}
@@ -2536,12 +2532,9 @@ void PropertyRotationItem::setValue(const QVariant& value)
Base::Vector3d axis;
double angle {};
h.getValue(axis, angle);
Base::QuantityFormat format(Base::QuantityFormat::Default, highPrec);
std::string val = fmt::format("App.Rotation(App.Vector({},{},{}),{})",
Base::UnitsApi::toNumber(axis.x, format),
Base::UnitsApi::toNumber(axis.y, format),
Base::UnitsApi::toNumber(axis.z, format),
Base::UnitsApi::toNumber(angle, format));
std::string val = fmt::format("App.Rotation(App.Vector({:.{}g},{:.{}g},{:.{}g}),{:.{}g})",
axis.x, highPrec, axis.y, highPrec, axis.z, highPrec,
angle, highPrec);
setPropertyValue(val);
}
@@ -2854,18 +2847,12 @@ void PropertyPlacementItem::setValue(const QVariant& value)
Base::Vector3d axis;
double angle {};
h.getValue(axis, angle);
Base::QuantityFormat format(Base::QuantityFormat::Default, highPrec);
std::string str = fmt::format("App.Placement("
"App.Vector({},{},{}),"
"App.Rotation(App.Vector({},{},{}),{}))",
Base::UnitsApi::toNumber(pos.x, format),
Base::UnitsApi::toNumber(pos.y, format),
Base::UnitsApi::toNumber(pos.z, format),
Base::UnitsApi::toNumber(axis.x, format),
Base::UnitsApi::toNumber(axis.y, format),
Base::UnitsApi::toNumber(axis.z, format),
Base::UnitsApi::toNumber(angle, format));
"App.Vector({:.{}g},{:.{}g},{:.{}g}),"
"App.Rotation(App.Vector({:.{}g},{:.{}g},{:.{}g}),{:.{}g}))",
pos.x, highPrec, pos.y, highPrec, pos.z, highPrec,
axis.x, highPrec, axis.y, highPrec, axis.z, highPrec,
angle, highPrec);
setPropertyValue(str);
}