Merge V8_4_BR branch.

[modules/geom.git] / src / GEOMGUI / GEOM_Displayer.h

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index a776a1c1b14573adaee66ed0d4e446784c2420d3..d9184ec540a9abd32417cd6b3923a9cb27b6cf77 100755 (executable)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -45,7 +45,6 @@ class SALOME_OCCViewType;
 #include <LightApp_Displayer.h>
 #include <LightApp_Study.h>
 #include <Aspect_TypeOfMarker.hxx>
-#include <AIS_ColorScale.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
 #include <QList>
@@ -193,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;
 
@@ -226,8 +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 SetUpdateColorScale(bool toUpdate) { myUpdateColorScale = toUpdate; } // IPAL54049
+  void UpdateColorScale();
+  bool SetUpdateColorScale(bool);
 
 protected:
   /* internal methods */
@@ -287,8 +286,7 @@ protected:
   std::string                      myTexture;
   int                              myType;
   SALOME_View*                     myViewFrame;
-  Handle(AIS_ColorScale)           myColorScale;
-  int                              myUpdateColorScale; // IPAL54049
+  bool                             myUpdateColorScale; // IPAL54049
 
   // Attributes
   Quantity_Color                   myShadingColor;