OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0032679: Data Exchange - STEP writer loses assembly instance name

Browse Source 
In STEPCAFControl_Writer::WriteNames, write the names of components
even if the name of the assembly is absent.

In STEPControl_ActorWrite::TransferSubShape, move assembly structure
information to the beginning of the list of results, so that CDSR
information of this assembly became preceding CDSR of any sub shapes.
This commit is contained in:
msv
2021-11-22 03:28:24 +03:00
committed by smoskvin
parent e1aa4ee31f
commit 87b7b496ec
3 changed files with 77 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/STEPCAFControl/STEPCAFControl_Writer.cxx
View File

@@ -1411,37 +1411,32 @@ Standard_Boolean STEPCAFControl_Writer::WriteNames (const Handle(XSControl_WorkS
// get name
Handle(TCollection_HAsciiString) hName = new TCollection_HAsciiString;
if ( ! GetLabelName (L, hName) ) continue;
// Handle(TDataStd_Name) N;
// if ( ! L.FindAttribute ( TDataStd_Name::GetID(), N ) ) continue;
// TCollection_ExtendedString name = N->Get();
// if ( name.Length() <=0 ) continue;
if (GetLabelName (L, hName))
{
// find target STEP entity for the current shape
if ( ! myLabels.IsBound ( L ) ) continue; // not recorded as translated, skip
TopoDS_Shape S = myLabels.Find ( L );
// find target STEP entity for the current shape
// TopoDS_Shape S;
// if ( ! XCAFDoc_ShapeTool::GetShape ( L, S ) ) continue;
if ( ! myLabels.IsBound ( L ) ) continue; // not recorded as translated, skip
TopoDS_Shape S = myLabels.Find ( L );
Handle(StepShape_ShapeDefinitionRepresentation) SDR;
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S );
if ( ! FP->FindTypedTransient ( mapper, STANDARD_TYPE(StepShape_ShapeDefinitionRepresentation), SDR ) ) {
Handle(StepShape_ShapeDefinitionRepresentation) SDR;
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S );
if ( ! FP->FindTypedTransient ( mapper, STANDARD_TYPE(StepShape_ShapeDefinitionRepresentation), SDR ) ) {
#ifdef OCCT_DEBUG
std::cout << "Warning: Cannot find SDR for " << S.TShape()->DynamicType()->Name() << std::endl;
std::cout << "Warning: Cannot find SDR for " << S.TShape()->DynamicType()->Name() << std::endl;
#endif
continue;
continue;
}
// set the name to the PRODUCT
Handle(StepRepr_PropertyDefinition) PropD = SDR->Definition().PropertyDefinition();
if ( PropD.IsNull() ) continue;
Handle(StepBasic_ProductDefinition) PD = PropD->Definition().ProductDefinition();
if ( PD.IsNull() ) continue;
Handle(StepBasic_Product) Prod = PD->Formation()->OfProduct();
Prod->SetId ( hName );
Prod->SetName ( hName );
}
// set the name to the PRODUCT
Handle(StepRepr_PropertyDefinition) PropD = SDR->Definition().PropertyDefinition();
if ( PropD.IsNull() ) continue;
Handle(StepBasic_ProductDefinition) PD = PropD->Definition().ProductDefinition();
if ( PD.IsNull() ) continue;
Handle(StepBasic_Product) Prod = PD->Formation()->OfProduct();
Prod->SetId ( hName );
Prod->SetName ( hName );
// write names for components of assemblies
if ( XCAFDoc_ShapeTool::IsAssembly ( L ) ) {
TDF_LabelSequence seq;
@@ -1453,14 +1448,14 @@ Standard_Boolean STEPCAFControl_Writer::WriteNames (const Handle(XSControl_WorkS
TDF_Label Lref;
if ( ! XCAFDoc_ShapeTool::GetReferredShape ( lab, Lref ) ||
! myLabels.IsBound ( Lref ) ) continue;
S = myLabels.Find ( Lref );
TopoDS_Shape S = myLabels.Find ( Lref );
S.Move ( XCAFDoc_ShapeTool::GetLocation ( lab ) );
hName = new TCollection_HAsciiString;
if ( ! GetLabelName (lab, hName) ) continue;
// find the target CDSR corresponding to a shape
mapper = TransferBRep::ShapeMapper ( FP, S );
Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S );
Handle(Transfer_Binder) binder = FP->Find ( mapper );
Handle(StepShape_ContextDependentShapeRepresentation) CDSR;
if ( ! FP->FindTypedTransient (mapper,STANDARD_TYPE(StepShape_ContextDependentShapeRepresentation), CDSR) )