X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.cpp;h=75b38aeb01e0f85057c88e9bc7dfeef34acb9202;hb=a83e22046c5fb877969fa8879e42491d4054f198;hp=ae09db9b06f8fbb9155e3007648aff42fc3a4d9d;hpb=5a0c0a41e24da95c81aee2e110f655fc721dfbb8;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index ae09db9b0..75b38aeb0 100644
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -17,11 +17,18 @@
 #include <Model_AttributeSelectionList.h>
 #include <Model_AttributeIntArray.h>
 #include <Model_Events.h>
+#include <Model_Expression.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Tools.h>
+#include <Model_Validator.h>
+
+#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
 
 #include <GeomData_Point.h>
 #include <GeomData_Point2D.h>
@@ -35,6 +42,7 @@
 #include <TDF_AttributeIterator.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_RelocationTable.hxx>
+#include <TColStd_HArray1OfByte.hxx>
 
 #include <string>
 
@@ -46,6 +54,8 @@
 static const int kFlagInHistory = 0;
 //                             1 - is displayed or not
 static const int kFlagDisplayed = 1;
+//                             2 - is deleted (for results) or not
+static const int kFlagDeleted = 2;
 
 // invalid data
 const static std::shared_ptr<ModelAPI_Data> kInvalid(new Model_Data());
@@ -60,9 +70,19 @@ void Model_Data::setLabel(TDF_Label theLab)
   // set or get the default flags
   if (!myLab.FindAttribute(TDataStd_BooleanArray::GetID(), myFlags)) {
     // set default values if not found
-    myFlags = TDataStd_BooleanArray::Set(myLab, 0, 1);
+    myFlags = TDataStd_BooleanArray::Set(myLab, 0, 2);
     myFlags->SetValue(kFlagInHistory, Standard_True); // is in history by default is true
     myFlags->SetValue(kFlagDisplayed, Standard_True); // is displayed by default is true
+    myFlags->SetValue(kFlagDeleted, Standard_False); // is deleted by default is false
+  } else if (myFlags->Length() != 3) { // for old formats support
+    Standard_Boolean aFlag0 = myFlags->Upper() >= 0 ? myFlags->Value(0) : Standard_True;
+    Standard_Boolean aFlag1 = myFlags->Upper() >= 1 ? myFlags->Value(1) : Standard_True;
+    Standard_Boolean aFlag2 = myFlags->Upper() >= 2 ? myFlags->Value(2) : Standard_True;
+    Handle(TColStd_HArray1OfByte) aNewArray = new TColStd_HArray1OfByte(0, 2);
+    myFlags->SetInternalArray(aNewArray);
+    myFlags->SetValue(0, aFlag0); 
+    myFlags->SetValue(1, aFlag1); 
+    myFlags->SetValue(2, aFlag2); 
   }
 }
 
@@ -77,6 +97,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 +107,8 @@ void Model_Data::setName(const std::string& theName)
     if (isModified)
       aName->Set(theName.c_str());
   }
+  if (mySendAttributeUpdated && isModified)
+    ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this);
 }
 
 AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
@@ -98,7 +121,11 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin
   } else if (theAttrType == Model_AttributeInteger::typeId()) {
     anAttr = new Model_AttributeInteger(anAttrLab);
   } else if (theAttrType == ModelAPI_AttributeDouble::typeId()) {
-    anAttr = new Model_AttributeDouble(anAttrLab);
+    Model_AttributeDouble* anAttribute = new Model_AttributeDouble(anAttrLab);
+    TDF_Label anExpressionLab = anAttrLab.FindChild(1);
+    anAttribute->myExpression.reset(new Model_Expression(anExpressionLab));
+    anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression->isInitialized(); 
+    anAttr = anAttribute;
   } else if (theAttrType == Model_AttributeBoolean::typeId()) {
     anAttr = new Model_AttributeBoolean(anAttrLab);
   } else if (theAttrType == Model_AttributeString::typeId()) {
@@ -116,13 +143,25 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin
   } else if (theAttrType == ModelAPI_AttributeIntArray::typeId()) {
     anAttr = new Model_AttributeIntArray(anAttrLab);
   } 
