diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-01-05 19:37:42 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 19:37:42 -0200 |
| commit | 9df133274802731220546d1f9383c213193c8413 (patch) | |
| tree | 9c6e2fa2a45d6c6c4c14d8711b2b89066bfb37d7 /Project/Text.h | |
| parent | c5343c718cf80620c2fc7452a4315f7ddb9e5826 (diff) | |
| parent | b6f96ca48bc156898df79deba63d270b393fb150 (diff) | |
| download | PSP.git-9df133274802731220546d1f9383c213193c8413.tar.gz PSP.git-9df133274802731220546d1f9383c213193c8413.tar.xz PSP.git-9df133274802731220546d1f9383c213193c8413.zip | |
Merge pull request #5 from Thales1330/opt/element-parent-search
Opt element parent search
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 |