From f5bb978b22c881dc61663d8ac660cc2778a842bb Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 6 Dec 2016 20:27:20 -0200 Subject: Text update under implementation --- Project/Text.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Project/Text.h') diff --git a/Project/Text.h b/Project/Text.h index 2b10380..98aeb65 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, @@ -82,12 +83,12 @@ class Text : public Element 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 -- cgit From a41af814d1339a03a7891ee5c84f49006fac58e5 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 7 Dec 2016 20:09:13 -0200 Subject: Multiline text implemented text update still under implementation --- Project/Text.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/Text.h') diff --git a/Project/Text.h b/Project/Text.h index 98aeb65..80f35fa 100644 --- a/Project/Text.h +++ b/Project/Text.h @@ -80,6 +80,8 @@ class Text : public Element protected: wxString m_text = _("Text"); + std::vector m_multlineText; + bool m_isMultlineText = false; int m_fontSize = 10; Element* m_element = NULL; -- cgit