-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
// 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
#include <GEOMImpl_GlueDriver.hxx>
#include <GEOM_Function.hxx>
#include <GEOMUtils.hxx>
+#include <BlockFix_BlockFixAPI.hxx>
+#include <ShHealOper_ShapeProcess.hxx>
#include <TNaming_CopyShape.hxx>
#include <Standard_ConstructionError.hxx>
#include <StdFail_NotDone.hxx>
-// Comment next macro in order to avoid check of boolean operations arguments for self-intersections
-#define BOP_CHECK_SELF_INTERSECTIONS
// Depth of self-intersection check (see BOPAlgo_CheckerSI::SetLevelOfCheck() for more details)
// Default value for BOPAlgo_CheckerSI gives very long computation when checking face-to-face intersections;
// here check level is decreased to more appropriate value to avoid problems with performance).
#define BOP_SELF_INTERSECTIONS_LEVEL 4
+/**
+ * This function performs extra edges removal.
+ *
+ * \param theShape the shape to be processed.
+ * \return the modified shape or null shape in case of failure.
+ */
+static TopoDS_Shape RemoveExtraEdges(const TopoDS_Shape &theShape)
+{
+ TopoDS_Shape aResult;
+
+ if (theShape.IsNull() == Standard_False) {
+ BlockFix_BlockFixAPI aTool;
+
+ aTool.OptimumNbFaces() = 0;
+ aTool.SetShape(theShape);
+ aTool.Perform();
+ aResult = aTool.Shape();
+
+ // Repair result
+ BRepCheck_Analyzer anAna (aResult, false);
+ Standard_Boolean isValid = anAna.IsValid();
+
+ if (!isValid) {
+ TopoDS_Shape aFixed;
+ ShHealOper_ShapeProcess aHealer;
+
+ aHealer.Perform(aResult, aFixed);
+
+ if (aHealer.isDone()) {
+ aResult = aFixed;
+ anAna.Init(aResult, false);
+ isValid = anAna.IsValid();
+ }
+ }
+
+ if (!isValid) {
+ aResult.Nullify();
+ }
+ }
+
+ return aResult;
+}
+
//=======================================================================
//function : GetID
//purpose :
GEOMImpl_IBoolean aCI (aFunction);
Standard_Integer aType = aFunction->GetType();
+ const Standard_Boolean isCheckSelfInte = aCI.GetCheckSelfIntersection();
+ const Standard_Boolean isRmExtraEdges = aCI.GetRmExtraEdges();
TopoDS_Shape aShape;
if (!ana.IsValid())
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPAlgo_CheckerSI aCSI; // checker of self-interferences
- aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
- BOPCol_ListOfShape aList1, aList2;
- aList1.Append(aShape1);
- aList2.Append(aShape2);
- aCSI.SetArguments(aList1);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
- aCSI.SetArguments(aList2);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
-#endif
+ if (isCheckSelfInte) {
+ BOPAlgo_CheckerSI aCSI; // checker of self-interferences
+ aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+ BOPCol_ListOfShape aList1, aList2;
+ aList1.Append(aShape1);
+ aList2.Append(aShape2);
+ aCSI.SetArguments(aList1);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ aCSI.SetArguments(aList2);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0)
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ }
// Make a copy to prevent the original shape changes.
TopoDS_Shape aShapeCopy1;
aShape = performOperation (aShapeCopy1, aShapeCopy2, aType);
- if (aShape.IsNull())
+ if (isRmExtraEdges) {
+ aShape = RemoveExtraEdges(aShape);
+ }
+
+ if (aShape.IsNull()) {
return 0;
+ }
}
}
break;
if (!aShape.IsNull()) {
BRepCheck_Analyzer anAna (aShape, Standard_True);
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPAlgo_CheckerSI aCSI; // checker of self-interferences
- aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
-#endif
if (!anAna.IsValid()) {
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
}
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPCol_ListOfShape aList1;
- aList1.Append(aShape);
- aCSI.SetArguments(aList1);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
- }
-#endif
+ BOPAlgo_CheckerSI aCSI; // checker of self-interferences
+
+ if (isCheckSelfInte) {
+ aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+ BOPCol_ListOfShape aList1;
+ aList1.Append(aShape);
+ aCSI.SetArguments(aList1);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ }
+ }
// Copy shape
TopoDS_Shape aShapeCopy;
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
}
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPCol_ListOfShape aList2;
- aList2.Append(aShape2);
- aCSI.SetArguments(aList2);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
- }
-#endif
+ if (isCheckSelfInte) {
+ BOPCol_ListOfShape aList2;
+ aList2.Append(aShape2);
+ aCSI.SetArguments(aList2);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ }
+ }
+
// Copy shape
+ aShapeCopy.Nullify();
TNaming_CopyShape::CopyTool(aShape2, aMapTShapes, aShapeCopy);
aShape = performOperation (aShape, aShapeCopy, aSimpleType);
+
+ if (isRmExtraEdges) {
+ aShape = RemoveExtraEdges(aShape);
+ }
if (aShape.IsNull()) {
return 0;
if (!aShape.IsNull()) {
// check arguments for Mantis issue 0021019
BRepCheck_Analyzer anAna (aShape, Standard_True);
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPAlgo_CheckerSI aCSI; // checker of self-interferences
- aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
-#endif
+
if (!anAna.IsValid()) {
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
}
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPCol_ListOfShape aList1;
- aList1.Append(aShape);
- aCSI.SetArguments(aList1);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
- }
-#endif
+ BOPAlgo_CheckerSI aCSI; // checker of self-interferences
+
+ if (isCheckSelfInte) {
+ aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL);
+ BOPCol_ListOfShape aList1;
+ aList1.Append(aShape);
+ aCSI.SetArguments(aList1);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ }
+ }
+
// Copy shape
TopoDS_Shape aShapeCopy;
TColStd_IndexedDataMapOfTransientTransient aMapTShapes;
StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid");
}
-#ifdef BOP_CHECK_SELF_INTERSECTIONS
- BOPCol_ListOfShape aList2;
- aList2.Append(aTool);
- aCSI.SetArguments(aList2);
- aCSI.Perform();
- if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
- StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
- }
-#endif
+ if (isCheckSelfInte) {
+ BOPCol_ListOfShape aList2;
+ aList2.Append(aTool);
+ aCSI.SetArguments(aList2);
+ aCSI.Perform();
+ if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) {
+ StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected");
+ }
+ }
// Copy shape
+ aShapeCopy.Nullify();
TNaming_CopyShape::CopyTool(aTool, aMapTShapes, aShapeCopy);
aShape = performOperation (aShape, aShapeCopy, BOOLEAN_CUT);
GEOMImpl_IBoolean aCI (function);
Standard_Integer aType = function->GetType();
+ Standard_Boolean isCheckSelfInte = aCI.GetCheckSelfIntersection();
switch ( aType ) {
case BOOLEAN_COMMON:
theOperationName = "COMMON";
AddParam( theParams, "Object 1", aCI.GetShape1() );
AddParam( theParams, "Object 2", aCI.GetShape2() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
break;
case BOOLEAN_CUT:
theOperationName = "CUT";
AddParam( theParams, "Main Object", aCI.GetShape1() );
AddParam( theParams, "Tool Object", aCI.GetShape2() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
break;
case BOOLEAN_FUSE:
theOperationName = "FUSE";
AddParam( theParams, "Object 1", aCI.GetShape1() );
AddParam( theParams, "Object 2", aCI.GetShape2() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+ AddParam( theParams, "Remove extra edges", aCI.GetRmExtraEdges() );
break;
case BOOLEAN_SECTION:
theOperationName = "SECTION";
AddParam( theParams, "Object 1", aCI.GetShape1() );
AddParam( theParams, "Object 2", aCI.GetShape2() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
break;
case BOOLEAN_COMMON_LIST:
theOperationName = "COMMON";
AddParam( theParams, "Selected objects", aCI.GetShapes() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
break;
case BOOLEAN_FUSE_LIST:
theOperationName = "FUSE";
AddParam( theParams, "Selected objects", aCI.GetShapes() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
+ AddParam( theParams, "Remove extra edges", aCI.GetRmExtraEdges() );
break;
case BOOLEAN_CUT_LIST:
theOperationName = "CUT";
AddParam( theParams, "Main Object", aCI.GetShape1() );
AddParam( theParams, "Tool Objects", aCI.GetShapes() );
+ AddParam( theParams, "Check self-intersections", isCheckSelfInte );
break;
default:
return false;
