Merge remote branch 'origin/V7_dev'

[modules/geom.git] / src / OBJECT / GEOM_AISShape.hxx

diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx
index 47c284e77f0c05bf86214b3bd5930bad463caf0d..0e6deec984d4923ce3765a70739bdd6c65b041b5 100644 (file)
--- a/src/OBJECT/GEOM_AISShape.hxx
+++ b/src/OBJECT/GEOM_AISShape.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -79,8 +79,10 @@ public:
   
   Standard_EXPORT void SetShadingColor(const Quantity_Color &aCol);
   Standard_EXPORT void SetEdgesInShadingColor(const Quantity_Color &aCol);
+  Standard_EXPORT void SetLabelColor(const Quantity_Color &aCol);
   Standard_EXPORT void SetDisplayVectors(bool isShow);
   Standard_EXPORT void SetDisplayVertices(bool isShow);
+  Standard_EXPORT void SetDisplayName(bool isShow);
 
   Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
                                       const Handle(Prs3d_Presentation)& aPresentation,
@@ -88,6 +90,7 @@ public:
   
   Standard_EXPORT virtual bool isShowVectors() { return myDisplayVectors; }
   Standard_EXPORT virtual bool isShowVertices() { return myDisplayVertices; }
+  Standard_EXPORT virtual bool isShowName() { return myDisplayName; }
 
   Standard_EXPORT virtual Standard_Boolean switchTopLevel();
   Standard_EXPORT virtual Standard_Boolean toActivate();
@@ -125,6 +128,9 @@ protected:
                                  const bool theIsText = false,
                                  const bool theIsHighlight = false );
   
+  // Displaying the name of shape
+  Standard_EXPORT void drawName( const Handle(Prs3d_Presentation)& thePrs );
+
   // Auxiliary method to compute a center of mass for the specified shape
   Standard_EXPORT static Standard_Boolean computeMassCenter( const TopoDS_Shape& theShape,
                                                             gp_Pnt& theCenter );
@@ -132,10 +138,12 @@ protected:
 private: 
   Quantity_Color           myShadingColor;
   Quantity_Color           myEdgesInShadingColor;
+  Quantity_Color           myLabelColor;
 
   TCollection_AsciiString  myName;
   bool                     myDisplayVectors;
   bool                     myDisplayVertices;
+  bool                     myDisplayName;
   Standard_Boolean         myTopLevel;
   Standard_Integer         myPrevDisplayMode;