-  // create also GeomData attributes here because only here the OCAF strucure is known
+  // create also GeomData attributes here because only here the OCAF structure is known
   else if (theAttrType == GeomData_Point::typeId()) {
-    anAttr = new GeomData_Point(anAttrLab);
+    GeomData_Point* anAttribute = new GeomData_Point(anAttrLab);
+    for (int aComponent = 0; aComponent < GeomData_Point::NUM_COMPONENTS; ++aComponent) {
+      TDF_Label anExpressionLab = anAttrLab.FindChild(aComponent + 1);
+      anAttribute->myExpression[aComponent].reset(new Model_Expression(anExpressionLab));
+      anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression[aComponent]->isInitialized(); 
+    }
+    anAttr = anAttribute;
   } else if (theAttrType == GeomData_Dir::typeId()) {
     anAttr = new GeomData_Dir(anAttrLab);
   } else if (theAttrType == GeomData_Point2D::typeId()) {
-    anAttr = new GeomData_Point2D(anAttrLab);
+    GeomData_Point2D* anAttribute = new GeomData_Point2D(anAttrLab);
+    for (int aComponent = 0; aComponent < GeomData_Point2D::NUM_COMPONENTS; ++aComponent) {
+      TDF_Label anExpressionLab = anAttrLab.FindChild(aComponent + 1);
+      anAttribute->myExpression[aComponent].reset(new Model_Expression(anExpressionLab));
+      anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression[aComponent]->isInitialized(); 
+    }
+    anAttr = anAttribute;
   }
   if (anAttr) {
     aResult = std::shared_ptr<ModelAPI_Attribute>(anAttr);
@@ -263,7 +302,12 @@ static Handle(TDataStd_IntegerArray) stateArray(TDF_Label& theLab)
 void Model_Data::execState(const ModelAPI_ExecState theState)
 {
   if (theState != ModelAPI_StateNothing) {
-    stateArray(myLab)->SetValue(STATE_INDEX_STATE, (int)theState);
+    if (stateArray(myLab)->Value(STATE_INDEX_STATE) != (int)theState) {
+      stateArray(myLab)->SetValue(STATE_INDEX_STATE, (int)theState);
+    }
+    // send signal even if the new value corresponds to the one in data model: undo issue 980
+    static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_ERROR_CHANGED);
+    ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent, false);
   }
 }
 
@@ -289,6 +333,13 @@ void Model_Data::setError(const std::string& theError, bool theSend)
     Events_Error::send(theError);
   }
   TDataStd_AsciiString::Set(myLab, theError.c_str());
+  static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_ERROR_CHANGED);
+  ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent, false);
+}
+
+void Model_Data::eraseErrorString()
+{
+  myLab.ForgetAttribute(TDataStd_AsciiString::GetID());
 }
 
 std::string Model_Data::error() const
