X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.cpp;h=fcccca5369263060fe270b22aa72c197716b4933;hb=ae3e12ab08ba2c98c74c9f4b93812faace2af798;hp=e5641930e1b1253ab05e0a83f5afbd1ab8c34137;hpb=77d6e03555d0d46232e09ace4178f66f8c9b40ee;p=modules%2Fshaper.git diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp index e5641930e..fcccca536 100644 --- a/src/Model/Model_Data.cpp +++ b/src/Model/Model_Data.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 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 @@ -49,13 +49,17 @@ #include #include +#include #include #include +#include #include #include #include +#include + #include #include #include @@ -75,7 +79,7 @@ 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()); @@ -83,6 +87,9 @@ 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) { @@ -101,22 +108,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()); @@ -131,7 +138,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) { @@ -156,6 +163,24 @@ bool Model_Data::hasUserDefinedName() const return shapeLab().IsAttribute(kUSER_DEFINED_NAME); } +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) { @@ -217,7 +242,10 @@ AttributePtr Model_Data::addAttribute( } 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); @@ -242,12 +270,12 @@ AttributePtr Model_Data::addFloatingAttribute( for(; anIter.More(); anIter.Next()) { TCollection_AsciiString aThisName(Handle(TDataStd_Name)::DownCast(anIter.Value())->Get()); if (theID == aThisName.ToCString()) { - TDF_Label aLab = anIter.Value()->Label(); + TDF_Label aChildLab = anIter.Value()->Label(); Handle(TDataStd_Name) aGName; - if (aLab.FindAttribute(kGroupAttributeGroupID, aGName)) { + if (aChildLab.FindAttribute(kGroupAttributeGroupID, aGName)) { TCollection_AsciiString aGroupName(aGName->Get()); if (theGroup == aGroupName.ToCString()) { - return addAttribute(theGroup + "__" + theID, theAttrType, aLab.Tag()); + return addAttribute(theGroup + "__" + theID, theAttrType, aChildLab.Tag()); } } } @@ -432,7 +460,8 @@ void Model_Data::sendAttributeUpdated(ModelAPI_Attribute* theAttr) } else { // 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() == "Transparency" || theAttr->id() == "Deflection" || + theAttr->id() == "Iso_lines" || theAttr->id() == "Show_Iso_lines")) { static const Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); ModelAPI_EventCreator::get()->sendUpdated(myObject, anEvent); } @@ -620,8 +649,10 @@ 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()) { @@ -644,38 +675,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 @@ -712,9 +743,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(); @@ -759,28 +790,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());