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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Channel.h
diff --git
a/src/HYDROData/HYDROData_Channel.h
b/src/HYDROData/HYDROData_Channel.h
index 8e9587643ec72ef8fca48f2665faffa059d1a276..163601c0d718be20b2d5ead90c5ad0febacdce2f 100644
(file)
--- a/
src/HYDROData/HYDROData_Channel.h
+++ b/
src/HYDROData/HYDROData_Channel.h
@@
-24,12
+24,8
@@
#include <TopoDS_Face.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Face.hxx>
#include <TopoDS_Wire.hxx>
-class Handle(HYDROData_Polyline3D);
-class Handle(HYDROData_Profile);
-class TopTools_SequenceOfShape;
-class TopTools_ListOfShape;
-
-DEFINE_STANDARD_HANDLE(HYDROData_Channel, HYDROData_ArtificialObject)
+class HYDROData_Polyline3D;
+class HYDROData_Profile;
/**\class HYDROData_Channel
* \brief
/**\class HYDROData_Channel
* \brief
@@
-58,11
+54,11
@@
protected:
DataTag_First = HYDROData_ArtificialObject::DataTag_First + 100, ///< first tag, to reserve
DataTag_GuideLine,
DataTag_Profile,
DataTag_First = HYDROData_ArtificialObject::DataTag_First + 100, ///< first tag, to reserve
DataTag_GuideLine,
DataTag_Profile,
+ DataTag_EquiDistance,
};
public:
};
public:
-
- DEFINE_STANDARD_RTTI(HYDROData_Channel);
+ DEFINE_STANDARD_RTTIEXT(HYDROData_Channel, HYDROData_ArtificialObject);
public:
public:
@@
-71,7
+67,8
@@
public:
*/
HYDRODATA_EXPORT static bool CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
const Handle(HYDROData_Profile)& theProfile,
*/
HYDRODATA_EXPORT static bool CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
const Handle(HYDROData_Profile)& theProfile,
- PrsDefinition& thePrs );
+ PrsDefinition& thePrs,
+ double theEquiDistance );
public:
public:
@@
-83,7
+80,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;
/**
* Returns the list of all reference objects of this object.
/**
* Returns the list of all reference objects of this object.
@@
-91,16
+89,16
@@
public:
HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
/**
HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
/**
- * Returns the
top shape of the object
.
+ * Returns the
left edge of the channel
.
*/
*/
- HYDRODATA_EXPORT virtual TopoDS_Shape Get
Top
Shape() const;
+ HYDRODATA_EXPORT virtual TopoDS_Shape Get
Left
Shape() const;
/**
/**
- * Returns the
3d shape of the object
.
+ * Returns the
right edge of the channel
.
*/
*/
- HYDRODATA_EXPORT virtual TopoDS_Shape Get
Shape3D
() const;
+ HYDRODATA_EXPORT virtual TopoDS_Shape Get
RightShape
() const;
- /**
+
/**
* Update the shape presentations of stream.
* Call this method whenever you made changes for channel data.
*/
* Update the shape presentations of stream.
* Call this method whenever you made changes for channel data.
*/
@@
-114,12
+112,12
@@
public:
/**
* Returns default filling color for new channel.
*/
/**
* Returns default filling color for new channel.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new channel.
*/
/**
* Returns default border color for new channel.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
public:
public:
@@
-156,19
+154,10
@@
public:
*/
HYDRODATA_EXPORT virtual void RemoveProfile();
*/
HYDRODATA_EXPORT virtual void RemoveProfile();
+ HYDRODATA_EXPORT void SetEquiDistance( double );
+ HYDRODATA_EXPORT double GetEquiDistance() const;
protected:
protected:
-
- /**
- * Returns default filling color for new object.
- */
- HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
- /**
- * Returns default border color for new object.
- */
- HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
-
/**
* Returns the type of child altitude object.
* Reimplemented to create chanel altitude object.
/**
* Returns the type of child altitude object.
* Reimplemented to create chanel altitude object.