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

Base: clean-up code in UnitsApi

Browse Source
This commit is contained in:
wmayer
2022-01-25 00:26:47 +01:00
parent 22a28370fd
commit 5502d1f2a7
5 changed files with 32 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/Base/UnitsApiPy.cpp
View File

@@ -41,34 +41,9 @@ using namespace Base;
//**************************************************************************
// Python stuff of UnitsApi
// UnitsApi Methods // Methods structure
// UnitsApi Methods
PyMethodDef UnitsApi::Methods[] = {
//{"translateUnit", (PyCFunction) UnitsApi::sTranslateUnit, METH_VARARGS,
// "translateUnit(string) -> double\n\n"
// "calculate a mathematical expression with units to a number. \n"
// "can be used for simple unit translation like: \n"
// " translateUnit('10m')\n"
// " or for more complex espressions:\n"
// " translateUnit('sin(pi)/50.0 m/s^2')\n"
//},
//{"getWithPrefs", (PyCFunction) UnitsApi::sGetWithPrefs, METH_VARARGS,
// "getWithPrefs(type,[string|float|int]) -> double\n\n"
// "Translation to internal regarding user prefs \n"
// " That means if no unit is issued the user prefs are in \n"
// " charge. If one unit is used the user prefs get ignored\n"
// " type can be: \n"
// " Length \n"
// " Area \n"
// " Volume \n"
// " Angle \n"
// " TimeSpan \n"
// " Velocity \n"
// " Acceleration \n"
// " Mass \n"
// " Temperature \n"
//},
{"parseQuantity", (PyCFunction) UnitsApi::sParseQuantity, METH_VARARGS,
{"parseQuantity", UnitsApi::sParseQuantity, METH_VARARGS,
"parseQuantity(string) -> Base.Quantity()\n\n"
"calculate a mathematical expression with units to a quantity object. \n"
"can be used for simple unit translation like: \n"
@@ -76,77 +51,31 @@ PyMethodDef UnitsApi::Methods[] = {
"or for more complex espressions:\n"
"parseQuantity('sin(pi)/50.0 m/s^2')\n"
},
{"listSchemas", (PyCFunction) UnitsApi::sListSchemas, METH_VARARGS,
{"listSchemas", UnitsApi::sListSchemas, METH_VARARGS,
"listSchemas() -> a tuple of schemas\n\n"
"listSchemas(int) -> description of the given schema\n\n"
},
{"getSchema", (PyCFunction) UnitsApi::sGetSchema, METH_VARARGS,
{"getSchema", UnitsApi::sGetSchema, METH_VARARGS,
"getSchema() -> int\n\n"
"The int is the position of the tuple returned by listSchemas"
},
{"setSchema", (PyCFunction) UnitsApi::sSetSchema, METH_VARARGS,
{"setSchema", UnitsApi::sSetSchema, METH_VARARGS,
"setSchema(int) -> None\n\n"
"Sets the current schema to the given number, if possible"
},
{"schemaTranslate", (PyCFunction) UnitsApi::sSchemaTranslate, METH_VARARGS,
{"schemaTranslate", UnitsApi::sSchemaTranslate, METH_VARARGS,
"schemaTranslate(Quantity, int) -> tuple\n\n"
"Translate a quantity to a given schema"
},
{NULL, NULL, 0, NULL} /* Sentinel */
{nullptr, nullptr, 0, nullptr} /* Sentinel */
};
//PyObject* UnitsApi::sTranslateUnit(PyObject * /*self*/, PyObject *args)
//{
// char *pstr;
// if (!PyArg_ParseTuple(args, "s", &pstr)) // convert args: Python->C
// return NULL; // NULL triggers exception
// try {
// return Py::new_reference_to(Py::Object(Py::Float(UnitsApi::translateUnit(pstr))));
// }
// catch (const Base::Exception& e) {
// PyErr_Format(PyExc_IOError, "invalid unit expression %s: %s\n", pstr, e.what());
// return 0L;
// }
// catch (const std::exception& e) {
// PyErr_Format(PyExc_IOError, "invalid unit expression %s: %s\n", pstr, e.what());
// return 0L;
// }
//}
//
//PyObject* UnitsApi::sGetWithPrefs(PyObject * /*self*/, PyObject *args)
//{
// char *type;
// PyObject *obj;
// if (!PyArg_ParseTuple(args, "sO", &type,&obj)) // convert args: Python->C
// return NULL; // NULL triggers exception
// try {
// QuantityType t;
// if(strcmp("Length",type)==0)
// t = Length;
// else{
// PyErr_Format(PyExc_IOError, "invalid quantity type: %s!", type);
// return 0L;
// }
//
// double result = toDblWithUserPrefs(t,obj);
// return Py::new_reference_to(Py::Object(Py::Float(result)));
// }
// 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;
// }
//}
PyObject* UnitsApi::sParseQuantity(PyObject * /*self*/, PyObject *args)
{
char *pstr;
if (!PyArg_ParseTuple(args, "et", "utf-8", &pstr)) // convert args: Python->C
return NULL; // NULL triggers exception
if (!PyArg_ParseTuple(args, "et", "utf-8", &pstr))
return nullptr;
Quantity rtn;
QString qstr = QString::fromUtf8(pstr);
@@ -180,22 +109,22 @@ PyObject* UnitsApi::sListSchemas(PyObject * /*self*/, PyObject *args)
int num = static_cast<int>(UnitSystem::NumUnitSystemTypes);
if (index < 0 || index >= num) {
PyErr_SetString(PyExc_ValueError, "invalid schema value");
return 0;
return nullptr;
}
return Py_BuildValue("s", UnitsApi::getDescription(static_cast<UnitSystem>(index)));
}
PyErr_SetString(PyExc_TypeError, "int or empty argument list expected");
return 0;
return nullptr;
}
PyObject* UnitsApi::sGetSchema(PyObject * /*self*/, PyObject *args)
{
if (!PyArg_ParseTuple(args, ""))
return NULL;
return nullptr;
return Py_BuildValue("i", static_cast<int>(actSystem));
return Py_BuildValue("i", static_cast<int>(currentSystem));
}
PyObject* UnitsApi::sSetSchema(PyObject * /*self*/, PyObject *args)
@@ -206,7 +135,7 @@ PyObject* UnitsApi::sSetSchema(PyObject * /*self*/, PyObject *args)
int num = static_cast<int>(UnitSystem::NumUnitSystemTypes);
if (index < 0 || index >= num) {
PyErr_SetString(PyExc_ValueError, "invalid schema value");
return 0;
return nullptr;
}
setSchema((UnitSystem)index);
}
@@ -218,7 +147,7 @@ PyObject* UnitsApi::sSchemaTranslate(PyObject * /*self*/, PyObject *args)
PyObject* q;
int index;
if (!PyArg_ParseTuple(args, "O!i", &(QuantityPy::Type), &q, &index))
return 0;
return nullptr;
Quantity quant;
quant = *static_cast<Base::QuantityPy*>(q)->getQuantityPtr();
@@ -226,7 +155,7 @@ PyObject* UnitsApi::sSchemaTranslate(PyObject * /*self*/, PyObject *args)
std::unique_ptr<UnitsSchema> schema(createSchema(static_cast<UnitSystem>(index)));
if (!schema.get()) {
PyErr_SetString(PyExc_ValueError, "invalid schema value");
return 0;
return nullptr;
}
double factor;