diff options
author | Thales1330 <thaleslima.ufu@gmail.com> | 2017-01-03 19:03:12 -0200 |
---|---|---|
committer | Thales1330 <thaleslima.ufu@gmail.com> | 2017-01-03 19:03:12 -0200 |
commit | a1932eec23589ed67d824873b37de3e83a09cd24 (patch) | |
tree | db2bed8e7a9c87ad6115a1b8a6a347cad6753b06 /Project/Text.h | |
parent | 2c0b51586b3b2243ae0fdcd653139818e4b4e23e (diff) | |
download | PSP.git-a1932eec23589ed67d824873b37de3e83a09cd24.tar.gz PSP.git-a1932eec23589ed67d824873b37de3e83a09cd24.tar.xz PSP.git-a1932eec23589ed67d824873b37de3e83a09cd24.zip |
Text element optimizated, but buggy
Element/parent search buggy
Diffstat (limited to 'Project/Text.h')
-rw-r--r-- | Project/Text.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Project/Text.h b/Project/Text.h index 36a6704..019f765 100644 --- a/Project/Text.h +++ b/Project/Text.h @@ -46,12 +46,12 @@ enum DataType { class Text : public Element { - public: +public: Text(); Text(wxPoint2DDouble position); ~Text(); - - virtual Element* GetCopy(); + + virtual Element* GetCopy(); virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return true; }; virtual bool Contains(wxPoint2DDouble position) const; virtual void Draw(wxPoint2DDouble translation, double scale); @@ -78,10 +78,13 @@ class Text : public Element int GetFontSize() const { return m_fontSize; } const ElectricalUnit GetUnit() const { return m_unit; } int GetDecimalPlaces() const { return m_decimalPlaces; } - - protected: + +protected: + wxGLString* m_glString = NULL; + wxGLStringArray* m_glStringArray = NULL; + wxString m_text = _("Text"); - std::vector<wxString> m_multlineText; + int m_numberOfLines; bool m_isMultlineText = false; int m_fontSize = 10; @@ -94,4 +97,4 @@ class Text : public Element int m_decimalPlaces = 2; }; -#endif // TEXT_H +#endif // TEXT_H |