Issue #2273: Error when reading HDF and Python dump

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

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
index 454d1e3aa18cdc47b6474c3af1b6f2c3c4376808..8028c1ddfb0480c2b4340f035d9a2ce6be92692e 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
@@ -122,18 +122,32 @@ void SketchSolver_ConstraintMultiTranslation::adjustConstraint()
     return;
 
   // Obtain delta between start and end points of translation
-  std::shared_ptr<PlaneGCSSolver_PointWrapper> aStartWrapper =
-      std::dynamic_pointer_cast<PlaneGCSSolver_PointWrapper>(myStorage->entity(
-      myBaseConstraint->attribute(SketchPlugin_MultiTranslation::START_POINT_ID())));
-  std::shared_ptr<PlaneGCSSolver_PointWrapper> aEndWrapper =
-      std::dynamic_pointer_cast<PlaneGCSSolver_PointWrapper>(myStorage->entity(
-      myBaseConstraint->attribute(SketchPlugin_MultiTranslation::END_POINT_ID())));
-
-  GCSPointPtr aStart = aStartWrapper->point();
-  GCSPointPtr aEnd   = aEndWrapper->point();
-
-  myDelta[0] = *(aEnd->x) - *(aStart->x);
-  myDelta[1] = *(aEnd->y) - *(aStart->y);
+  AttributeRefAttrPtr aStartEnd[2] = {
+      myBaseConstraint->refattr(SketchPlugin_MultiTranslation::START_POINT_ID()),
+      myBaseConstraint->refattr(SketchPlugin_MultiTranslation::END_POINT_ID())
+  };
+  double aCoords[2][2];
+  for (int i = 0; i < 2; ++i)
+  {
+    std::shared_ptr<PlaneGCSSolver_PointWrapper> aPointWrapper =
+        std::dynamic_pointer_cast<PlaneGCSSolver_PointWrapper>(myStorage->entity(aStartEnd[i]));
+    if (aPointWrapper)
+    {
+      GCSPointPtr aPnt = aPointWrapper->point();
+      aCoords[i][0] = *(aPnt->x);
+      aCoords[i][1] = *(aPnt->y);
+    }
+    else
+    {
+      AttributePoint2DPtr aPnt =
+          std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aStartEnd[i]->attr());
+      aCoords[i][0] = aPnt->x();
+      aCoords[i][1] = aPnt->y();
+    }
+  }
+
+  myDelta[0] = aCoords[1][0] - aCoords[0][0];
+  myDelta[1] = aCoords[1][1] - aCoords[0][1];
 
   if (myIsFullValue && myNumberOfCopies > 0) {
     myDelta[0] /= myNumberOfCopies;