#1182 point is attched to Sketch Constraint line

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

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
index 7653eb59ba4575ff1c2ebd1edd754a5f724ae22a..8867e16d55932720530b9e6e0ea9dde72eeb88b6 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
@@ -1,8 +1,14 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:    SketchPlugin_ConstraintRigid.cpp
 // Created: 13 Oct 2014
 // Author:  Artem ZHIDKOV
 
 #include "SketchPlugin_ConstraintRigid.h"
+#include "SketchPlugin_ConstraintParallel.h"
+#include "SketchPlugin_Feature.h"
+
+#include <SketcherPrs_Factory.h>
 
 #include <ModelAPI_ResultConstruction.h>
 #include <Config_PropManager.h>
@@ -16,7 +22,7 @@ SketchPlugin_ConstraintRigid::SketchPlugin_ConstraintRigid()
 
 void SketchPlugin_ConstraintRigid::initAttributes()
 {
-  data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::type());
+  data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId());
 }
 
 void SketchPlugin_ConstraintRigid::execute()
@@ -28,42 +34,20 @@ AISObjectPtr SketchPlugin_ConstraintRigid::getAISObject(AISObjectPtr thePrevious
   if (!sketch())
     return thePrevious;
 
-  std::shared_ptr<ModelAPI_Data> aData = data();
-  std::shared_ptr<ModelAPI_AttributeRefAttr> anAttr = std::dynamic_pointer_cast<
-      ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
-  if (!anAttr /*|| !anAttr->isObject()*/)
-    return thePrevious;
-
-  std::shared_ptr<GeomAPI_Shape> aShape;
-
-  if (anAttr->isObject()) {
-    std::shared_ptr<ModelAPI_ResultConstruction> aConst;
-    aConst = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(anAttr->object());
-
-    if (!aConst) 
-      return thePrevious;
-    aShape = aConst->shape();
-  }
-  else {
-    std::shared_ptr<GeomDataAPI_Point2D> aPointAttr =
-                             std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->attr());
-    if (!aPointAttr)
-      return thePrevious;
-    std::shared_ptr<GeomAPI_Pnt> aPoint(sketch()->to3D(aPointAttr->x(), aPointAttr->y()));
-    aShape = GeomAlgoAPI_PointBuilder::point(aPoint);
-  }
-
   AISObjectPtr anAIS = thePrevious;
-  if (!anAIS)
-    anAIS = AISObjectPtr(new GeomAPI_AISObject);
-
-  std::shared_ptr<GeomAPI_Pln> aPlane = sketch()->plane();
-  anAIS->createFixed(aShape, aPlane);
-
-  // Set color from preferences
-  std::vector<int> aRGB = Config_PropManager::color("Visualization", "fixing_color",
-                                                    FIXING_COLOR);
-  anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
+  if (anAIS.get() == NULL) {
+    std::shared_ptr<ModelAPI_Data> aData = data();
+    std::shared_ptr<ModelAPI_AttributeRefAttr> anAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
+    ObjectPtr aObj = anAttr->object();
+    if (aObj.get() != NULL) {
+      FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+      std::shared_ptr<SketchPlugin_Feature> aSkFea = 
+        std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+      if (!aSkFea->isExternal()) 
+        anAIS = SketcherPrs_Factory::rigidConstraint(this, sketch()->coordinatePlane());
+    }
+  }
 
   return anAIS;
 }
\ No newline at end of file