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
Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Profile.h
diff --git
a/src/HYDROData/HYDROData_Profile.h
b/src/HYDROData/HYDROData_Profile.h
index 03339e1f52d851b229697bced5820d9612d6d526..f1f5238076afee17d34b514fcfd36118348b99f5 100644
(file)
--- a/
src/HYDROData/HYDROData_Profile.h
+++ b/
src/HYDROData/HYDROData_Profile.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-91,12
+87,12
@@
public:
/**
* Returns default filling color for new profile.
*/
/**
* Returns default filling color for new profile.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new profile.
*/
/**
* Returns default border color for new profile.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
public:
public:
@@
-129,7
+125,8
@@
public:
* \param thePoint[out] profile first point
* \return true if point has been set
*/
* \param thePoint[out] profile first point
* \return true if point has been set
*/
- HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false ) const;
+ HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false,
+ bool CanUseDefault = false ) const;
/**
* Set last(right) point for profile.
/**
* Set last(right) point for profile.
@@
-142,8
+139,8
@@
public:
* \param thePoint[out] profile last point
* \return true if point has been set
*/
* \param thePoint[out] profile last point
* \return true if point has been set
*/
- HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false
) const;
-
+ HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false
,
+ bool CanUseDefault = false ) const;
/**
* Returns object which store parametric presentation of profile points.
/**
* Returns object which store parametric presentation of profile points.
@@
-189,7
+186,8
@@
public:
* Empty sequence is returned if first or last point was not set.
* \return profile points list
*/
* Empty sequence is returned if first or last point was not set.
* \return profile points list
*/
- HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false ) const;
+ HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false,
+ bool CanUseDefaultLeftRight = false ) const;
/**
/**
@@
-198,6
+196,12
@@
public:
*/
HYDRODATA_EXPORT ProfilePoint GetBottomPoint() const;
*/
HYDRODATA_EXPORT ProfilePoint GetBottomPoint() const;
+ /**
+ * Return profile middle point.
+ * \return non-parametric profile point
+ */
+ HYDRODATA_EXPORT ProfilePoint GetMiddlePoint( bool CanUseDefault ) const;
+
public:
// Public methods to work with files.
public:
// Public methods to work with files.
@@
-243,23
+247,13
@@
public:
bool* theIsRead = 0 );
protected:
bool* theIsRead = 0 );
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;
-
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.
*/
HYDRODATA_EXPORT virtual void checkAndSetObject3D() {}
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.
*/
HYDRODATA_EXPORT virtual void checkAndSetObject3D() {}
+ TopoDS_Shape CreateProfileWire( bool canUseDefaultPoints ) const;
protected:
protected: