X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Tool.h;h=359ddf5b136bfd64c594d1fedd4f1da711eaeb5b;hb=8d4dba4a45855249f5eb022e9cc7dcff202bce3c;hp=761f9ec86e7134db9010be51f1ce817948647db2;hpb=a28b2f9db8b078ac1610cc4b626d057b0f0849a4;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Tool.h b/src/HYDROData/HYDROData_Tool.h
index 761f9ec8..359ddf5b 100644
--- a/src/HYDROData/HYDROData_Tool.h
+++ b/src/HYDROData/HYDROData_Tool.h
@@ -23,20 +23,24 @@
 #include <QStringList>
 #include <Precision.hxx>
 
-class Handle_HYDROData_Document;
-class Handle_HYDROData_Entity;
+class HYDROData_Document;
+class HYDROData_Entity;
 class HYDROData_SequenceOfObjects;
 class MapOfTreatedObjects;
 class gp_XY;
 class QColor;
 class QFile;
 class TCollection_ExtendedString;
-enum TopAbs_State;
+#ifdef WIN32
+  enum TopAbs_State;
+#else
+  #include <TopAbs_State.hxx>
+#endif
 class TopoDS_Edge;
 class TopoDS_Face;
 class TopoDS_Shape;
 class TopoDS_Wire;
-class TopTools_SequenceOfShape;
+class Quantity_Color;
 
 class HYDRODATA_EXPORT HYDROData_Tool {
 
@@ -46,12 +50,6 @@ public:
                                                             const QStringList& theStrings,
                                                             const QString&     theSep = "\n" );
 
-  /**
-   * Enables "MustBeUpdated" flag for objects that are depended on "MustBeUpdated" objects.
-   * \param theDoc document where this operation is performed
-   */
-  static void                           SetMustBeUpdatedObjects( const Handle_HYDROData_Document& theDoc );
-
   /**
    * \brief Generate name for new object.
    * \param theDoc document
@@ -60,7 +58,7 @@ public:
    * \param theIsTryToUsePurePrefix if true - the prefix will be returned if the name equal to the prefix is not busy
    * \return generated name
    */
-  static QString                        GenerateObjectName( const Handle_HYDROData_Document& theDoc,
+  static QString GenerateObjectName( const Handle(HYDROData_Document)& theDoc,
                                                             const QString&                   thePrefix,
                                                             const QStringList&               theUsedNames = QStringList(),
                                                             const bool                       theIsTryToUsePurePrefix = false );
@@ -70,7 +68,7 @@ public:
    * \param theObject object to check
    * \return true if object is geometry object
    */
-  static bool                           IsGeometryObject( const Handle_HYDROData_Entity& theObject );
+  static bool                           IsGeometryObject( const Handle(HYDROData_Entity)& theObject );
 
   /**
    * \brief Updates the child object name.
@@ -80,7 +78,7 @@ public:
    */
   static void                           UpdateChildObjectName( const QString&                  theOldStr,
                                                                const QString&                  theNewStr,
-                                                               const Handle_HYDROData_Entity& theObject );
+                                                               const Handle(HYDROData_Entity)& theObject );
 
 
   /**
@@ -119,6 +117,17 @@ public:
 
   static TCollection_ExtendedString toExtString( const QString& );
   static QString                    toQString( const TCollection_ExtendedString& );
+
+  static Quantity_Color toOccColor( const QColor& );
+  static QColor toQtColor( const Quantity_Color& );
+
+  static bool IsNan( double theValue );
+  static bool IsInf( double theValue );
+
+  /**
+  Rebuilds shape container (like compound/compsolid/shell) which contains faces (shared or nonshared with each other)
+  */
+  static TopoDS_Shape RebuildCmp(const TopoDS_Shape& in);
 };
 
 inline bool ValuesEquals( const double& theFirst, const double& theSecond )
@@ -141,6 +150,8 @@ HYDRODATA_EXPORT std::ostream& operator<<( std::ostream& theStream, const QStrin
 HYDRODATA_EXPORT std::ostream& operator<<( std::ostream& theStream, const QColor& theText );
 HYDRODATA_EXPORT std::ostream& operator<<( std::ostream& theStream, const TopoDS_Shape& theShape );
 HYDRODATA_EXPORT std::ostream& operator<<( std::ostream& theStream, const TopoDS_Face& theFace );
+HYDRODATA_EXPORT bool operator == ( const gp_XY& thePoint1, const gp_XY& thePoint2 );
+HYDRODATA_EXPORT std::ostream& operator<<( std::ostream& theStream, const gp_XY& theXY );
 
 #endif