Constriction type for all sketch entities

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

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
index 847ecfc86238c86c59afe562b3d7b1adb2151727..cd1aa6e73af6b86ad6483ff6cd319f96a2f0493b 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
@@ -1,8 +1,11 @@
+// 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 <ModelAPI_ResultConstruction.h>
 #include <Config_PropManager.h>
@@ -28,28 +31,35 @@ AISObjectPtr SketchPlugin_ConstraintRigid::getAISObject(AISObjectPtr thePrevious
   if (!sketch())
     return thePrevious;
 
-  boost::shared_ptr<ModelAPI_Data> aData = data();
-  boost::shared_ptr<ModelAPI_AttributeRefAttr> anAttr = boost::dynamic_pointer_cast<
+  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;
 
-  boost::shared_ptr<GeomAPI_Shape> aShape;
+  std::shared_ptr<GeomAPI_Shape> aShape;
 
   if (anAttr->isObject()) {
-    boost::shared_ptr<ModelAPI_ResultConstruction> aConst;
-    aConst = boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(anAttr->object());
+    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 {
-    boost::shared_ptr<GeomDataAPI_Point2D> aPointAttr =
-                             boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->attr());
+    std::shared_ptr<GeomDataAPI_Point2D> aPointAttr =
+                             std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->attr());
     if (!aPointAttr)
       return thePrevious;
-    boost::shared_ptr<GeomAPI_Pnt> aPoint(sketch()->to3D(aPointAttr->x(), aPointAttr->y()));
+    std::shared_ptr<GeomAPI_Pnt> aPoint(sketch()->to3D(aPointAttr->x(), aPointAttr->y()));
     aShape = GeomAlgoAPI_PointBuilder::point(aPoint);
   }
 
@@ -57,12 +67,13 @@ AISObjectPtr SketchPlugin_ConstraintRigid::getAISObject(AISObjectPtr thePrevious
   if (!anAIS)
     anAIS = AISObjectPtr(new GeomAPI_AISObject);
 
-  boost::shared_ptr<GeomAPI_Pln> aPlane = sketch()->plane();
+  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);
+  std::vector<int> aRGB = Config_PropManager::color("Visualization", "sketch_parallel_color",
+                                                    SKETCH_CONSTRAINT_COLOR);
+
   anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
 
   return anAIS;