X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FGEOM_Displayer.h;h=d9184ec540a9abd32417cd6b3923a9cb27b6cf77;hb=2736f682fe0d63fbaf9dff49c46b4fa6c23d72ce;hp=36d2d4aee75b4031c32db6f0d3a1c4acbaee99bb;hpb=8370b4a1c488f6ef18d8944869d6a8cd3a2d18d2;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
old mode 100644
new mode 100755
index 36d2d4aee..d9184ec54
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -28,6 +28,7 @@
 #define GEOM_DISPLAYER_H
 
 #include "GEOM_GEOMGUI.hxx"
+#include <GEOM_AISShape.hxx>
 
 #include <SALOME_InteractiveObject.hxx>
 
@@ -45,7 +46,7 @@ class SALOME_OCCViewType;
 #include <LightApp_Study.h>
 #include <Aspect_TypeOfMarker.hxx>
 #include <TCollection_AsciiString.hxx>
-#include <Basics_OCCTVersion.hxx>
+#include <TColStd_MapOfInteger.hxx>
 #include <QList>
 
 #include <list>
@@ -60,14 +61,11 @@ class SALOME_OCCViewType;
 
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
-class TColStd_MapOfInteger;
 class LightApp_SelectionMgr;
 class SalomeApp_Study;
 class SalomeApp_Application;
 class SUIT_SelectionFilter;
-class Handle_GEOM_AISShape;
 class gp_Ax3;
-//class SALOME_Selection;
 
 class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
 {
@@ -194,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;
 
@@ -227,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 */
@@ -261,6 +260,7 @@ protected:
   void           updateShapeProperties( const Handle(GEOM_AISShape)&, bool );
   void           updateActorProperties( GEOM_Actor*, bool );
   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 getDefaultPropertyMap();
@@ -273,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;
@@ -298,6 +286,7 @@ protected:
   std::string                      myTexture;
   int                              myType;
   SALOME_View*                     myViewFrame;
+  bool                             myUpdateColorScale; // IPAL54049
 
   // Attributes
   Quantity_Color                   myShadingColor;
@@ -312,6 +301,7 @@ protected:
   Aspect_TypeOfMarker              myTypeOfMarker;
   double                           myScaleOfMarker;
   double                           myTransparency;
+  bool                             myIsRedisplayed;
 
 private:
   SalomeApp_Application* myApp;