Issue #2639: Avoid using pre-selection of feature in Sketcher

diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
index f55678ade0a81b34e4ffea4d06b6ec550eeae85a..b59050037e12cd38b8344f16cf1b79bc70aea87d 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
@@ -136,6 +136,8 @@ bool ModuleBase_WidgetValidated::isValidInFilters(const ModuleBase_ViewerPrsPtr&
           }
           aSelectAttr->setValue(ObjectPtr(), GeomShapePtr(), true);
         }
+        else
+          aValid = false; // only results with a shape can be filtered
       } else
         aValid = false; // only results with a shape can be filtered
     }

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
index b1cc7010d9ad4eaafaafba89459f0dbe7205cc5e..f4dc4a4ffd8eac689f79181bf7274393089d8d4e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
@@ -82,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());
+      }
     }
   }
 }