#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>
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;
}
ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
}
} else {
- myWasChangedButBlocked = true;
+ // 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)
{
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;
+ 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()) {
- // 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]);
+ 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]);
+ }
}
}
}
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;
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
