0031459: Visualization, AIS_TextLabel - add missing getters

Add getters for Text, FontName and FontAspect
Remove duplicate properties: Font and FontAspect

diff --git a/src/AIS/AIS_TextLabel.cxx b/src/AIS/AIS_TextLabel.cxx
index 07a9ed391c131f631978ddcc1475965c2d062827..cd99f683e477541321e2dd0d49949d163e797546 100644 (file)
--- a/src/AIS/AIS_TextLabel.cxx
+++ b/src/AIS/AIS_TextLabel.cxx
@@ -38,8 +38,6 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_TextLabel,AIS_InteractiveObject)
 //=======================================================================
 AIS_TextLabel::AIS_TextLabel()
 : myText             ("?"),
-  myFont             ("Courier"),
-  myFontAspect       (Font_FA_Regular),
   myHasOrientation3D (Standard_False),
   myHasFlipping      (Standard_False)
 {
@@ -155,8 +153,7 @@ void AIS_TextLabel::SetFontAspect (const Font_FontAspect theFontAspect)
 //=======================================================================
 void AIS_TextLabel::SetFont (Standard_CString theFont)
 {
-  myFont = theFont;
-  myDrawer->TextAspect()->SetFont (myFont.ToCString());
+  myDrawer->TextAspect()->SetFont (theFont);
 }
 
 //=======================================================================
@@ -187,6 +184,24 @@ const gp_Pnt& AIS_TextLabel::Position() const
   return myOrientation3D.Location();
 }
 
+//=======================================================================
+//function : FontName
+//purpose  :
+//=======================================================================
+const TCollection_AsciiString& AIS_TextLabel::FontName() const
+{
+  return myDrawer->TextAspect()->Aspect()->Font();
+}
+
+//=======================================================================
+//function : FontAspect
+//purpose  :
+//=======================================================================
+Font_FontAspect AIS_TextLabel::FontAspect() const
+{
+  return myDrawer->TextAspect()->Aspect()->GetTextFontAspect();
+}
+
 //=======================================================================
 //function : Orientation3D
 //purpose  :

diff --git a/src/AIS/AIS_TextLabel.hxx b/src/AIS/AIS_TextLabel.hxx
index 33c5d3e9f882bfd2219969ed203da8d2e6afad2d..4386ff44b63645d4afce85aef07c923c0bf7a70b 100644 (file)
--- a/src/AIS/AIS_TextLabel.hxx
+++ b/src/AIS/AIS_TextLabel.hxx
@@ -83,6 +83,15 @@ public:
   //! Returns position.
   Standard_EXPORT const gp_Pnt& Position() const;
 
+  //! Returns the label text.
+  const TCollection_ExtendedString& Text() const { return myText; }
+
+  //! Returns the font of the label text.
+  Standard_EXPORT const TCollection_AsciiString& FontName() const;
+
+  //! Returns the font aspect of the label text.
+  Standard_EXPORT Font_FontAspect FontAspect() const;
+
   //! Returns label orientation in the model 3D space.
   Standard_EXPORT const gp_Ax2& Orientation3D() const;
 
@@ -120,8 +129,6 @@ private:
 protected:
 
   TCollection_ExtendedString myText;
-  TCollection_AsciiString    myFont;
-  Font_FontAspect            myFontAspect;
   gp_Ax2                     myOrientation3D;
   Standard_Boolean           myHasOrientation3D;
   Standard_Boolean           myHasFlipping;