Merge branch 'FreeCAD:master' into master

src/Base/Quantity.cpp

@@ -242,6 +242,22 @@ QString Quantity::getUserString(UnitsSchema* schema, double &factor, QString &un
     return schema->schemaTranslate(*this, factor, unitString);
 }
 
+QString Quantity::getSafeUserString() const
+{
+    auto retString = getUserString();
+    if(Q_LIKELY(this->_Value != 0))
+    {
+        auto feedbackQty = parse(retString);
+        auto feedbackVal = feedbackQty.getValue();
+        if (feedbackVal == 0) {
+            retString = QStringLiteral("%1 %2")
+                .arg(this->_Value)
+                .arg(this->getUnit().getString());
+        }
+    }
+    return retString;
+}
+
 /// true if it has a number without a unit
 bool Quantity::isDimensionless() const
 {

src/Base/Quantity.h

@@ -153,6 +153,7 @@ public:
         return getUserString(dummy1,dummy2);
     }
     QString getUserString(UnitsSchema* schema, double &factor, QString &unitString) const;
+    QString getSafeUserString() const;
 
     static Quantity parse(const QString &string);