X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.cpp;h=e9d808ade039cee5c7f934664bdfa7817b73b81e;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=75b38aeb01e0f85057c88e9bc7dfeef34acb9202;hpb=83e85cedfb936e7755500322e1afa638d318a863;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 75b38aeb0..e9d808ade 100644
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -11,6 +11,7 @@
 #include <Model_AttributeReference.h>
 #include <Model_AttributeRefAttr.h>
 #include <Model_AttributeRefList.h>
+#include <Model_AttributeRefAttrList.h>
 #include <Model_AttributeBoolean.h>
 #include <Model_AttributeString.h>
 #include <Model_AttributeSelection.h>
@@ -24,6 +25,7 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultCompSolid.h>
 #include <ModelAPI_Tools.h>
 #include <Model_Validator.h>
 
@@ -60,7 +62,7 @@ static const int kFlagDeleted = 2;
 // invalid data
 const static std::shared_ptr<ModelAPI_Data> kInvalid(new Model_Data());
 
-Model_Data::Model_Data() : mySendAttributeUpdated(true)
+Model_Data::Model_Data() : mySendAttributeUpdated(true), myWasChangedButBlocked(false)
 {
 }
 
@@ -114,17 +116,22 @@ void Model_Data::setName(const std::string& theName)
 AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
 {
   AttributePtr aResult;
-  TDF_Label anAttrLab = myLab.FindChild(myAttrs.size() + 1);
+  TDF_Label anAttrLab = myLab.FindChild(int(myAttrs.size()) + 1);
   ModelAPI_Attribute* anAttr = 0;
   if (theAttrType == ModelAPI_AttributeDocRef::typeId()) {
     anAttr = new Model_AttributeDocRef(anAttrLab);
   } else if (theAttrType == Model_AttributeInteger::typeId()) {
-    anAttr = new Model_AttributeInteger(anAttrLab);
+    Model_AttributeInteger* anAttribute = new Model_AttributeInteger();
+    // Expression should use the same label to support backward compatibility
+    TDF_Label anExpressionLab = anAttrLab;
+    anAttribute->myExpression.reset(new Model_ExpressionInteger(anExpressionLab));
+    anAttribute->myIsInitialized = anAttribute->myExpression->isInitialized();
+    anAttr = anAttribute;
   } else if (theAttrType == ModelAPI_AttributeDouble::typeId()) {
-    Model_AttributeDouble* anAttribute = new Model_AttributeDouble(anAttrLab);
+    Model_AttributeDouble* anAttribute = new Model_AttributeDouble();
     TDF_Label anExpressionLab = anAttrLab.FindChild(1);
-    anAttribute->myExpression.reset(new Model_Expression(anExpressionLab));
-    anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression->isInitialized(); 
+    anAttribute->myExpression.reset(new Model_ExpressionDouble(anExpressionLab));
+    anAttribute->myIsInitialized = anAttribute->myExpression->isInitialized();
     anAttr = anAttribute;
   } else if (theAttrType == Model_AttributeBoolean::typeId()) {
     anAttr = new Model_AttributeBoolean(anAttrLab);
@@ -140,27 +147,33 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin
     anAttr = new Model_AttributeRefAttr(anAttrLab);
   } else if (theAttrType == ModelAPI_AttributeRefList::typeId()) {
     anAttr = new Model_AttributeRefList(anAttrLab);
+  } else if (theAttrType == ModelAPI_AttributeRefAttrList::typeId()) {
+    anAttr = new Model_AttributeRefAttrList(anAttrLab);
   } else if (theAttrType == ModelAPI_AttributeIntArray::typeId()) {
     anAttr = new Model_AttributeIntArray(anAttrLab);
   } 
   // create also GeomData attributes here because only here the OCAF structure is known
   else if (theAttrType == GeomData_Point::typeId()) {
-    GeomData_Point* anAttribute = new GeomData_Point(anAttrLab);
+    GeomData_Point* anAttribute = new GeomData_Point();
+    bool anAllInitialized = true;
     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(); 
+      anAttribute->myExpression[aComponent].reset(new Model_ExpressionDouble(anExpressionLab));
+      anAllInitialized = anAllInitialized && anAttribute->myExpression[aComponent]->isInitialized();
     }
+    anAttribute->myIsInitialized = anAllInitialized;
     anAttr = anAttribute;
   } else if (theAttrType == GeomData_Dir::typeId()) {
     anAttr = new GeomData_Dir(anAttrLab);
   } else if (theAttrType == GeomData_Point2D::typeId()) {
-    GeomData_Point2D* anAttribute = new GeomData_Point2D(anAttrLab);
+    GeomData_Point2D* anAttribute = new GeomData_Point2D();
+    bool anAllInitialized = true;
     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(); 
+      anAttribute->myExpression[aComponent].reset(new Model_ExpressionDouble(anExpressionLab));
+      anAllInitialized = anAllInitialized && anAttribute->myExpression[aComponent]->isInitialized();
     }
