From cf2b2fd8bf61079999d3e8a1218043ca7efe4171 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:48:36 +0100 Subject: [PATCH 1/4] [PD] Gui - Primitives change Base Quantity Format --- src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index 9563e773cf..64f0ac1b58 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -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( From 88aa1a796b7e5cdf9b44064b3953f4e404b1a3e2 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:52:25 +0100 Subject: [PATCH 2/4] [Gui] PropertyItem change Base Quantity Format --- src/Gui/propertyeditor/PropertyItem.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index 512e7589cb..e94075eb73 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -1051,7 +1051,7 @@ void PropertyUnitItem::setValue(const QVariant& value) return; const Base::Quantity& val = value.value(); - 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::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))") From 147e015fd21de3e9571a7e505df6995417f4fc30 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:55:50 +0100 Subject: [PATCH 3/4] [Base] Increase precision --- src/Base/UnitsApi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index 0cde90a3b0..7b607f153a 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -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; } @@ -168,7 +168,7 @@ QString UnitsApi::toNumber(const Base::Quantity& q, const QuantityFormat& f) QString UnitsApi::toNumber(double d, const QuantityFormat& f) { - QString number = QString::fromLatin1("%1").arg(d, 0, f.toFormat(), f.precision+1); + QString number = QString::fromLatin1("%1").arg(d, 0, f.toFormat(), f.precision+2); return number; } From ced5f31993f034b0624bb2b8d7baa958918e64bf Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Thu, 12 Aug 2021 11:13:29 +0100 Subject: [PATCH 4/4] [Base] Remove one unnecessary precision level --- src/Base/UnitsApi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Base/UnitsApi.cpp b/src/Base/UnitsApi.cpp index 7b607f153a..5bdff83351 100644 --- a/src/Base/UnitsApi.cpp +++ b/src/Base/UnitsApi.cpp @@ -168,7 +168,7 @@ QString UnitsApi::toNumber(const Base::Quantity& q, const QuantityFormat& f) QString UnitsApi::toNumber(double d, const QuantityFormat& f) { - QString number = QString::fromLatin1("%1").arg(d, 0, f.toFormat(), f.precision+2); + QString number = QString::fromLatin1("%1").arg(d, 0, f.toFormat(), f.precision+1); return number; }