-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: Model_Data.hxx
-// Created: 21 Mar 2014
-// Author: Mikhail PONIKAROV
+// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
#include <Model_Data.h>
#include <Model_AttributeDocRef.h>
ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this);
if (isModified && myObject && myObject->document()) {
std::dynamic_pointer_cast<Model_Document>(myObject->document())->
- changeNamingName(anOldName, theName);
+ changeNamingName(anOldName, theName, myLab);
}
#ifdef DEBUG_NAMES
myObject->myName = theName;
AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
{
AttributePtr aResult;
- TDF_Label anAttrLab = myLab.FindChild(int(myAttrs.size()) + 1);
+ int anAttrIndex = int(myAttrs.size()) + 1;
+ TDF_Label anAttrLab = myLab.FindChild(anAttrIndex);
ModelAPI_Attribute* anAttr = 0;
if (theAttrType == ModelAPI_AttributeDocRef::typeId()) {
anAttr = new Model_AttributeDocRef(anAttrLab);
}
if (anAttr) {
aResult = std::shared_ptr<ModelAPI_Attribute>(anAttr);
- myAttrs[theID] = aResult;
+ myAttrs[theID] = std::pair<AttributePtr, int>(aResult, anAttrIndex);
anAttr->setObject(myObject);
anAttr->setID(theID);
} else {
#define GET_ATTRIBUTE_BY_ID(ATTR_TYPE, METHOD_NAME) \
std::shared_ptr<ATTR_TYPE> Model_Data::METHOD_NAME(const std::string& theID) { \
std::shared_ptr<ATTR_TYPE> aRes; \
- std::map<std::string, AttributePtr >::iterator aFound = \
- myAttrs.find(theID); \
+ AttributeMap::iterator aFound = myAttrs.find(theID); \
if (aFound != myAttrs.end()) { \
- aRes = std::dynamic_pointer_cast<ATTR_TYPE>(aFound->second); \
+ aRes = std::dynamic_pointer_cast<ATTR_TYPE>(aFound->second.first); \
} \
return aRes; \
}
std::shared_ptr<ModelAPI_Attribute> aResult;
if (myAttrs.find(theID) == myAttrs.end()) // no such attribute
return aResult;
- return myAttrs[theID];
+ return myAttrs[theID].first;
}
const std::string& Model_Data::id(const std::shared_ptr<ModelAPI_Attribute>& theAttr)
{
- std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr =
- myAttrs.begin();
+ AttributeMap::iterator anAttr = myAttrs.begin();
for (; anAttr != myAttrs.end(); anAttr++) {
- if (anAttr->second == theAttr)
+ if (anAttr->second.first == theAttr)
return anAttr->first;
}
// not found
std::list<std::shared_ptr<ModelAPI_Attribute> > Model_Data::attributes(const std::string& theType)
{
std::list<std::shared_ptr<ModelAPI_Attribute> > aResult;
- std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator anAttrsIter =
- myAttrs.begin();
+ AttributeMap::iterator anAttrsIter = myAttrs.begin();
for (; anAttrsIter != myAttrs.end(); anAttrsIter++) {
- if (theType.empty() || anAttrsIter->second->attributeType() == theType) {
- aResult.push_back(anAttrsIter->second);
+ AttributePtr anAttr = anAttrsIter->second.first;
+ if (theType.empty() || anAttr->attributeType() == theType) {
+ aResult.push_back(anAttr);
}
}
return aResult;
std::list<std::string> Model_Data::attributesIDs(const std::string& theType)
{
std::list<std::string> aResult;
- std::map<std::string, std::shared_ptr<ModelAPI_Attribute> >::iterator anAttrsIter =
- myAttrs.begin();
+ AttributeMap::iterator anAttrsIter = myAttrs.begin();
for (; anAttrsIter != myAttrs.end(); anAttrsIter++) {
- if (theType.empty() || anAttrsIter->second->attributeType() == theType) {
+ AttributePtr anAttr = anAttrsIter->second.first;
+ if (theType.empty() || anAttr->attributeType() == theType) {
aResult.push_back(anAttrsIter->first);
}
}
if (theAttr->isArgument()) {
if (mySendAttributeUpdated) {
if (myObject) {
- myObject->attributeChanged(theAttr->id());
+ try {
+ myObject->attributeChanged(theAttr->id());
+ } catch(...) {
+ if (owner().get() && owner()->data().get() && owner()->data()->isValid()) {
+ Events_InfoMessage("Model_Data",
+ "%1 has failed during the update").arg(owner()->data()->name()).send();
+ }
+ }
static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
}
if (myWasChangedButBlocked.empty() || *(myWasChangedButBlocked.rbegin()) != theAttr)
myWasChangedButBlocked.push_back(theAttr);
}
+ } else {
+ // trim: need to redisplay
+ if (myObject) {
+ static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
+ }
}
}
myWasChangedButBlocked.clear();
std::list<ModelAPI_Attribute*>::iterator aChangedIter = aWasChangedButBlocked.begin();
for(; aChangedIter != aWasChangedButBlocked.end(); aChangedIter++) {
- myObject->attributeChanged((*aChangedIter)->id());
+ try {
+ myObject->attributeChanged((*aChangedIter)->id());
+ } catch(...) {
+ if (owner().get() && owner()->data().get() && owner()->data()->isValid()) {
+ Events_InfoMessage("Model_Data",
+ "%1 has failed during the update").arg(owner()->data()->name()).send();
+ }
+ }
}
static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent);
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]);
+ aData->removeBackReference(myAttrs[anAttrIter->first].first);
}
}
}
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();
+ AttributeMap::iterator anAttrIt = myAttrs.begin();
std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory management
- for(; anAttr != myAttrs.end(); anAttr++) {
+ for(; anAttrIt != myAttrs.end(); anAttrIt++) {
+ AttributePtr anAttr = anAttrIt->second.first;
// skip not-case attributes, that really may refer to anything not-used (issue 671)
- if (aMyFeature.get() && !aValidators->isCase(aMyFeature, anAttr->second->id()))
+ if (aMyFeature.get() && !aValidators->isCase(aMyFeature, anAttr->id()))
continue;
- std::string aType = anAttr->second->attributeType();
+ std::string aType = anAttr->attributeType();
if (aType == ModelAPI_AttributeReference::typeId()) { // reference to object
std::shared_ptr<ModelAPI_AttributeReference> aRef = std::dynamic_pointer_cast<
- ModelAPI_AttributeReference>(anAttr->second);
+ ModelAPI_AttributeReference>(anAttr);
aReferenced.push_back(aRef->value());
} 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);
+ ModelAPI_AttributeRefAttr>(anAttr);
if (aRef->isObject()) {
aReferenced.push_back(aRef->object());
} else {
aReferenced.push_back(anAttr->owner());
}
} else if (aType == ModelAPI_AttributeRefList::typeId()) { // list of references
- aReferenced = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(anAttr->second)->list();
+ aReferenced = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(anAttr)->list();
} else if (aType == ModelAPI_AttributeSelection::typeId()) { // selection attribute
std::shared_ptr<ModelAPI_AttributeSelection> aRef = std::dynamic_pointer_cast<
- ModelAPI_AttributeSelection>(anAttr->second);
+ ModelAPI_AttributeSelection>(anAttr);
aReferenced.push_back(aRef->context());
} else if (aType == ModelAPI_AttributeSelectionList::typeId()) { // list of selection attributes
std::shared_ptr<ModelAPI_AttributeSelectionList> aRef = std::dynamic_pointer_cast<
- ModelAPI_AttributeSelectionList>(anAttr->second);
- for(int a = aRef->size() - 1; a >= 0; a--) {
+ ModelAPI_AttributeSelectionList>(anAttr);
+ for(int a = 0, aSize = aRef->size(); a < aSize; ++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);
+ ModelAPI_AttributeRefAttrList>(anAttr);
std::list<std::pair<ObjectPtr, AttributePtr> > aRefs = aRefAttr->list();
std::list<std::pair<ObjectPtr, AttributePtr> >::const_iterator anIt = aRefs.begin(),
aLast = aRefs.end();
}
} else if (aType == ModelAPI_AttributeInteger::typeId()) { // integer attribute
AttributeIntegerPtr anAttribute =
- std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(anAttr->second);
+ std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(anAttr);
std::set<std::string> anUsedParameters = anAttribute->usedParameters();
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::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr);
std::set<std::string> anUsedParameters = anAttribute->usedParameters();
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::dynamic_pointer_cast<GeomDataAPI_Point>(anAttr);
std::set<std::string> anUsedParameters = usedParameters(anAttribute);
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::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr);
std::set<std::string> anUsedParameters = usedParameters(anAttribute);
std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
continue; // nothing to do, not reference
if (!aReferenced.empty()) {
- theRefs.push_back(std::pair<std::string, std::list<ObjectPtr> >(anAttr->first, aReferenced));
+ theRefs.push_back(
+ std::pair<std::string, std::list<ObjectPtr> >(anAttrIt->first, aReferenced));
aReferenced.clear();
}
}
{
return myObject;
}
+
+bool Model_Data::isPrecedingAttribute(const std::string& theAttribute1,
+ const std::string& theAttribute2) const
+{
+ AttributeMap::const_iterator aFound1 = myAttrs.find(theAttribute1);
+ AttributeMap::const_iterator aFound2 = myAttrs.find(theAttribute2);
+ if (aFound2 == myAttrs.end())
+ return true;
+ else if (aFound1 == myAttrs.end())
+ return false;
+ return aFound1->second.second < aFound2->second.second;
+}
