-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
static void StoreGroups(GEOMImpl_IPipe *theCI,
Handle(TColStd_HArray1OfInteger) *theGroups);
-static bool DoGroups(BRepOffsetAPI_MakePipeShell &theSweep,
- TopTools_SequenceOfShape *theGroups);
+// after OCCT improvement
+static bool DoGroups1(const TopoDS_Shape &theProfile,
+ BRepOffsetAPI_MakePipeShell &theSweep,
+ TopTools_SequenceOfShape *theGroups);
-static bool CreateGroups(BRepOffsetAPI_MakePipeShell &theSweep,
- GEOMImpl_IPipe *theCI);
+static bool CreateGroups1(const TopoDS_Shape &theProfile,
+ BRepOffsetAPI_MakePipeShell &theSweep,
+ GEOMImpl_IPipe *theCI);
//=======================================================================
//function : GetID
//=======================================================================
//function : EvaluateBestSweepMode
-//purpose : auxilary for right call of MakePipe and MakePipeShell
+//purpose : auxiliary for right call of MakePipe and MakePipeShell
//=======================================================================
static GeomFill_Trihedron EvaluateBestSweepMode(const TopoDS_Shape& Spine)
{
//=======================================================================
static Standard_Boolean BuildPipeShell(BRepOffsetAPI_MakePipeShell &theBuilder)
{
+ theBuilder.SetForceApproxC1(Standard_True);
+
theBuilder.Build();
Standard_Boolean isDone = theBuilder.IsDone();
//=======================================================================
//function : FillForOtherEdges
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillForOtherEdges(const TopoDS_Shape& F1,
const TopoDS_Shape& E1,
//=======================================================================
//function : FillCorrespondingEdges
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
//=======================================================================
//function : FillCorrespondingEdges
-//purpose : auxilary for CreatePipeShellsWithoutPath()
+//purpose : auxiliary for CreatePipeShellsWithoutPath()
//=======================================================================
static bool FillCorrespondingEdges(const TopoDS_Shape& FS1,
const TopoDS_Shape& FS2,
//=======================================================================
//function : FindNextPairOfFaces
-//purpose : auxilary for CreatePipeForShellSections()
+//purpose : auxiliary for CreatePipeForShellSections()
//=======================================================================
static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
TopTools_IndexedDataMapOfShapeListOfShape& aMapEdgeFaces1,
bool stat = FillForOtherEdges(F1other,E1,V1,FF);
if (!stat) {
if (aCI) delete aCI;
- Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not mapping other egdes");
+ Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not map other edges");
}
FindNextPairOfFaces(F1other, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
//=======================================================================
//function : FindFirstPairFaces
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
TopoDS_Vertex& V1, TopoDS_Vertex& V2,
//function : RemoveFaces
//purpose : This function returns theShapeFrom without faces of the shape
// theFacesToRm. It returns a shell if theShapeFrom is a solid or
-// a compound otherwise. Auxilary for CreatePipeWithDifferentSections
+// a compound otherwise. Auxiliary for CreatePipeWithDifferentSections
// method.
//=======================================================================
static TopoDS_Shape RemoveFaces(const TopoDS_Shape &theShapeFrom,
}
}
if (nbEdges<Edges.Length()) {
- // one of edges was splitted => we have to update WirePath
+ // one of edges was split => we have to update WirePath
BRep_Builder B;
TopoDS_Wire W;
B.MakeWire(W);
// Make groups.
TopTools_SequenceOfShape aGroups[5];
- if (!DoGroups(aBuilder, aGroups)) {
+ TopoDS_Shape aProfile = aTmpSeqBases.Value(1);
+ if (!DoGroups1(aProfile, aBuilder, aGroups)) {
Standard_ConstructionError::Raise("Generate groups failure");
}
// Make groups.
TopTools_SequenceOfShape aGroups[5];
- if (!DoGroups(aBuilder, aGroups)) {
+ TopoDS_Shape aProfile = aTmpSeqBases.Value(1);
+ if (!DoGroups1(aProfile, aBuilder, aGroups)) {
Standard_ConstructionError::Raise("Generate groups failure");
}
// Make groups.
TopTools_SequenceOfShape aSeqGroups[5];
- if (!DoGroups(aBuilder, aSeqGroups)) {
+ TopoDS_Shape aProfile = usedBases.Value(1);
+ if (!DoGroups1(aProfile, aBuilder, aSeqGroups)) {
Standard_ConstructionError::Raise("Generate groups failure");
}
// Fill the groups.
- Handle(TColStd_HArray1OfInteger) aGroupIds[5];
+ //Handle(TColStd_HArray1OfInteger) aGroupIds[5];
TopTools_IndexedMapOfShape anIndices;
const TopoDS_Shape aResult = aBuilder.Shape();
//=======================================================================
//function : CreatePipeForShellSections
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
// Create groups.
if (isGenerateGroups) {
// Make groups.
- if (!DoGroups(aBuilder, aLocalGroups)) {
+ if (!DoGroups1(aWire1, aBuilder, aLocalGroups)) {
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Generate groups failure");
}
bool stat = FillForOtherEdges(FS1,E1,V11,FF);
if (!stat) {
if (aCI) delete aCI;
- Standard_ConstructionError::Raise("FindForOtherEdges: Can not mapping other egdes");
+ Standard_ConstructionError::Raise("FindForOtherEdges: Can not map other edges");
}
}
// Create groups.
if (isGenerateGroups) {
// Make groups.
- if (!DoGroups(aBuilder, aLocalGroups)) {
+ if (!DoGroups1(aWire1, aBuilder, aLocalGroups)) {
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Generate groups failure");
}
//=======================================================================
//function : CreatePipeShellsWithoutPath
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI)
{
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Can not create correct pipe");
}
- MESSAGE (" correspondences for sub-shapes of first pair of faces is found");
+ MESSAGE (" correspondences for sub-shapes of first pair of faces found");
FindNextPairOfFaces(FS1, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
- MESSAGE (" other correspondences is found, make pipe for all pairs of faces");
+ MESSAGE (" other correspondences found, make pipe for all pairs of faces");
// make pipe for each pair of faces
- // auxilary map vertex->edge for created pipe edges
+ // auxiliary map vertex->edge for created pipe edges
TopTools_IndexedDataMapOfShapeShape VPE;
ShapeAnalysis_Edge sae;
//cout<<"FF.Extent()="<<FF.Extent()<<endl;
if (VPE.Contains(E1)) {
aNewFs.Append(VPE.FindFromKey(E1));
#ifdef _DEBUG_
- MESSAGE (" using existed face");
+ MESSAGE (" using existing face");
#endif
continue;
}
GeomAPI_Interpolate anInt(HAP,Standard_False,1.e-7);
anInt.Load(aDir1,aDir2);
anInt.Perform();
- Handle(Geom_Curve) iso = anInt.Curve();
+ const Handle(Geom_BSplineCurve) iso = anInt.Curve();
fp = iso->FirstParameter();
lp = iso->LastParameter();
step = (lp-fp)/(NbP-1);
//=======================================================================
//function : CreatePipeBiNormalAlongVector
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath,
GEOMImpl_IPipe* aCI)
PipeBuilder.MakeSolid();
}
- if (!CreateGroups(PipeBuilder, aCIBN)) {
+ if (!CreateGroups1(aProf, PipeBuilder, aCIBN)) {
if (aCIBN) delete aCIBN;
Standard_ConstructionError::Raise("Generate groups failure");
}
//=======================================================================
//function : FillGroups
-//purpose : auxilary for DoGroups()
+//purpose : auxiliary for DoGroups()
//=======================================================================
bool FillGroups(const TopTools_SequenceOfShape *theGroups,
const TopTools_IndexedMapOfShape &theIndices,
//=======================================================================
//function : StoreGroups
-//purpose : auxilary for CreateGroups()
+//purpose : auxiliary for CreateGroups()
//=======================================================================
void StoreGroups(GEOMImpl_IPipe *theCI,
Handle(TColStd_HArray1OfInteger) *theGroups)
//=======================================================================
//function : CreateDownUpGroups
-//purpose : auxilary for DoGroups()
+//purpose : auxiliary for DoGroups()
//=======================================================================
static bool CreateDownUpGroups(BRepPrimAPI_MakeSweep *theSweep,
TopTools_SequenceOfShape *theGroups,
}
//=======================================================================
-//function : DoGroups
-//purpose : auxilary for CreateGroups()
+//function : DoGroups1
+//purpose : auxiliary for CreateGroups1()
//=======================================================================
-bool DoGroups(BRepOffsetAPI_MakePipeShell &theSweep,
- TopTools_SequenceOfShape *theGroups)
+bool DoGroups1 (const TopoDS_Shape &theProfile,
+ BRepOffsetAPI_MakePipeShell &theSweep,
+ TopTools_SequenceOfShape *theGroups)
{
Standard_Boolean isDoSides = Standard_False;
return false;
}
- const TopoDS_Shape aDownShape = theSweep.FirstShape();
+ TopoDS_Shape aDownShape = theProfile;
+ if (aDownShape.IsNull()) aDownShape = theSweep.FirstShape();
if (isDoSides) {
// Create Side1 and Side2 groups.
if (aMapFence.Add(aSideShape)) {
theGroups[anIdSide].Append(aSideShape);
}
+ } else if (aSideShape.ShapeType() == TopAbs_WIRE) {
+ if (aMapFence.Add(aSideShape)) {
+ TopExp_Explorer anExpWE (aSideShape, TopAbs_EDGE);
+ for (; anExpWE.More(); anExpWE.Next()) {
+ theGroups[anIdSide].Append(anExpWE.Current());
+ }
+ }
} else {
- // Only edges can be is Side1 and Side2 groups.
+ // Only edges can be in Side1 and Side2 groups.
return false;
}
}
}
}
} else {
- // Create Other group. Get boudnary edges of the profile.
+ // Create Other group. Get boundary edges of the profile.
TopTools_MapOfShape aMapBndEdges;
TopExp_Explorer anExp(aDownShape, TopAbs_EDGE);
if (aMapFence.Add(anOtherShape)) {
theGroups[GROUP_OTHER].Append(anOtherShape);
}
+ } else if (anOtherShape.ShapeType() == TopAbs_SHELL) {
+ if (aMapFence.Add(anOtherShape)) {
+ TopExp_Explorer anExpSHF (anOtherShape, TopAbs_FACE);
+ for (; anExpSHF.More(); anExpSHF.Next()) {
+ theGroups[GROUP_OTHER].Append(anExpSHF.Current());
+ }
+ }
} else {
// Only faces can be in Other group.
return false;
}
//=======================================================================
-//function : CreateGroups
-//purpose : auxilary for Execute()
+//function : CreateGroups1
+//purpose : auxiliary for Execute()
//=======================================================================
-bool CreateGroups(BRepOffsetAPI_MakePipeShell &theSweep,
- GEOMImpl_IPipe *theCI)
+bool CreateGroups1 (const TopoDS_Shape &theProfile,
+ BRepOffsetAPI_MakePipeShell &theSweep,
+ GEOMImpl_IPipe *theCI)
{
if (!theCI->GetGenerateGroups()) {
// Nothing to do.
// Make groups.
TopTools_SequenceOfShape aGroups[5];
- if (!DoGroups(theSweep, aGroups)) {
+ if (!DoGroups1(theProfile, theSweep, aGroups)) {
return false;
}
}
//=======================================================================
-//function : DoGroups
-//purpose : auxilary for CreateGroups()
+//function : DoGroups2
+//purpose : auxiliary for CreateGroups()
//=======================================================================
-static bool DoGroups(const TopoDS_Shape &theProfile,
- const TopoDS_Shape &thePath,
- BRepOffsetAPI_MakePipe &theSweep,
- TopTools_SequenceOfShape *theGroups)
+static bool DoGroups2(const TopoDS_Shape &theProfile,
+ const TopoDS_Shape &thePath,
+ BRepOffsetAPI_MakePipe &theSweep,
+ TopTools_SequenceOfShape *theGroups)
{
Standard_Boolean isDoSides = Standard_False;
}
}
} else {
- // Create Other group. Get boudnary edges of the profile.
+ // Create Other group. Get boundary edges of the profile.
TopTools_MapOfShape aMapBndEdges;
TopExp_Explorer anExp(theProfile, TopAbs_EDGE);
//=======================================================================
//function : CreateGroups
-//purpose : auxilary for Execute()
+//purpose : auxiliary for Execute()
//=======================================================================
-static bool CreateGroups(const TopoDS_Shape &theProfile,
- const TopoDS_Shape &thePath,
- BRepOffsetAPI_MakePipe &theSweep,
- GEOMImpl_IPipe *theCI)
+static bool CreateGroups2(const TopoDS_Shape &theProfile,
+ const TopoDS_Shape &thePath,
+ BRepOffsetAPI_MakePipe &theSweep,
+ GEOMImpl_IPipe *theCI)
{
if (!theCI->GetGenerateGroups()) {
// Nothing to do.
// Make groups.
TopTools_SequenceOfShape aGroups[5];
- if (!DoGroups(theProfile, thePath, theSweep, aGroups)) {
+ if (!DoGroups2(theProfile, thePath, theSweep, aGroups)) {
return false;
}
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const
+Standard_Integer GEOMImpl_PipeDriver::Execute(Handle(TFunction_Logbook)& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
if (aShapeBase.ShapeType() == TopAbs_EDGE ||
aShapeBase.ShapeType() == TopAbs_WIRE)
{
- TopoDS_Wire Profile;
+ TopoDS_Wire aProfile;
if (aShapeBase.ShapeType() == TopAbs_WIRE)
- Profile = TopoDS::Wire(aShapeBase);
+ aProfile = TopoDS::Wire(aShapeBase);
else
{
BRep_Builder BB;
- BB.MakeWire(Profile);
- BB.Add(Profile, aShapeBase);
+ BB.MakeWire(aProfile);
+ BB.Add(aProfile, aShapeBase);
}
BRepOffsetAPI_MakePipeShell Sweep (aWirePath);
BRepBuilderAPI_MakeFace FaceBuilder (aWirePath, Standard_True); //to find the plane of spine
if (FaceBuilder.IsDone())
Sweep.SetMode(FaceBuilder.Face());
- Sweep.Add(Profile);
+ Sweep.Add(aProfile);
Standard_Boolean isDone = BuildPipeShell(Sweep);
else
aShape = Sweep.Shape(); //result is good
- if (!CreateGroups(Sweep, aCI)) {
+ if (!CreateGroups1(aProfile, Sweep, aCI)) {
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Generate groups failure");
}
else
{
GeomFill_Trihedron theBestMode = EvaluateBestSweepMode(aWirePath);
- BRepOffsetAPI_MakePipe aMkPipe(aWirePath, aShapeBase, theBestMode);
+ BRepOffsetAPI_MakePipe aMkPipe
+ (aWirePath, aShapeBase, theBestMode, Standard_True);
if (aMkPipe.IsDone() && aMkPipe.ErrorOnSurface() <= TolPipeSurf) {
aShape = aMkPipe.Shape();
- if (!CreateGroups(aShapeBase, aWirePath, aMkPipe, aCI)) {
+ if (!CreateGroups2(aShapeBase, aWirePath, aMkPipe, aCI)) {
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Generate groups failure");
}
} else if (theBestMode != GeomFill_IsDiscreteTrihedron) {
// Try to use Descrete Trihedron mode.
BRepOffsetAPI_MakePipe aMkPipeDescrete
- (aWirePath, aShapeBase, GeomFill_IsDiscreteTrihedron);
+ (aWirePath, aShapeBase, GeomFill_IsDiscreteTrihedron, Standard_True);
if (aMkPipeDescrete.IsDone()) {
aShape = aMkPipeDescrete.Shape();
- if (!CreateGroups(aShapeBase, aWirePath, aMkPipeDescrete, aCI)) {
+ if (!CreateGroups2(aShapeBase, aWirePath, aMkPipeDescrete, aCI)) {
if (aCI) delete aCI;
Standard_ConstructionError::Raise("Generate groups failure");
}
TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape);
aFunction->SetValue(aRes);
- log.SetTouched(Label());
+ log->SetTouched(Label());
return 1;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PipeDriver,GEOM_BaseDriver);
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver);
