diff options
| author | Thales1330 <thaleslima.ufu@gmail.com> | 2016-12-09 16:35:34 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 16:35:34 -0200 |
| commit | cff8d90d61be4d34f5e84e8dd0933f678e6214be (patch) | |
| tree | 077fdde43d69c248f518fc22978796d8f16e03f3 /Project/Text.h | |
| parent | e282ec268db0d17a1d53f813c5fff9473d25e797 (diff) | |
| parent | ac671068f32849807728b4c2844a4cda995a73c8 (diff) | |
| download | PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.gz PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.xz PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.zip | |
Merge pull request #2 from Thales1330/wip/currentState
Wip currentstate
Diffstat (limited to 'Project/Text.h')
| -rw-r--r-- | Project/Text.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Project/Text.h b/Project/Text.h index 2b10380..80f35fa 100644 --- a/Project/Text.h +++ b/Project/Text.h @@ -17,6 +17,7 @@ class Inductor; class Capacitor; enum ElementType { + TYPE_NONE = 0, TYPE_BUS, TYPE_CAPACITOR, TYPE_IND_MOTOR, @@ -79,15 +80,17 @@ class Text : public Element protected: wxString m_text = _("Text"); + std::vector<wxString> m_multlineText; + bool m_isMultlineText = false; int m_fontSize = 10; Element* m_element = NULL; - ElementType m_elementType; + ElementType m_elementType = TYPE_NONE; int m_elementNumber; DataType m_dataType; ElectricalUnit m_unit; - int m_direction; - int m_decimalPlaces; + int m_direction = 0; + int m_decimalPlaces = 2; }; #endif // TEXT_H |