Changeset 10636

Timestamp:

10/10/09 13:06:30 (4 years ago)

Author:

robert

Message:

From Cesar L.B. Silveira, "I have written these few lines of code which allow setting the label
of an osgWidget::Label with an osgText::String. I had to do this on a
project I'm working on, because I needed UTF-8 strings on my labels,
and using setLabel with std::string was not working.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgWidget/Label (modified) (2 diffs)
• src/osgWidget/Label.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/include/osgWidget/Label

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -37 +37 @@
 
         void setLabel     (const std::string&);
+        void setLabel     (const osgText::String&);
         void setFont      (const std::string&);
         void setFontSize  (unsigned int);

OpenSceneGraph/trunk/src/osgWidget/Label.cpp

@@ -9 +9 @@
 Label::Label(const std::string& name, const std::string& label):
 Widget     (name, 0, 0),
-_text      (new osgText::Text()), 
+_text      (new osgText::Text()),
 _textIndex (0) {
     _text->setAlignment(osgText::Text::LEFT_BOTTOM);
@@ -44 +44 @@
 
     if(getWidth() < size.x()) setWidth(size.x());
-    
+
     if(getHeight() < size.y()) setHeight(size.y());
 }
@@ -57 +57 @@
     // currently cloned object. In this case, we'll need to check to be SURE.
     osgText::Text* text = dynamic_cast<osgText::Text*>(geode->getDrawable(_textIndex));
-    
+
     if(text) parent->getGeode()->setDrawable(_textIndex, _text.get());
 
@@ -109 +109 @@
 }
 
+void Label::setLabel(const osgText::String& label)
+{
+   _text->setText(label);
+
+   _calculateSize(getTextSize());
+}
+
 void Label::setFont(const std::string& font) {
     _text->setFont(font);
-    
+
     _calculateSize(getTextSize());
 }
@@ -118 +125 @@
     _text->setCharacterSize(size);
     _text->setFontResolution(size, size);
-    
+
     _calculateSize(getTextSize());
 }