#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>
#include <ModelAPI_Validator.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultCompSolid.h>
#include <ModelAPI_Tools.h>
#include <Model_Validator.h>
// 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)
{
}
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);
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) {
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)
{
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()
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)) {
+ FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttr->owner());
+ if (aFeatureOwner.get() &&
+ ModelAPI_Session::get()->validators()->isConcealed(aFeatureOwner->getKind(), theAttr->id())) {
updateConcealmentFlag();
}
}
for(; aRefsIter != myRefsToMe.end(); aRefsIter++) {
if (aRefsIter->get()) {
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefsIter)->owner());
- if (aFeature.get() && !aFeature->isDisabled()) {
+ if (aFeature.get() && !aFeature->isDisabled() && aFeature->isStable()) {
if (ModelAPI_Session::get()->validators()->isConcealed(
aFeature->getKind(), (*aRefsIter)->id())) {
- return; // it is still concealed, nothing to do
+ 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->isConcealed()) {
+ 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);
}
}
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);
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();
}
}
}
