suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ allow to set constraints of properties via Python

Browse Source
This commit is contained in:
wmayer 2014-02-15 14:10:17 +01:00
parent 23d8820582
commit cc033f8d30
1 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/App/PropertyStandard.cpp
View File

@ -575,10 +575,41 @@ void PropertyIntegerConstraint::setPyObject(PyObject *value)
else if(temp < _ConstStruct->LowerBound)
temp = _ConstStruct->LowerBound;
}
aboutToSetValue();
_lValue = temp;
hasSetValue();
}
else if (PyTuple_Check(value) && PyTuple_Size(value) == 4) {
long values[4];
for (int i=0; i<4; i++) {
PyObject* item;
item = PyTuple_GetItem(value,i);
if (PyInt_Check(item))
values[i] = PyInt_AsLong(item);
else
throw Base::TypeError("Type in tuple must be int");
}
if (!_ConstStruct) {
Constraints* c = new Constraints();
c->LowerBound = values[1];
c->UpperBound = values[2];
c->StepSize = std::max<long>(1, values[3]);
if (values[0] > c->UpperBound)
values[0] = c->UpperBound;
else if (values[0] < c->LowerBound)
values[0] = c->LowerBound;
setConstraints(c);
}
else {
throw Base::RuntimeError("Cannot override limits of constraint");
}
aboutToSetValue();
_lValue = values[0];
hasSetValue();
}
else {
std::string error = std::string("type must be int, not ");
error += value->ob_type->tp_name;
@ -1019,6 +1050,38 @@ void PropertyFloatConstraint::setPyObject(PyObject *value)
_dValue = temp;
hasSetValue();
}
else if (PyTuple_Check(value) && PyTuple_Size(value) == 4) {
double values[4];
for (int i=0; i<4; i++) {
PyObject* item;
item = PyTuple_GetItem(value,i);
if (PyFloat_Check(item))
values[i] = PyFloat_AsDouble(item);
else if (PyInt_Check(item))
values[i] = PyInt_AsLong(item);
else
throw Base::TypeError("Type in tuple must be float or int");
}
if (!_ConstStruct) {
Constraints* c = new Constraints();
c->LowerBound = values[1];
c->UpperBound = values[2];
c->StepSize = std::max<double>(0.1, values[3]);
if (values[0] > c->UpperBound)
values[0] = c->UpperBound;
else if (values[0] < c->LowerBound)
values[0] = c->LowerBound;
setConstraints(c);
}
else {
throw Base::RuntimeError("Cannot override limits of constraint");
}
aboutToSetValue();
_dValue = values[0];
hasSetValue();
}
else {
std::string error = std::string("type must be float, not ");
error += value->ob_type->tp_name;