#include <Model_AttributeSelectionList.h>
#include <Model_AttributeIntArray.h>
#include <Model_Events.h>
+#include <Model_Expression.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Tools.h>
+
+#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
#include <GeomData_Point.h>
#include <GeomData_Point2D.h>
void Model_Data::setName(const std::string& theName)
{
bool isModified = false;
+ std::string anOldName = name();
Handle(TDataStd_Name) aName;
if (!myLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
TDataStd_Name::Set(myLab, theName.c_str());
if (isModified)
aName->Set(theName.c_str());
}
+ if (mySendAttributeUpdated && isModified)
+ ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this);
}
AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType)
} else if (theAttrType == Model_AttributeInteger::typeId()) {
anAttr = new Model_AttributeInteger(anAttrLab);
} else if (theAttrType == ModelAPI_AttributeDouble::typeId()) {
- anAttr = new Model_AttributeDouble(anAttrLab);
+ Model_AttributeDouble* anAttribute = new Model_AttributeDouble(anAttrLab);
+ TDF_Label anExpressionLab = anAttrLab.FindChild(1);
+ anAttribute->myExpression.reset(new Model_Expression(anExpressionLab));
+ anAttribute->myIsInitialized = anAttribute->myIsInitialized && anAttribute->myExpression->isInitialized();
+ anAttr = anAttribute;
} else if (theAttrType == Model_AttributeBoolean::typeId()) {
anAttr = new Model_AttributeBoolean(anAttrLab);
} else if (theAttrType == Model_AttributeString::typeId()) {
} else if (theAttrType == ModelAPI_AttributeIntArray::typeId()) {
anAttr = new Model_AttributeIntArray(anAttrLab);
}
- // create also GeomData attributes here because only here the OCAF strucure is known
+ // create also GeomData attributes here because only here the OCAF structure is known
else if (theAttrType == GeomData_Point::typeId()) {
- anAttr = new GeomData_Point(anAttrLab);
+ GeomData_Point* anAttribute = new GeomData_Point(anAttrLab);
+ 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();
+ }
+ anAttr = anAttribute;
} else if (theAttrType == GeomData_Dir::typeId()) {
anAttr = new GeomData_Dir(anAttrLab);
} else if (theAttrType == GeomData_Point2D::typeId()) {
- anAttr = new GeomData_Point2D(anAttrLab);
+ GeomData_Point2D* anAttribute = new GeomData_Point2D(anAttrLab);
+ 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();
+ }
+ anAttr = anAttribute;
}
if (anAttr) {
aResult = std::shared_ptr<ModelAPI_Attribute>(anAttr);
return;
myRefsToMe.erase(anAttribute);
+
+ // remove concealment immideately: on deselection it must be posible to reselect in GUI the same
+ if (ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) {
+ updateConcealmentFlag();
+ }
}
void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID,
}
}
+void Model_Data::updateConcealmentFlag()
+{
+ std::set<AttributePtr>::iterator aRefsIter = myRefsToMe.begin();
+ for(; aRefsIter != myRefsToMe.end(); aRefsIter++) {
+ if (aRefsIter->get()) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefsIter)->owner());
+ if (aFeature.get() && !aFeature->isDisabled()) {
+ if (ModelAPI_Session::get()->validators()->isConcealed(
+ aFeature->getKind(), (*aRefsIter)->id())) {
+ return; // it is still concealed, nothing to do
+ }
+ }
+ }
+ }
+ // 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->setIsConcealed(false);
+ static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+ ModelAPI_EventCreator::get()->sendUpdated(aRes, anEvent);
+ Events_Loop::loop()->flush(anEvent);
+ }
+}
+
+#include <Model_Validator.h>
+
+std::set<std::string> set_union(const std::set<std::string>& theLeft,
+ const std::set<std::string>& theRight)
+{
+ std::set<std::string> aResult;
+ aResult.insert(theLeft.begin(), theLeft.end());
+ aResult.insert(theRight.begin(), theRight.end());
+ return aResult;
+}
+
+std::set<std::string> usedParameters(const AttributePointPtr& theAttribute)
+{
+ std::set<std::string> anUsedParameters;
+ for (int aComponent = 0; aComponent < 3; ++aComponent)
+ anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+ return anUsedParameters;
+}
+
+std::set<std::string> usedParameters(const AttributePoint2DPtr& theAttribute)
+{
+ std::set<std::string> anUsedParameters;
+ for (int aComponent = 0; aComponent < 2; ++aComponent)
+ anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+ return anUsedParameters;
+}
+
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters,
+ const DocumentPtr& theDocument)
+{
+ std::list<ResultParameterPtr> aResult;
+ std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
+ for (; aParamIt != theParameters.cend(); ++aParamIt) {
+ const std::string& aName = *aParamIt;
+ double aValue;
+ ResultParameterPtr aParam;
+ if (ModelAPI_Tools::findVariable(aName, aValue, aParam, theDocument))
+ aResult.push_back(aParam);
+ }
+ return aResult;
+}
+
void Model_Data::referencesToObjects(
std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs)
{
+ static Model_ValidatorsFactory* aValidators =
+ 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();
- std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory menagement
+ std::list<ObjectPtr> aReferenced; // not inside of cycle to avoid excess memory management
for(; anAttr != myAttrs.end(); anAttr++) {
+ // skip not-case attributes, that really may refer to anything not-used (issue 671)
+ if (aMyFeature.get() && !aValidators->isCase(aMyFeature, anAttr->second->id()))
+ continue;
+
std::string aType = anAttr->second->attributeType();
if (aType == ModelAPI_AttributeReference::typeId()) { // reference to object
std::shared_ptr<ModelAPI_AttributeReference> aRef = std::dynamic_pointer_cast<
for(int a = aRef->size() - 1; a >= 0; a--) {
aReferenced.push_back(aRef->value(a)->context());
}
+ } 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());
+ 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());
+ 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());
+ aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
} else
continue; // nothing to do, not reference
{
return kInvalid;
}
+
+std::shared_ptr<ModelAPI_Object> Model_Data::owner()
+{
+ return myObject;
+}
