Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro

[modules/hydro.git] / src / HYDROData / HYDROData_Tool.cxx

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index 072b0d2290baa22a03bf24b3bb9c701281c0d07c..50c1ef702cded42b472e7a81ee73e0cc8c02b1a7 100644 (file)
--- 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,17 +27,18 @@
 #include "HYDROData_Iterator.h"
 #include "HYDROData_NaturalObject.h"
 
-#include <TopoDS_Shape.hxx>
-
-#include <TopTools_SequenceOfShape.hxx>
-
-#include <TopExp_Explorer.hxx>
-
 #include <QFile>
 #include <QStringList>
 #include <QTextStream>
 
 #include <limits>
+#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
+#include <ElSLib.hxx>
+#include <TopAbs_State.hxx>
+#include <BRepAdaptor_Surface.hxx>
+#include <BRepTopAdaptor_FClass2d.hxx>
+#include <BRep_Tool.hxx>
 
 static int aMaxNameId = std::numeric_limits<int>::max();
 
@@ -108,56 +130,6 @@ QString HYDROData_Tool::GenerateObjectName( const Handle(HYDROData_Document)& th
   return aName;
 }
 
-Handle(HYDROData_Entity) HYDROData_Tool::FindObjectByName( const Handle(HYDROData_Document)& theDoc,
-                                                           const QString&                    theName,
-                                                           const ObjectKind                  theObjectKind )
-{
-  Handle(HYDROData_Entity) anObject;
-  if ( theName.isEmpty() || theDoc.IsNull() )
-    return anObject;
-
-  QStringList aNamesList;
-  aNamesList << theName;
-
-  HYDROData_SequenceOfObjects aSeqOfObjs = FindObjectsByNames( theDoc, aNamesList, theObjectKind );
-  if( aSeqOfObjs.IsEmpty() )
-    return anObject;
-  
-  anObject = aSeqOfObjs.First();
-  return anObject;
-}
-
-HYDROData_SequenceOfObjects HYDROData_Tool::FindObjectsByNames( const Handle(HYDROData_Document)& theDoc,
-                                                                const QStringList&                theNames,
-                                                                const ObjectKind                  theObjectKind )
-{
-  HYDROData_SequenceOfObjects aResSeq;
-  if( theDoc.IsNull() )
-    return aResSeq;
-
-  QStringList aNamesList = theNames;
-
-  HYDROData_Iterator anIter( theDoc, theObjectKind );
-  for( ; anIter.More(); anIter.Next() )
-  {
-    Handle(HYDROData_Entity) anObject = anIter.Current();
-    if( anObject.IsNull() )
-      continue;
-
-    QString anObjName = anObject->GetName();
-    if ( anObjName.isEmpty() || !aNamesList.contains( anObjName ) )
-      continue;
-
-    aResSeq.Append( anObject );
-
-    aNamesList.removeAll( anObjName );
-    if ( aNamesList.isEmpty() )
-      break;
-  }
-
-  return aResSeq;
-}
-
 bool HYDROData_Tool::IsGeometryObject( const Handle(HYDROData_Entity)& theObject )
 {
   if ( theObject.IsNull() )
@@ -210,4 +182,20 @@ QString HYDROData_Tool::GenerateNameForPython( const MapOfTreatedObjects& theTre
   }
 
   return aName;
+}
+//======================================================================================================
+TopAbs_State HYDROData_Tool::ComputePointState( const gp_XY& theXY, const TopoDS_Face& theFace )
+{
+  TopAbs_State aState(TopAbs_UNKNOWN);
+  if(theFace.IsNull()) return aState;  
+  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;
 }
\ No newline at end of file