Skip to content

Commit

Permalink
fixes #1744 Use unicode in Unit system
Browse files Browse the repository at this point in the history
  • Loading branch information
@5263 @wwmayer
5263 authored and wwmayer committed Sep 20, 2014
1 parent 810fada commit 6ad50db
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 54 deletions.
75 changes: 51 additions & 24 deletions src/Base/QuantityPyImp.cpp
View file
Expand Up @@ -37,7 +37,7 @@ std::string QuantityPy::representation(void) const
{
std::stringstream ret;
ret << getQuantityPtr()->getValue() << " ";
ret << getQuantityPtr()->getUnit().getString().toLatin1().constData();
ret << getQuantityPtr()->getUnit().getString().toUtf8().constData();

return ret.str();
}
Expand Down Expand Up @@ -83,20 +83,29 @@ int QuantityPy::PyInit(PyObject* args, PyObject* kwd)
return 0;
}
PyErr_Clear(); // set by PyArg_ParseTuple()
const char* string;
if (PyArg_ParseTuple(args,"s", &string)) {
try {
*self = Quantity::parse(QString::fromLatin1(string));
}catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return-1;
}

return 0;
}

PyErr_SetString(PyExc_TypeError, "Either three floats, tuple or Vector expected");
return -1;
if (PyArg_ParseTuple(args,"O", &object)) {
if (PyString_Check(object) || PyUnicode_Check(object)) {
QString qstr;
if (PyUnicode_Check(object)) {
PyObject * utf8str = PyUnicode_AsUTF8String(object);
qstr = QString::fromUtf8(PyString_AsString(utf8str));
Py_DECREF(utf8str);
}
else {
qstr = QString::fromUtf8(PyString_AsString(object));
}
try {
*self = Quantity::parse(qstr);
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return -1;
}
return 0;
} // Not string or unicode
} // zero or more than one object
PyErr_SetString(PyExc_TypeError, "Either quantity, float and Base unit, float and 8 integers or unicode or utf-8 string expected");
return -1;
}

PyObject* QuantityPy::getUserPreferred(PyObject *args)
Expand All @@ -107,9 +116,9 @@ PyObject* QuantityPy::getUserPreferred(PyObject *args)

QString uss = getQuantityPtr()->getUserString(factor,uus);

res[0] = Py::String(uss.toLatin1());
res[0] = Py::String(uss.toUtf8(),"utf-8");
res[1] = Py::Float(factor);
res[2] = Py::String(uus.toLatin1());
res[2] = Py::String(uus.toUtf8(),"utf-8");

return Py::new_reference_to(res);
}
Expand Down Expand Up @@ -169,14 +178,32 @@ PyObject* QuantityPy::getValueAs(PyObject *args)

if (!quant.isValid()) {
PyErr_Clear();
const char* string;
if (PyArg_ParseTuple(args,"s", &string)) {
quant = Quantity::parse(QString::fromLatin1(string));
}
}
PyObject *object;
if (PyArg_ParseTuple(args,"O", &object)) {
if (PyString_Check(object) || PyUnicode_Check(object)) {
QString qstr;
if (PyUnicode_Check(object)) {
PyObject * utf8str = PyUnicode_AsUTF8String(object);
qstr = QString::fromUtf8(PyString_AsString(utf8str));
Py_DECREF(utf8str);
}
else {
qstr = QString::fromUtf8(PyString_AsString(object));
}
try {
quant = Quantity::parse(qstr);
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return 0;
}
return 0;
} // Not string or unicode
} // zero or more than one object
} // !isValid

if (!quant.isValid()) {
PyErr_SetString(PyExc_TypeError, "Either quantity, string, float or unit expected");
PyErr_SetString(PyExc_TypeError, "Either quantity, float and Base unit, float and 8 integers or unicode or utf-8 string expected");
return 0;
}

Expand Down Expand Up @@ -559,7 +586,7 @@ void QuantityPy::setUnit(Py::Object arg)

Py::String QuantityPy::getUserString(void) const
{
return Py::String(getQuantityPtr()->getUserString().toLatin1());
return Py::String(getQuantityPtr()->getUserString().toUtf8(),"utf-8");
}

