ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-05 04:44:18 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from BR_new_bop 15/01/2013

Browse Source
This commit is contained in:
vsr 2013-01-16 10:44:33 +00:00
parent 08b70d2054
commit b309f2d9ae
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SMESH/Makefile.am
View File

@ -95,5 +95,4 @@ libSMESHimpl_la_LDFLAGS = \
$(DriverCGNS_LIB) \ $(DriverCGNS_LIB) \
../SMESHUtils/libSMESHUtils.la \ ../SMESHUtils/libSMESHUtils.la \
$(BOOST_LIB_THREAD) \ $(BOOST_LIB_THREAD) \
$(GEOM_LDFLAGS) -lNMTTools \
$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF

2
src/SMESHClient/Makefile.am
View File

@ -69,7 +69,7 @@ libSMESHClient_la_LDFLAGS = \
../Controls/libSMESHControls.la \ ../Controls/libSMESHControls.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
-lSalomeIDLKernel -lSALOMELocalTrace \ -lSalomeIDLKernel -lSALOMELocalTrace \
$(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \ $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \
$(CAS_KERNEL) $(CAS_KERNEL)

6
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
View File

@ -45,7 +45,7 @@
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx> #include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepTools.hxx> #include <BRepClass3d.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
@ -162,7 +162,7 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// get 2 shells // get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape ); TopoDS_Solid solid = TopoDS::Solid( aShape );
TopoDS_Shell outerShell = BRepTools::OuterShell( solid ); TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell; TopoDS_Shape innerShell;
int nbShells = 0; int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells ) for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )
@ -402,7 +402,7 @@ bool StdMeshers_RadialPrism_3D::Evaluate(SMESH_Mesh& aMesh,
{ {
// get 2 shells // get 2 shells
TopoDS_Solid solid = TopoDS::Solid( aShape ); TopoDS_Solid solid = TopoDS::Solid( aShape );
TopoDS_Shell outerShell = BRepTools::OuterShell( solid ); TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid );
TopoDS_Shape innerShell; TopoDS_Shape innerShell;
int nbShells = 0; int nbShells = 0;
for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells ) for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells )