X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.cpp;h=00e6defd2e6566b00481ceb52d2c24f8ec0abb8e;hb=c837befca5d8a28a000ac1b87345f038d87b727f;hp=e3db875e3b492790caf26aa338f61ce7173226e9;hpb=70e5fad08976dd113a2dd1d278867d1d1192e43c;p=modules%2Fshaper.git diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp index e3db875e3..00e6defd2 100644 --- a/src/Model/Model_Data.cpp +++ b/src/Model/Model_Data.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -33,35 +32,39 @@ #include #include #include +#include #include #include #include +#include +#include + #include #include #include +#include #include #include #include #include -#include #include #include +#include #include #include +#include #include #include #include +#include + #include #include -#include #include -#include -#include -#include -#include +#include #include @@ -77,11 +80,18 @@ static const int kFlagDisplayed = 1; static const int kFlagDeleted = 2; // TDataStd_Integer - 0 if the name of the object is generated automatically, // otherwise the name is defined by user -Standard_GUID kUSER_DEFINED_NAME("9c694d18-a83c-4a56-bc9b-8020628a8244"); +static const Standard_GUID kUSER_DEFINED_NAME("9c694d18-a83c-4a56-bc9b-8020628a8244"); // invalid data const static std::shared_ptr kInvalid(new Model_Data()); +static const Standard_GUID kGroupAttributeGroupID("df64ea4c-fc42-4bf8-ad7e-08f7a54bf1b8"); +static const Standard_GUID kGroupAttributeID("ebdcb22a-e045-455b-9a7f-cfd38d68e185"); + +// id of attribute to store the version of the feature +static const Standard_GUID kVERSION_ID("61cdb78a-1ba7-4942-976f-63bea7f4a2b1"); + + Model_Data::Model_Data() : mySendAttributeUpdated(true), myWasChangedButBlocked(false) { } @@ -99,22 +109,22 @@ void Model_Data::setLabel(TDF_Label theLab) } } -std::string Model_Data::name() +std::wstring Model_Data::name() { Handle(TDataStd_Name) aName; if (shapeLab().FindAttribute(TDataStd_Name::GetID(), aName)) { #ifdef DEBUG_NAMES - myObject->myName = TCollection_AsciiString(aName->Get()).ToCString(); + myObject->myName = Locale::Convert::toWString(aName->Get().ToExtString()); #endif - return std::string(TCollection_AsciiString(aName->Get()).ToCString()); + return Locale::Convert::toWString(aName->Get().ToExtString()); } - return ""; // not defined + return L""; // not defined } -void Model_Data::setName(const std::string& theName) +void Model_Data::setName(const std::wstring& theName) { bool isModified = false; - std::string anOldName = name(); + std::wstring anOldName = name(); Handle(TDataStd_Name) aName; if (!shapeLab().FindAttribute(TDataStd_Name::GetID(), aName)) { TDataStd_Name::Set(shapeLab(), theName.c_str()); @@ -129,7 +139,7 @@ void Model_Data::setName(const std::string& theName) bool isUserDefined = true; ResultPtr aResult = std::dynamic_pointer_cast(myObject); if (aResult) { - std::string aDefaultName = ModelAPI_Tools::getDefaultName(aResult, false).first; + std::wstring aDefaultName = ModelAPI_Tools::getDefaultName(aResult, false).first; isUserDefined = aDefaultName != theName; } if (isUserDefined) { @@ -154,10 +164,29 @@ bool Model_Data::hasUserDefinedName() const return shapeLab().IsAttribute(kUSER_DEFINED_NAME); } -AttributePtr Model_Data::addAttribute(const std::string& theID, const std::string theAttrType) +std::string Model_Data::version() +{ + Handle(TDataStd_Name) aVersionAttr; + std::string aVersion; + if (shapeLab().FindAttribute(kVERSION_ID, aVersionAttr)) + aVersion = TCollection_AsciiString(aVersionAttr->Get()).ToCString(); + return aVersion; +} + +void Model_Data::setVersion(const std::string& theVersion) +{ + Handle(TDataStd_Name) aVersionAttr; + std::string aVersion; + if (!shapeLab().FindAttribute(kVERSION_ID, aVersionAttr)) + aVersionAttr = TDataStd_Name::Set(shapeLab(), kVERSION_ID, TCollection_ExtendedString()); + aVersionAttr->Set(theVersion.c_str()); +} + +AttributePtr Model_Data::addAttribute( + const std::string& theID, const std::string theAttrType, const int theIndex) { AttributePtr aResult; - int anAttrIndex = int(myAttrs.size()) + 1; + int anAttrIndex = theIndex == -1 ? int(myAttrs.size()) + 1 : theIndex; TDF_Label anAttrLab = myLab.FindChild(anAttrIndex); ModelAPI_Attribute* anAttr = 0; if (theAttrType == ModelAPI_AttributeDocRef::typeId()) { @@ -190,6 +219,8 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin anAttr = new Model_AttributeDoubleArray(anAttrLab); } else if (theAttrType == ModelAPI_AttributeTables::typeId()) { anAttr = new Model_AttributeTables(anAttrLab); + } else if (theAttrType == ModelAPI_AttributeImage::typeId()) { + anAttr = new Model_AttributeImage(anAttrLab); } // create also GeomData attributes here because only here the OCAF structure is known else if (theAttrType == GeomData_Point::typeId()) { @@ -214,7 +245,10 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin } anAttribute->myIsInitialized = anAllInitialized; anAttr = anAttribute; + } else if (theAttrType == GeomData_Point2DArray::typeId()) { + anAttr = new GeomData_Point2DArray(anAttrLab); } + if (anAttr) { aResult = std::shared_ptr(anAttr); myAttrs[theID] = std::pair(aResult, anAttrIndex); @@ -227,6 +261,97 @@ AttributePtr Model_Data::addAttribute(const std::string& theID, const std::strin return aResult; } +AttributePtr Model_Data::addFloatingAttribute( + const std::string& theID, const std::string theAttrType, const std::string& theGroup) +{ + // compute the index of the attribute placement + int anIndex; + TDF_Label aLab; + if (myLab.IsAttribute(TDF_TagSource::GetID())) { + // check this is re-init of attributes, so, check attribute with this name already there + TDF_ChildIDIterator anIter(myLab, kGroupAttributeID, false); + for(; anIter.More(); anIter.Next()) { + TCollection_AsciiString aThisName(Handle(TDataStd_Name)::DownCast(anIter.Value())->Get()); + if (theID == aThisName.ToCString()) { + TDF_Label aChildLab = anIter.Value()->Label(); + Handle(TDataStd_Name) aGName; + if (aChildLab.FindAttribute(kGroupAttributeGroupID, aGName)) { + TCollection_AsciiString aGroupName(aGName->Get()); + if (theGroup == aGroupName.ToCString()) { + return addAttribute(theGroup + "__" + theID, theAttrType, aChildLab.Tag()); + } + } + } + } + aLab = myLab.NewChild(); // already exists a floating attribute, create the next + anIndex = aLab.Tag(); + } else { // put the first floating attribute, quite far from other standard attributes + anIndex = int(myAttrs.size()) + 1000; + TDF_TagSource::Set(myLab)->Set(anIndex); + aLab = myLab.FindChild(anIndex, true); + } + // store the group ID and the attribute ID (to restore correctly) + TDataStd_Name::Set(aLab, kGroupAttributeGroupID, theGroup.c_str()); + TDataStd_Name::Set(aLab, kGroupAttributeID, theID.c_str()); + + return addAttribute(theGroup + "__" + theID, theAttrType, anIndex); +} + +void Model_Data::allGroups(std::list& theGroups) +{ + std::set alreadyThere; + for(TDF_ChildIDIterator aGroup(myLab, kGroupAttributeGroupID); aGroup.More(); aGroup.Next()) { + Handle(TDataStd_Name) aGroupAttr = Handle(TDataStd_Name)::DownCast(aGroup.Value()); + std::string aGroupID = TCollection_AsciiString(aGroupAttr->Get()).ToCString(); + if (alreadyThere.find(aGroupID) == alreadyThere.end()) { + theGroups.push_back(aGroupID); + alreadyThere.insert(aGroupID); + } + } +} + +void Model_Data::attributesOfGroup(const std::string& theGroup, + std::list >& theAttrs) +{ + for(TDF_ChildIDIterator aGroup(myLab, kGroupAttributeGroupID); aGroup.More(); aGroup.Next()) { + Handle(TDataStd_Name) aGroupID = Handle(TDataStd_Name)::DownCast(aGroup.Value()); + if (aGroupID->Get().IsEqual(theGroup.c_str())) { + Handle(TDataStd_Name) anID; + if (aGroup.Value()->Label().FindAttribute(kGroupAttributeID, anID)) { + TCollection_AsciiString anAsciiID(aGroupID->Get() + "__" + anID->Get()); + theAttrs.push_back(attribute(anAsciiID.ToCString())); + } + } + } +} + +void Model_Data::removeAttributes(const std::string& theGroup) +{ + TDF_LabelList aLabsToRemove; // collect labels that must be erased after the cycle + for(TDF_ChildIDIterator aGroup(myLab, kGroupAttributeGroupID); aGroup.More(); aGroup.Next()) { + Handle(TDataStd_Name) aGroupID = Handle(TDataStd_Name)::DownCast(aGroup.Value()); + if (aGroupID->Get().IsEqual(theGroup.c_str())) { + Handle(TDataStd_Name) anID; + if (!aGroup.Value()->Label().IsNull() && + aGroup.Value()->Label().FindAttribute(kGroupAttributeID, anID)) { + aLabsToRemove.Append(aGroup.Value()->Label()); + } + TCollection_AsciiString anAsciiID(aGroupID->Get() + "__" + anID->Get()); + myAttrs.erase(anAsciiID.ToCString()); + } + } + for(TDF_LabelList::Iterator aLab(aLabsToRemove); aLab.More(); aLab.Next()) { + aLab.ChangeValue().ForgetAllAttributes(true); + } +} + +void Model_Data::clearAttributes() +{ + myAttrs.clear(); +} + + + // 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) { \ @@ -253,6 +378,7 @@ GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeRefAttrList, refattrlist); GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeIntArray, intArray); GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeDoubleArray, realArray); GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeTables, tables); +GET_ATTRIBUTE_BY_ID(ModelAPI_AttributeImage, image); std::shared_ptr Model_Data::attribute(const std::string& theID) { @@ -336,8 +462,11 @@ void Model_Data::sendAttributeUpdated(ModelAPI_Attribute* theAttr) myWasChangedButBlocked.push_back(theAttr); } } else { - // trim: need to redisplay - if (myObject && theAttr->attributeType() == "Point2D") { + // trim: need to redisplay or set color in the python script + if (myObject && (theAttr->attributeType() == "Point2D" || theAttr->id() == "Color" || + theAttr->id() == "Transparency" || theAttr->id() == "Deflection" || + theAttr->id() == "Iso_lines" || theAttr->id() == "Show_Iso_lines" || + theAttr->id() == "Show_Edges_direction")) { static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent); } @@ -505,7 +634,7 @@ void Model_Data::addBackReference(FeaturePtr theFeature, std::string theAttrID, // be displayed and previewed; also for avoiding of quick show/hide on history // moving deep down if (aRes && !theFeature->isDisabled()) { - aRes->setIsConcealed(true); + aRes->setIsConcealed(true, theFeature->getKind() == "RemoveResults"); } } } @@ -525,13 +654,20 @@ void Model_Data::updateConcealmentFlag() if (aRefsIter->get()) { FeaturePtr aFeature = std::dynamic_pointer_cast((*aRefsIter)->owner()); if (aFeature.get() && !aFeature->isDisabled() && aFeature->isStable()) { - if (ModelAPI_Session::get()->validators()->isConcealed( - aFeature->getKind(), (*aRefsIter)->id())) { + ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators(); + bool isCase = aValidators->isCase(aFeature, (*aRefsIter)->id()); + bool isConcealed = aValidators->isConcealed(aFeature->getKind(), (*aRefsIter)->id()); + if (isCase && isConcealed) { std::shared_ptr aRes = std::dynamic_pointer_cast(myObject); if (aRes.get()) { - aRes->setIsConcealed(true); // set concealed - return; + if (aRes->groupName() != ModelAPI_ResultConstruction::group()) { + aRes->setIsConcealed(true); // set concealed + return; + } else if (aFeature->getKind() == "RemoveResults") { + aRes->setIsConcealed(true, true); + return; + } } } } @@ -544,38 +680,38 @@ void Model_Data::updateConcealmentFlag() } } -std::set set_union(const std::set& theLeft, - const std::set& theRight) +std::set set_union(const std::set& theLeft, + const std::set& theRight) { - std::set aResult; + std::set aResult; aResult.insert(theLeft.begin(), theLeft.end()); aResult.insert(theRight.begin(), theRight.end()); return aResult; } -std::set usedParameters(const AttributePointPtr& theAttribute) +std::set usedParameters(const AttributePointPtr& theAttribute) { - std::set anUsedParameters; + std::set anUsedParameters; for (int aComponent = 0; aComponent < 3; ++aComponent) anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent)); return anUsedParameters; } -std::set usedParameters(const AttributePoint2DPtr& theAttribute) +std::set usedParameters(const AttributePoint2DPtr& theAttribute) { - std::set anUsedParameters; + std::set anUsedParameters; for (int aComponent = 0; aComponent < 2; ++aComponent) anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent)); return anUsedParameters; } -std::list findVariables(const std::set& theParameters, +std::list findVariables(const std::set& theParameters, const DocumentPtr& theDocument) { std::list aResult; - std::set::const_iterator aParamIt = theParameters.cbegin(); + std::set::const_iterator aParamIt = theParameters.cbegin(); for (; aParamIt != theParameters.cend(); ++aParamIt) { - const std::string& aName = *aParamIt; + const std::wstring& aName = *aParamIt; double aValue; ResultParameterPtr aParam; // theSearcher is not needed here: in expressions @@ -612,9 +748,9 @@ void Model_Data::referencesToObjects( if (aRef->isObject()) { aReferenced.push_back(aRef->object()); } else { - AttributePtr anAttr = aRef->attr(); - if (anAttr.get()) - aReferenced.push_back(anAttr->owner()); + AttributePtr aReferredAttr = aRef->attr(); + if (aReferredAttr.get()) + aReferenced.push_back(aReferredAttr->owner()); } } else if (aType == ModelAPI_AttributeRefList::typeId()) { // list of references aReferenced = std::dynamic_pointer_cast(anAttr)->list(); @@ -659,28 +795,28 @@ void Model_Data::referencesToObjects( } else if (aType == ModelAPI_AttributeInteger::typeId()) { // integer attribute AttributeIntegerPtr anAttribute = std::dynamic_pointer_cast(anAttr); - std::set anUsedParameters = anAttribute->usedParameters(); + std::set anUsedParameters = anAttribute->usedParameters(); std::list aParameters = findVariables(anUsedParameters, owner()->document()); aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end()); } else if (aType == ModelAPI_AttributeDouble::typeId()) { // double attribute AttributeDoublePtr anAttribute = std::dynamic_pointer_cast(anAttr); - std::set anUsedParameters = anAttribute->usedParameters(); + std::set anUsedParameters = anAttribute->usedParameters(); std::list aParameters = findVariables(anUsedParameters, owner()->document()); aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end()); } else if (aType == GeomDataAPI_Point::typeId()) { // point attribute AttributePointPtr anAttribute = std::dynamic_pointer_cast(anAttr); - std::set anUsedParameters = usedParameters(anAttribute); + std::set anUsedParameters = usedParameters(anAttribute); std::list aParameters = findVariables(anUsedParameters, owner()->document()); aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end()); } else if (aType == GeomDataAPI_Point2D::typeId()) { // point attribute AttributePoint2DPtr anAttribute = std::dynamic_pointer_cast(anAttr); - std::set anUsedParameters = usedParameters(anAttribute); + std::set anUsedParameters = usedParameters(anAttribute); std::list aParameters = findVariables(anUsedParameters, owner()->document()); aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end()); @@ -695,31 +831,10 @@ void Model_Data::referencesToObjects( } } -/// makes copy of all attributes on the given label and all sub-labels -static void copyAttrs(TDF_Label theSource, TDF_Label theDestination) { - TDF_AttributeIterator anAttrIter(theSource); - for(; anAttrIter.More(); anAttrIter.Next()) { - Handle(TDF_Attribute) aTargetAttr; - if (!theDestination.FindAttribute(anAttrIter.Value()->ID(), aTargetAttr)) { - // create a new attribute if not yet exists in the destination - aTargetAttr = anAttrIter.Value()->NewEmpty(); - theDestination.AddAttribute(aTargetAttr); - } - // no special relocation, empty map, but self-relocation is on: copy references w/o changes - Handle(TDF_RelocationTable) aRelocTable = new TDF_RelocationTable(Standard_True); - anAttrIter.Value()->Paste(aTargetAttr, aRelocTable); - } - // copy the sub-labels content - TDF_ChildIterator aSubLabsIter(theSource); - for(; aSubLabsIter.More(); aSubLabsIter.Next()) { - copyAttrs(aSubLabsIter.Value(), theDestination.FindChild(aSubLabsIter.Value().Tag())); - } -} - void Model_Data::copyTo(std::shared_ptr theTarget) { TDF_Label aTargetRoot = std::dynamic_pointer_cast(theTarget)->label(); - copyAttrs(myLab, aTargetRoot); + Model_Tools::copyAttrs(myLab, aTargetRoot); // reinitialize Model_Attributes by TDF_Attributes set std::shared_ptr aTData = std::dynamic_pointer_cast(theTarget); aTData->myAttrs.clear();