Fix for the issue #2753 : error when dump/load script

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

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
index 504314fbd293b7a98c91b1b684c681d9b2ed0427..f4dc4a4ffd8eac689f79181bf7274393089d8d4e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
@@ -24,10 +24,14 @@
 #include <GeomDataAPI_Point2D.h>
 
 #include <SketcherPrs_Factory.h>
+#include <SketcherPrs_Tools.h>
 
 #include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Result.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
 
 #include <GeomDataAPI_Point2D.h>
 
@@ -52,6 +56,10 @@ 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());
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), LOCATION_TYPE_ID());
 }
 
 void SketchPlugin_ConstraintLength::colorConfigInfo(std::string& theSection, std::string& theName,
@@ -74,22 +82,24 @@ void SketchPlugin_ConstraintLength::execute()
     std::shared_ptr<GeomDataAPI_Point2D> aPoint2 = std::dynamic_pointer_cast<
         GeomDataAPI_Point2D>(aFeature->data()->attribute(SketchPlugin_Line::END_ID()));
 
-    double aLenght = aPoint1->pnt()->distance(aPoint2->pnt());
-
-    //std::shared_ptr<ModelAPI_AttributeDouble> aValueAttr = std::dynamic_pointer_cast<
-    //    ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE()));
-    //if(!aValueAttr->isInitialized()) {
-    //  aValueAttr->setValue(aLenght);
-    //}
-
-    // the value should to be computed here, not in the getAISObject
-    // in order to change the model value
-    // inside the object transaction. This is important for creating a constraint by preselection.
-    // The display of the presentation in this case happens after the transaction commit
-    AttributePtr aFlyOutAttribute =
-      data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
-    if (!aFlyOutAttribute->isInitialized()) {
-      compute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
+    if (aPoint1.get() && aPoint2.get()) {
+      double aLenght = aPoint1->pnt()->distance(aPoint2->pnt());
+
+      //std::shared_ptr<ModelAPI_AttributeDouble> aValueAttr = std::dynamic_pointer_cast<
+      //    ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE()));
+      //if(!aValueAttr->isInitialized()) {
+      //  aValueAttr->setValue(aLenght);
+      //}
+
+      // the value should to be computed here, not in the getAISObject
+      // in order to change the model value
+      // inside the object transaction. This is important for creating a constraint by preselection.
+      // The display of the presentation in this case happens after the transaction commit
+      AttributePtr aFlyOutAttribute =
+        data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
+      if (!aFlyOutAttribute->isInitialized()) {
+        compute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
+      }
     }
   }
 }