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 master
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_ImmersibleZone.h
diff --git
a/src/HYDROData/HYDROData_ImmersibleZone.h
b/src/HYDROData/HYDROData_ImmersibleZone.h
index c8d6416a55552b47bdf3750b7512ce1d5b76705b..3e4d6e8475afd48b860470f1378d5a079907b320 100644
(file)
--- a/
src/HYDROData/HYDROData_ImmersibleZone.h
+++ b/
src/HYDROData/HYDROData_ImmersibleZone.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;
/**
* Returns the list of all reference objects of this object.
/**
* Returns the list of all reference objects of this object.
@@
-74,11
+71,6
@@
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.
*/
/**
* Returns the 3d shape of the object.
*/
@@
-87,12
+79,12
@@
public:
/**
* Returns default filling color for new zone.
*/
/**
* Returns default filling color for new zone.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new zone.
*/
/**
* Returns default border color for new zone.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
/**
* Sets reference polyline object for zone.
/**
* Sets reference polyline object for zone.
@@
-112,18
+104,6
@@
public:
HYDRODATA_EXPORT TopoDS_Shape generateTopShape() const;
HYDRODATA_EXPORT static TopoDS_Shape generateTopShape( const Handle(HYDROData_PolylineXY)& );
HYDRODATA_EXPORT TopoDS_Shape generateTopShape() const;
HYDRODATA_EXPORT static TopoDS_Shape generateTopShape( const Handle(HYDROData_PolylineXY)& );
-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;
-
private:
/**
private:
/**