X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewerProxy.h;h=38aa7de21ee62155c903259b1c8228f053d09dda;hb=49aaa9439aeca0bb0bc2153afd79b3f3107d720b;hp=9969ae9e40abb7db82068c3d6d6c3caa3ff214f9;hpb=423c10234142d14d0d5de89383f2f96a4ec5930f;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.h b/src/XGUI/XGUI_ViewerProxy.h
index 9969ae9e4..38aa7de21 100644
--- a/src/XGUI/XGUI_ViewerProxy.h
+++ b/src/XGUI/XGUI_ViewerProxy.h
@@ -1,17 +1,42 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2021  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef XGUI_VIEWERPROXY_H
 #define XGUI_VIEWERPROXY_H
 
 #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
@@ -71,6 +96,9 @@ Q_OBJECT
   //! Sets the view fitted all
   virtual void fitAll();
 
+  //! Erases all presentations from the viewer
+  virtual void eraseAll();
+
   /// Connects to a viewer according to current environment
   void connectToViewer();
 
@@ -94,8 +122,60 @@ 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();
+  //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
@@ -128,10 +208,22 @@ 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);
+   bool eraseHighlight();
+   void createPresentations(const ResultPtr& theRes, const TopoDS_Shape& theIgnoreShape);
+
+
   XGUI_Workshop* myWorkshop;
+  ResultPtr myResult;
+  AIS_ListOfInteractive myHighlights;
+
 };
 
 #endif