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_Channel.h
diff --git
a/src/HYDROData/HYDROData_Channel.h
b/src/HYDROData/HYDROData_Channel.h
index f5c8a4b17ed91f159a14defdad17e8b7ddb03ed4..86ed56b0c5b150559a9e5d5f274ce2022ad50475 100644
(file)
--- a/
src/HYDROData/HYDROData_Channel.h
+++ b/
src/HYDROData/HYDROData_Channel.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
@@
-95,14
+91,14
@@
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.
/**
* Update the shape presentations of stream.
@@
-118,12
+114,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:
@@
-162,17
+158,6
@@
public:
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.