Attachment #367184 for bug #457830

Lines 42-51 Link Here

(-)a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialPrism_3D.cpp (+12 lines)
42		42
43	#include "utilities.h"	43	#include "utilities.h"
44		44
		45	#include <Standard_Version.hxx>
45	#include <BRepAdaptor_Curve.hxx>	46	#include <BRepAdaptor_Curve.hxx>
46	#include <BRepBuilderAPI_MakeEdge.hxx>	47	#include <BRepBuilderAPI_MakeEdge.hxx>
47	#include <BRepTools.hxx>	48	#include <BRepTools.hxx>
48	#include <BRep_Tool.hxx>	49	#include <BRep_Tool.hxx>
		50	#if OCC_VERSION_HEX >= 0x060600
		51	#include <BRepClass3d.hxx>
		52	#endif
49	#include <TopExp_Explorer.hxx>	53	#include <TopExp_Explorer.hxx>
50	#include <TopoDS.hxx>	54	#include <TopoDS.hxx>
51	#include <TopoDS_Shell.hxx>	55	#include <TopoDS_Shell.hxx>
Lines 161-167 bool StdMeshers_RadialPrism_3D::Compute( Link Here
161		165
162	// get 2 shells	166	// get 2 shells
163	TopoDS_Solid solid = TopoDS::Solid( aShape );	167	TopoDS_Solid solid = TopoDS::Solid( aShape );
		168	#if OCC_VERSION_HEX >= 0x060600
		169	TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
		170	#else
164	TopoDS_Shell outerShell = BRepTools::OuterShell( solid );	171	TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
		172	#endif
165	TopoDS_Shape innerShell;	173	TopoDS_Shape innerShell;
166	int nbShells = 0;	174	int nbShells = 0;
167	for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )	175	for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
Lines 401-407 bool StdMeshers_RadialPrism_3D::Evaluate Link Here
401	{	409	{
402	// get 2 shells	410	// get 2 shells
403	TopoDS_Solid solid = TopoDS::Solid( aShape );	411	TopoDS_Solid solid = TopoDS::Solid( aShape );
		412	#if OCC_VERSION_HEX >= 0x060600
		413	TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
		414	#else
404	TopoDS_Shell outerShell = BRepTools::OuterShell( solid );	415	TopoDS_Shell outerShell = BRepTools::OuterShell( solid );
		416	#endif
405	TopoDS_Shape innerShell;	417	TopoDS_Shape innerShell;
406	int nbShells = 0;	418	int nbShells = 0;
407	for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )	419	for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )

Lines 23-30 Link Here

(-)a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp (+8 lines)
23		23
24	#include "PreCompiled.h"	24	#include "PreCompiled.h"
25		25
		26	#include <Standard_Version.hxx>
26	#include <BRepGProp.hxx>	27	#include <BRepGProp.hxx>
27	#include <BRepTools.hxx>	28	#include <BRepTools.hxx>
		29	#if OCC_VERSION_HEX >= 0x060600
		30	#include <BRepClass3d.hxx>
		31	#endif
28	#include <GProp_GProps.hxx>	32	#include <GProp_GProps.hxx>
29	#include <BRepBuilderAPI_MakeSolid.hxx>	33	#include <BRepBuilderAPI_MakeSolid.hxx>
30	#include <TopExp_Explorer.hxx>	34	#include <TopExp_Explorer.hxx>
Lines 104-110 Py::Object TopoShapeSolidPy::getOuterShe Link Here
104	TopoDS_Shell shell;	108	TopoDS_Shell shell;
105	const TopoDS_Shape& shape = getTopoShapePtr()->_Shape;	109	const TopoDS_Shape& shape = getTopoShapePtr()->_Shape;
106	if (!shape.IsNull() && shape.ShapeType() == TopAbs_SOLID)	110	if (!shape.IsNull() && shape.ShapeType() == TopAbs_SOLID)
		111	#if OCC_VERSION_HEX >= 0x060600
		112	shell = BRepClass3d::OuterShell(TopoDS::Solid(shape));
		113	#else
107	shell = BRepTools::OuterShell(TopoDS::Solid(shape));	114	shell = BRepTools::OuterShell(TopoDS::Solid(shape));
		115	#endif
108	return Py::Object(new TopoShapeShellPy(new TopoShape(shell)),true);	116	return Py::Object(new TopoShapeShellPy(new TopoShape(shell)),true);
109	}	117	}
110		118

Return to bug 457830