Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compilation issue with gcc 6.3
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_PolylineXY.h
diff --git
a/src/HYDROData/HYDROData_PolylineXY.h
b/src/HYDROData/HYDROData_PolylineXY.h
index a0172fd743de4aed5bb98d2d698d1c3b83fbab62..8375616b912921c6e36b12f4aabca5daa9314387 100644
(file)
--- 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 HYDROData_PolylineXY_HeaderFile
#include "HYDROData_IPolyline.h"
-
-DEFINE_STANDARD_HANDLE(HYDROData_PolylineXY, HYDROData_IPolyline)
+#include <TopTools_HSequenceOfShape.hxx>
class QPainterPath;
class QTransform;
class QPainterPath;
class QTransform;
@@
-30,7
+29,7
@@
class gp_XYZ;
class gp_Pnt;
/**\class HYDROData_PolylineXY
class gp_Pnt;
/**\class HYDROData_PolylineXY
- * \brief Class that stores/retr
eives information about the
+ * \brief Class that stores/retr
ieves information about the
* parametric profile points.
*/
class HYDROData_PolylineXY : public HYDROData_IPolyline
* parametric profile points.
*/
class HYDROData_PolylineXY : public HYDROData_IPolyline
@@
-46,7
+45,7
@@
protected:
};
public:
};
public:
- DEFINE_STANDARD_RTTI
(HYDROData_PolylineXY
);
+ DEFINE_STANDARD_RTTI
EXT(HYDROData_PolylineXY, HYDROData_IPolyline
);
/**
/**
@@
-57,7
+56,8
@@
public:
/**
* Dump object to Python script representation.
*/
/**
* 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.
/**
* Update the wire contour on the basis of the polyline data.
@@
-68,13
+68,13
@@
public:
HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
/**
HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
/**
- * Checks that object has 2D presentation. Re
imlemented to retu
n true.
+ * Checks that object has 2D presentation. Re
-implemented to retur
n true.
*/
HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
/**
* Returns data of object wrapped to QVariant.
*/
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();
*/
HYDRODATA_EXPORT virtual QVariant GetDataVariant();
@@
-83,17
+83,21
@@
public:
*/
HYDRODATA_EXPORT static QColor DefaultWireColor();
*/
HYDRODATA_EXPORT static QColor DefaultWireColor();
+ HYDRODATA_EXPORT bool IsCustom() const;
+ HYDRODATA_EXPORT bool GetIsInCustomFlag() const;
+ HYDRODATA_EXPORT void SetIsInCustomFlag( bool theValue );
+
public:
/**
public:
/**
- * Returns the presentation of polyline section in CAS maner.
+ * Returns the presentation of polyline section in CAS man
n
er.
*/
HYDRODATA_EXPORT static TopoDS_Wire BuildWire( const SectionType& theType,
const bool& theIsClosed,
const NCollection_Sequence<gp_XYZ>& thePoints );
/**
*/
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 man
n
er.
*/
HYDRODATA_EXPORT static void BuildPainterPath( QPainterPath& thePath,
const SectionType& theType,
*/
HYDRODATA_EXPORT static void BuildPainterPath( QPainterPath& thePath,
const SectionType& theType,
@@
-122,16
+126,14
@@
public:
public:
public:
- /**
- * Returns the 2D presentation of all points.
- */
- HYDRODATA_EXPORT virtual TopoDS_Shape GetShape() const;
-
/**
* Returns the 3D presentation of all points.
*/
/**
* 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.
/**
* Returns flag indicating that polyline can be edited or not.
@@
-148,14
+150,18
@@
public:
*/
HYDRODATA_EXPORT bool IsClosed( const bool theIsSimpleCheck = true ) const;
*/
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 be
etw
en first and point with index thePointIndex
+ * Returns the distance be
twe
en 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;
* 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.
*/
/**
* Returns number of sections.
*/
@@
-278,7
+284,7
@@
public:
* only for section with this index
* \return list of points
*/
* 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;
/**
/**
@@
-301,6
+307,8
@@
protected:
*/
HYDRODATA_EXPORT virtual void setEditable( const bool theIsEditable );
*/
HYDRODATA_EXPORT virtual void setEditable( const bool theIsEditable );
+ HYDRODATA_EXPORT void Interpolate();
+
protected:
friend class HYDROData_Profile;
protected:
friend class HYDROData_Profile;
@@
-316,6
+324,9
@@
protected:
* Destructs properties of the object and object itself, removes it from the document.
*/
HYDRODATA_EXPORT ~HYDROData_PolylineXY();
* Destructs properties of the object and object itself, removes it from the document.
*/
HYDRODATA_EXPORT ~HYDROData_PolylineXY();
+
+private:
+ bool myIsInCustomFlag;
};
#endif
};
#endif