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_ShapeBathymetry.h
diff --git
a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
index 8a6447215ebe52080263d0b88a436febe75bbbee..c736c60fd1765b072cf1a489a1a9e32b9ec0b7da 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
+++ b/
src/HYDROGUI/HYDROGUI_ShapeBathymetry.h
@@
-23,8
+23,8
@@
#include <TColgp_HArray1OfPnt.hxx>
#include <Quantity_HArray1OfColor.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <Quantity_HArray1OfColor.hxx>
-class H
andle_H
YDROData_Bathymetry;
-class
Handle_Aspect
_ColorScale;
+class HYDROData_Bathymetry;
+class
AIS
_ColorScale;
class HYDROGUI_OCCDisplayer;
class HYDROGUI_ShapeBathymetry : public HYDROGUI_Shape
class HYDROGUI_OCCDisplayer;
class HYDROGUI_ShapeBathymetry : public HYDROGUI_Shape
@@
-32,12
+32,12
@@
class HYDROGUI_ShapeBathymetry : public HYDROGUI_Shape
public:
HYDROGUI_ShapeBathymetry( HYDROGUI_OCCDisplayer* theDisplayer,
const Handle(AIS_InteractiveContext)& theContext,
public:
HYDROGUI_ShapeBathymetry( HYDROGUI_OCCDisplayer* theDisplayer,
const Handle(AIS_InteractiveContext)& theContext,
- const Handle
_HYDROData_Bathymetry
& theBathymetry,
+ const Handle
(HYDROData_Bathymetry)
& theBathymetry,
const int theZLayer = -1 );
virtual ~HYDROGUI_ShapeBathymetry();
void GetRange( double& theMin, double& theMax ) const;
const int theZLayer = -1 );
virtual ~HYDROGUI_ShapeBathymetry();
void GetRange( double& theMin, double& theMax ) const;
- void UpdateWithColorScale( const Handle
_Aspect_ColorScale
& );
+ void UpdateWithColorScale( const Handle
(AIS_ColorScale)
& );
virtual void display( const bool theIsUpdateViewer = true );
virtual void erase( const bool theIsUpdateViewer = true );
virtual void display( const bool theIsUpdateViewer = true );
virtual void erase( const bool theIsUpdateViewer = true );
@@
-48,15
+48,15
@@
public:
virtual void setVisible( const bool theState,
const bool theIsUpdateViewer = true );
protected:
virtual void setVisible( const bool theState,
const bool theIsUpdateViewer = true );
protected:
- virtual Handle
_AIS_InteractiveObject
createShape() const;
+ virtual Handle
(AIS_InteractiveObject)
createShape() const;
virtual void displayShape( const bool theIsUpdateViewer );
void setToUpdateColorScale( bool isChanged );
private:
HYDROGUI_OCCDisplayer* myDisplayer;
virtual void displayShape( const bool theIsUpdateViewer );
void setToUpdateColorScale( bool isChanged );
private:
HYDROGUI_OCCDisplayer* myDisplayer;
- Handle
_TColgp_HArray1OfPnt
myCoords;
- Handle
_Quantity_HArray1OfColor
myColors;
+ Handle
(TColgp_HArray1OfPnt)
myCoords;
+ Handle
(Quantity_HArray1OfColor)
myColors;
};
#endif
};
#endif