mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-05-31 22:37:48 +05:00
NPAL18205: MakePipe problem on Debian Etch 32bits.
This commit is contained in:
parent
a8b3aeb578
commit
aacfac41af
@ -29,10 +29,14 @@
|
|||||||
#include <GEOMImpl_Types.hxx>
|
#include <GEOMImpl_Types.hxx>
|
||||||
#include <GEOM_Function.hxx>
|
#include <GEOM_Function.hxx>
|
||||||
|
|
||||||
|
#include <GEOMAlgo_GlueAnalyser.hxx>
|
||||||
|
|
||||||
#include <ShapeAnalysis_FreeBounds.hxx>
|
#include <ShapeAnalysis_FreeBounds.hxx>
|
||||||
#include <ShapeAnalysis_Edge.hxx>
|
#include <ShapeAnalysis_Edge.hxx>
|
||||||
#include <ShapeFix_Face.hxx>
|
#include <ShapeFix_Face.hxx>
|
||||||
#include <ShapeFix_Shell.hxx>
|
#include <ShapeFix_Shell.hxx>
|
||||||
|
#include <ShapeFix_Shape.hxx>
|
||||||
|
#include <ShapeFix_ShapeTolerance.hxx>
|
||||||
|
|
||||||
#include <BRep_Tool.hxx>
|
#include <BRep_Tool.hxx>
|
||||||
#include <BRep_Builder.hxx>
|
#include <BRep_Builder.hxx>
|
||||||
@ -87,10 +91,6 @@
|
|||||||
|
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
|
||||||
//#include "BRepTools.hxx"
|
|
||||||
//#include "GeomTools.hxx"
|
|
||||||
#include <GEOMAlgo_GlueAnalyser.hxx>
|
|
||||||
|
|
||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
//function : GetID
|
//function : GetID
|
||||||
@ -2295,19 +2295,28 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
|
|||||||
aShape = CreatePipeShellsWithoutPath(aCI);
|
aShape = CreatePipeShellsWithoutPath(aCI);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (aCI) delete aCI;
|
||||||
|
|
||||||
if (aShape.IsNull()) return 0;
|
if (aShape.IsNull()) return 0;
|
||||||
|
|
||||||
BRepCheck_Analyzer ana (aShape, Standard_False);
|
BRepCheck_Analyzer ana (aShape, Standard_False);
|
||||||
if (!ana.IsValid()) {
|
if (!ana.IsValid()) {
|
||||||
if(aCI) delete aCI;
|
ShapeFix_ShapeTolerance aSFT;
|
||||||
Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
|
aSFT.LimitTolerance(aShape,Precision::Confusion(),Precision::Confusion());
|
||||||
|
Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
|
||||||
|
aSfs->SetPrecision(Precision::Confusion());
|
||||||
|
aSfs->Perform();
|
||||||
|
aShape = aSfs->Shape();
|
||||||
|
|
||||||
|
ana.Init(aShape, Standard_False);
|
||||||
|
if (!ana.IsValid())
|
||||||
|
Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
|
||||||
}
|
}
|
||||||
|
|
||||||
TopoDS_Shape aRes = GEOMImpl_IShapesOperations::CompsolidToCompound(aShape);
|
TopoDS_Shape aRes = GEOMImpl_IShapesOperations::CompsolidToCompound(aShape);
|
||||||
aFunction->SetValue(aRes);
|
aFunction->SetValue(aRes);
|
||||||
|
|
||||||
log.SetTouched(Label());
|
log.SetTouched(Label());
|
||||||
if(aCI) delete aCI;
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user