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
change def hasher for indexed map
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Entity.h
diff --git
a/src/HYDROData/HYDROData_Entity.h
b/src/HYDROData/HYDROData_Entity.h
index 7e22bf794db5940372b09211648ac912ab4c0e2a..a38e771dd47ba9a8499061bc6a34835b23e38882 100644
(file)
--- a/
src/HYDROData/HYDROData_Entity.h
+++ b/
src/HYDROData/HYDROData_Entity.h
@@
-23,9
+23,9
@@
#include <NCollection_Sequence.hxx>
#include <TDF_Label.hxx>
#include <QMap>
#include <NCollection_Sequence.hxx>
#include <TDF_Label.hxx>
#include <QMap>
+#include <QString>
class QColor;
class QColor;
-class QString;
class QVariant;
class QStringList;
class Handle(TDataStd_ReferenceList);
class QVariant;
class QStringList;
class Handle(TDataStd_ReferenceList);
@@
-58,12
+58,14
@@
const ObjectKind KIND_ARTIFICIAL_OBJECT = 19;
const ObjectKind KIND_NATURAL_OBJECT = 20;
const ObjectKind KIND_DUMMY_3D = 21;
const ObjectKind KIND_SHAPES_GROUP = 22;
const ObjectKind KIND_NATURAL_OBJECT = 20;
const ObjectKind KIND_DUMMY_3D = 21;
const ObjectKind KIND_SHAPES_GROUP = 22;
-const ObjectKind KIND_SPLIT
TED_GROUP
= 23;
+const ObjectKind KIND_SPLIT
_GROUP
= 23;
const ObjectKind KIND_STREAM_ALTITUDE = 24;
const ObjectKind KIND_OBSTACLE_ALTITUDE = 25;
const ObjectKind KIND_STRICKLER_TABLE = 26;
const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
const ObjectKind KIND_STREAM_ALTITUDE = 24;
const ObjectKind KIND_OBSTACLE_ALTITUDE = 25;
const ObjectKind KIND_STRICKLER_TABLE = 26;
const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
-const ObjectKind KIND_LAND_COVER_MAP = 28;
+const ObjectKind KIND_CHANNEL_ALTITUDE = 28;
+const ObjectKind KIND_LAND_COVER_MAP = 29;
+const ObjectKind KIND_DTM = 30;
const ObjectKind KIND_LAST = KIND_LAND_COVER_MAP;
DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
const ObjectKind KIND_LAST = KIND_LAND_COVER_MAP;
DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
@@
-101,6
+103,7
@@
protected:
DataTag_First = 0, ///< first tag, to reserve
DataTag_ZLevel, ///< z-level of object presentation
DataTag_GeomChange,
DataTag_First = 0, ///< first tag, to reserve
DataTag_ZLevel, ///< z-level of object presentation
DataTag_GeomChange,
+ DataTag_DefaultName, ///< to keep the automatic name, useful in Python dump
};
public:
};
public:
@@
-129,10
+132,15
@@
public:
*/
HYDRODATA_EXPORT virtual QString GetName() const;
*/
HYDRODATA_EXPORT virtual QString GetName() const;
+ /**
+ * Returns the default name of this object.
+ */
+ HYDRODATA_EXPORT virtual QString GetDefaultName() const;
+
/**
* Updates the name of this object.
*/
/**
* Updates the name of this object.
*/
- HYDRODATA_EXPORT void SetName( const QString& theName );
+ HYDRODATA_EXPORT void SetName( const QString& theName
, bool isDefault = false
);
/**
* Returns the name of this object valid for Python script.
/**
* Returns the name of this object valid for Python script.
@@
-248,14
+256,22
@@
public:
HYDRODATA_EXPORT virtual void RemoveZLevel();
/**
HYDRODATA_EXPORT virtual void RemoveZLevel();
/**
- Find the Python object in the document by the object name.
- @param theTreatedObjects the map of treated objects
+ Add in Python script the find instruction, to retrieve the Python object in the document by the object name.
@param theScript the script
@param theScript the script
+ @param defName the name to use, if not default name.
*/
*/
- void findPythonReferenceObject(
MapOfTreatedObjects& theTreatedObjects
,
- QString
List& theScript
) const;
+ void findPythonReferenceObject(
QStringList& theScript
,
+ QString
defName = QString()
) const;
/**
/**
+ Add in Python script the set name instruction.
+ @param theScript the script
+ @param defName the name to use, if not default name.
+ */
+ void SetNameInDumpPython(QStringList& theScript,
+ QString theName = QString()) const;
+
+ /**
* Internal method that used to store the color attribute
* \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
* \param theColor color to save
* Internal method that used to store the color attribute
* \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
* \param theColor color to save
@@
-434,6
+450,9
@@
protected:
void SetShape( int theTag, const TopoDS_Shape& theShape );
TopoDS_Shape GetShape( int theTag ) const;
void SetShape( int theTag, const TopoDS_Shape& theShape );
TopoDS_Shape GetShape( int theTag ) const;
+ void SetDouble( int theTag, double theValue );
+ double GetDouble( int theTag, double theDefValue = 0.0 ) const;
+
int GetGeomChangeFlag() const;
protected:
int GetGeomChangeFlag() const;
protected: