OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

0030870: Data Exchange - Add the support for empty draughting models and empty presentation layer assignments for step import

Browse Source 
Protections to avoid exception in the methods  RWStepVisual_RWDraughtingModel::ReadStep and RWStepVisual_RWPresentationLayerAssignment::ReadStep for case when assigned items are absent were added
This commit is contained in:
drazmyslovich 2019-08-07 11:04:53 +03:00 committed by bugmaster
parent fa68c1e116
commit 9063f1e089
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/RWStepVisual/RWStepVisual_RWDraughtingModel.cxx
View File

@ -56,11 +56,14 @@ void RWStepVisual_RWDraughtingModel::ReadStep (const Handle(StepData_StepReaderD
if ( data->ReadSubList (num, 2, "representation.items", ach, sub2) ) { if ( data->ReadSubList (num, 2, "representation.items", ach, sub2) ) {
Standard_Integer num2 = sub2; Standard_Integer num2 = sub2;
Standard_Integer nb0 = data->NbParams(num2); Standard_Integer nb0 = data->NbParams(num2);
aRepresentation_Items = new StepRepr_HArray1OfRepresentationItem (1, nb0); if (nb0 > 0)
for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) { {
Handle(StepRepr_RepresentationItem) anIt0; aRepresentation_Items = new StepRepr_HArray1OfRepresentationItem (1, nb0);
data->ReadEntity (num2, i0, "representation.items", ach, STANDARD_TYPE(StepRepr_RepresentationItem), anIt0); for ( Standard_Integer i0=1; i0 <= nb0; i0++ ) {
aRepresentation_Items->SetValue(i0, anIt0); Handle(StepRepr_RepresentationItem) anIt0;
data->ReadEntity (num2, i0, "representation.items", ach, STANDARD_TYPE(StepRepr_RepresentationItem), anIt0);
aRepresentation_Items->SetValue(i0, anIt0);
}
} }
} }

19
src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cxx
View File

@ -52,17 +52,16 @@ void RWStepVisual_RWPresentationLayerAssignment::ReadStep
Handle(StepVisual_HArray1OfLayeredItem) aAssignedItems; Handle(StepVisual_HArray1OfLayeredItem) aAssignedItems;
StepVisual_LayeredItem aAssignedItemsItem; StepVisual_LayeredItem aAssignedItemsItem;
Standard_Integer nsub3; Standard_Integer nsub3;
if (data->ReadSubList(num, 3, "assigned_items", ach, nsub3)) { if (data->ReadSubList (num,3,"assigned_items",ach,nsub3)) {
Standard_Integer nb3 = data->NbParams(nsub3); Standard_Integer nb3 = data->NbParams(nsub3);
if (nb3) if (nb3 > 0)
{ {
aAssignedItems = new StepVisual_HArray1OfLayeredItem (1, nb3);
aAssignedItems = new StepVisual_HArray1OfLayeredItem(1, nb3); for (Standard_Integer i3 = 1; i3 <= nb3; i3 ++) {
for (Standard_Integer i3 = 1; i3 <= nb3; i3++) { //szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed
//szv#4:S4163:12Mar99 `Standard_Boolean stat3 =` not needed if (data->ReadEntity (nsub3,i3,"assigned_items",ach,aAssignedItemsItem))
if (data->ReadEntity(nsub3, i3, "assigned_items", ach, aAssignedItemsItem)) aAssignedItems->SetValue(i3,aAssignedItemsItem);
aAssignedItems->SetValue(i3, aAssignedItemsItem); }
}
} }
} }