From: vsv <vitaly.smetannikov@opencascade.com>
Date: Mon, 6 Apr 2015 13:30:39 +0000 (+0300)
Subject: Do not show Rigid symbol on external objects
X-Git-Tag: V_1.1.0~57^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3eb3f9ef9ec25ea5c339c81db2ae2f25e42cd5c7;p=modules%2Fshaper.git

Do not show Rigid symbol on external objects
---

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
index 741674a5b..8867e16d5 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRigid.cpp
@@ -6,6 +6,7 @@
 
 #include "SketchPlugin_ConstraintRigid.h"
 #include "SketchPlugin_ConstraintParallel.h"
+#include "SketchPlugin_Feature.h"
 
 #include <SketcherPrs_Factory.h>
 
@@ -34,8 +35,18 @@ AISObjectPtr SketchPlugin_ConstraintRigid::getAISObject(AISObjectPtr thePrevious
     return thePrevious;
 
   AISObjectPtr anAIS = thePrevious;
-  if (!anAIS) {
-    anAIS = SketcherPrs_Factory::rigidConstraint(this, sketch()->coordinatePlane());
+  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;
diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp
index e77247629..cbe4bb8fe 100644
--- a/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@ -103,7 +103,7 @@ void XGUI_Displayer::display(ObjectPtr theObject, bool isUpdateViewer)
     GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(theObject);
     bool isShading = false;
     if (aPrs.get() != NULL) {
-      anAIS = aPrs->getAISObject(AISObjectPtr());
+      anAIS = aPrs->getAISObject(anAIS);
     } else {
       ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
       if (aResult.get() != NULL) {