X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Tool.h;h=eab582db707ce1b6616b4759d51671c6a1b05c9a;hb=f7c005b67e48ec7bac99c566fb4f34215ec1a4b1;hp=6aaf6eeb6931da53ed0781dd277894b0c706346a;hpb=5114139e76c36b62fa0c7134625324ac89090721;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Tool.h b/src/HYDROData/HYDROData_Tool.h
index 6aaf6eeb..eab582db 100644
--- a/src/HYDROData/HYDROData_Tool.h
+++ b/src/HYDROData/HYDROData_Tool.h
@@ -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
+//
 
 #ifndef HYDROData_Tool_HeaderFile
 #define HYDROData_Tool_HeaderFile
@@ -11,6 +32,8 @@
 
 #include <QString>
 #include <QStringList>
+#include <gp_XY.hxx>
+#include <TopoDS_Face.hxx>
 
 class QFile;
 class TopoDS_Shape;
@@ -33,7 +56,7 @@ public:
 
   /**
    * \brief Generate name for new object.
-   * \param theModule module
+   * \param theDoc document
    * \param thePrefix name prefix
    * \param theUsedNames list of already used names
    * \param theIsTryToUsePurePrefix if true - the prefix will be returned if the name equal to the prefix is not busy
@@ -44,28 +67,6 @@ public:
                                                             const QStringList&                theUsedNames = QStringList(),
                                                             const bool                        theIsTryToUsePurePrefix = false );
 
-  /**
-   * \brief Find the data object with the specified name.
-   * \param theModule module
-   * \param theName name
-   * \param theObjectKind kind of object
-   * \return data object
-   */
-  static Handle(HYDROData_Entity)       FindObjectByName( const Handle(HYDROData_Document)& theDoc,
-                                                          const QString&                    theName,
-                                                          const ObjectKind                  theObjectKind = KIND_UNKNOWN );
-
-  /**
-   * \brief Find the data objects with the specified names.
-   * \param theModule module
-   * \param theNames list of names
-   * \param theObjectKind kind of object
-   * \return list of data objects
-   */
-  static HYDROData_SequenceOfObjects    FindObjectsByNames( const Handle(HYDROData_Document)& theDoc,
-                                                            const QStringList&                theNames,
-                                                            const ObjectKind                  theObjectKind = KIND_UNKNOWN );
-
   /**
    * \brief Checks the type of object.
    * \param theObject object to check
@@ -74,15 +75,30 @@ public:
   static bool                           IsGeometryObject( const Handle(HYDROData_Entity)& theObject );
 
   /**
-   * \brief Explore the incoming shape to shapes with given type.
-   * \param theInShape object to explore
-   * \param theExpType type to explore
-   * \param theOutShapes[out] list of result shapes if any
+   * \brief Updates the child object name.
+   * \param theOldStr old father object name
+   * \param theNewStr new father object name
+   * \param theObject object to update
    */
-  static void                           ExploreShapeToShapes( const TopoDS_Shape&       theInShape,
-                                                              const TopAbs_ShapeEnum&   theExpType,
-                                                              TopTools_SequenceOfShape& theOutShapes );
+  static void                           UpdateChildObjectName( const QString&                  theOldStr,
+                                                               const QString&                  theNewStr,
+                                                               const Handle(HYDROData_Entity)& theObject );
 
+
+  /**
+   * \brief Generate name for new object in python environment.
+   * \param theTreatedObjects objects which was alredy created by dump operation
+   * \param thePrefix name prefix
+   * \return generated name
+   */
+  static QString                        GenerateNameForPython( const MapOfTreatedObjects& theTreatedObjects,
+                                                               const QString&             thePrefix );
+ /**
+  * Computes Point State from TopAbs (simplified & limited method).
+  */
+
+ static TopAbs_State                    ComputePointState( const gp_XY& thePnt2d, 
+	                                                       const TopoDS_Face& theFace );
 };
 
 inline bool ValuesEquals( const double& theFirst, const double& theSecond )