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_Polyline3D.h
diff --git
a/src/HYDROData/HYDROData_Polyline3D.h
b/src/HYDROData/HYDROData_Polyline3D.h
index 1975afaff26a0dfd559f3e19c4dea2d563c1ab40..2506681e944d2e55851e1a9f92ba08ca8edf7d95 100644
(file)
--- a/
src/HYDROData/HYDROData_Polyline3D.h
+++ b/
src/HYDROData/HYDROData_Polyline3D.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
@@
-72,16
+68,6
@@
public:
*/
HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
*/
HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
- /**
- * Returns the top shape of the object.
- */
- HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
-
- /**
- * Returns the 3d shape of the object.
- */
- HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
-
/**
* Update the shape presentations of stream.
* Call this method whenever you made changes for stream data.
/**
* Update the shape presentations of stream.
* Call this method whenever you made changes for stream data.
@@
-91,12
+77,12
@@
public:
/**
* Returns default filling color for new 3D polyline.
*/
/**
* Returns default filling color for new 3D polyline.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new 3D polyline.
*/
/**
* Returns default border color for new 3D polyline.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
public:
public:
@@
-158,19
+144,13
@@
public:
*/
HYDRODATA_EXPORT void SetChildProfileUZ( const Handle(HYDROData_ProfileUZ)& theProfile );
*/
HYDRODATA_EXPORT void SetChildProfileUZ( const Handle(HYDROData_ProfileUZ)& theProfile );
-
-protected:
-
/**
/**
- * Returns default filling color for new object.
+ * Returns list of polyline points.
+ * \return list of 3D points
*/
*/
- HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
- /**
- * Returns default border color for new object.
- */
- HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
+ HYDRODATA_EXPORT Polyline3DPoints GetPoints() const;
+protected:
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.