-// Copyright (C) 2014-2021 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
Model_AttributeSelection::Model_AttributeSelection(TDF_Label& theLabel)
: myRef(theLabel),
+ myTmpCenterType(NOT_CENTER),
+ myParent(NULL),
myIsGeometricalSelection(false)
{
myIsInitialized = myRef.isInitialized();
- myParent = NULL;
}
void Model_AttributeSelection::setID(const std::string theID)
if(!this->isInitialized())
return !theDefaultName.empty() ? theDefaultName : aName;
- // not argument has not parametric name (filters)
- if (!this->isArgument() || (myParent && !myParent->isArgument())) {
- GeomShapePtr aShape = value();
- if (!aShape.get() && context().get())
- aShape = context()->shape();
- std::wstring aNotArgName;
- if (aShape.get()) {
- aNotArgName = Locale::Convert::toWString(aShape->shapeTypeStr());
- if (myParent) {
- std::wostringstream aStream;
- aStream << "_" << selectionLabel().Father().Tag();
- aNotArgName += aStream.str();
- }
- }
- return aNotArgName;
- }
-
CenterType aCenterType = NOT_CENTER;
std::shared_ptr<GeomAPI_Shape> aSubSh = internalValue(aCenterType);
}
}
+ // Fix for opened study (aDoc->myNamingNames is empty)
+ if (theValue.IsNull() && aCont->groupName() != ModelAPI_ResultConstruction::group()) {
+ std::wstring::size_type aSlash = aSubShapeName.rfind(L'/');
+ if (aSlash != std::wstring::npos) {
+ std::wstring aCompName = aSubShapeName.substr(aSlash + 1);
+ TDF_Label aLab = std::dynamic_pointer_cast<Model_Data>(aCont->data())->shapeLab();
+ TDF_ChildIDIterator aSubNames (aLab, TDataStd_Name::GetID());
+ for (; aSubNames.More(); aSubNames.Next()) {
+ if (Handle(TDataStd_Name)::DownCast(aSubNames.Value())->Get().IsEqual(aCompName.c_str())) {
+ theValue = aSubNames.Value()->Label();
+ aDoc->addNamingName(theValue, aSubShapeName);
+ break;
+ }
+ }
+ }
+ }
+
if (aCont.get()) {
theContext = std::dynamic_pointer_cast<Model_Data>(aCont->data())->label();
}