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
Porting to dev version of OCCT.
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_WireSolid.cxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
index 958d4270f954a94d5dbfd347d9c200caed2e77e3..7439181b6ca515c658aaeb4ba4bf9b00e9335a32 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
+++ b/
src/GEOMAlgo/GEOMAlgo_WireSolid.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-27,8
+27,6
@@
//
#include <GEOMAlgo_WireSolid.hxx>
//
#include <GEOMAlgo_WireSolid.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Failure.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <Standard_Failure.hxx>
#include <TopAbs_ShapeEnum.hxx>
@@
-40,17
+38,11
@@
#include <BOPDS_ListOfPaveBlock.hxx>
#include <BOPDS_PaveBlock.hxx>
#include <TopoDS_Solid.hxx>
#include <BOPDS_ListOfPaveBlock.hxx>
#include <BOPDS_PaveBlock.hxx>
#include <TopoDS_Solid.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRep_Tool.hxx>
#include <BOPTools_AlgoTools.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
#include <BRep_Tool.hxx>
#include <BOPTools_AlgoTools.hxx>
-#include <Basics_OCCTVersion.hxx>
-
//=======================================================================
//function : GEOMAlgo_WireSolid
//purpose :
//=======================================================================
//function : GEOMAlgo_WireSolid
//purpose :
@@
-80,7
+72,7
@@
void GEOMAlgo_WireSolid::Perform()
myErrorStatus=10;
return;
}
myErrorStatus=10;
return;
}
- if(myDSFiller->
ErrorStatu
s()) {
+ if(myDSFiller->
HasError
s()) {
myErrorStatus=11;
return;
}
myErrorStatus=11;
return;
}
@@
-88,7
+80,7
@@
void GEOMAlgo_WireSolid::Perform()
Standard_Integer aNbArgs;
//
const BOPDS_DS& aDS=myDSFiller->DS();
Standard_Integer aNbArgs;
//
const BOPDS_DS& aDS=myDSFiller->DS();
- const
BOPCol
_ListOfShape& aLS=aDS.Arguments();
+ const
TopTools
_ListOfShape& aLS=aDS.Arguments();
aNbArgs=aLS.Extent();
if (!aNbArgs) {
myErrorStatus=13;
aNbArgs=aLS.Extent();
if (!aNbArgs) {
myErrorStatus=13;
@@
-123,7
+115,7
@@
void GEOMAlgo_WireSolid::BuildResult()
const BOPDS_DS& aDS=myDSFiller->DS();
BOPDS_DS* pDS=(BOPDS_DS*)&aDS;
//
const BOPDS_DS& aDS=myDSFiller->DS();
BOPDS_DS* pDS=(BOPDS_DS*)&aDS;
//
- const
BOPCol
_ListOfShape& aLS=pDS->Arguments();
+ const
TopTools
_ListOfShape& aLS=pDS->Arguments();
aNbArgs=aLS.Extent();
if (aNbArgs!=2) {
myErrorStatus=14;
aNbArgs=aLS.Extent();
if (aNbArgs!=2) {
myErrorStatus=14;
@@
-150,11
+142,7
@@
void GEOMAlgo_WireSolid::BuildResult()
const TopoDS_Solid& aSolid=(iRank==0) ? *((TopoDS_Solid*)&aTool) :
*((TopoDS_Solid*)&aObj);
//
const TopoDS_Solid& aSolid=(iRank==0) ? *((TopoDS_Solid*)&aTool) :
*((TopoDS_Solid*)&aObj);
//
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) aCtx=myDSFiller->Context();
Handle(IntTools_Context) aCtx=myDSFiller->Context();
-#else
- Handle(BOPInt_Context) aCtx=myDSFiller->Context();
-#endif
//BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
const BOPDS_IndexRange& aRange=pDS->Range(iRank);
//BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
const BOPDS_IndexRange& aRange=pDS->Range(iRank);
@@
-186,11
+174,7
@@
void GEOMAlgo_WireSolid::BuildResult()
}
else if (aNbPB==1) {
const Handle(BOPDS_PaveBlock)& aPB=aLPB.First();
}
else if (aNbPB==1) {
const Handle(BOPDS_PaveBlock)& aPB=aLPB.First();
-#if OCC_VERSION_LARGE > 0x06060000 // Porting to OCCT higher 6.6.0 version
if (pDS->IsCommonBlock(aPB)) {
if (pDS->IsCommonBlock(aPB)) {
-#else
- if (aPB->IsCommonBlock()) {
-#endif
aState=TopAbs_ON;
}
else{
aState=TopAbs_ON;
}
else{