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
Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Shape.h
diff --git
a/src/HYDROGUI/HYDROGUI_Shape.h
b/src/HYDROGUI/HYDROGUI_Shape.h
index 5447abb04b7a98660d1c32d72741b2adce0da109..76b002ca1741b2d95a0344a2adab5f8212cfcee2 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Shape.h
+++ b/
src/HYDROGUI/HYDROGUI_Shape.h
@@
-95,12
+95,11
@@
public:
virtual void setHighlightColor( const QColor& theColor );
virtual QColor getHighlightColor() const;
virtual void setHighlightColor( const QColor& theColor );
virtual QColor getHighlightColor() const;
- virtual Handle(AIS_InteractiveObject) getAISObject() const;
-
void setZLayer( const int theZLayer );
void setZLayer( const int theZLayer );
-
void setSelectionMode( int theSelectionMode );
void setSelectionMode( int theSelectionMode );
+ QList<Handle(AIS_InteractiveObject)> getAISObjects() const;
+
protected:
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
protected:
virtual void buildShape();
virtual void updateShape( const bool theToDisplay = true,
@@
-109,7
+108,7
@@
protected:
virtual void eraseShape( const bool theIsUpdateViewer );
virtual QColor getActiveColor() const;
virtual void eraseShape( const bool theIsUpdateViewer );
virtual QColor getActiveColor() const;
- virtual
Handle_AIS_InteractiveObject
createShape() const;
+ virtual
QList<Handle(AIS_InteractiveObject)>
createShape() const;
void setDisplayMode( int theDisplayMode );
void setDisplayMode( int theDisplayMode );
@@
-120,7
+119,7
@@
private:
private:
Handle(AIS_InteractiveContext) myContext;
Handle(HYDROData_Entity) myObject;
private:
Handle(AIS_InteractiveContext) myContext;
Handle(HYDROData_Entity) myObject;
-
Handle(AIS_InteractiveObject) myShape
;
+
QList<Handle(AIS_InteractiveObject)> myShapes
;
int myZLayer;
int myZLayer;