-// 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include <Standard_Stream.hxx>
#include <GEOMImpl_PointDriver.hxx>
#include <BRep_Tool.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepExtrema_DistShapeShape.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>
-#include <GeomAPI_ProjectPointOnSurf.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>
{
}
+//=======================================================================
+//function : getExtremaSolution
+//purpose : local function
+//=======================================================================
+static Standard_Boolean getExtremaSolution
+(GEOMImpl_IPoint& thePI,
+ TopoDS_Shape& theRefShape,
+ gp_Pnt& thePnt)
+{
+ gp_Pnt anInitPnt( thePI.GetX(), thePI.GetY(), thePI.GetZ() );
+ BRepBuilderAPI_MakeVertex mkVertex (anInitPnt);
+ TopoDS_Vertex anInitV = TopoDS::Vertex(mkVertex.Shape());
+
+ BRepExtrema_DistShapeShape anExt( anInitV, theRefShape );
+ if ( !anExt.IsDone() || anExt.NbSolution() < 1 )
+ return Standard_False;
+ thePnt = anExt.PointOnShape2(1);
+ Standard_Real aMinDist2 = anInitPnt.SquareDistance( thePnt );
+ for ( Standard_Integer j = 2, jn = anExt.NbSolution(); j <= jn; j++ )
+ {
+ gp_Pnt aPnt = anExt.PointOnShape2(j);
+ Standard_Real aDist2 = anInitPnt.SquareDistance( aPnt );
+ if ( aDist2 > aMinDist2)
+ continue;
+ aMinDist2 = aDist2;
+ thePnt = aPnt;
+ }
+ return Standard_True;
+}
//=======================================================================
//function : Execute
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());
}
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();
Standard_TypeMismatch::Raise
("Point On Curve creation aborted : curve shape is not an edge");
}
- Standard_Real aFP, aLP;
- Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFP, aLP);
- gp_Pnt anInitPnt( aPI.GetX(), aPI.GetY(), aPI.GetZ() );
- GeomAPI_ProjectPointOnCurve aProj(anInitPnt, aCurve/*, aFP, aLP*/);
- if ( aProj.NbPoints() <= 0 ) {
+ if (!getExtremaSolution( aPI, aRefShape, aPnt ) ) {
Standard_ConstructionError::Raise
("Point On Curve creation aborted : cannot project point");
}
- aPnt = aProj.NearestPoint();
}
else if (aType == POINT_SURFACE_PAR) {
Handle(GEOM_Function) aRefCurve = aPI.GetSurface();
Standard_TypeMismatch::Raise
("Point On Surface creation aborted : surface shape is not a face");
}
- TopoDS_Face F = TopoDS::Face(aRefShape);
- Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
- Standard_Real U1,U2,V1,V2;
- //aSurf->Bounds(U1,U2,V1,V2);
- ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
-
- gp_Pnt anInitPnt( aPI.GetX(), aPI.GetY(), aPI.GetZ() );
- GeomAPI_ProjectPointOnSurf aProj( anInitPnt, aSurf/*,
- U1,U2,V1,V2, Precision::Confusion()*/ );
- if ( !aProj.IsDone() ) {
+ if (!getExtremaSolution( aPI, aRefShape, aPnt ) ) {
Standard_ConstructionError::Raise
("Point On Surface creation aborted : cannot project point");
}
- aPnt = aProj.NearestPoint();
}
else if (aType == POINT_LINES_INTERSECTION) {
Handle(GEOM_Function) aRef1 = aPI.GetLine1();
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());
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_PointDriver",
- sizeof(GEOMImpl_PointDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+ sizeof(GEOMImpl_PointDriver),
+ 1,
+ (Standard_Address)_Ancestors,
+ (Standard_Address)NULL);
return _aType;
}
return _anOtherObject ;
}
-
-