@@ -317,47 +368,33 @@ void Model_Data::eraseBackReferences()
 void Model_Data::removeBackReference(FeaturePtr theFeature, std::string theAttrID)
 {
   AttributePtr anAttribute = theFeature->data()->attribute(theAttrID);
-  if (myRefsToMe.find(anAttribute) == myRefsToMe.end())
+  removeBackReference(anAttribute);
+}
+
+void Model_Data::removeBackReference(AttributePtr theAttr)
+{
+  if (myRefsToMe.find(theAttr) == myRefsToMe.end())
     return;
 
-  myRefsToMe.erase(anAttribute);
+  myRefsToMe.erase(theAttr);
 
   // remove concealment immideately: on deselection it must be posible to reselect in GUI the same
-  if (ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) {
-    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()) {
-          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);
-    }
+  FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttr->owner());
+  if (aFeatureOwner.get() &&
+    ModelAPI_Session::get()->validators()->isConcealed(aFeatureOwner->getKind(), theAttr->id())) {
+    updateConcealmentFlag();
   }
 }
 
 void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID, 
    const bool theApplyConcealment)
 {
-  // do not add the same attribute twice
+  // it is possible to add the same attribute twice: may be last time the owner was not Stable...
   AttributePtr anAttribute = theFeature->data()->attribute(theAttrID);
-  if (myRefsToMe.find(anAttribute) != myRefsToMe.end())
-    return;
+  if (myRefsToMe.find(anAttribute) == myRefsToMe.end())
+    myRefsToMe.insert(theFeature->data()->attribute(theAttrID));
 
-  myRefsToMe.insert(theFeature->data()->attribute(theAttrID));
-  if (theApplyConcealment && 
+  if (theApplyConcealment &&  theFeature->isStable() && 
       ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) {
     std::shared_ptr<ModelAPI_Result> aRes = 
       std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
@@ -370,12 +407,87 @@ 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() && aFeature->isStable()) {
+        if (ModelAPI_Session::get()->validators()->isConcealed(
+              aFeature->getKind(), (*aRefsIter)->id())) {
+          std::shared_ptr<ModelAPI_Result> aRes = 
+            std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
+          if (aRes.get()) {
+            aRes->setIsConcealed(true); // set concealed
+          }
+          return;
+        }
+      }
+    }
+  }
+  // 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);
+  }
+}
+
+std::set<std::string> set_union(const std::set<std::string>& theLeft, 
+                                const std::set<std::string>& theRight)
+{
+  std::set<std::string> aResult;
+  aResult.insert(theLeft.begin(), theLeft.end());
+  aResult.insert(theRight.begin(), theRight.end());
+  return aResult;
+}
+
+std::set<std::string> usedParameters(const AttributePointPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 3; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::set<std::string> usedParameters(const AttributePoint2DPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 2; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters, 
+                                            const DocumentPtr& theDocument)
+{
+  std::list<ResultParameterPtr> aResult;
+  std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
+  for (; aParamIt != theParameters.cend(); ++aParamIt) {
+    const std::string& aName = *aParamIt;
+    double aValue;
+    ResultParameterPtr aParam;
+    if (ModelAPI_Tools::findVariable(aName, aValue, aParam, theDocument))
+      aResult.push_back(aParam);
+  }
+  return aResult;
+}
+
 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
+  std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory management
   for(; anAttr != myAttrs.end(); anAttr++) {
+    // skip not-case attributes, 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<
@@ -397,6 +509,24 @@ void Model_Data::referencesToObjects(
       for(int a = aRef->size() - 1; a >= 0; a--) {
         aReferenced.push_back(aRef->value(a)->context());
       }
+    } else if (aType == ModelAPI_AttributeDouble::typeId()) { // double attribute
+      AttributeDoublePtr anAttribute =
+          std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr->second);
+      std::set<std::string> anUsedParameters = anAttribute->usedParameters();
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters, aMyFeature->document());
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point::typeId()) { // point attribute
+      AttributePointPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters, aMyFeature->document());
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point2D::typeId()) { // point attribute
+      AttributePoint2DPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters, aMyFeature->document());
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else
       continue; // nothing to do, not reference
 
@@ -450,6 +580,16 @@ void Model_Data::setIsInHistory(const bool theFlag)
   return myFlags->SetValue(kFlagInHistory, theFlag);
 }
 
+bool Model_Data::isDeleted()
+{
+  return myFlags->Value(kFlagDeleted) == Standard_True;
+}
+
+void Model_Data::setIsDeleted(const bool theFlag)
+{
+  return myFlags->SetValue(kFlagDeleted, theFlag);
+}
+
 bool Model_Data::isDisplayed()
 {
   if (!myObject.get() || !myObject->document().get() || // object is in valid
@@ -484,3 +624,8 @@ std::shared_ptr<ModelAPI_Data> Model_Data::invalidData()
 {
   return kInvalid;
 }
+
+std::shared_ptr<ModelAPI_Object> Model_Data::owner()
+{
+  return myObject;
+}