X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Tool.cxx;h=50c1ef702cded42b472e7a81ee73e0cc8c02b1a7;hb=cd6ea20d9a76665a24a533d0340385a335961f05;hp=333205a0e371be975b631e52c75e5e0991e767f0;hpb=ee8e304b51d61dd8bf5d25328039aa645f80e4da;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index 333205a0..50c1ef70 100644
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -1,3 +1,24 @@
+// Copyright (C) 2007-2015  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, 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
+// 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 "HYDROData_Tool.h"
 
@@ -6,33 +27,19 @@
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 
-#include <TopTools_SequenceOfShape.hxx>
-#include <TopExp_Explorer.hxx>
-
 #include <QFile>
 #include <QStringList>
 #include <QTextStream>
 
 #include <limits>
-#define CLASS2D 1
-#ifdef CLASS2D
 #include <gp_Pnt.hxx>
-#include <gp_Vec.hxx>
 #include <gp_Pln.hxx>
-#include <TopExp.hxx>
-#include <Geom_Plane.hxx>
+#include <ElSLib.hxx>
+#include <TopAbs_State.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepTopAdaptor_FClass2d.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_FindPlane.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TColgp_SequenceOfVec.hxx>
-#include <TopTools_ShapeMapHasher.hxx>
-#undef _NCollection_MapHasher
-#endif
+
 static int aMaxNameId = std::numeric_limits<int>::max();
 
 void HYDROData_Tool::WriteStringsToFile( QFile&             theFile,
@@ -177,63 +184,18 @@ QString HYDROData_Tool::GenerateNameForPython( const MapOfTreatedObjects& theTre
   return aName;
 }
 //======================================================================================================
-// the Face to be: planer, whitout holes
-#ifdef CLASS2D
-TopAbs_State HYDROData_Tool::ComputePointState( const gp_XY& thePnt2d, const TopoDS_Face& theFace )
+TopAbs_State HYDROData_Tool::ComputePointState( const gp_XY& theXY, const TopoDS_Face& theFace )
 {
   TopAbs_State aState(TopAbs_UNKNOWN);
   if(theFace.IsNull()) return aState;  
-
-#ifdef CLASS2D	   
-  TopoDS_Wire aWire; int nb(0);
-  TopoDS_Iterator it(theFace);
-  for(;it.More();it.Next()) {
-	  aWire = TopoDS::Wire(it.Value());
-	  nb++;
-  }
-  if(nb > 1 || aWire.IsNull()) return aState;
-  gp_Pln aPlane;
-  gp_Vec aNormal;
-  BRepBuilderAPI_FindPlane fndPlane (theFace, Precision::Confusion());
-  if(fndPlane.Found())
-    aPlane = fndPlane.Plane()->Pln();
-  else
-    return aState;
-  aNormal = gp_Vec(aPlane.Axis().Direction());
-  if(theFace.Orientation() == TopAbs_REVERSED) 
-    aNormal.Reverse();
-  gp_Pnt aPoint = gp_Pnt (thePnt2d.X(), thePnt2d.Y(), 0);
-  TColgp_SequenceOfVec aSeq;
-  TopTools_MapOfShape aMap;
-  it.Initialize(aWire);
-  for (;it.More(); it.Next()) {
-	const TopoDS_Vertex& aVx = TopExp::FirstVertex(TopoDS::Edge(it.Value()), Standard_True);
-	if(!aMap.Add(aVx))
-	  continue;
-	const gp_Pnt& aCurPnt = BRep_Tool::Pnt(TopoDS::Vertex(aVx));
-	if(aPoint.IsEqual(aCurPnt,Precision::Confusion())) {
-      aState = TopAbs_ON;
-	  return aState;
-	}
-	gp_Vec aVec (aPoint, aCurPnt);
-	aSeq.Append(aVec);
-  }
-  Standard_Real anAng(0.0);
-  for(int i = 1;i < aSeq.Length();i++) {
-    const gp_Vec& aV1 = aSeq.Value(i);
-	const gp_Vec& aV2 = aSeq.Value(i+1);
-	 anAng += aV1.AngleWithRef(aV2, aNormal);
-  }
-  anAng += aSeq.Value(aSeq.Length()).AngleWithRef(aSeq.Value(1), aNormal);
-  if(abs(anAng) > Precision::Angular())
-    aState = TopAbs_IN;
-  else
-	 aState = TopAbs_OUT;
-
-#else
-  BRepTopAdaptor_FClass2d aClassifier( theFace, Precision::Confusion() ); 
-  aState = aClassifier.Perform( gp_Pnt2d( thePoint ), Standard_False );
-#endif
+  Standard_Real aTol = BRep_Tool::Tolerance(theFace);
+  BRepAdaptor_Surface Ads ( theFace, Standard_False );
+  Standard_Real toluv = Min ( Ads.UResolution(aTol), Ads.VResolution(aTol) ); 
+  const gp_Pln& aPlane = Ads.Surface().Plane();
+  gp_Pnt aPnt(theXY.X(), theXY.Y(), 0.);
+  Standard_Real aU1, aV1;
+  ElSLib::Parameters(aPlane,aPnt, aU1, aV1);
+  BRepTopAdaptor_FClass2d aClassifier( theFace, toluv ); 
+  aState = aClassifier.Perform( gp_Pnt2d(aU1, aV1), Standard_False );
   return aState;
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file