Make the movement, placement and rotation 3D features may be applied to the Part...

[modules/shaper.git] / src / Model / Model_Data.cpp

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 4546128eb5625815766cddcb2e1d22f60a302f07..29a9266a51ff31c74a7e42ad20b6f09c45704199 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -77,6 +77,7 @@ std::string Model_Data::name()
 void Model_Data::setName(const std::string& theName)
 {
   bool isModified = false;
+  std::string anOldName = name();
   Handle(TDataStd_Name) aName;
   if (!myLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
     TDataStd_Name::Set(myLab, theName.c_str());
@@ -86,6 +87,8 @@ void Model_Data::setName(const std::string& theName)
     if (isModified)
       aName->Set(theName.c_str());
   }
+  if (isModified)
+    ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this);
 }
 
 AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
@@ -321,6 +324,11 @@ void Model_Data::removeBackReference(FeaturePtr theFeature, std::string theAttrI
     return;
 
   myRefsToMe.erase(anAttribute);
+
+  // remove concealment immideately: on deselection it must be posible to reselect in GUI the same
+  if (ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) {
+    updateConcealmentFlag();
+  }
 }
 
 void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID, 
@@ -345,12 +353,47 @@ void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID,
   }
 }
 
+void Model_Data::updateConcealmentFlag()
+{
+  std::set<AttributePtr>::iterator aRefsIter = myRefsToMe.begin();
+  for(; aRefsIter != myRefsToMe.end(); aRefsIter++) {
+    if (aRefsIter->get()) {
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefsIter)->owner());
+      if (aFeature.get() && !aFeature->isDisabled()) {
+        if (ModelAPI_Session::get()->validators()->isConcealed(
+              aFeature->getKind(), (*aRefsIter)->id())) {
+          return; // it is still concealed, nothing to do
+        }
+      }
+    }
+  }
+  // thus, no concealment references anymore => make not-concealed
+  std::shared_ptr<ModelAPI_Result> aRes = 
+    std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
+  if (aRes.get()) {
+    aRes->setIsConcealed(false);
+    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+    ModelAPI_EventCreator::get()->sendUpdated(aRes, anEvent);
+    Events_Loop::loop()->flush(anEvent);
+  }
+}
+
+#include <Model_Validator.h>
+
 void Model_Data::referencesToObjects(
   std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs)
 {
+  static Model_ValidatorsFactory* aValidators = 
+    static_cast<Model_ValidatorsFactory*>(ModelAPI_Session::get()->validators());
+  FeaturePtr aMyFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(myObject);
+
   std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr = myAttrs.begin();
   std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory menagement
   for(; anAttr != myAttrs.end(); anAttr++) {
+    // skip not-case attributres, that really may refer to anything not-used (issue 671)
+    if (aMyFeature.get() && !aValidators->isCase(aMyFeature, anAttr->second->id()))
+      continue;
+
     std::string aType = anAttr->second->attributeType();
     if (aType == ModelAPI_AttributeReference::typeId()) { // reference to object
       std::shared_ptr<ModelAPI_AttributeReference> aRef = std::dynamic_pointer_cast<
@@ -459,3 +502,8 @@ std::shared_ptr<ModelAPI_Data> Model_Data::invalidData()
 {
   return kInvalid;
 }
+
+bool Model_Data::isOwner(ModelAPI_Object* theOwner)
+{
+  return theOwner == myObject.get();
+}