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
Mantis issue 0020998: EDF 1572 GEOM: Some limitations to the PipeTShape.
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_BooleanDriver.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
index ae4fa899c970468a8b93e28366696f229d347632..d311b0dcec72ca420b10ac2454487947cc151cc4 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
+++ b/
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-18,6
+18,7
@@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <GEOMImpl_BooleanDriver.hxx>
#include <GEOMImpl_IBoolean.hxx>
#include <GEOMImpl_BooleanDriver.hxx>
#include <GEOMImpl_IBoolean.hxx>
@@
-437,13
+438,14
@@
Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
//}
//Alternative case to check shape result Mantis 0020604: EDF 1172
//}
//Alternative case to check shape result Mantis 0020604: EDF 1172
- TopoDS_Iterator It (aShape, Standard_True, Standard_True);
+
/*
TopoDS_Iterator It (aShape, Standard_True, Standard_True);
int nbSubshapes=0;
for (; It.More(); It.Next())
nbSubshapes++;
if (!nbSubshapes)
int nbSubshapes=0;
for (; It.More(); It.Next())
nbSubshapes++;
if (!nbSubshapes)
- Standard_ConstructionError::Raise("Boolean operation aborted : result object is empty compound");
+ Standard_ConstructionError::Raise("Boolean operation aborted : result object is empty compound");
*/
//end of 0020604: EDF 1172
//end of 0020604: EDF 1172
+ //! the changes temporary commented because of customer needs (see the same mantis bug)
aFunction->SetValue(aShape);
aFunction->SetValue(aShape);
@@
-470,10
+472,10
@@
Standard_EXPORT Handle_Standard_Type& GEOMImpl_BooleanDriver_Type_()
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_BooleanDriver",
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_BooleanDriver",
- sizeof(GEOMImpl_BooleanDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+
sizeof(GEOMImpl_BooleanDriver),
+
1,
+
(Standard_Address)_Ancestors,
+
(Standard_Address)NULL);
return _aType;
}
return _aType;
}