+    anAttribute->myIsInitialized = anAllInitialized;
     anAttr = anAttribute;
   }
   if (anAttr) {
@@ -196,6 +209,7 @@ GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeSelection, selection);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeSelectionList, selectionList);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefAttr, refattr);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefList, reflist);
+GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefAttrList, refattrlist);
 GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeIntArray, intArray);
 
 std::shared_ptr<ModelAPI_Attribute> Model_Data::attribute(const std::string& theID)
@@ -262,17 +276,28 @@ void Model_Data::sendAttributeUpdated(ModelAPI_Attribute* theAttr)
 {
   theAttr->setInitialized();
   if (theAttr->isArgument()) {
-    static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-    ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
-    if (mySendAttributeUpdated && myObject) {
-      myObject->attributeChanged(theAttr->id());
+    if (mySendAttributeUpdated) {
+      if (myObject) {
+        myObject->attributeChanged(theAttr->id());
+        static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+        ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+      }
+    } else {
+      myWasChangedButBlocked = true;
     }
   }
 }
 
 void Model_Data::blockSendAttributeUpdated(const bool theBlock)
 {
-  mySendAttributeUpdated = !theBlock;
+  if (mySendAttributeUpdated == theBlock) {
+    mySendAttributeUpdated = !theBlock;
+    if (mySendAttributeUpdated && myWasChangedButBlocked) { // so, now it is ok to send the update signal
+      static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+      ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+      myWasChangedButBlocked = false;
+    }
+  }
 }
 
 void Model_Data::erase()
@@ -426,7 +451,6 @@ void Model_Data::updateConcealmentFlag()
       }
     }
   }
-  // thus, no concealment references anymore => make not-concealed
   std::shared_ptr<ModelAPI_Result> aRes = 
     std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
   if (aRes.get()) {
@@ -509,6 +533,21 @@ void Model_Data::referencesToObjects(
       for(int a = aRef->size() - 1; a >= 0; a--) {
         aReferenced.push_back(aRef->value(a)->context());
       }
+    } else if (aType == ModelAPI_AttributeRefAttrList::typeId()) {
+      std::shared_ptr<ModelAPI_AttributeRefAttrList> aRefAttr = std::dynamic_pointer_cast<
+          ModelAPI_AttributeRefAttrList>(anAttr->second);
+      std::list<std::pair<ObjectPtr, AttributePtr> > aRefs = aRefAttr->list();
+      std::list<std::pair<ObjectPtr, AttributePtr> >::const_iterator anIt = aRefs.begin(),
+                                                                     aLast = aRefs.end();
+      for (; anIt != aLast; anIt++) {
+        aReferenced.push_back(anIt->first);
+      }
+    } else if (aType == ModelAPI_AttributeInteger::typeId()) { // integer attribute
+      AttributeIntegerPtr anAttribute =
+          std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(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 == ModelAPI_AttributeDouble::typeId()) { // double attribute
       AttributeDoublePtr anAttribute =
           std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr->second);
@@ -565,7 +604,9 @@ void Model_Data::copyTo(std::shared_ptr<ModelAPI_Data> theTarget)
   std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator aMyIter = myAttrs.begin();
   for(; aMyIter != myAttrs.end(); aMyIter++) {
     if (aMyIter->second->isInitialized()) {
-      theTarget->attribute(aMyIter->first)->setInitialized();
+      AttributePtr aTargetAttr = theTarget->attribute(aMyIter->first);
+      if (aTargetAttr)
+        aTargetAttr->setInitialized();
     }
   }
 }