Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'

[modules/shaper.git] / src / XGUI / XGUI_ViewerProxy.h

diff --git a/src/XGUI/XGUI_ViewerProxy.h b/src/XGUI/XGUI_ViewerProxy.h
index 3f86889606fe9ceea2b3b84dea3f802c1054e826..19e23ac3bff3a7d737d150fc29f7a158adb3338d 100644 (file)
--- a/src/XGUI/XGUI_ViewerProxy.h
+++ b/src/XGUI/XGUI_ViewerProxy.h
@@ -28,10 +28,15 @@
 #include <AIS_Trihedron.hxx>
 #include <AIS_ListOfInteractive.hxx>
 
-#ifndef HAVE_SALOME
+#ifdef HAVE_SALOME
+#include <OCCViewer_ViewModel.h>
+#else
+  #include <AppElements_Viewer.h>
   #include <AppElements_ViewWindow.h>
 #endif
 
+
+
 class XGUI_Workshop;
 /**
  * \ingroup GUI
@@ -164,6 +169,14 @@ Q_OBJECT
   // Fit all along Z (perpendicular to display)
   //virtual void Zfitall();
 
+#ifdef HAVE_SALOME
+  virtual void setFitter(OCCViewer_Fitter* theFitter);
+  virtual OCCViewer_Fitter* fitter() const;
+#else
+  virtual void setFitter(AppElements_Fitter* theFitter);
+  virtual AppElements_Fitter* fitter() const;
+#endif
+
 signals:
   /// Emits by mouse entering the view port
   void enterViewPort();
@@ -203,14 +216,13 @@ private slots:
 
  private:
    void displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape);
-   void eraseHighlight();
+   bool eraseHighlight();
 
 
   XGUI_Workshop* myWorkshop;
   ResultPtr myResult;
   AIS_ListOfInteractive myHighlights;
 
-  bool myShowHighlight;
 };
 
 #endif