Crash when searching duplicated constraints

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

diff --git a/src/SketchPlugin/SketchPlugin_Plugin.cpp b/src/SketchPlugin/SketchPlugin_Plugin.cpp
index 4e29b3bfc08b11ac6d5b47f7bd921f8ae9fcc7d2..a40e7772252eb6b964b55ac651ba5626de49487f 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Plugin.cpp
+++ b/src/SketchPlugin/SketchPlugin_Plugin.cpp
@@ -6,6 +6,7 @@
 #include <SketchPlugin_Point.h>
 #include <SketchPlugin_Circle.h>
 #include <SketchPlugin_Arc.h>
+#include <SketchPlugin_ConstraintAngle.h>
 #include <SketchPlugin_ConstraintCoincidence.h>
 #include <SketchPlugin_ConstraintDistance.h>
 #include <SketchPlugin_ConstraintEqual.h>
@@ -57,8 +58,6 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
                               new SketchPlugin_ExternalValidator);
   aFactory->registerValidator("SketchPlugin_TangentAttr",
                               new SketchPlugin_TangentAttrValidator);
-  aFactory->registerValidator("SketchPlugin_CoincidentAttr",
-                              new SketchPlugin_CoincidentAttr);
   aFactory->registerValidator("SketchPlugin_NotFixed",
                               new SketchPlugin_NotFixedValidator);
   aFactory->registerValidator("SketchPlugin_EqualAttr",
@@ -69,11 +68,15 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
                               new SketchPlugin_CoincidenceAttrValidator);
   aFactory->registerValidator("SketchPlugin_CopyValidator",
                               new SketchPlugin_CopyValidator);
+  aFactory->registerValidator("SketchPlugin_SolverErrorValidator",
+                              new SketchPlugin_SolverErrorValidator);
+  aFactory->registerValidator("SketchPlugin_FilletVertexValidator",
+                              new SketchPlugin_FilletVertexValidator);
 
   // register this plugin
   ModelAPI_Session::get()->registerPlugin(this);
   
-  Config_PropManager::registerProp("Visualization", "sketch_entity_color", "Sketch enity color",
+  Config_PropManager::registerProp("Visualization", "sketch_entity_color", "Sketch entity color",
                                    Config_Prop::Color, SKETCH_ENTITY_COLOR);
 
   Config_PropManager::registerProp("Visualization", "sketch_external_color", "Sketch external entity color",
@@ -138,6 +141,8 @@ FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
     return FeaturePtr(new SketchPlugin_MultiTranslation);
   } else if (theFeatureID == SketchPlugin_MultiRotation::ID()) {
     return FeaturePtr(new SketchPlugin_MultiRotation);
+  } else if (theFeatureID == SketchPlugin_ConstraintAngle::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintAngle);
   }
   // feature of such kind is not found
   return FeaturePtr();
@@ -158,8 +163,8 @@ std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
 ::getFeaturesState(const std::shared_ptr<ModelAPI_Feature>& theFeature) const
 {
   const Events_ID kResponseEvent = Events_Loop::loop()->eventByName(EVENT_FEATURE_STATE_RESPONSE);
-  std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg =
-      std::make_shared<ModelAPI_FeatureStateMessage>(kResponseEvent, this);
+  std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg(
+      new ModelAPI_FeatureStateMessage(kResponseEvent, this));
 
   bool aHasSketchPlane = false;
   std::shared_ptr<SketchPlugin_Sketch> aSketchFeature =
@@ -188,6 +193,7 @@ std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
       aMsg->setState(SketchPlugin_ConstraintTangent::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintMirror::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintFillet::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintAngle::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_MultiRotation::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_MultiTranslation::ID(), aHasSketchPlane);
     }