Code alignment.

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

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index 993297ad76778812ca1343d005e611208f6ef2eb..e5bfa5fb2945a3337fd4d9f5f465d4d5af1a454d 100644 (file)
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -15,6 +15,7 @@ const ObjectKind KIND_UNKNOWN = 0;
 const ObjectKind KIND_IMAGE = 1;
 const ObjectKind KIND_POLYLINE = 2;
 const ObjectKind KIND_VISUAL_STATE = 3;
+const ObjectKind KIND_BATHYMETRY = 4;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Object, MMgt_TShared)
 
@@ -33,27 +34,10 @@ protected:
    */
   enum DataTag
   {
-    DataTag_First = 0,    ///< first tag, to reserve
-    DataTag_ViewId,       ///< visual state, array of view ids
-    DataTag_Visibility,   ///< visual state, array of visibility states
-    DataTag_Transparency, ///< visual state, array of transparency values
-    DataTag_ZValue        ///< visual state, array of z-values
+    DataTag_First = 0     ///< first tag, to reserve
+    // ...
   };
 
-public:
-  /**
-   * Visual state data.
-   */
-  struct VisualState
-  {
-    bool Visibility;
-    double Transparency;
-    double ZValue;
-    VisualState() : Visibility( false ), Transparency( 1.0 ), ZValue( 0.0 ) {}
-  };
-  typedef QMap        < int, VisualState > ViewId2VisualStateMap;
-  typedef QMapIterator< int, VisualState > ViewId2VisualStateMapIterator;
-
 public:
   DEFINE_STANDARD_RTTI(HYDROData_Object);
 
@@ -72,21 +56,6 @@ public:
    */
   HYDRODATA_EXPORT void SetName(const QString& theName);
 
-  /**
-   * Returns the object visibility state for the view with specified id.
-   * \param theViewId view id
-   * \returns visibility state
-   */
-  HYDRODATA_EXPORT bool IsVisible( const int theViewId ) const;
-
-  /**
-   * Sets the object visibility state for the view with specified id.
-   * \param theViewId view id
-   * \param theVal visibility state
-   */
-  HYDRODATA_EXPORT void SetVisible( const int theViewId,
-                                    const bool theVal );
-
   /**
    * Checks is object exists in the data structure.
    * \returns true is object is not exists in the data model
@@ -153,18 +122,6 @@ protected:
    */
   const char* ByteArray(const int theTag, int& theLen);
 
-  /**
-   * Returns the map containing the visual states for the specified views.
-   * \param theMap map of visual states
-   */
-  void GetViewId2VisualStateMap( ViewId2VisualStateMap& theMap ) const;
-
-  /**
-   * Sets the map containing the visual states for the specified views.
-   * \param theMap map of visual states
-   */
-  void SetViewId2VisualStateMap( const ViewId2VisualStateMap& theMap );
-
 protected:
   /// Array of pointers to the properties of this object; index in this array is returned by \a AddProperty.
   TDF_Label myLab; ///< label of this object