X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineXY.h;h=d67f0ad5ad781a3b0c0694742f8057927b769c68;hb=d398a8be8e0b0259b476b358d53d234ce4c82379;hp=ef7101048ef76aa9f003a624c8a0eb7d01908c3b;hpb=4442203c0056e3c2e5d75756338a3f7e5bef968e;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_PolylineXY.h b/src/HYDROData/HYDROData_PolylineXY.h
index ef710104..d67f0ad5 100644
--- a/src/HYDROData/HYDROData_PolylineXY.h
+++ b/src/HYDROData/HYDROData_PolylineXY.h
@@ -20,6 +20,7 @@
 #define HYDROData_PolylineXY_HeaderFile
 
 #include "HYDROData_IPolyline.h"
+#include <TopTools_HSequenceOfShape.hxx>
 
 DEFINE_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline)
 
@@ -27,9 +28,10 @@ class QPainterPath;
 class QTransform;
 class TopoDS_Wire;
 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
@@ -56,7 +58,8 @@ public:
   /**
    * Dump object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Update the wire contour on the basis of the polyline data.
@@ -67,13 +70,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();
 
@@ -82,17 +85,21 @@ 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,
@@ -121,16 +128,14 @@ public:
 
 public:
 
-  /**
-   * Returns the 2D presentation of all points.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape() const;
-
   /**
    * Returns the 3D presentation of all points.
    */
-  HYDRODATA_EXPORT virtual bool ImportShape( const TopoDS_Shape& theShape );
-
+  HYDRODATA_EXPORT virtual bool ImportShape( const TopoDS_Shape& theShape,
+                                             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 +152,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.
    */
@@ -277,7 +286,7 @@ public:
    *                        only for section with this index
    * \return list of points
    */
-  HYDRODATA_EXPORT virtual PointsList GetPoints( const int theSectionIndex = -1 ) const;
+  HYDRODATA_EXPORT virtual PointsList GetPoints( const int theSectionIndex = -1, bool IsConvertToGlobal = false ) const;
 
 
   /**
@@ -300,6 +309,8 @@ protected:
    */
   HYDRODATA_EXPORT virtual void setEditable( const bool theIsEditable );
 
+  HYDRODATA_EXPORT void Interpolate();
+
 protected:
 
   friend class HYDROData_Profile;
@@ -315,6 +326,9 @@ protected:
    * Destructs properties of the object and object itself, removes it from the document.
    */
   HYDRODATA_EXPORT ~HYDROData_PolylineXY();
+
+private:
+  bool myIsInCustomFlag;
 };
 
 #endif