- aPointAttribute->setExpressionInvalid(0, !isValid[0]);
- aPointAttribute->setExpressionInvalid(1, !isValid[1]);
- aPointAttribute->setExpressionInvalid(2, !isValid[2]);
-
- aPointAttribute->setCalculatedValue(
- isValid[0] ? aValue[0] : aPointAttribute->x(),
- isValid[1] ? aValue[1] : aPointAttribute->y(),
- isValid[2] ? aValue[2] : aPointAttribute->z()
- );
- }
-
- // Point2D
- AttributePoint2DPtr aPoint2DAttribute =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aMessage->attribute());
- if (aPoint2DAttribute.get()) {
- std::string anError[2];
- double aValue[2] = {
- evaluate(aPoint2DAttribute->textX(), anError[0]),
- evaluate(aPoint2DAttribute->textY(), anError[1])
+ for (int i = 0; i < 3; ++i) {
+ std::string anError;
+ double aValue = evaluate(aText[i], anError, anAttribute->owner()->document());
+ bool isValid = anError.empty();
+ if (isValid) aCalculatedValue[i] = aValue;
+ anAttribute->setUsedParameters(i, isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::string>());
+ anAttribute->setExpressionInvalid(i, !isValid);
+ anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError);
+ }
+ anAttribute->setCalculatedValue(aCalculatedValue[0],
+ aCalculatedValue[1],
+ aCalculatedValue[2]);
+ } else
+ if (aMessage->attribute()->attributeType() == GeomDataAPI_Point2D::typeId()) {
+ AttributePoint2DPtr anAttribute =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aMessage->attribute());
+ std::string aText[] = {
+ anAttribute->textX(),
+ anAttribute->textY()