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_PORTING_OCCT_7' of ssh://git.salome-platform.org/modules/hydro into...
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Entity.h
diff --git
a/src/HYDROData/HYDROData_Entity.h
b/src/HYDROData/HYDROData_Entity.h
index 6d51a47a2060b3b08dd8137f6aff35cd3c1e0c35..d82b3d7b015ff69068a4ed005751b168ac47c105 100644
(file)
--- a/
src/HYDROData/HYDROData_Entity.h
+++ b/
src/HYDROData/HYDROData_Entity.h
@@
-23,13
+23,14
@@
#include <NCollection_Sequence.hxx>
#include <TDF_Label.hxx>
#include <QMap>
#include <NCollection_Sequence.hxx>
#include <TDF_Label.hxx>
#include <QMap>
+#include <QString>
+#include <Standard_Type.hxx>
class QColor;
class QColor;
-class QString;
class QVariant;
class QStringList;
class QVariant;
class QStringList;
-class
Handle(TDataStd_ReferenceList)
;
-class H
andle_H
YDROData_Entity;
+class
TDataStd_ReferenceList
;
+class HYDROData_Entity;
class TopoDS_Shape;
///! Kind of an object in a document
class TopoDS_Shape;
///! Kind of an object in a document
@@
-65,24
+66,23
@@
const ObjectKind KIND_STRICKLER_TABLE = 26;
const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
const ObjectKind KIND_CHANNEL_ALTITUDE = 28;
const ObjectKind KIND_LAND_COVER_MAP = 29;
const ObjectKind KIND_LAND_COVER_OBSOLETE = 27;
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;
const ObjectKind KIND_LAST = KIND_LAND_COVER_MAP;
-DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
-
class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
{
};
class MapOfTreatedObjects : public QMap<QString,Handle(Standard_Transient)>
{
};
-class HYDRODATA_EXPORT HYDROData_SequenceOfObjects : public NCollection_Sequence<Handle
_HYDROData_Entity
>
+class HYDRODATA_EXPORT HYDROData_SequenceOfObjects : public NCollection_Sequence<Handle
(HYDROData_Entity)
>
{
public:
HYDROData_SequenceOfObjects();
HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& );
{
public:
HYDROData_SequenceOfObjects();
HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& );
- HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle
_HYDROData_Entity
>& );
+ HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle
(HYDROData_Entity)
>& );
};
///! Is Equal for HYDROData_Entity mapping
};
///! Is Equal for HYDROData_Entity mapping
-HYDRODATA_EXPORT bool IsEqual(const Handle
_HYDROData_Entity& theObj1, const Handle_HYDROData_Entity
& theObj2);
+HYDRODATA_EXPORT bool IsEqual(const Handle
(HYDROData_Entity)& theObj1, const Handle(HYDROData_Entity)
& theObj2);
/**\class HYDROData_Entity
* \brief Generic class of any object in the data model.
/**\class HYDROData_Entity
* \brief Generic class of any object in the data model.
@@
-102,6
+102,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:
@@
-118,7
+119,7
@@
public:
};
public:
};
public:
- DEFINE_STANDARD_RTTI
(HYDROData_Entity
);
+ DEFINE_STANDARD_RTTI
EXT(HYDROData_Entity, MMgt_TShared
);
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
@@
-130,10
+131,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.
@@
-236,7
+242,7
@@
public:
/**
* Returns the z-level for object presentation, -1 if no z-level.
*/
/**
* Returns the z-level for object presentation, -1 if no z-level.
*/
- HYDRODATA_EXPORT virtual
Standard_Boolean
GetZLevel( Standard_Integer& theLevel ) const;
+ HYDRODATA_EXPORT virtual
bool
GetZLevel( Standard_Integer& theLevel ) const;
/**
* Set the z-level for object presentation.
/**
* Set the z-level for object presentation.
@@
-249,14
+255,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
@@
-320,7
+334,7
@@
protected:
* \param theObj pointer to reference object
* \param theTag tag of a label to store attribute (for 0 this is myLab)
*/
* \param theObj pointer to reference object
* \param theTag tag of a label to store attribute (for 0 this is myLab)
*/
- bool HasReference( const Handle
_HYDROData_Entity
& theObj,
+ bool HasReference( const Handle
(HYDROData_Entity)
& theObj,
const int theTag = 0 ) const;
/**
const int theTag = 0 ) const;
/**
@@
-328,7
+342,7
@@
protected:
* \param theObj pointer to reference object
* \param theTag tag of a label to store attribute (for 0 this is myLab)
*/
* \param theObj pointer to reference object
* \param theTag tag of a label to store attribute (for 0 this is myLab)
*/
- void AddReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+ void AddReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag = 0 );
/**
const int theTag = 0 );
/**
@@
-340,7
+354,7
@@
protected:
- if less than zero then prepend to the list
- indexing starts from 0
*/
- if less than zero then prepend to the list
- indexing starts from 0
*/
- void SetReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+ void SetReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag = 0,
const int theIndex = 0 );
const int theTag = 0,
const int theIndex = 0 );
@@
-353,7
+367,7
@@
protected:
- if less than zero then prepend to the list
- indexing starts from 0
*/
- if less than zero then prepend to the list
- indexing starts from 0
*/
- void InsertReferenceObject( const Handle
_HYDROData_Entity
& theObj,
+ void InsertReferenceObject( const Handle
(HYDROData_Entity)
& theObj,
const int theTag = 0,
const int theBeforeIndex = 0 );
const int theTag = 0,
const int theBeforeIndex = 0 );
@@
-372,7
+386,7
@@
protected:
* - indexing starts from 0
* \returns pointer to reference object or NULL if label is not set
*/
* - indexing starts from 0
* \returns pointer to reference object or NULL if label is not set
*/
- Handle
_HYDROData_Entity
GetReferenceObject( const int theTag = 0,
+ Handle
(HYDROData_Entity)
GetReferenceObject( const int theTag = 0,
const int theIndex = 0 ) const;
HYDROData_SequenceOfObjects GetReferenceObjects( const int theTag = 0 ) const;
const int theIndex = 0 ) const;
HYDROData_SequenceOfObjects GetReferenceObjects( const int theTag = 0 ) const;
@@
-435,6
+449,13
@@
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;
+
+ void SetInteger( int theTag, int theValue );
+ int GetInteger( int theTag, int theDefValue = 0 ) const;
+
+
int GetGeomChangeFlag() const;
protected:
int GetGeomChangeFlag() const;
protected: