Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_LandCoverMapPrs.h

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h
index e1acc832233537f8a33a1df5da74bd7c4492cc9e..f9fe4a15bf4f7b9c1c0ef26551c5c34e184a033a 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapPrs.h
@@ -22,14 +22,13 @@
 #include <HYDROData_LandCoverMap.h>
 #include <HYDROData_StricklerTable.h>
 #include <AIS_ColoredShape.hxx>
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
 
-DEFINE_STANDARD_HANDLE( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
 
 class HYDROGUI_LandCoverMapPrs : public AIS_ColoredShape
 {
 public:
-  DEFINE_STANDARD_RTTI( HYDROGUI_LandCoverMapPrs );
+  DEFINE_STANDARD_RTTIEXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape );
 
   HYDROGUI_LandCoverMapPrs( const Handle(HYDROData_LandCoverMap)& );
   virtual ~HYDROGUI_LandCoverMapPrs();
@@ -37,8 +36,8 @@ public:
   Handle(HYDROData_LandCoverMap) GetLandCoverMap() const;
   void SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& );
 
-  Handle(Aspect_ColorScale) GetColorScale() const;
-  void SetColorScale( const Handle(Aspect_ColorScale)& );
+  Handle(AIS_ColorScale) GetColorScale() const;
+  void SetColorScale( const Handle(AIS_ColorScale)& );
 
   Handle(HYDROData_StricklerTable) GetTable() const;
   void SetTable( const Handle(HYDROData_StricklerTable)& );
@@ -52,13 +51,14 @@ public:
 
   Quantity_Color GetColor( const QString& theStricklerType ) const;
 
-protected:
   void UpdateColors();
+
+protected:
   void SetHilightAttributes( const Quantity_Color& theEdgesColor );
 
 private:
   Handle(HYDROData_LandCoverMap)   myLCMap;
-  Handle(Aspect_ColorScale)        myColorScale;
+  Handle(AIS_ColorScale)           myColorScale;
   Handle(HYDROData_StricklerTable) myTable;
 };