Join modifications from branch OCC_development_for_3_2_0a2

[modules/visu.git] / src / VVTK / VVTK_ViewModel.h

diff --git a/src/VVTK/VVTK_ViewModel.h b/src/VVTK/VVTK_ViewModel.h
index 0846edcd0a3618c46bfb8597a30392ad6f6df0ab..5f343dc9cb7c86c55946c6f46ed786a3f61fafd0 100644 (file)
--- a/src/VVTK/VVTK_ViewModel.h
+++ b/src/VVTK/VVTK_ViewModel.h
@@ -4,15 +4,12 @@
 #include <qcolor.h>
 
 #include "VVTK.h"
-#include "SVTK_ViewModelBase.h"
-
-#include "SALOME_Prs.h"
-#include "SALOME_InteractiveObject.hxx"
+#include "SVTK_ViewModel.h"
 
 class VVTK_ViewWindow;
 
-//! Extends two interfaces #SVTK_ViewModelBase and #SALOME_View 
-class VVTK_EXPORT VVTK_Viewer : public SVTK_ViewModelBase, public SALOME_View
+//! VVTK View Model
+class VVTK_EXPORT VVTK_Viewer : public SVTK_Viewer
 {
   Q_OBJECT;
 
@@ -23,48 +20,11 @@ public:
   VVTK_Viewer();
   virtual ~VVTK_Viewer();
 
-  //! Redefine SUIT_ViewModel::createView
+  //! See #SUIT_ViewModel::createView
   virtual SUIT_ViewWindow* createView(SUIT_Desktop*);
 
-  //! Redefine SUIT_ViewModel::setViewManager
-  virtual void setViewManager(SUIT_ViewManager* theViewManager);
-  //! Redefine SUIT_ViewModel::contextMenuPopup
-  virtual void contextMenuPopup( QPopupMenu* );
   //! See SUIT_ViewModel::getType
   virtual QString getType() const { return Type(); }
-
-  //! Redefine SALOME_View::Repaint
-  virtual void Repaint();
-
-  //! Redefine SALOME_View::isVisible
-  virtual bool isVisible( const Handle(SALOME_InteractiveObject)& );
-
-  //! Get background color of the viewer
-  QColor backgroundColor() const;
-
-  //! Set background color to the viewer
-  void   setBackgroundColor( const QColor& );
-
-  //! Get size of trihedron of the viewer (see SVTK_Renderer::SetTrihedronSize)
-  int    trihedronSize() const;
-
-  //! Set size of trihedron of the viewer (see SVTK_Renderer::SetTrihedronSize)
-  void   setTrihedronSize( const int );
-
-protected slots:
-  void onMousePress(SUIT_ViewWindow*, QMouseEvent*);
-  void onMouseMove(SUIT_ViewWindow*, QMouseEvent*);
-  void onMouseRelease(SUIT_ViewWindow*, QMouseEvent*);
-
-  void onDumpView();
-  void onShowToolbar();
-  void onChangeBgColor();
-
-private:
-  QColor myBgColor;
-  int    myTrihedronSize;
-  bool   mySelectionEnabled;
-  bool   myMultiSelectionEnabled;
 };
 
 #endif