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

0025169: STEP Reader - allow opened shells to be an outer for ManifoldSolidBrep

Browse Source 
Allow opened shells to be an outer for ManifoldSolidBrep
This commit is contained in:
drazmyslovich 2014-08-19 15:31:06 +02:00 committed by bugmaster
parent bedd79c434
commit eab2c8518e
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cxx
View File

@ -43,9 +43,9 @@ void RWStepShape_RWManifoldSolidBrep::ReadStep
// --- own field : outer --- // --- own field : outer ---
Handle(StepShape_ClosedShell) aOuter; Handle(StepShape_ConnectedFaceSet) aOuter;
//szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed //szv#4:S4163:12Mar99 `Standard_Boolean stat2 =` not needed
data->ReadEntity(num, 2,"outer", ach, STANDARD_TYPE(StepShape_ClosedShell), aOuter); data->ReadEntity(num, 2,"outer", ach, STANDARD_TYPE(StepShape_ConnectedFaceSet), aOuter);
//--- Initialisation of the read entity --- //--- Initialisation of the read entity ---

2
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -2184,7 +2184,7 @@ void STEPCAFControl_Reader::ExpandManifoldSolidBrep(TDF_Label& ShapeLab,
{ {
// Access outer shell // Access outer shell
Handle(StepShape_ManifoldSolidBrep) aMSB = Handle(StepShape_ManifoldSolidBrep)::DownCast(Repr); Handle(StepShape_ManifoldSolidBrep) aMSB = Handle(StepShape_ManifoldSolidBrep)::DownCast(Repr);
Handle(StepShape_ClosedShell) aShell = aMSB->Outer(); Handle(StepShape_ConnectedFaceSet) aShell = aMSB->Outer();
// Expand shell contents to CAF tree // Expand shell contents to CAF tree
ExpandShell(aShell, ShapeLab, TP, ShapeTool); ExpandShell(aShell, ShapeLab, TP, ShapeTool);

11
src/StepShape/StepShape_ManifoldSolidBrep.cdl
View File

@ -20,6 +20,7 @@ inherits SolidModel from StepShape
uses uses
ConnectedFaceSet from StepShape,
ClosedShell from StepShape, ClosedShell from StepShape,
HAsciiString from TCollection HAsciiString from TCollection
is is
@ -35,13 +36,17 @@ is
aName : HAsciiString from TCollection; aName : HAsciiString from TCollection;
aOuter : ClosedShell from StepShape) is virtual; aOuter : ClosedShell from StepShape) is virtual;
Init (me : mutable;
aName : HAsciiString from TCollection;
aOuter : ConnectedFaceSet from StepShape) is virtual;
-- Specific Methods for Field Data Access -- -- Specific Methods for Field Data Access --
SetOuter(me : mutable; aOuter : ClosedShell); SetOuter(me : mutable; aOuter : ConnectedFaceSet);
Outer (me) returns ClosedShell; Outer (me) returns ConnectedFaceSet;
fields fields
outer : ClosedShell from StepShape; outer : ConnectedFaceSet from StepShape;
end ManifoldSolidBrep; end ManifoldSolidBrep;

17
src/StepShape/StepShape_ManifoldSolidBrep.cxx
View File

@ -23,9 +23,19 @@ void StepShape_ManifoldSolidBrep::Init(
StepRepr_RepresentationItem::Init(aName); StepRepr_RepresentationItem::Init(aName);
} }
void StepShape_ManifoldSolidBrep::Init(
const Handle(TCollection_HAsciiString)& aName,
const Handle(StepShape_ClosedShell)& aOuter)
{
// --- classe own fields ---
outer = aOuter;
// --- classe inherited fields ---
StepRepr_RepresentationItem::Init(aName);
}
void StepShape_ManifoldSolidBrep::Init( void StepShape_ManifoldSolidBrep::Init(
const Handle(TCollection_HAsciiString)& aName, const Handle(TCollection_HAsciiString)& aName,
const Handle(StepShape_ClosedShell)& aOuter) const Handle(StepShape_ConnectedFaceSet)& aOuter)
{ {
// --- classe own fields --- // --- classe own fields ---
outer = aOuter; outer = aOuter;
@ -33,13 +43,12 @@ void StepShape_ManifoldSolidBrep::Init(
StepRepr_RepresentationItem::Init(aName); StepRepr_RepresentationItem::Init(aName);
} }
void StepShape_ManifoldSolidBrep::SetOuter(const Handle(StepShape_ConnectedFaceSet)& aOuter)
void StepShape_ManifoldSolidBrep::SetOuter(const Handle(StepShape_ClosedShell)& aOuter)
{ {
outer = aOuter; outer = aOuter;
} }
Handle(StepShape_ClosedShell) StepShape_ManifoldSolidBrep::Outer() const Handle(StepShape_ConnectedFaceSet) StepShape_ManifoldSolidBrep::Outer() const
{ {
return outer; return outer;
} }

14
src/StepToTopoDS/StepToTopoDS_Builder.cxx
View File

@ -192,15 +192,15 @@ void StepToTopoDS_Builder::Init
// Start Mapping // Start Mapping
Handle(StepShape_ClosedShell) aCShell; Handle(StepShape_ConnectedFaceSet) aShell;
aCShell = aManifoldSolid->Outer(); aShell = aManifoldSolid->Outer();
StepToTopoDS_TranslateShell myTranShell; StepToTopoDS_TranslateShell myTranShell;
myTranShell.SetPrecision(Precision()); myTranShell.SetPrecision(Precision());
myTranShell.SetMaxTol(MaxTol()); myTranShell.SetMaxTol(MaxTol());
// Non-manifold topology is not referenced by ManifoldSolidBrep (ssv; 14.11.2010) // Non-manifold topology is not referenced by ManifoldSolidBrep (ssv; 14.11.2010)
StepToTopoDS_NMTool dummyNMTool; StepToTopoDS_NMTool dummyNMTool;
myTranShell.Init(aCShell, myTool, dummyNMTool); myTranShell.Init(aShell, myTool, dummyNMTool);
if (myTranShell.IsDone()) { if (myTranShell.IsDone()) {
TopoDS_Shape Sh = myTranShell.Value(); TopoDS_Shape Sh = myTranShell.Value();
@ -234,7 +234,7 @@ void StepToTopoDS_Builder::Init
ResetPreci (S, MaxTol()); ResetPreci (S, MaxTol());
} }
else { else {
TP->AddWarning(aCShell," OuterShell from ManifoldSolidBrep not mapped to TopoDS"); TP->AddWarning(aShell," OuterShell from ManifoldSolidBrep not mapped to TopoDS");
myError = StepToTopoDS_BuilderOther; myError = StepToTopoDS_BuilderOther;
done = Standard_False; done = Standard_False;
} }
@ -273,7 +273,7 @@ void StepToTopoDS_Builder::Init
myTranShell.SetMaxTol(MaxTol()); myTranShell.SetMaxTol(MaxTol());
// OuterBound // OuterBound
aCShell = aBRepWithVoids->Outer(); aCShell = Handle(StepShape_ClosedShell)::DownCast(aBRepWithVoids->Outer());
// Non-manifold topology is not referenced by BrepWithVoids (ssv; 14.11.2010) // Non-manifold topology is not referenced by BrepWithVoids (ssv; 14.11.2010)
StepToTopoDS_NMTool dummyNMTool; StepToTopoDS_NMTool dummyNMTool;
myTranShell.Init(aCShell, myTool, dummyNMTool); myTranShell.Init(aCShell, myTool, dummyNMTool);
@ -360,7 +360,7 @@ void StepToTopoDS_Builder::Init(const Handle(StepShape_FacetedBrep)& aFB,
// Start Mapping // Start Mapping
Handle(StepShape_ClosedShell) aCShell; Handle(StepShape_ClosedShell) aCShell;
aCShell = aFB->Outer(); aCShell = Handle(StepShape_ClosedShell)::DownCast(aFB->Outer());
TopoDS_Shape Sh; TopoDS_Shape Sh;
StepToTopoDS_TranslateShell myTranShell; StepToTopoDS_TranslateShell myTranShell;
@ -411,7 +411,7 @@ void StepToTopoDS_Builder::Init
// Start Mapping // Start Mapping
Handle(StepShape_ClosedShell) aCShell; Handle(StepShape_ClosedShell) aCShell;
aCShell = aFBABWV->Outer(); aCShell = Handle(StepShape_ClosedShell)::DownCast(aFBABWV->Outer());
TopoDS_Shape Sh; TopoDS_Shape Sh;
StepToTopoDS_TranslateShell myTranShell; StepToTopoDS_TranslateShell myTranShell;