Issue #2206 Avoid the ability to cancel the current sketch when saving,

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_ConstraintLength.cpp

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
index 36932d4ddee7442002e25a7cc3419c09a320f014..6eda688a8da5422a87f9b4de2e07526ff0195c4e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
@@ -26,6 +26,7 @@
 #include <SketcherPrs_Factory.h>
 
 #include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Result.h>
 
@@ -52,6 +53,9 @@ void SketchPlugin_ConstraintLength::initAttributes()
   data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::typeId());
   data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::typeId());
   data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId());
+
+  data()->addAttribute(SketchPlugin_ConstraintLength::LOCATION_TYPE_ID(),
+                       ModelAPI_AttributeInteger::typeId());
 }
 
 void SketchPlugin_ConstraintLength::colorConfigInfo(std::string& theSection, std::string& theName,
@@ -165,37 +169,6 @@ AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePreviou
   return anAIS;
 }
 
-void SketchPlugin_ConstraintLength::move(double theDeltaX, double theDeltaY)
-{
-  std::shared_ptr<ModelAPI_Data> aData = data();
-  if (!aData->isValid())
-    return;
-
-  AttributeRefAttrPtr aLineAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-      attribute(SketchPlugin_Constraint::ENTITY_A()));
-  if (!aLineAttr || !aLineAttr->isObject())
-    return;
-  FeaturePtr aLine = ModelAPI_Feature::feature(aLineAttr->object());
-  if (!aLine || aLine->getKind() != SketchPlugin_Line::ID())
-    return;
-
-  // Recalculate a shift of flyout point in terms of local coordinates
-  std::shared_ptr<GeomAPI_XY> aDir(new GeomAPI_XY(theDeltaX, theDeltaY));
-  std::shared_ptr<GeomAPI_XY> aStartPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-      aLine->attribute(SketchPlugin_Line::START_ID()))->pnt()->xy();
-  std::shared_ptr<GeomAPI_XY> aEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-      aLine->attribute(SketchPlugin_Line::END_ID()))->pnt()->xy();
-  std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
-  double dX = aDir->dot(aLineDir->xy());
-  double dY = -aDir->cross(aLineDir->xy());
-
-  myFlyoutUpdate = true;
-  std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-      aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
-  aPoint->setValue(aPoint->x() + dX, aPoint->y() + dY);
-  myFlyoutUpdate = false;
-}
-
 void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) {
   if (theID == SketchPlugin_Constraint::ENTITY_A())
   {
@@ -208,7 +181,6 @@ void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) {
         aValueAttr->setValue(aLength);
     }
   } else if (theID == SketchPlugin_Constraint::FLYOUT_VALUE_PNT() && !myFlyoutUpdate) {
-    myFlyoutUpdate = true;
     // Recalculate flyout point in local coordinates of the line:
     // the X coordinate is a length of projection of the flyout point on the line
     // the Y coordinate is a distance from the point to the line
@@ -229,6 +201,7 @@ void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) {
     std::shared_ptr<GeomAPI_XY> aEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
         aLine->attribute(SketchPlugin_Line::END_ID()))->pnt()->xy();
 
+    myFlyoutUpdate = true;
     std::shared_ptr<GeomAPI_Dir2d> aLineDir(new GeomAPI_Dir2d(aEndPnt->decreased(aStartPnt)));
     std::shared_ptr<GeomAPI_XY> aFlyoutDir = aFlyoutPnt->xy()->decreased(aStartPnt);
     double X = aFlyoutDir->dot(aLineDir->xy());