Updated for PAL11539.

[modules/geom.git] / src / GEOMGUI / GEOM_Displayer.h

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index 4091324b34186e5e4efe864a85f0db9f523d742d..2668e7d84807b976f24dea05443ac0d4ae7cef5a 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -34,7 +34,7 @@
 #include "SALOME_ListIO.hxx"
 #include <TopoDS_Shape.hxx>
 #include <Quantity_Color.hxx>
-#include <SalomeApp_Displayer.h>
+#include <LightApp_Displayer.h>
 
 #include <list>
 
@@ -49,10 +49,12 @@
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
 class TColStd_MapOfInteger;
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 class SalomeApp_Study;
+class SalomeApp_Application;
 class SUIT_SelectionFilter;
 //class SALOME_Selection;
+
 //#ifdef WNT
 //#include <SALOME_WNT.hxx>
 //#else
@@ -64,17 +66,18 @@ class SUIT_SelectionFilter;
 #define GEOMGUI_WNT_EXPORT
 #endif
 
-class GEOMGUI_WNT_EXPORT GEOM_Displayer : public SalomeApp_Displayer
+class GEOMGUI_WNT_EXPORT GEOM_Displayer : public LightApp_Displayer
 {
     
 public:
   /* Constructor */
-  GEOM_Displayer( SalomeApp_Study* study );
+  GEOM_Displayer( SalomeApp_Study* app );
   /* Destructor */
   virtual ~GEOM_Displayer();
 
-  /* Display/Erase object methods */
+  virtual bool canBeDisplayed( const QString& /*entry*/, const QString& /*viewer_type*/ ) const;
 
+  /* Display/Erase object methods */
   void          Display   ( const Handle(SALOME_InteractiveObject)& theIO,
                             const bool updateViewer = true,
                            SALOME_View* theViewFrame = 0 );
@@ -127,8 +130,8 @@ public:
 
 
   /* Sets name - for temporary objects only */
-  void          SetName( const char* theName ) { myName = theName; }
-  void          UnsetName() { myName = ""; }
+  void          SetName( const char* theName );
+  void          UnsetName();
 
   /* Reimplemented from SALOME_Displayer */
   virtual void  Update( SALOME_OCCPrs* );
@@ -146,7 +149,7 @@ public:
   void         GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
   void         GlobalSelection( const TColStd_MapOfInteger&, const bool = false );
 
-  SalomeApp_Study* getStudy() const {return myStudy;}
+  SalomeApp_Study* getStudy() const;
 
 protected:
   /* internal methods */
@@ -154,15 +157,15 @@ protected:
   virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 );
   
   /* Sets interactive object */
-  void        setIO( const Handle(SALOME_InteractiveObject)& theIO ) { myIO = theIO; }
+  void        setIO( const Handle(SALOME_InteractiveObject)& theIO );
   
   /* Sets shape */
-  void        setShape( const TopoDS_Shape& theShape ) { myShape = theShape; }
+  void        setShape( const TopoDS_Shape& theShape );
   
   /* Resets internal data */
   void        internalReset();
 
-  void        clearTemporary( SalomeApp_SelectionMgr* theSelMgr );
+  void        clearTemporary( LightApp_SelectionMgr* theSelMgr );
 
   SUIT_SelectionFilter* getFilter( const int theMode );
   
@@ -181,7 +184,7 @@ protected:
   int                              myDisplayMode;
 
 private:
-  SalomeApp_Study* myStudy;
+  SalomeApp_Application* myApp;
 };
 
 #endif // __GEOM_DISPLAYER_H