diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index 8bdc1b566..f688bf0b1 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -130,19 +130,6 @@ QString Quantity::getUserString(double &factor,QString &unitString)const return Base::UnitsApi::schemaTranslate(*this,factor,unitString); } -//double Quantity::getUserPrefered(QString &unitString)const -//{ -// return Base::UnitsApi::schemaPrefUnit(_Unit,unitString).getValue() * _Value; -//} -// -//std::string Quantity::getUserString(void)const -//{ -// std::stringstream sstream; -// sstream << _Value << _Unit.getString(); -// //TODO: implementing -// return sstream.str(); -//} - /// true if it has a number without a unit bool Quantity::isDimensionless(void)const { diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h index b99abefd7..8dd5645f7 100644 --- a/src/Base/Quantity.h +++ b/src/Base/Quantity.h @@ -69,9 +69,6 @@ public: QString dummy2; return getUserString(dummy1,dummy2); } - //double getUserPrefered() const { QString dummy; return getUserPrefered(dummy); } - //double getUserPrefered(QString &unitString) const; - //std::string getUserString(void)const; static Quantity parse(const QString &string); diff --git a/src/Base/QuantityPy.xml b/src/Base/QuantityPy.xml index 81a253162..882d1b6c7 100644 --- a/src/Base/QuantityPy.xml +++ b/src/Base/QuantityPy.xml @@ -34,7 +34,7 @@ Quantity(string) -- arbitrary mixture of numbers and chars defining a Quantity - + returns a quantity with the translation factor and a string with the prevered unit diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp index d848aff1d..598ee8fb6 100644 --- a/src/Base/QuantityPyImp.cpp +++ b/src/Base/QuantityPyImp.cpp @@ -85,7 +85,7 @@ PyObject* QuantityPy::pow(PyObject * args) return 0; } -PyObject* QuantityPy::getUserPrefered(PyObject *args) +PyObject* QuantityPy::getUserPreferred(PyObject *args) { QString uus; double factor;