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
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 <HYDROData_LandCoverMap.h>
#include <HYDROData_StricklerTable.h>
#include <AIS_ColoredShape.hxx>
-#include <A
spect
_ColorScale.hxx>
+#include <A
IS
_ColorScale.hxx>
-DEFINE_STANDARD_HANDLE( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape )
class HYDROGUI_LandCoverMapPrs : public AIS_ColoredShape
{
public:
class HYDROGUI_LandCoverMapPrs : public AIS_ColoredShape
{
public:
- DEFINE_STANDARD_RTTI
( HYDROGUI_LandCoverMapPrs
);
+ DEFINE_STANDARD_RTTI
EXT( HYDROGUI_LandCoverMapPrs, AIS_ColoredShape
);
HYDROGUI_LandCoverMapPrs( const Handle(HYDROData_LandCoverMap)& );
virtual ~HYDROGUI_LandCoverMapPrs();
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(HYDROData_LandCoverMap) GetLandCoverMap() const;
void SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& );
- Handle(A
spect
_ColorScale) GetColorScale() const;
- void SetColorScale( const Handle(A
spect
_ColorScale)& );
+ Handle(A
IS
_ColorScale) GetColorScale() const;
+ void SetColorScale( const Handle(A
IS
_ColorScale)& );
Handle(HYDROData_StricklerTable) GetTable() const;
void SetTable( const Handle(HYDROData_StricklerTable)& );
Handle(HYDROData_StricklerTable) GetTable() const;
void SetTable( const Handle(HYDROData_StricklerTable)& );
@@
-52,13
+51,14
@@
public:
Quantity_Color GetColor( const QString& theStricklerType ) const;
Quantity_Color GetColor( const QString& theStricklerType ) const;
-protected:
void UpdateColors();
void UpdateColors();
+
+protected:
void SetHilightAttributes( const Quantity_Color& theEdgesColor );
private:
Handle(HYDROData_LandCoverMap) myLCMap;
void SetHilightAttributes( const Quantity_Color& theEdgesColor );
private:
Handle(HYDROData_LandCoverMap) myLCMap;
- Handle(A
spect_ColorScale)
myColorScale;
+ Handle(A
IS_ColorScale)
myColorScale;
Handle(HYDROData_StricklerTable) myTable;
};
Handle(HYDROData_StricklerTable) myTable;
};