Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo-fix by Kunda
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_FinderShapeOn.cxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
index 4708ce5540c3d659e5a6d67f6c265b75c1601c0f..f3834064aea1e6cd97eff3ab1d9dec5377a39b78 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
+++ b/
src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,11
+26,7
@@
#include <GEOMAlgo_FinderShapeOn.hxx>
#include <GEOMAlgo_FinderShapeOn.hxx>
-#include <Basics_OCCTVersion.hxx>
-
-#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
#include <Precision.hxx>
#include <Precision.hxx>
-#endif
#include <gp_Pnt.hxx>
#include <gp_Pnt.hxx>
@@
-64,7
+60,6
@@
#include <BRepLib_MakeFace.hxx>
#include <BRepLib_FaceError.hxx>
#include <BRepLib_MakeFace.hxx>
#include <BRepLib_FaceError.hxx>
-#include <BOPTools_DSFiller.hxx>
#include <GEOMAlgo_WireSolid.hxx>
#include <GEOMAlgo_ShellSolid.hxx>
#include <GEOMAlgo_WireSolid.hxx>
#include <GEOMAlgo_ShellSolid.hxx>
@@
-72,7
+67,10
@@
#include <GEOMAlgo_ShapeSolid.hxx>
#include <GEOMAlgo_SolidSolid.hxx>
#include <GEOMAlgo_SurfaceTools.hxx>
#include <GEOMAlgo_ShapeSolid.hxx>
#include <GEOMAlgo_SolidSolid.hxx>
#include <GEOMAlgo_SurfaceTools.hxx>
-#include <GEOMAlgo_Tools.hxx>
+#include <GEOMAlgo_AlgoTools.hxx>
+
+#include <BOPAlgo_PaveFiller.hxx>
+#include <BOPCol_ListOfShape.hxx>
//=======================================================================
//function : GEOMAlgo_FinderShapeOn
//=======================================================================
//function : GEOMAlgo_FinderShapeOn
@@
-267,7
+265,7
@@
void GEOMAlgo_FinderShapeOn::Find()
return;
}
//
return;
}
//
- bICS=GEOMAlgo_Tools::IsCompositeShape(myArg2);
+ bICS=GEOMAlgo_
Algo
Tools::IsCompositeShape(myArg2);
if (!bICS || myIsAnalytic) {
TopoDS_Compound aCmp;
BRep_Builder aBB;
if (!bICS || myIsAnalytic) {
TopoDS_Compound aCmp;
BRep_Builder aBB;
@@
-299,23
+297,21
@@
void GEOMAlgo_FinderShapeOn::Find(const TopoDS_Shape& aS)
{
myErrorStatus=0;
//
{
myErrorStatus=0;
//
- Standard_Boolean bIsDone;
Standard_Integer i, iErr;
TopAbs_State aSts[]={TopAbs_IN, TopAbs_OUT, TopAbs_ON};
TopTools_ListIteratorOfListOfShape aIt;
Standard_Integer i, iErr;
TopAbs_State aSts[]={TopAbs_IN, TopAbs_OUT, TopAbs_ON};
TopTools_ListIteratorOfListOfShape aIt;
- BOPTools_DSFiller aDF;
+ BOPCol_ListOfShape aLS;
+ BOPAlgo_PaveFiller aPF;
//
// 1. Prepare DSFiller
//
// 1. Prepare DSFiller
- aDF.SetShapes (myArg1, aS);
- bIsDone=aDF.IsDone();
- if (!bIsDone) {
- myErrorStatus=30; // wrong args are used for DSFiller
- return;
- }
- aDF.Perform();
- bIsDone=aDF.IsDone();
- if (!bIsDone) {
- myErrorStatus=31; // DSFiller failed
+ aLS.Append(myArg1);
+ aLS.Append(aS);
+ aPF.SetArguments(aLS);
+ //
+ aPF.Perform();
+ iErr=aPF.ErrorStatus();
+ if (iErr) {
+ myErrorStatus=31; // PaveFiller is failed
return;
}
//
return;
}
//
@@
-347,7
+343,7
@@
void GEOMAlgo_FinderShapeOn::Find(const TopoDS_Shape& aS)
return;
}
//
return;
}
//
- pSS->SetFiller(a
D
F);
+ pSS->SetFiller(a
P
F);
pSS->Perform();
iErr=pSS->ErrorStatus();
if (iErr) {
pSS->Perform();
iErr=pSS->ErrorStatus();
if (iErr) {
@@
-391,11
+387,8
@@
void GEOMAlgo_FinderShapeOn::MakeArgument1()
//
// Argument 1
if (!myIsAnalytic) {
//
// Argument 1
if (!myIsAnalytic) {
-#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
aMF.Init(mySurface, Standard_True, Precision::Confusion());
aMF.Init(mySurface, Standard_True, Precision::Confusion());
-#else
- aMF.Init(mySurface, Standard_True);
-#endif
+
aFErr=aMF.Error();
if (aFErr!=BRepLib_FaceDone) {
myErrorStatus=20; // can not build the face
aFErr=aMF.Error();
if (aFErr!=BRepLib_FaceDone) {
myErrorStatus=20; // can not build the face
@@
-409,6
+402,7
@@
void GEOMAlgo_FinderShapeOn::MakeArgument1()
aM.Add(aF);
TopExp::MapShapes(aF, TopAbs_VERTEX, aM);
TopExp::MapShapes(aF, TopAbs_EDGE, aM);
aM.Add(aF);
TopExp::MapShapes(aF, TopAbs_VERTEX, aM);
TopExp::MapShapes(aF, TopAbs_EDGE, aM);
+
aNb=aM.Extent();
for (i=1; i<=aNb; ++i) {
const TopoDS_Shape& aS=aM(i);
aNb=aM.Extent();
for (i=1; i<=aNb; ++i) {
const TopoDS_Shape& aS=aM(i);