refs #430: incorrect coordinates in dump polyline

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

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index d754ec0f76ad4be3d286814f72faadef5f1f1093..8867c8eafe999e2d99c20929d0a7eb6cd5400b2f 100644 (file)
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -6,17 +6,20 @@
 #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();
 
 void HYDROData_Tool::WriteStringsToFile( QFile&             theFile,
                                          const QStringList& theStrings,
@@ -93,8 +96,7 @@ QString HYDROData_Tool::GenerateObjectName( const Handle(HYDROData_Document)& th
     aName = thePrefix;
   } else {
     int anId = 1;
-    int aMaxId = std::numeric_limits<int>::max();
-    while( anId < aMaxId )
+    while( anId < aMaxNameId )
     {
       aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
 
@@ -107,56 +109,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() )
@@ -191,3 +143,38 @@ void HYDROData_Tool::UpdateChildObjectName( const QString&                  theO
   theObject->SetName( anObjName );
 }
 
+QString HYDROData_Tool::GenerateNameForPython( const MapOfTreatedObjects& theTreatedObjects,
+                                               const QString&             thePrefix )
+{
+  QString aName = thePrefix;
+  if ( !theTreatedObjects.contains( aName ) )
+    return aName;
+
+  int anId = 1;
+  while( anId < aMaxNameId )
+  {
+    aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
+
+    // check that there are no other objects with the same name
+    if ( !theTreatedObjects.contains( aName ) )
+      break;
+  }
+
+  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