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 branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Object.h
diff --git
a/src/HYDROData/HYDROData_Object.h
b/src/HYDROData/HYDROData_Object.h
index 5959a163b392bc2d702c4acec7c69733e2f9a8c8..0c217f274a6464e8e44d93c5271e4c7de578453b 100644
(file)
--- a/
src/HYDROData/HYDROData_Object.h
+++ b/
src/HYDROData/HYDROData_Object.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
@@
-25,7
+21,6
@@
#include <HYDROData_Entity.h>
#include <HYDROData_Entity.h>
-
DEFINE_STANDARD_HANDLE(HYDROData_Object, HYDROData_Entity)
class TopoDS_Shape;
DEFINE_STANDARD_HANDLE(HYDROData_Object, HYDROData_Entity)
class TopoDS_Shape;
@@
-54,6
+49,7
@@
protected:
DataTag_Object3D, ///< child 3D object
DataTag_EdgesGroup, ///< child group objects
DataTag_ChildAltitudeObject, ///< child altitude object
DataTag_Object3D, ///< child 3D object
DataTag_EdgesGroup, ///< child group objects
DataTag_ChildAltitudeObject, ///< child altitude object
+ DataTag_IsSubmersible, ///< the attribute "is submersible"
};
public:
};
public:
@@
-80,7
+76,7
@@
public:
* Sets the "MustBeUpdated" flag: if object is depended on updated features.
* Reimplemented to update the state of child 3D object.
*/
* Sets the "MustBeUpdated" flag: if object is depended on updated features.
* Reimplemented to update the state of child 3D object.
*/
- HYDRODATA_EXPORT virtual void
SetToUpdate( bool theFlag
);
+ HYDRODATA_EXPORT virtual void
Changed( Geometry
);
/**
/**
@@
-91,7
+87,7
@@
public:
/**
* Returns the top shape of the object.
*/
/**
* Returns the top shape of the object.
*/
- HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const
= 0
;
+ HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
/**
* Sets the 3d shape of the object.
/**
* Sets the 3d shape of the object.
@@
-101,9
+97,8
@@
public:
/**
* Returns the 3d shape of the object.
*/
/**
* Returns the 3d shape of the object.
*/
- HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const
= 0
;
+ HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
-
/**
* Returns reference object which represent the 3D shape of object.
*/
/**
* Returns reference object which represent the 3D shape of object.
*/
@@
-162,17
+157,11
@@
public:
*/
HYDRODATA_EXPORT virtual QColor GetBorderColor() const;
*/
HYDRODATA_EXPORT virtual QColor GetBorderColor() const;
-protected:
+ HYDRODATA_EXPORT bool IsSubmersible() const;
+ HYDRODATA_EXPORT void SetIsSubmersible( bool ) const;
- /**
- * 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;
+ HYDRODATA_EXPORT virtual void GetBoundaries( QList<TopoDS_Shape>& theBoundShapes,
+ QStringList& theBoundNames ) const;
protected:
protected:
@@
-180,7
+169,7
@@
protected:
* Creates new object in the internal data structure. Use higher level objects
* to create objects with real content.
*/
* Creates new object in the internal data structure. Use higher level objects
* to create objects with real content.
*/
- HYDRODATA_EXPORT HYDROData_Object();
+ HYDRODATA_EXPORT HYDROData_Object(
Geometry
);
/**
* Destructs properties of the object and object itself, removes it from the document.
/**
* Destructs properties of the object and object itself, removes it from the document.
@@
-188,6
+177,8
@@
protected:
virtual HYDRODATA_EXPORT ~HYDROData_Object();
protected:
virtual HYDRODATA_EXPORT ~HYDROData_Object();
protected:
+ HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
+ HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
/**
* Dump the initial object creation to a Python script.
/**
* Dump the initial object creation to a Python script.
@@
-232,29
+223,17
@@
protected:
/**
* Remove all child group objects.
*/
/**
* Remove all child group objects.
*/
- HYDRODATA_EXPORT virtual void removeGroupObjects();
-
-
- /**
- * Retrieve the top shape of the object from data label.
- */
- HYDRODATA_EXPORT TopoDS_Shape getTopShape() const;
+ HYDRODATA_EXPORT virtual void RemoveGroupObjects();
/**
* Removes the top shape from data label of the object.
*/
/**
* Removes the top shape from data label of the object.
*/
- HYDRODATA_EXPORT void removeTopShape();
-
-
- /**
- * Retrieve the 3d shape of the object from data label.
- */
- HYDRODATA_EXPORT TopoDS_Shape getShape3D() const;
+ HYDRODATA_EXPORT void RemoveTopShape();
/**
* Removes the 3d shape from data label of the object.
*/
/**
* Removes the 3d shape from data label of the object.
*/
- HYDRODATA_EXPORT void
r
emoveShape3D();
+ HYDRODATA_EXPORT void
R
emoveShape3D();
};
#endif
};
#endif