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

Merge pull request #4967 from Syres916/patch-30

Browse Source 
[Base/Gui] Bugfix Property Item formatting
This commit is contained in:
Yorik van Havre
2021-08-16 14:34:41 +02:00
committed by GitHub
parent b8a2844cf9 ced5f31993
commit d1ca1f19aa
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/UnitsApi.cpp
View File

@@ -156,7 +156,7 @@ void UnitsApi::setSchema(UnitSystem s)
QString UnitsApi::toString(const Base::Quantity& q, const QuantityFormat& f)
{
QString value = QString::fromLatin1("'%1 %2'").arg(q.getValue(), 0, f.toFormat(), f.precision+1)
QString value = QString::fromLatin1("'%1 %2'").arg(q.getValue(), 0, f.toFormat(), f.precision+2)
.arg(q.getUnit().getString());
return value;
}

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

@@ -1051,7 +1051,7 @@ void PropertyUnitItem::setValue(const QVariant& value)
return;
const Base::Quantity& val = value.value<Base::Quantity>();
Base::QuantityFormat format(Base::QuantityFormat::Default, decimals());
Base::QuantityFormat format(Base::QuantityFormat::Fixed, decimals());
QString unit = Base::UnitsApi::toString(val, format);
setPropertyValue(unit);
}
@@ -1644,7 +1644,7 @@ void PropertyVectorDistanceItem::setValue(const QVariant& variant)
Base::Quantity y = Base::Quantity(value.y, Base::Unit::Length);
Base::Quantity z = Base::Quantity(value.z, Base::Unit::Length);
Base::QuantityFormat format(Base::QuantityFormat::Default, decimals());
Base::QuantityFormat format(Base::QuantityFormat::Fixed, decimals());
QString data = QString::fromLatin1("(%1, %2, %3)")
.arg(Base::UnitsApi::toNumber(x, format))
.arg(Base::UnitsApi::toNumber(y, format))
@@ -2370,7 +2370,7 @@ void PropertyPlacementItem::setValue(const QVariant& value)
const Base::Placement& val = value.value<Base::Placement>();
Base::Vector3d pos = val.getPosition();
Base::QuantityFormat format(Base::QuantityFormat::Default, decimals());
Base::QuantityFormat format(Base::QuantityFormat::Fixed, decimals());
QString data = QString::fromLatin1("App.Placement("
"App.Vector(%1,%2,%3),"
"App.Rotation(App.Vector(%4,%5,%6),%7))")

2
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -691,7 +691,7 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
return false;
}
Base::QuantityFormat format(Base::QuantityFormat::Default, Base::UnitsApi::getDecimals());
Base::QuantityFormat format(Base::QuantityFormat::Fixed, Base::UnitsApi::getDecimals());
switch(ui->widgetStack->currentIndex()) {
case 1: // box
cmd = QString::fromLatin1(