X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_MirrorDriver.cxx;h=0090fa03a492b8aacaea5269798afe8d8d7561eb;hb=660a8df6ce074fade762f47209f5cac9ad30fcc3;hp=fefb1531d7c524c79e83c73c9c4f5cdb3677df00;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
index fefb1531d..0090fa03a 100644
--- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx
@@ -1,21 +1,47 @@
-
-using namespace std;
-#include "GEOMImpl_MirrorDriver.hxx"
+// Copyright (C) 2007-2011  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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// 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 <Standard_Stream.hxx>
+
+#include <GEOMImpl_MirrorDriver.hxx>
 
 #include <GEOMImpl_IMirror.hxx>
 #include <GEOMImpl_Types.hxx>
-#include "GEOM_Function.hxx"
+#include <GEOM_Function.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
+#include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepClass_FaceClassifier.hxx>
+#include <BRepTools.hxx>
 
 #include <TopAbs.hxx>
+#include <TopExp.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 #include <Geom_Plane.hxx>
 
@@ -66,6 +92,21 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const
   TopoDS_Shape anOriginal = anOriginalFunction->GetValue();
   if (anOriginal.IsNull()) return 0;
 
+  // Bug 12158: Check for standalone (not included in faces) degenerated edges
+  TopTools_IndexedDataMapOfShapeListOfShape aEFMap;
+  TopExp::MapShapesAndAncestors(anOriginal, TopAbs_EDGE, TopAbs_FACE, aEFMap);
+  Standard_Integer i, nbE = aEFMap.Extent();
+  for (i = 1; i <= nbE; i++) {
+    TopoDS_Shape anEdgeSh = aEFMap.FindKey(i);
+    if (BRep_Tool::Degenerated(TopoDS::Edge(anEdgeSh))) {
+      const TopTools_ListOfShape& aFaces = aEFMap.FindFromIndex(i);
+      if (aFaces.IsEmpty())
+        Standard_ConstructionError::Raise
+          ("Mirror aborted : cannot process standalone degenerated edge");
+    }
+  }
+
+  // Perform Mirror
   if (aType == MIRROR_PLANE || aType == MIRROR_PLANE_COPY) {
     Handle(GEOM_Function) aPlane = TI.GetPlane();
     if (aPlane.IsNull()) return 0;
@@ -80,8 +121,8 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const
     const gp_Dir dir = pos.Direction(); /* Main direction of the plane (Z axis) */
     gp_Ax2 aPln (loc, dir);
     aTrsf.SetMirror(aPln);
-
-  } else if (aType == MIRROR_AXIS || aType == MIRROR_AXIS_COPY) {
+  }
+  else if (aType == MIRROR_AXIS || aType == MIRROR_AXIS_COPY) {
     Handle(GEOM_Function) anAxis = TI.GetAxis();
     if (anAxis.IsNull()) return 0;
     TopoDS_Shape anAxisShape = anAxis->GetValue();
@@ -93,8 +134,8 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const
     gp_Vec aV (aP1, aP2);
     gp_Ax1 anAx1 (aP1, aV);
     aTrsf.SetMirror(anAx1);
-
-  } else if (aType == MIRROR_POINT || aType == MIRROR_POINT_COPY) {
+  }
+  else if (aType == MIRROR_POINT || aType == MIRROR_POINT_COPY) {
     Handle(GEOM_Function) aPoint = TI.GetPoint();
     if (aPoint.IsNull()) return 0;
     TopoDS_Shape aVertexShape = aPoint->GetValue();
@@ -103,7 +144,8 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const
 
     gp_Pnt aP = BRep_Tool::Pnt(aVertex);
     aTrsf.SetMirror(aP);
-  } else {
+  }
+  else {
     return 0;
   }
 
@@ -137,10 +179,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_MirrorDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_MirrorDriver",
-			                                 sizeof(GEOMImpl_MirrorDriver),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
+                                                         sizeof(GEOMImpl_MirrorDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }
@@ -160,7 +202,5 @@ const Handle(GEOMImpl_MirrorDriver) Handle(GEOMImpl_MirrorDriver)::DownCast(cons
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
-
-