X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.cpp;h=9f69e4bddcdd4d58f018c0923c506bd6b00b0a2c;hb=85afcf29664dfb5bda0bc6239c8760d6e424b1f2;hp=8d21b7a7834e5a8ed8d12fcf21fa41fb80dc7af1;hpb=f4cfe8737541aa62dd7dd713e63702e99db4c2db;p=modules%2Fshaper.git diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp index 8d21b7a78..9f69e4bdd 100644 --- a/src/Model/Model_Data.cpp +++ b/src/Model/Model_Data.cpp @@ -8,9 +8,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -24,6 +26,7 @@ #include #include #include +#include #include #include @@ -34,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -60,7 +63,7 @@ static const int kFlagDeleted = 2; // invalid data const static std::shared_ptr kInvalid(new Model_Data()); -Model_Data::Model_Data() : mySendAttributeUpdated(true) +Model_Data::Model_Data() : mySendAttributeUpdated(true), myWasChangedButBlocked(false) { } @@ -109,23 +112,23 @@ void Model_Data::setName(const std::string& theName) } if (mySendAttributeUpdated && isModified) ModelAPI_ObjectRenamedMessage::send(myObject, anOldName, theName, this); + if (isModified && myObject && myObject->document()) { + std::dynamic_pointer_cast(myObject->document())-> + changeNamingName(anOldName, theName); + } } 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); } else if (theAttrType == ModelAPI_AttributeDouble::typeId()) { - 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; + anAttr = new Model_AttributeDouble(anAttrLab); } else if (theAttrType == Model_AttributeBoolean::typeId()) { anAttr = new Model_AttributeBoolean(anAttrLab); } else if (theAttrType == Model_AttributeString::typeId()) { @@ -140,27 +143,35 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin 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); - } + } else if (theAttrType == ModelAPI_AttributeDoubleArray::typeId()) { + anAttr = new Model_AttributeDoubleArray(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) { @@ -169,12 +180,13 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin 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; } -// macro for gthe generic returning of the attribute by the ID +// macro for the generic returning of the attribute by the ID #define GET_ATTRIBUTE_BY_ID(ATTR_TYPE, METHOD_NAME) \ std::shared_ptr Model_Data::METHOD_NAME(const std::string& theID) { \ std::shared_ptr aRes; \ @@ -196,7 +208,9 @@ GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeSelection, selection); 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); +GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeDoubleArray, realArray); std::shared_ptr Model_Data::attribute(const std::string& theID) { @@ -262,23 +276,67 @@ void Model_Data::sendAttributeUpdated(ModelAPI_Attribute* theAttr) { 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) -{ - mySendAttributeUpdated = !theBlock; +void Model_Data::blockSendAttributeUpdated(const bool theBlock, const bool theSendMessage) +{ + 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 aWasChangedButBlocked = myWasChangedButBlocked; + myWasChangedButBlocked.clear(); + std::list::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 > > aRefs; + referencesToObjects(aRefs); + std::list > >::iterator + anAttrIter = aRefs.begin(); + for(; anAttrIter != aRefs.end(); anAttrIter++) { + std::list::iterator aReferenced = anAttrIter->second.begin(); + for(; aReferenced != anAttrIter->second.end(); aReferenced++) { + if (aReferenced->get() && (*aReferenced)->data()->isValid()) { + std::shared_ptr aData = + std::dynamic_pointer_cast((*aReferenced)->data()); + aData->removeBackReference(myAttrs[anAttrIter->first]); + } + } + } + } + myAttrs.clear(); myLab.ForgetAllAttributes(); + } } // indexes in the state array @@ -305,9 +363,6 @@ void Model_Data::execState(const ModelAPI_ExecState theState) 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); } } @@ -330,11 +385,9 @@ void Model_Data::setError(const std::string& theError, bool theSend) { 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() @@ -368,13 +421,20 @@ void Model_Data::eraseBackReferences() 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(theAttr->owner()); + if (aFeatureOwner.get() && + ModelAPI_Session::get()->validators()->isConcealed(aFeatureOwner->getKind(), theAttr->id())) { updateConcealmentFlag(); } } @@ -382,20 +442,20 @@ void Model_Data::removeBackReference(FeaturePtr theFeature, std::string theAttrI void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID, const bool theApplyConcealment) { - // do not add the same attribute twice + // it is possible to add the same attribute twice: may be last time the owner was not Stable... AttributePtr anAttribute = theFeature->data()->attribute(theAttrID); - if (myRefsToMe.find(anAttribute) != myRefsToMe.end()) - return; + if (myRefsToMe.find(anAttribute) == myRefsToMe.end()) + myRefsToMe.insert(theFeature->data()->attribute(theAttrID)); - myRefsToMe.insert(theFeature->data()->attribute(theAttrID)); - if (theApplyConcealment && + if (theApplyConcealment && theFeature->isStable() && ModelAPI_Session::get()->validators()->isConcealed(theFeature->getKind(), theAttrID)) { std::shared_ptr aRes = std::dynamic_pointer_cast(myObject); // the second condition is for history upper than concealment causer, so the feature result may // be displayed and previewed; also for avoiding of quick show/hide on history // moving deep down - if (aRes && !theFeature->isDisabled()) { + if (aRes && !theFeature->isDisabled() && + !ModelAPI_Session::get()->validators()->isUnconcealed(aRes, theFeature)) { aRes->setIsConcealed(true); } } @@ -407,22 +467,25 @@ void Model_Data::updateConcealmentFlag() for(; aRefsIter != myRefsToMe.end(); aRefsIter++) { if (aRefsIter->get()) { FeaturePtr aFeature = std::dynamic_pointer_cast((*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 aRes = + std::dynamic_pointer_cast(myObject); + if (aRes.get()) { + if (!ModelAPI_Session::get()->validators()->isUnconcealed(aRes, aFeature)) { + aRes->setIsConcealed(true); // set concealed + return; + } + } } } } } - // thus, no concealment references anymore => make not-concealed std::shared_ptr aRes = std::dynamic_pointer_cast(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); } } @@ -451,8 +514,7 @@ std::set usedParameters(const AttributePoint2DPtr& theAttribute) return anUsedParameters; } -std::list findVariables(const std::set& theParameters, - const DocumentPtr& theDocument) +std::list findVariables(const std::set& theParameters) { std::list aResult; std::set::const_iterator aParamIt = theParameters.cbegin(); @@ -460,7 +522,9 @@ std::list findVariables(const std::set& thePara 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; @@ -488,7 +552,13 @@ void Model_Data::referencesToObjects( } else if (aType == ModelAPI_AttributeRefAttr::typeId()) { // reference to attribute or object std::shared_ptr 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(anAttr->second)->list(); } else if (aType == ModelAPI_AttributeSelection::typeId()) { // selection attribute @@ -501,23 +571,38 @@ void Model_Data::referencesToObjects( 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 aRefAttr = std::dynamic_pointer_cast< + ModelAPI_AttributeRefAttrList>(anAttr->second); + std::list > aRefs = aRefAttr->list(); + std::list >::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(anAttr->second); + std::set anUsedParameters = anAttribute->usedParameters(); + std::list 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(anAttr->second); std::set anUsedParameters = anAttribute->usedParameters(); - std::list aParameters = findVariables(anUsedParameters, aMyFeature->document()); + std::list 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(anAttr->second); std::set anUsedParameters = usedParameters(anAttribute); - std::list aParameters = findVariables(anUsedParameters, aMyFeature->document()); + std::list 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(anAttr->second); std::set anUsedParameters = usedParameters(anAttribute); - std::list aParameters = findVariables(anUsedParameters, aMyFeature->document()); + std::list aParameters = findVariables(anUsedParameters); aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end()); } else continue; // nothing to do, not reference @@ -553,13 +638,10 @@ void Model_Data::copyTo(std::shared_ptr theTarget) { TDF_Label aTargetRoot = std::dynamic_pointer_cast(theTarget)->label(); copyAttrs(myLab, aTargetRoot); - // make initialized the initialized attributes - std::map >::iterator aMyIter = myAttrs.begin(); - for(; aMyIter != myAttrs.end(); aMyIter++) { - if (aMyIter->second->isInitialized()) { - theTarget->attribute(aMyIter->first)->setInitialized(); - } - } + // reinitialize Model_Attributes by TDF_Attributes set + std::shared_ptr aTData = std::dynamic_pointer_cast(theTarget); + aTData->myAttrs.clear(); + theTarget->owner()->initAttributes(); // reinit feature attributes } bool Model_Data::isInHistory()