X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOM_Displayer.h;h=9643a8c86adb699f96170694bc049341c184b2a3;hb=e416f88e1451b70473027d8de401d5dd3fa168b0;hp=390466f58fd5e362339a1d09ca3712fef2a15f56;hpb=cec4acc1bc6ec094152934099a770ce798dff2bb;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
old mode 100755
new mode 100644
index 390466f58..9643a8c86
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -45,12 +45,8 @@ class SALOME_OCCViewType;
 #include <LightApp_Displayer.h>
 #include <LightApp_Study.h>
 #include <Aspect_TypeOfMarker.hxx>
-#if OCC_VERSION_MAJOR >= 7
-  #include <AIS_ColorScale.hxx>
-#endif
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <Basics_OCCTVersion.hxx>
 #include <QList>
 
 #include <list>
@@ -76,7 +72,7 @@ class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
 
 public:
   /* Constructor */
-  GEOM_Displayer( SalomeApp_Study* app );
+  GEOM_Displayer();
   /* Destructor */
   virtual ~GEOM_Displayer();
 
@@ -133,7 +129,7 @@ public:
   /* Update visibility state */
   void          UpdateVisibility( SALOME_View*, const SALOME_Prs*, bool );
 
-  /* build presentation accordint to the current viewer type*/
+  /* build presentation according to the current viewer type*/
   SALOME_Prs*   BuildPrs  ( GEOM::GEOM_Object_ptr );
   SALOME_Prs*   BuildPrs  ( const TopoDS_Shape& );
 
@@ -196,7 +192,7 @@ public:
   virtual void  BeforeErase  ( SALOME_View*, const SALOME_OCCPrs* );
   virtual void  AfterErase   ( SALOME_View*, const SALOME_OCCPrs* );
 
-  /* This methos is used for activisation/deactivisation of objects to be displayed*/
+  /* This methods is used for activisation/deactivisation of objects to be displayed*/
   void          SetToActivate( const bool );
   bool          ToActivate() const;
 
@@ -229,7 +225,8 @@ public:
                                                 SALOME_View* = 0);
 
   /* Update visibility and parameters of the currently selected field step's color scale */
-  void UpdateColorScale( const bool theIsRedisplayFieldSteps = false, const bool updateViewer = true );
+  void UpdateColorScale();
+  bool SetUpdateColorScale(bool);
 
 protected:
   /* internal methods */
@@ -265,7 +262,7 @@ protected:
   void           updateDimensions( const Handle(SALOME_InteractiveObject)&, SALOME_OCCPrs*, const gp_Ax3& );
   void           updateShapeAnnotations( const Handle(SALOME_InteractiveObject)&, SALOME_OCCPrs*, const gp_Ax3& );
 
-  PropMap getObjectProperties( SalomeApp_Study*, const QString&, SALOME_View* = 0 );
+  PropMap getObjectProperties( const QString&, SALOME_View* = 0 );
   PropMap getDefaultPropertyMap();
 
   /* Methods for reading the field step information */
@@ -276,18 +273,6 @@ protected:
                                   double& theFieldStepRangeMin,
                                   double& theFieldStepRangeMax );
 
-  // Note: the method is copied from Aspect_ColorScale class
-  static Standard_Integer HueFromValue( const Standard_Integer aValue,
-                                        const Standard_Integer aMin,
-                                        const Standard_Integer aMax );
-
-  // Note: the method is copied from Aspect_ColorScale class
-  static Standard_Boolean FindColor( const Standard_Real aValue, 
-                                     const Standard_Real aMin,
-                                     const Standard_Real aMax,
-                                     const Standard_Integer ColorsCount,
-                                     Quantity_Color& aColor );
-
 protected:
   Handle(SALOME_InteractiveObject) myIO;
   TopoDS_Shape                     myShape;
@@ -301,9 +286,7 @@ protected:
   std::string                      myTexture;
   int                              myType;
   SALOME_View*                     myViewFrame;
-#if OCC_VERSION_MAJOR >= 7
-  Handle(AIS_ColorScale)           myColorScale;
-#endif
+  bool                             myUpdateColorScale; // IPAL54049
 
   // Attributes
   Quantity_Color                   myShadingColor;