SketchSolver Refactoring: Eliminate SolveSpace as a sketch solver.

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintDistance.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintDistance.cpp b/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
index afe792932bd99f06b85e9d2a49e76bb7b774b388..9e01c65a8377ae06fb3db06751e8f1da238aa7cd 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintDistance.cpp
@@ -13,7 +13,7 @@
 
 
 void SketchSolver_ConstraintDistance::getAttributes(
-    double& theValue,
+    EntityWrapperPtr& theValue,
     std::vector<EntityWrapperPtr>& theAttributes)
 {
   SketchSolver_Constraint::getAttributes(theValue, theAttributes);
@@ -34,37 +34,58 @@ void SketchSolver_ConstraintDistance::getAttributes(
 
 void SketchSolver_ConstraintDistance::adjustConstraint()
 {
-  ConstraintWrapperPtr aConstraint = myStorage->constraint(myBaseConstraint).front();
+  ConstraintWrapperPtr aConstraint = myStorage->constraint(myBaseConstraint);
 
   // Adjust point-point distance if the points are equal
   if (getType() == CONSTRAINT_PT_PT_DISTANCE) {
-    const std::list<EntityWrapperPtr>& aSubs = aConstraint->entities();
-    if (aSubs.front()->isEqual(aSubs.back())) {
-      // Change X coordinate of second point to eliminate coincidence
-      ParameterWrapperPtr aX = aSubs.back()->parameters().front();
-      aX->setValue(aX->value() + 1.0);
-      myStorage->update(aX);
-    }
+////    AttributePtr aPt1 = myBaseConstraint->attribute(SketchPlugin_Constraint::ENTITY_A());
+////    AttributePtr aPt2 = myBaseConstraint->attribute(SketchPlugin_Constraint::ENTITY_B());
+////
+////    BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+////    std::shared_ptr<GeomAPI_Pnt2d> aPoint1 = aBuilder->point(myStorage->entity(aPt1));
+////    EntityWrapperPtr anEntity2 = myStorage->entity(aPt2);
+////    std::shared_ptr<GeomAPI_Pnt2d> aPoint2 = aBuilder->point(anEntity2);
+////
+////////    if (aPoint1->distance(aPoint2) < tolerance) {
+////////      // Change X coordinate of second point to eliminate coincidence
+////////      ParameterWrapperPtr aX = aSubs.back()->parameters().front();
+////////      aX->setValue(aX->value() + 1.0);
+////////      myStorage->update(aX);
+////////    }
     return;
   }
 
   // Adjust point-line distance
   if (fabs(myPrevValue) == fabs(aConstraint->value())) {
     // sign of distance is not changed
-    aConstraint->setValue(myPrevValue);
-    myStorage->addConstraint(myBaseConstraint, aConstraint);
+////    aConstraint->setValue(myPrevValue);
+////    myStorage->addConstraint(myBaseConstraint, aConstraint);
     return;
   }
 
-  // Adjust the sign of constraint value
-  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
-  aBuilder->adjustConstraint(aConstraint);
-  myStorage->addConstraint(myBaseConstraint, aConstraint);
+////  // Adjust the sign of constraint value
+////  BuilderPtr aBuilder = SketchSolver_Manager::instance()->builder();
+////
+////  std::shared_ptr<GeomAPI_Lin2d> aLine;
+////  std::shared_ptr<GeomAPI_Pnt2d> aPoint;
+////  for (int i = 0; i < 2; ++i) {
+////    AttributePtr anAttr = myBaseConstraint->attribute(SketchPlugin_Constraint::ATTRIBUTE(i));
+////    EntityWrapperPtr anEntity = myStorage->entity(anAttr);
+////    if (anEntity->type() == ENTITY_POINT)
+////      aPoint = aBuilder->point(anEntity);
+////    else if (anEntity->type() == ENTITY_LINE)
+////      aLine = aBuilder->line(anEntity);
+////  }
+////
+////  std::shared_ptr<GeomAPI_XY> aLineVec = aLine->direction()->xy();
+////  std::shared_ptr<GeomAPI_XY> aPtLineVec = aPoint->xy()->decreased(aLine->location()->xy());
+////  if (aLineVec->cross(aPtLineVec) * aConstraint->value() < 0.0)
+////    aConstraint->setValue(aConstraint->value() * (-1.0));
 }
 
 void SketchSolver_ConstraintDistance::update()
 {
-  ConstraintWrapperPtr aConstraint = myStorage->constraint(myBaseConstraint).front();
+  ConstraintWrapperPtr aConstraint = myStorage->constraint(myBaseConstraint);
   myPrevValue = aConstraint->value();
 
   SketchSolver_Constraint::update();