Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_Shape.h b/src/HYDROGUI/HYDROGUI_Shape.h
index 695310583709b36f07d5d2df2316e9197e54f0b2..76b002ca1741b2d95a0344a2adab5f8212cfcee2 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Shape.h
+++ b/src/HYDROGUI/HYDROGUI_Shape.h
@@ -79,7 +79,8 @@ public:
 
   virtual void               setShape( const TopoDS_Shape& theShape,
                                        const bool          theToDisplay = true,
-                                       const bool          theIsUpdateViewer = true );
+                                       const bool          theIsUpdateViewer = true,
+                                       const int           theDisplayMode = AIS_Shaded );
 
   virtual void               setFillingColor( const QColor& theColor,
                                               const bool    theToDisplay = true,
@@ -94,12 +95,11 @@ public:
   virtual void               setHighlightColor( const QColor& theColor );
   virtual QColor             getHighlightColor() const;
 
-  virtual Handle(AIS_InteractiveObject)  getAISObject() const;
-
   void                       setZLayer( const int theZLayer );
-
   void                       setSelectionMode( int theSelectionMode );
 
+  QList<Handle(AIS_InteractiveObject)> getAISObjects() const;
+
 protected:
   virtual void               buildShape();
   virtual void               updateShape( const bool theToDisplay      = true,
@@ -108,7 +108,7 @@ protected:
   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 );
 
@@ -119,7 +119,7 @@ private:
 private:
   Handle(AIS_InteractiveContext) myContext;
   Handle(HYDROData_Entity)       myObject;
-  Handle(AIS_InteractiveObject)  myShape;
+  QList<Handle(AIS_InteractiveObject)>  myShapes;
 
   int                            myZLayer;