- std::vector<Slvs_hConstraint>::iterator aCIter = mySlvsConstraints.begin();
- for (; aCIter != mySlvsConstraints.end(); aCIter++) {
- Slvs_Constraint aConstraint = myStorage->getConstraint(*aCIter);
- Slvs_Entity aLine = myStorage->getEntity(aConstraint.entityA);
- // Obtain point and line coordinates
- Slvs_hEntity aPointID[3] = {aConstraint.ptA, aLine.point[0], aLine.point[1]};
- std::shared_ptr<GeomAPI_XY> aPoints[3];
- for (int i = 0; i < 3; i++) {
- Slvs_Entity aPoint = myStorage->getEntity(aPointID[i]);
- Slvs_Param aParams[2] = {
- myStorage->getParameter(aPoint.param[0]),
- myStorage->getParameter(aPoint.param[1])};
- aPoints[i] = std::shared_ptr<GeomAPI_XY>(new GeomAPI_XY(aParams[0].val, aParams[1].val));
- }
- std::shared_ptr<GeomAPI_XY> aLineVec = aPoints[2]->decreased(aPoints[1]);
- std::shared_ptr<GeomAPI_XY> aPtLineVec = aPoints[0]->decreased(aPoints[1]);
- if (aPtLineVec->cross(aLineVec) * aConstraint.valA < 0.0) {
- aConstraint.valA *= -1.0;
- myStorage->updateConstraint(aConstraint);
- }
+ BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+ std::shared_ptr<GeomAPI_Pnt2d> aPoint;
+ std::shared_ptr<GeomAPI_Lin2d> aLine;
+ std::list<EntityWrapperPtr> aSubs = aConstraint->entities();
+ std::list<EntityWrapperPtr>::const_iterator aSIt = aSubs.begin();
+ for (; aSIt != aSubs.end(); ++aSIt) {
+ if ((*aSIt)->type() == ENTITY_POINT)
+ aPoint = aBuilder->point(*aSIt);
+ else if ((*aSIt)->type() == ENTITY_LINE)
+ aLine = aBuilder->line(*aSIt);
+ }
+
+ std::shared_ptr<GeomAPI_XY> aLineVec = aLine->direction()->xy();
+ std::shared_ptr<GeomAPI_XY> aPtLineVec = aPoint->xy()->decreased(aLine->location()->xy());
+ if (aPtLineVec->cross(aLineVec) * aConstraint->value() < 0.0 || myIsNegative) {
+ aConstraint->setValue(aConstraint->value() * (-1.0));
+ myStorage->addConstraint(myBaseConstraint, aConstraint);
+ myIsNegative = true;