OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0033660: Data Exchange, Step Import - Adding product attributes to metadata

Browse Source 
Attributes of product was added to metadata.
This commit is contained in:
ichesnok 2024-04-04 21:13:07 +01:00
parent 57e317d966
commit 2e17aa1485
1 changed files with 76 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -5388,9 +5388,40 @@ Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_Work
Standard_Integer aNb = aModel->NbEntities(); Standard_Integer aNb = aModel->NbEntities();
STEPConstruct_Tool aTool(theWS); STEPConstruct_Tool aTool(theWS);
TDF_LabelMap aGeneralLabelMap;
NCollection_DataMap<TDF_Label, NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>> anAttrMap;
NCollection_DataMap<TDF_Label, NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>>> anExtraAttrMap;
for (Standard_Integer anEntityInd = 1; anEntityInd <= aNb; ++anEntityInd) for (Standard_Integer anEntityInd = 1; anEntityInd <= aNb; ++anEntityInd)
{ {
Handle(Standard_Transient) anEntity = aModel->Value(anEntityInd); Handle(Standard_Transient) anEntity = aModel->Value(anEntityInd);
// checking for Product attributes
Handle(StepBasic_ProductDefinition) aProdDefinition = Handle(StepBasic_ProductDefinition)::DownCast(anEntity);
if (!aProdDefinition.IsNull())
{
Handle(Transfer_Binder) aBinder = aTP->Find(aProdDefinition);
if (!aBinder.IsNull())
{
TopoDS_Shape aShape = TransferBRep::ShapeResult(aTP, aBinder);
if (!aShape.IsNull())
{
TDF_Label aShapeLabel;
if (myMap.Find(aShape, aShapeLabel))
{
aGeneralLabelMap.Add(aShapeLabel);
NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>> anAttrSeq;
Handle(StepBasic_Product) aProduct = aProdDefinition->Formation()->OfProduct();
anAttrSeq.Append({ "ProductID", aProduct->Id() });
anAttrSeq.Append({ "ProductName", aProduct->Name() });
anAttrSeq.Append({ "Description", aProduct->Description() });
anAttrSeq.Append({ "ProductDefinition", aProdDefinition->Description() });
anExtraAttrMap.Bind(aShapeLabel, anAttrSeq);
}
}
}
}
// checking for User Defined Attributes
Handle(StepBasic_GeneralProperty) aGeneralProp = Handle(StepBasic_GeneralProperty)::DownCast(anEntity); Handle(StepBasic_GeneralProperty) aGeneralProp = Handle(StepBasic_GeneralProperty)::DownCast(anEntity);
if (aGeneralProp.IsNull()) if (aGeneralProp.IsNull())
continue; continue;
@ -5410,13 +5441,13 @@ Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_Work
if (aPropDefinitionList.IsEmpty()) if (aPropDefinitionList.IsEmpty())
continue; continue;
NCollection_List<Handle(StepRepr_PropertyDefinition)> aGroupedProperties;
NCollection_List< Handle(StepRepr_PropertyDefinition)>::Iterator aPropDefIter(aPropDefinitionList); NCollection_List< Handle(StepRepr_PropertyDefinition)>::Iterator aPropDefIter(aPropDefinitionList);
for ( ; aPropDefIter.More(); aPropDefIter.Next()) for ( ; aPropDefIter.More(); aPropDefIter.Next())
{ {
Handle(StepRepr_PropertyDefinition) aPropDefinition = aPropDefIter.Value(); Handle(StepRepr_PropertyDefinition) aPropDefinition = aPropDefIter.Value();
// check group of PropertyDefinition // check group of PropertyDefinition
NCollection_List<Handle(StepRepr_PropertyDefinition)> aGroupedProperties;
Interface_EntityIterator aSharingsListOfPD = theWS->Graph().Sharings(aPropDefinition); Interface_EntityIterator aSharingsListOfPD = theWS->Graph().Sharings(aPropDefinition);
for (aSharingsListOfPD.Start(); aSharingsListOfPD.More(); aSharingsListOfPD.Next()) for (aSharingsListOfPD.Start(); aSharingsListOfPD.More(); aSharingsListOfPD.Next())
{ {
@ -5558,40 +5589,70 @@ Standard_Boolean STEPCAFControl_Reader::ReadMetadata(const Handle(XSControl_Work
continue; continue;
TDF_Label aShapeLabel; TDF_Label aShapeLabel;
if (myMap.IsBound(aShape)) if (myMap.Find(aShape, aShapeLabel))
{
aShapeLabel = myMap.Find(aShape);
}
if (!aShapeLabel.IsNull())
{ {
aLabelSeq.Append(aShapeLabel); aLabelSeq.Append(aShapeLabel);
aGeneralLabelMap.Add(aShapeLabel);
} }
} }
//create metadata // fill user defined attribute map
for (TDF_LabelSequence::Iterator aLabelIt(aLabelSeq); aLabelIt.More(); aLabelIt.Next()) for (TDF_LabelSequence::Iterator aLabelIt(aLabelSeq); aLabelIt.More(); aLabelIt.Next())
{ {
TDF_Label aLabel = aLabelIt.Value(); NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>* aPropSeqPtr = anAttrMap.ChangeSeek(aLabelIt.Value());
Handle(TDataStd_NamedData) anAttr; if (aPropSeqPtr == NULL)
if (!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAttr))
{ {
anAttr = new TDataStd_NamedData; NCollection_Sequence<Handle(StepRepr_PropertyDefinition)> aPropSeq;
aLabel.AddAttribute(anAttr); aPropSeqPtr = anAttrMap.Bound(aLabelIt.Value(), aPropSeq);
} }
fillAttributes(theWS, aPropDefinition, theLocalFactors, anAttr); aPropSeqPtr->Append(aPropDefinition);
if (!aGroupedProperties.IsEmpty()) if (!aGroupedProperties.IsEmpty())
{ {
NCollection_List<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(aGroupedProperties); NCollection_List<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(aGroupedProperties);
for ( ; aPropIt.More(); aPropIt.Next()) for (; aPropIt.More(); aPropIt.Next())
{ {
fillAttributes(theWS, aPropIt.Value(), theLocalFactors, anAttr); aPropSeqPtr->Append(aPropIt.Value());
} }
} }
} }
} }
} }
// create metadata
for (TDF_LabelMap::Iterator aLabelIt(aGeneralLabelMap); aLabelIt.More(); aLabelIt.Next())
{
Handle(TDataStd_NamedData) anAttr;
if (!aLabelIt.Value().FindAttribute(TDataStd_NamedData::GetID(), anAttr))
{
anAttr = new TDataStd_NamedData;
aLabelIt.Value().AddAttribute(anAttr);
}
NCollection_Sequence<Handle(StepRepr_PropertyDefinition)> anAttrib;
if (anAttrMap.Find(aLabelIt.Value(), anAttrib))
{
NCollection_Sequence<Handle(StepRepr_PropertyDefinition)>::Iterator aPropIt(anAttrib);
for (; aPropIt.More(); aPropIt.Next())
{
fillAttributes(theWS, aPropIt.Value(), theLocalFactors, anAttr);
}
}
NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>> aPairSeq;
if (anExtraAttrMap.Find(aLabelIt.Value(), aPairSeq))
{
NCollection_Sequence<std::pair<TCollection_AsciiString, Handle(TCollection_HAsciiString)>>::Iterator aSeqIt(aPairSeq);
for (; aSeqIt.More(); aSeqIt.Next())
{
const auto & aPair = aSeqIt.Value();
if (aPair.second.IsNull() || aPair.second->String().IsEmpty())
{
continue;
}
anAttr->SetString(aPair.first, aPair.second->String());
}
}
}
return Standard_True; return Standard_True;
} }