0021018: EDF 1592 GEOM: Problems with the radius input field in the Fillet 1D dialog box

[modules/geom.git] / src / GEOMImpl / GEOMImpl_PointDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
index bf8adfc02809a010bc41245cad82fc567f248cf3..8af5452e656926f7ee8b4e056f7339b0019e7109 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_PointDriver.hxx>
@@ -29,12 +30,14 @@
 #include <BRep_Tool.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
+#include <BRep_Builder.hxx>
 #include <Precision.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
+#include <TopoDS_Compound.hxx>
 
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
@@ -105,6 +108,8 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
   Standard_Integer aType = aFunction->GetType();
 
   gp_Pnt aPnt;
+  TopoDS_Compound aCompound;
+  bool retCompound = false;
 
   if (aType == POINT_XYZ) {
     aPnt = gp_Pnt(aPI.GetX(), aPI.GetY(), aPI.GetZ());
@@ -120,7 +125,6 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
     }
     gp_Pnt P = BRep_Tool::Pnt(TopoDS::Vertex(aRefShape));
     aPnt = gp_Pnt(P.X() + aPI.GetX(), P.Y() + aPI.GetY(), P.Z() + aPI.GetZ());
-
   }
   else if (aType == POINT_CURVE_PAR) {
     Handle(GEOM_Function) aRefCurve = aPI.GetCurve();
@@ -181,33 +185,50 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_Logbook& log) const
     TopoDS_Shape aRefShape1 = aRef1->GetValue();
     TopoDS_Shape aRefShape2 = aRef2->GetValue();
 
-    if (aRefShape1.ShapeType() != TopAbs_EDGE || aRefShape2.ShapeType() != TopAbs_EDGE ) {
+    if ( (aRefShape1.ShapeType() != TopAbs_EDGE && aRefShape1.ShapeType() != TopAbs_WIRE)
+      || (aRefShape2.ShapeType() != TopAbs_EDGE && aRefShape2.ShapeType() != TopAbs_WIRE) ) {
       Standard_TypeMismatch::Raise
-        ("Creation Point On Lines Intersection Aborted : Line shape is not an edge");
+        ("Creation Point On Lines Intersection Aborted : Line shape is not an edge or wire");
     }
+
+    if (aRefShape1.IsSame(aRefShape2))
+      Standard_ConstructionError::Raise("The lines to make intersection must be different");
+
     //Calculate Lines Intersection Point
     BRepExtrema_DistShapeShape dst (aRefShape1, aRefShape2);
-    if (dst.IsDone())
-      {
-        gp_Pnt P1, P2;
-        for (int i = 1; i <= dst.NbSolution(); i++) {
-          P1 = dst.PointOnShape1(i);
-          P2 = dst.PointOnShape2(i);
-          Standard_Real Dist = P1.Distance(P2);
-          if ( Dist <= Precision::Confusion() )
-            aPnt = P1;
-          else 
-            Standard_TypeMismatch::Raise ("Lines not have an Intersection Point");
+    if (dst.IsDone()) {
+      gp_Pnt P1, P2;
+      BRep_Builder B;
+      B.MakeCompound( aCompound );
+      for (int i = 1; i <= dst.NbSolution(); i++) {
+        P1 = dst.PointOnShape1(i);
+        P2 = dst.PointOnShape2(i);
+        Standard_Real Dist = P1.Distance(P2);
+        if ( Dist <= Precision::Confusion() && dst.NbSolution() > 1) {
+          BRepBuilderAPI_MakeVertex mkVertex (P1);
+          B.Add(aCompound, mkVertex.Shape());
+          retCompound = true;
+        } else if ( Dist <= Precision::Confusion() ) {
+          aPnt = P1;
+        } else {
+          Standard_TypeMismatch::Raise ("Shapes have not an Intersection Point");
         }
       }
+    }
   }
   else {
     return 0;
   }
 
-  BRepBuilderAPI_MakeVertex mkVertex (aPnt);
-  TopoDS_Shape aShape = mkVertex.Shape();
-  aShape.Infinite(Standard_True);
+  TopoDS_Shape aShape;
+  if ( retCompound ) {
+    aShape = aCompound;
+  } else {
+    BRepBuilderAPI_MakeVertex mkVertex (aPnt);
+    aShape = mkVertex.Shape();
+  }
+
+  //aShape.Infinite(Standard_True); // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines)
   aFunction->SetValue(aShape);
 
   log.SetTouched(Label());
@@ -258,5 +279,3 @@ const Handle(GEOMImpl_PointDriver) Handle(GEOMImpl_PointDriver)::DownCast(const
 
   return _anOtherObject ;
 }
-
-