PyObject *QuantityPy::getCustomAttributes(const char* /*attr*/) const
Expand Down
34 changes: 24 additions & 10 deletions src/Base/UnitPyImp.cpp
View file
Expand Up @@ -16,7 +16,7 @@ std::string UnitPy::representation(void) const
const UnitSignature & Sig = getUnitPtr()->getSignature();
std::stringstream ret;
ret << "Unit: ";
ret << getUnitPtr()->getString().toLatin1().constData() << " (";
ret << getUnitPtr()->getString().toUtf8().constData() << " (";
ret << Sig.Length << ",";
ret << Sig.Mass << ",";
ret << Sig.Time << ",";
Expand All @@ -25,7 +25,7 @@ std::string UnitPy::representation(void) const
ret << Sig.AmountOfSubstance << ",";
ret << Sig.LuminoseIntensity << ",";
ret << Sig.Angle << ")";
std::string type = getUnitPtr()->getTypeString().toLatin1().constData();
std::string type = getUnitPtr()->getTypeString().toUtf8().constData();
if(! type.empty())
ret << " [" << type << "]";

Expand Down Expand Up @@ -72,13 +72,27 @@ int UnitPy::PyInit(PyObject* args, PyObject* kwd)
return 0;
}
PyErr_Clear(); // set by PyArg_ParseTuple()
const char* string;
if (PyArg_ParseTuple(args,"s", &string)) {

*self = Quantity::parse(QString::fromLatin1(string)).getUnit();
return 0;
}

if (PyArg_ParseTuple(args,"O", &object)) {
if (PyString_Check(object) || PyUnicode_Check(object)) {
QString qstr;
if (PyUnicode_Check(object)) {
PyObject * utf8str = PyUnicode_AsUTF8String(object);
qstr = QString::fromUtf8(PyString_AsString(utf8str));
Py_DECREF(utf8str);
}
else {
qstr = QString::fromUtf8(PyString_AsString(object));
}
try {
*self = Quantity::parse(qstr).getUnit();
}
catch(const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return -1;
}
return 0;
} // Not string or unicode
} // zero or more than one object
PyErr_SetString(PyExc_TypeError, "Either string, (float,8 ints), Unit() or Quantity()");
return -1;
}
Expand Down Expand Up @@ -178,7 +192,7 @@ PyObject* UnitPy::richCompare(PyObject *v, PyObject *w, int op)

Py::String UnitPy::getType(void) const
{
return Py::String(getUnitPtr()->getTypeString().toLatin1());
return Py::String(getUnitPtr()->getTypeString().toUtf8(),"utf-8");
}


Expand Down
48 changes: 29 additions & 19 deletions src/Base/UnitsApiPy.cpp
View file
Expand Up @@ -128,23 +128,33 @@ PyMethodDef UnitsApi::Methods[] = {

PyObject* UnitsApi::sParseQuantity(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
{
char *pstr;
if (!PyArg_ParseTuple(args, "s", &pstr)) // convert args: Python->C
return NULL; // NULL triggers exception

Quantity rtn;
try {
rtn = Quantity::parse(QString::fromLatin1(pstr));
}
catch (const Base::Exception&) {
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
}
catch (const std::exception&) {
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
}

return new QuantityPy(new Quantity(rtn));

PyObject * object;
if (PyArg_ParseTuple(args,"O", &object)) {
if (PyString_Check(object) || PyUnicode_Check(object)) {
QString qstr;
if (PyUnicode_Check(object)) {
PyObject * utf8str = PyUnicode_AsUTF8String(object);
qstr = QString::fromUtf8(PyString_AsString(utf8str));
Py_DECREF(utf8str);
}
else {
qstr = QString::fromUtf8(PyString_AsString(object));
}
Quantity rtn;
try {
rtn = Quantity::parse(qstr);
}
catch (const Base::Exception&) {
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
}
catch (const std::exception&) {
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
}
return new QuantityPy(new Quantity(rtn));
} //string or unicode
} //if one object
PyErr_Format(PyExc_IOError, "invalid unit expression \n");
return 0L;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Draft/DraftGui.py
View file
Expand Up @@ -142,7 +142,7 @@ def displayExternal(internValue,decimals=4,dim='Length',showUnit=True):
qty = FreeCAD.Units.Quantity(internValue,FreeCAD.Units.Angle)
pref=qty.getUserPreferred()
conversion = pref[1]
uom = pref[2].decode('latin-1')
uom = pref[2]
else:
conversion = 1.0
uom = "??"
Expand Down

0 comments on commit 6ad50db

Please sign in to comment.