X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineXY.h;h=8375616b912921c6e36b12f4aabca5daa9314387;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=e9181876b885f1421da0765e5d64cb7c866d6dd5;hpb=9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_PolylineXY.h b/src/HYDROData/HYDROData_PolylineXY.h
index e9181876..8375616b 100644
--- a/src/HYDROData/HYDROData_PolylineXY.h
+++ b/src/HYDROData/HYDROData_PolylineXY.h
@@ -20,8 +20,7 @@
 #define HYDROData_PolylineXY_HeaderFile
 
 #include "HYDROData_IPolyline.h"
-
-DEFINE_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline)
+#include <TopTools_HSequenceOfShape.hxx>
 
 class QPainterPath;
 class QTransform;
@@ -30,7 +29,7 @@ class gp_XYZ;
 class gp_Pnt;
 
 /**\class HYDROData_PolylineXY
- * \brief Class that stores/retreives information about the 
+ * \brief Class that stores/retrieves information about the
  *        parametric profile points.
  */
 class HYDROData_PolylineXY : public HYDROData_IPolyline
@@ -46,7 +45,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_PolylineXY);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_PolylineXY, HYDROData_IPolyline);
 
 
   /**
@@ -69,13 +68,13 @@ public:
   HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
 
   /**
-   * Checks that object has 2D presentation. Reimlemented to retun true.
+   * Checks that object has 2D presentation. Re-implemented to return true.
    */
   HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
 
   /**
    * Returns data of object wrapped to QVariant.
-   * Reimplemented to wrap and return saved path.
+   * Re-implemented to wrap and return saved path.
    */
   HYDRODATA_EXPORT virtual QVariant GetDataVariant();
 
@@ -85,18 +84,20 @@ public:
   HYDRODATA_EXPORT static QColor DefaultWireColor();
 
   HYDRODATA_EXPORT bool IsCustom() const;
+  HYDRODATA_EXPORT bool GetIsInCustomFlag() const;
+  HYDRODATA_EXPORT void SetIsInCustomFlag( bool theValue );
 
 public:
 
   /**
-   * Returns the presentation of polyline section in CAS maner.
+   * Returns the presentation of polyline section in CAS manner.
    */
   HYDRODATA_EXPORT static TopoDS_Wire BuildWire( const SectionType&                  theType,
                                                  const bool&                         theIsClosed,
                                                  const NCollection_Sequence<gp_XYZ>& thePoints );
 
   /**
-   * Returns the presentation of polyline section in Qt maner.
+   * Returns the presentation of polyline section in Qt manner.
    */
   HYDRODATA_EXPORT static void BuildPainterPath( QPainterPath&                       thePath,
                                                  const SectionType&                  theType,
@@ -129,8 +130,10 @@ public:
    * Returns the 3D presentation of all points.
    */
   HYDRODATA_EXPORT virtual bool ImportShape( const TopoDS_Shape& theShape,
-                                             bool IsInterpolationAllowed = false,
-                                             double theDeviation = 1E-3 );
+                                             bool IsInterpolationAllowed,
+                                             const Handle( HYDROData_PolylineXY )& theOldPolyline,
+                                             bool IsClosureAllowed = true,
+                                             double theDeviation = 1.);
 
   /**
    * Returns flag indicating that polyline can be edited or not.
@@ -147,14 +150,18 @@ public:
    */
   HYDRODATA_EXPORT bool IsClosed( const bool theIsSimpleCheck = true ) const;
 
+  /**
+   * Returns connected wires and their number, by rebuild of the wires from the edges, looking for connections
+   */
+  HYDRODATA_EXPORT int GetNbConnectedWires(Handle(TopTools_HSequenceOfShape)& aConnectedWires) const;
+
    /**
-   * Returns the distance beetwen first and point with index thePointIndex
+   * Returns the distance between first and point with index thePointIndex
    * at the section with index theSectionIndex. -1 is returned if error is occurred.
    */
   HYDRODATA_EXPORT double GetDistance( const int theSectionIndex,
                                        const int thePointIndex ) const;
 
-
   /**
    * Returns number of sections.
    */