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
porting on linux
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Obstacle.h
diff --git
a/src/HYDROData/HYDROData_Obstacle.h
b/src/HYDROData/HYDROData_Obstacle.h
index cd0cb95d6efdb8d30ab731f2be27d8575f12512a..bbf690a2259e77a775c52ead1e9429e06e2a7504 100644
(file)
--- a/
src/HYDROData/HYDROData_Obstacle.h
+++ b/
src/HYDROData/HYDROData_Obstacle.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
@@
-56,7
+52,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 immersible zone object.
/**
* Update the immersible zone object.
@@
-71,25
+68,15
@@
public:
*/
HYDRODATA_EXPORT virtual bool IsHas2dPrs() const;
*/
HYDRODATA_EXPORT virtual bool IsHas2dPrs() 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;
-
/**
* Returns default filling color for new obstacle.
*/
/**
* Returns default filling color for new obstacle.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new obstacle.
*/
/**
* Returns default border color for new obstacle.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
/**
/**
@@
-155,17
+142,6
@@
public:
const double theDz );
protected:
const double theDz );
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 obstacle altitude object.
/**
* Returns the type of child altitude object.
* Reimplemented to create obstacle altitude object.