FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added encoding and font setting to dxfText as a first step towards making these user controllable to enble handling of non default settings

Browse Source
This commit is contained in:
Robert Osfield 2020-01-13 09:58:47 +00:00
parent 457d12d9b2
commit d969516595
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/dxf/dxfEntity.cpp
View File

@ -910,10 +910,10 @@ dxfText::drawScene(scene* sc)
sc->ocs(m); sc->ocs(m);
ref_ptr<osgText::Text> _text = new osgText::Text; ref_ptr<osgText::Text> _text = new osgText::Text;
_text->setText(_string); _text->setText(_string, encoding);
_text->setFont(font);
_text->setCharacterSize( _height, 1.0/_xscale ); _text->setCharacterSize( _height, 1.0/_xscale );
_text->setFont("arial.ttf");
Quat qr( DegreesToRadians(_rotation), Z_AXIS ); Quat qr( DegreesToRadians(_rotation), Z_AXIS );

6
src/osgPlugins/dxf/dxfEntity.h
View File

@ -293,6 +293,8 @@ class dxfText : public dxfBasicEntity
{ {
public: public:
dxfText() : dxfText() :
encoding(osgText::String::ENCODING_ASCII),
font("arial.ttf"),
_string(""), _string(""),
_point1(0,0,0), _point1(0,0,0),
_point2(0,0,0), _point2(0,0,0),
@ -310,6 +312,10 @@ public:
virtual void assign(dxfFile* dxf, codeValue& cv); virtual void assign(dxfFile* dxf, codeValue& cv);
virtual void drawScene(scene* sc); virtual void drawScene(scene* sc);
// application settings
osgText::String::Encoding encoding;
std::string font;
protected: protected:
std::string _string; // 1 std::string _string; // 1
osg::Vec3d _point1; // 10,20,30 osg::Vec3d _point1; // 10,20,30