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

Base: Make units of PropertyQuantity settable from Python code

Browse Source 
The previous implementation did not allow the unit to be set after it
is initialised by the default constructor - this fix makes it possible
to set the unit by explicitly assigning a Unit object.
This commit is contained in:
Oliver Oxtoby
2018-08-02 14:34:51 +02:00
committed by wmayer
parent 855f4ef2f6
commit de282ad5ce
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/App/PropertyUnits.cpp
View File

@@ -40,6 +40,7 @@
#include "PropertyUnits.h"
#include <Base/PyObjectBase.h>
#include <Base/QuantityPy.h>
#include <Base/UnitPy.h>
using namespace App;
using namespace Base;
@@ -113,18 +114,28 @@ Base::Quantity PropertyQuantity::createQuantityFromPy(PyObject *value)
void PropertyQuantity::setPyObject(PyObject *value)
{
Base::Quantity quant= createQuantityFromPy(value);
Unit unit = quant.getUnit();
if (unit.isEmpty()){
PropertyFloat::setValue(quant.getValue());
return;
// Set the unit if Unit object supplied, else check the unit
// and set the value
if (PyObject_TypeCheck(value, &(UnitPy::Type))) {
Base::UnitPy *pcObject = static_cast<Base::UnitPy*>(value);
Base::Unit unit = *(pcObject->getUnitPtr());
_Unit = unit;
}
else {
Base::Quantity quant= createQuantityFromPy(value);
if (unit != _Unit)
throw Base::UnitsMismatchError("Not matching Unit!");
Unit unit = quant.getUnit();
if (unit.isEmpty()){
PropertyFloat::setValue(quant.getValue());
return;
}
PropertyFloat::setValue(quant.getValue());
if (unit != _Unit)
throw Base::UnitsMismatchError("Not matching Unit!");
PropertyFloat::setValue(quant.getValue());
}
}
void PropertyQuantity::setPathValue(const ObjectIdentifier & /*path*/, const boost::any &value)