X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_ViewerProxy.h;h=723aae64437e3a602f05eb63dba01c1294f5f31d;hb=2cb4458b35ae6c9561a35b3b18dbdb673d0c12c9;hp=93e76332bcf84ce48894e4095c4842ecf5a078e6;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.h b/src/XGUI/XGUI_ViewerProxy.h
index 93e76332b..723aae644 100644
--- a/src/XGUI/XGUI_ViewerProxy.h
+++ b/src/XGUI/XGUI_ViewerProxy.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef XGUI_VIEWERPROXY_H
@@ -23,13 +22,21 @@
 
 #include "XGUI.h"
 #include <ModuleBase_IViewer.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Result.h>
 
 #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
@@ -115,9 +122,61 @@ Q_OBJECT
   /// by mouse drugging. If this is impossible thet it has to return False.
   virtual bool canDragByMouse() const;
 
+  virtual void updateHighlight();
+
+  // Methods for color scale management
+
+  //! Returns True if ColorScale is visible
+  virtual bool isColorScaleVisible() const;
+
+  //! Show/Hide ColorScale object
+  virtual void setColorScaleShown(bool on);
+
+  //! Set position of color scale
+  // \param theX is X position relative to current view width
+  // \param theY is Y position relative to current view heigth
+  virtual void setColorScalePosition(double theX, double theY);
+
+  //! Set size of color scale
+  // \param theW is width relative to current view width
+  // \param theh is height relative to current view heigth
+  virtual void setColorScaleSize(double theW, double theH);
+
+  //! Set range of color scale
+  // \param theMin is a minimal value
+  // \param theMax is a maximal value
+  virtual void setColorScaleRange(double theMin, double theMax);
+
+  //! Set number of intervals of color scale
+  // \param theNb is number of intervals
+  virtual void setColorScaleIntervals(int theNb);
+
+  //! Set text heigth of color scale
+  // \param theH is number of intervals
+  virtual void setColorScaleTextHeigth(int theH);
+
+  //! Set color of text of color scale
+  // \param theH is number of intervals
+  virtual void setColorScaleTextColor(const QColor& theColor);
+
+  //! Set title of color scale
+  // \param theText is a title
+  virtual void setColorScaleTitle(const QString& theText);
+
+  //! Set color scale parameters according to user preferences and window size
+  void setupColorScale();
+
   // 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();
@@ -149,10 +208,21 @@ private slots:
   void onKeyRelease(AppElements_ViewWindow*, QKeyEvent*);
 
   void onViewTransformed(AppElements_ViewWindow::OperationType);
+#else
+  void onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*);
+  void onKeyPress(ModuleBase_IViewWindow*, QKeyEvent*);
+  void onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*);
 #endif
 
  private:
+   void displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape);
+   void eraseHighlight();
+
+
   XGUI_Workshop* myWorkshop;
+  ResultPtr myResult;
+  AIS_ListOfInteractive myHighlights;
+
 };
 
 #endif