ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

22674: Remove redundant code

Browse Source
This commit is contained in:
skv 2014-11-07 12:47:15 +03:00
parent b32b505c2a
commit e50a7e7c84
2 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
View File

@ -360,35 +360,6 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const
} }
} }
}
else if (aType == SOLID_SHELL) {
anExpectedType = TopAbs_SOLID;
Handle(GEOM_Function) aRefShell = aCI.GetBase();
TopoDS_Shape aShapeShell = aRefShell->GetValue();
if (!aShapeShell.IsNull() && aShapeShell.ShapeType() == TopAbs_COMPOUND) {
TopoDS_Iterator It (aShapeShell, Standard_True, Standard_True);
if (It.More()) aShapeShell = It.Value();
}
if (aShapeShell.IsNull() || aShapeShell.ShapeType() != TopAbs_SHELL) {
Standard_NullObject::Raise("Shape for solid construction is null or not a shell");
}
BRepCheck_Shell chkShell(TopoDS::Shell(aShapeShell));
if (chkShell.Closed() == BRepCheck_NotClosed) return 0;
TopoDS_Solid Sol;
B.MakeSolid(Sol);
B.Add(Sol, aShapeShell);
BRepClass3d_SolidClassifier SC (Sol);
SC.PerformInfinitePoint(Precision::Confusion());
if (SC.State() == TopAbs_IN) {
B.MakeSolid(Sol);
B.Add(Sol, aShapeShell.Reversed());
}
aShape = Sol;
} }
else if (aType == SOLID_SHELLS) { else if (aType == SOLID_SHELLS) {
anExpectedType = TopAbs_SOLID; anExpectedType = TopAbs_SOLID;
@ -445,30 +416,6 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const
aShape = C; aShape = C;
} }
/*
else if (aType == REVERSE_ORIENTATION) {
Handle(GEOM_Function) aRefShape = aCI.GetBase();
TopoDS_Shape aShape_i = aRefShape->GetValue();
if (aShape_i.IsNull()) {
Standard_NullObject::Raise("Shape for reverse is null");
}
BRepBuilderAPI_Copy Copy(aShape_i);
if( Copy.IsDone() ) {
TopoDS_Shape tds = Copy.Shape();
if( tds.IsNull() ) {
Standard_ConstructionError::Raise("Orientation aborted : Can not reverse the shape");
}
if( tds.Orientation() == TopAbs_FORWARD)
tds.Orientation(TopAbs_REVERSED);
else
tds.Orientation(TopAbs_FORWARD);
aShape = tds;
}
}
*/
else if (aType == EDGE_WIRE) { else if (aType == EDGE_WIRE) {
anExpectedType = TopAbs_EDGE; anExpectedType = TopAbs_EDGE;
@ -1221,7 +1168,6 @@ GetCreationInformation(std::string& theOperationName,
theOperationName = "SHELL"; theOperationName = "SHELL";
AddParam( theParams, "Objects", aCI.GetShapes() ); AddParam( theParams, "Objects", aCI.GetShapes() );
break; break;
case SOLID_SHELL:
case SOLID_SHELLS: case SOLID_SHELLS:
theOperationName = "SOLID"; theOperationName = "SOLID";
AddParam( theParams, "Objects", aCI.GetShapes() ); AddParam( theParams, "Objects", aCI.GetShapes() );

2
src/GEOMImpl/GEOMImpl_Types.hxx
View File

@ -292,7 +292,7 @@
#define WIRE_EDGES 1 #define WIRE_EDGES 1
#define FACE_WIRE 2 #define FACE_WIRE 2
#define SHELL_FACES 3 #define SHELL_FACES 3
#define SOLID_SHELL 4 //#define SOLID_SHELL 4
#define SOLID_SHELLS 5 #define SOLID_SHELLS 5
#define COMPOUND_SHAPES 6 #define COMPOUND_SHAPES 6
#define SUBSHAPE_SORTED 7 #define SUBSHAPE_SORTED 7