#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 <GeomData_Point2D.h>
#include <GeomData_Dir.h>
#include <Events_Loop.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <TDataStd_Name.hxx>
#include <TDataStd_AsciiString.hxx>
// 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()) {
- Model_AttributeInteger* anAttribute = 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->myIsInitialized && anAttribute->myExpression->isInitialized();
+ 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_ExpressionDouble(anExpressionLab));
- anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression->isInitialized();
+ 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_ExpressionDouble(anExpressionLab));
- anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression[aComponent]->isInitialized();
+ 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_ExpressionDouble(anExpressionLab));
- anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression[aComponent]->isInitialized();
+ anAllInitialized = anAllInitialized && anAttribute->myExpression[aComponent]->isInitialized();
}
+ anAttribute->myIsInitialized = anAllInitialized;
anAttr = anAttribute;
}
if (anAttr) {
anAttr->setObject(myObject);
anAttr->setID(theID);
} else {
- Events_Error::send("Can not create unknown type of attribute " + theAttrType);
+ Events_InfoMessage("Model_Data", "Can not create unknown type of attribute %1").arg(theAttrType).send();
}
return aResult;
}
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 {
+ // to avoid too many duplications do not add the same like the last
+ if (myWasChangedButBlocked.empty() || *(myWasChangedButBlocked.rbegin()) != theAttr)
+ myWasChangedButBlocked.push_back(theAttr);
}
}
}
-void Model_Data::blockSendAttributeUpdated(const bool theBlock)
+void Model_Data::blockSendAttributeUpdated(const bool theBlock, const bool theSendMessage)
{
- mySendAttributeUpdated = !theBlock;
+ if (mySendAttributeUpdated == theBlock) {
+ mySendAttributeUpdated = !theBlock;
+ if (mySendAttributeUpdated && !myWasChangedButBlocked.empty()) { // so, now it is ok to send the update signal
+ if (theSendMessage) {
+ // make a copy to avoid iteration on modified list (may be cleared by attribute changed call)
+ std::list<ModelAPI_Attribute*> aWasChangedButBlocked = myWasChangedButBlocked;
+ myWasChangedButBlocked.clear();
+ std::list<ModelAPI_Attribute*>::iterator aChangedIter = aWasChangedButBlocked.begin();
+ for(; aChangedIter != aWasChangedButBlocked.end(); aChangedIter++) {
+ myObject->attributeChanged((*aChangedIter)->id());
+ }
+ static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+ ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+ } else {
+ myWasChangedButBlocked.clear();
+ }
+ }
+ }
}
void Model_Data::erase()
{
- if (!myLab.IsNull())
+ if (!myLab.IsNull()) {
+ if (myLab.HasAttribute()) {
+ // remove in order to clear back references in other objects
+ std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
+ referencesToObjects(aRefs);
+ std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator anAttrIter = aRefs.begin();
+ for(; anAttrIter != aRefs.end(); anAttrIter++) {
+ std::list<ObjectPtr>::iterator aReferenced = anAttrIter->second.begin();
+ for(; aReferenced != anAttrIter->second.end(); aReferenced++) {
+ if (aReferenced->get() && (*aReferenced)->data()->isValid()) {
+ std::shared_ptr<Model_Data> aData =
+ std::dynamic_pointer_cast<Model_Data>((*aReferenced)->data());
+ aData->removeBackReference(myAttrs[anAttrIter->first]);
+ }
+ }
+ }
+ }
+ myAttrs.clear();
myLab.ForgetAllAttributes();
+ }
}
// indexes in the state array
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);
}
}
{
execState(ModelAPI_StateExecFailed);
if (theSend) {
- Events_Error::send(theError);
+ Events_InfoMessage("Model_Data", theError).send();
}
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()
return anUsedParameters;
}
-std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters,
- const DocumentPtr& theDocument)
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters)
{
std::list<ResultParameterPtr> aResult;
std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
const std::string& aName = *aParamIt;
double aValue;
ResultParameterPtr aParam;
- if (ModelAPI_Tools::findVariable(aName, aValue, aParam, theDocument))
+ // theSearcher is not needed here: in expressions of features the parameters history is not needed
+ if (ModelAPI_Tools::findVariable(FeaturePtr(), aName, aValue, aParam))
aResult.push_back(aParam);
}
return aResult;
} else if (aType == ModelAPI_AttributeRefAttr::typeId()) { // reference to attribute or object
std::shared_ptr<ModelAPI_AttributeRefAttr> aRef = std::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(anAttr->second);
- aReferenced.push_back(aRef->isObject() ? aRef->object() : aRef->attr()->owner());
+ if (aRef->isObject()) {
+ aReferenced.push_back(aRef->object());
+ } else {
+ AttributePtr anAttr = aRef->attr();
+ if (anAttr.get())
+ aReferenced.push_back(anAttr->owner());
+ }
} else if (aType == ModelAPI_AttributeRefList::typeId()) { // list of references
aReferenced = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(anAttr->second)->list();
} else if (aType == ModelAPI_AttributeSelection::typeId()) { // selection attribute
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());
+ std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
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::set<std::string> anUsedParameters = anAttribute->usedParameters();
- std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters, aMyFeature->document());
+ std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
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());
+ std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
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());
+ std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
} else
continue; // nothing to do, not reference