Do not allow user to move fixed entities (issue #1043)

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

diff --git a/src/SketchSolver/SketchSolver_ConstraintMovement.cpp b/src/SketchSolver/SketchSolver_ConstraintMovement.cpp
index 030274ac2dcc831be74167f26a689dcb20acb1ab..b97d1a754fde25fbc659b8bfa8e0e771e1502c48 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMovement.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMovement.cpp
@@ -2,6 +2,11 @@
 #include <SketchSolver_Error.h>
 #include <SketchSolver_Group.h>
 
+#include <SketchPlugin_Arc.h>
+#include <SketchPlugin_Circle.h>
+#include <SketchPlugin_Line.h>
+#include <SketchPlugin_Point.h>
+
 SketchSolver_ConstraintMovement::SketchSolver_ConstraintMovement(FeaturePtr theFeature)
   : SketchSolver_ConstraintRigid(theFeature)
 {
@@ -45,6 +50,7 @@ void SketchSolver_ConstraintMovement::getAttributes(
   theIsFullyMoved = true;
   int aType = SLVS_E_UNKNOWN; // type of created entity
   Slvs_hEntity anEntityID = SLVS_E_UNKNOWN;
+  Slvs_hEntity anEntMaxID = myStorage->entityMaxID();
   anEntityID = myGroup->getFeatureId(myBaseFeature);
   if (anEntityID == SLVS_E_UNKNOWN) {
     anEntityID = changeEntity(myBaseFeature, aType);
@@ -65,17 +71,28 @@ void SketchSolver_ConstraintMovement::getAttributes(
      isComplexFeature = true;
   }
 
+  int aNbOutOfGroup = 0;
   if (isComplexFeature) {
      std::list<AttributePtr> aPoints =
         myBaseFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
      std::list<AttributePtr>::iterator anIt = aPoints.begin();
      for (; anIt != aPoints.end(); ++anIt) {
-       Slvs_hEntity anAttr = myGroup->getAttributeId(*anIt);
+       std::map<AttributePtr, Slvs_hEntity>::const_iterator aFound = myAttributeMap.find(*anIt);
+       Slvs_hEntity anAttr = aFound != myAttributeMap.end() ?
+                             aFound->second : myGroup->getAttributeId(*anIt);
+       Slvs_Entity anAttrEnt = myStorage->getEntity(anAttr);
 
        // Check the attribute changes coordinates
        std::shared_ptr<GeomDataAPI_Point2D> aPt =
           std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIt);
-       if (isMoved(aPt, anAttr)) {
+       // Check the entity is not lying in the current group or it is not moved
+       if (anAttr == SLVS_E_UNKNOWN || anAttrEnt.group != myGroup->getId() ||
+           (anAttr <= anEntMaxID && !isMoved(aPt, anAttrEnt))) {
+         if (anAttrEnt.group == SLVS_G_OUTOFGROUP)
+           ++aNbOutOfGroup;
+         theIsFullyMoved = false;
+       }
+       else {
          theAttributes.push_back(anAttr);
          // update point coordinates
          Slvs_Entity anAttrEnt = myStorage->getEntity(anAttr);
@@ -86,11 +103,21 @@ void SketchSolver_ConstraintMovement::getAttributes(
            myStorage->updateParameter(aParam);
          }
        }
-       else
-         theIsFullyMoved = false;
      }
   }
 
+  // Additional checking, which leads to fix whole feature, if it has fixed points
+  if (!theIsFullyMoved) {
+    Slvs_Entity aFeature = myStorage->getEntity(anEntityID);
+    int aNbPoints = 4;
+    while (aNbPoints > 0 && aFeature.point[aNbPoints-1] == SLVS_E_UNKNOWN)
+      --aNbPoints;
+    if (aNbPoints == aNbOutOfGroup + (int)theAttributes.size()) {
+      theIsFullyMoved = true;
+      return;
+    }
+  }
+
   // Leave only points which are used in constraints
   if (myStorage->isUsedByConstraints(anEntityID))
     return;
@@ -107,12 +134,43 @@ void SketchSolver_ConstraintMovement::getAttributes(
 }
 
 bool SketchSolver_ConstraintMovement::isMoved(
-    std::shared_ptr<GeomDataAPI_Point2D> thePoint, Slvs_hEntity theEntity)
+    std::shared_ptr<GeomDataAPI_Point2D> thePoint, const Slvs_Entity& theEntity)
 {
-  Slvs_Entity anAttrEnt = myStorage->getEntity(theEntity);
-  double aDeltaX = myStorage->getParameter(anAttrEnt.param[0]).val;
-  double aDeltaY = myStorage->getParameter(anAttrEnt.param[1]).val;
+  double aDeltaX = myStorage->getParameter(theEntity.param[0]).val;
+  double aDeltaY = myStorage->getParameter(theEntity.param[1]).val;
   aDeltaX -= thePoint->x();
   aDeltaY -= thePoint->y();
   return aDeltaX * aDeltaX + aDeltaY * aDeltaY >= tolerance * tolerance;
 }
+
+void SketchSolver_ConstraintMovement::fixFeature()
+{
+  Slvs_hEntity anEntID = fixedEntity();
+
+  std::string aKind;
+  std::map<FeaturePtr, Slvs_hEntity>::const_iterator aFIt = myFeatureMap.begin();
+  for (; aFIt != myFeatureMap.end() && aKind.empty(); ++aFIt)
+    if (aFIt->second == anEntID)
+      aKind = aFIt->first->getKind();
+  std::map<AttributePtr, Slvs_hEntity>::const_iterator anAtIt = myAttributeMap.begin();
+  for (; anAtIt != myAttributeMap.end() && aKind.empty(); ++anAtIt)
+    if (anAtIt->second == anEntID)
+      aKind = anAtIt->first->attributeType();
+
+  if (aKind == SketchPlugin_Line::ID()) {
+    Slvs_Entity aLine = myStorage->getEntity(anEntID);
+    fixLine(aLine);
+  }
+  else if (aKind == SketchPlugin_Arc::ID()) {
+    Slvs_Entity anArc = myStorage->getEntity(anEntID);
+    fixArc(anArc);
+  }
+  else if (aKind == SketchPlugin_Circle::ID()) {
+    Slvs_Entity aCirc = myStorage->getEntity(anEntID);
+    fixCircle(aCirc);
+  }
+  else if (aKind == SketchPlugin_Point::ID() || aKind == GeomDataAPI_Point2D::typeId()) {
+    fixPoint(anEntID);
+  }
+}
+