Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

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

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
index 51f4b3a01eb49249bd9e9745f3975365977c48e2..6695a8813dd8f0b0b7b1be6929734e6e05d8be75 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
@@ -7,6 +7,8 @@
 #include "SketchPlugin_ConstraintRigid.h"
 #include "SketchPlugin_ConstraintParallel.h"
 
+#include <SketcherPrs_Factory.h>
+
 #include <ModelAPI_ResultConstruction.h>
 #include <Config_PropManager.h>
 
@@ -31,50 +33,10 @@ 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;
-
-    std::shared_ptr<SketchPlugin_Feature> aSketchFea = 
-      std::dynamic_pointer_cast<SketchPlugin_Feature>(ModelAPI_Feature::feature(aConst));
-    if (aSketchFea.get() != NULL) {
-      if (aSketchFea->isExternal())
-        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", "sketch_constraint_color",
-                                                    SKETCH_CONSTRAINT_COLOR);
-
-  anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
+  if (!anAIS) {
+    anAIS = SketcherPrs_Factory::rigidConstraint(this, sketch()->coordinatePlane());
+  }
 
   return anAIS;
 }
\ No newline at end of file