[fix] After merge with BR_PY3

[modules/hydro.git] / src / HYDROData / HYDROData_StricklerTable.h

diff --git a/src/HYDROData/HYDROData_StricklerTable.h b/src/HYDROData/HYDROData_StricklerTable.h
index 856786c7d574a34af32be557b306b688abf39f3b..de409785d67571b276aa9650ba49a4b49abf2531 100644 (file)
--- a/src/HYDROData/HYDROData_StricklerTable.h
+++ b/src/HYDROData/HYDROData_StricklerTable.h
@@ -23,9 +23,7 @@
 
 #include <TColStd_SequenceOfExtendedString.hxx>
 
-class Handle( TDataStd_NamedData );
-
-DEFINE_STANDARD_HANDLE( HYDROData_StricklerTable, HYDROData_Entity )
+class TDataStd_NamedData;
 
 class HYDROData_StricklerTable : public HYDROData_Entity
 {
@@ -35,31 +33,43 @@ protected:
   enum DataTag
   {
     DataTag_Table = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
+    DataTag_AttrName,
   };
 
   HYDRODATA_EXPORT HYDROData_StricklerTable();
   HYDRODATA_EXPORT ~HYDROData_StricklerTable();
 
 public:
-  DEFINE_STANDARD_RTTI( HYDROData_StricklerTable );
+  DEFINE_STANDARD_RTTIEXT( HYDROData_StricklerTable, HYDROData_Entity );
 
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const;
 
-  HYDRODATA_EXPORT bool Import( const TCollection_AsciiString& theFileName );
-  HYDRODATA_EXPORT bool Export( const TCollection_AsciiString& theFileName );
+  HYDRODATA_EXPORT bool Import( const QString& theFileName );
+  HYDRODATA_EXPORT bool Export( const QString& theFileName );
 
-  HYDRODATA_EXPORT double Get( const TCollection_ExtendedString& theType, double theDefault ) const;
-  HYDRODATA_EXPORT void Set( const TCollection_ExtendedString& theType, double theCoefficient );
+  HYDRODATA_EXPORT double Get( const QString& theType, double theDefault ) const;
+  HYDRODATA_EXPORT void Set( const QString& theType, double theCoefficient );
 
+  HYDRODATA_EXPORT QStringList GetTypes() const;
   HYDRODATA_EXPORT void GetCoefficientRange( double& theMin, double& theMax ) const;
 
-  HYDRODATA_EXPORT TColStd_SequenceOfExtendedString GetTypes() const;
-
-  HYDRODATA_EXPORT bool HasType( const TCollection_ExtendedString& theType ) const;
+  HYDRODATA_EXPORT bool HasType( const QString& theType ) const;
 
   HYDRODATA_EXPORT void Clear();
 
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
+
+  HYDRODATA_EXPORT QString GetAttrName() const;
+  HYDRODATA_EXPORT bool    SetAttrName( const QString& ) const;
+
+  HYDRODATA_EXPORT QString GetAttrValue( const QString& theType ) const;
+  HYDRODATA_EXPORT void    SetAttrValue( const QString& theType, const QString& theAttrValue ) const;
+
+  HYDRODATA_EXPORT QString GetType( const QString& theAttrValue ) const;
+
+  HYDRODATA_EXPORT QColor GetColor( const QString& theType ) const;
+  HYDRODATA_EXPORT void SetColor( const QString& theType, const QColor& theColor ) const;
 
 private:
   Handle(TDataStd_NamedData) Map() const;