]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Make the coordinate of arc edited in the property panel unchanged in edit mode
authormpv <mpv@opencascade.com>
Fri, 6 Nov 2015 06:47:03 +0000 (09:47 +0300)
committermpv <mpv@opencascade.com>
Fri, 6 Nov 2015 06:47:03 +0000 (09:47 +0300)
src/SketchPlugin/SketchPlugin_Arc.cpp

index 22898f95ee77310535f117643b59137e85b2299d..07e9b1a784176ae4117a6335d25f24a17537a07e 100644 (file)
@@ -272,33 +272,33 @@ void SketchPlugin_Arc::attributeChanged(const std::string& theID)
         new GeomAPI_Circ2d(aCenterAttr->pnt(), aStartAttr->pnt()));
     std::shared_ptr<GeomAPI_Pnt2d> aProjection = aCircleForArc->project(anEndAttr->pnt());
     if (aProjection && anEndAttr->pnt()->distance(aProjection) > tolerance) {
-      // issue #855: trying to update only not-updated coordinate if it is possible
-      /*
-      if (abs(myXEndBefore - anEndAttr->x()) < 1.e-10) { // keep Y unchanged
-        double aVy = aCenterAttr->y() - anEndAttr->y();
-        double aVy2 = aVy * aVy;
-        double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
-        if (aVy2 <= aR2) {
-          double aDX = sqrt(aR2 - aVy * aVy);
-          if (anEndAttr->x() > aCenterAttr->x())
-            aProjection->setX(aCenterAttr->x() + aDX);
-          else 
-            aProjection->setX(aCenterAttr->x() - aDX);
-          aProjection->setY(anEndAttr->y());
-        }
-      } else if (abs(myYEndBefore - anEndAttr->y()) < 1.e-10) { // keep X unchanged
-        double aVx = aCenterAttr->x() - anEndAttr->x();
-        double aVx2 = aVx * aVx;
-        double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
-        if (aVx2 <= aR2) {
-          double aDY = sqrt(aR2 - aVx * aVx);
-          if (anEndAttr->y() > aCenterAttr->y())
-            aProjection->setY(aCenterAttr->y() + aDY);
-          else 
-            aProjection->setY(aCenterAttr->y() - aDY);
-          aProjection->setX(anEndAttr->x());
+      if (!isStable()) { // issue #855: trying to update only not-updated coordinate if it is possible
+        if (abs(myXEndBefore - anEndAttr->x()) < 1.e-10) { // keep Y unchanged
+          double aVy = aCenterAttr->y() - anEndAttr->y();
+          double aVy2 = aVy * aVy;
+          double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+          if (aVy2 <= aR2) {
+            double aDX = sqrt(aR2 - aVy * aVy);
+            if (anEndAttr->x() > aCenterAttr->x())
+              aProjection->setX(aCenterAttr->x() + aDX);
+            else 
+              aProjection->setX(aCenterAttr->x() - aDX);
+            aProjection->setY(anEndAttr->y());
+          }
+        } else if (abs(myYEndBefore - anEndAttr->y()) < 1.e-10) { // keep X unchanged
+          double aVx = aCenterAttr->x() - anEndAttr->x();
+          double aVx2 = aVx * aVx;
+          double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+          if (aVx2 <= aR2) {
+            double aDY = sqrt(aR2 - aVx * aVx);
+            if (anEndAttr->y() > aCenterAttr->y())
+              aProjection->setY(aCenterAttr->y() + aDY);
+            else 
+              aProjection->setY(aCenterAttr->y() - aDY);
+            aProjection->setX(anEndAttr->x());
+          }
         }
-      }*/
+      }
 
       anEndAttr->setValue(aProjection);
     }