From bdb0625280d827ba7333b6fc9d6c6534e0720100 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 24 Jan 2017 18:25:17 -0200 Subject: Control editor implementation start --- Project/TransferFunction.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Project/TransferFunction.h (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h new file mode 100644 index 0000000..2a5acbb --- /dev/null +++ b/Project/TransferFunction.h @@ -0,0 +1,14 @@ +#ifndef TRANSFERFUNCTION_H +#define TRANSFERFUNCTION_H + +#include "ControlElement.h" + +class TransferFunction : public ControlElement +{ +public: + TransferFunction(); + ~TransferFunction(); + +}; + +#endif // TRANSFERFUNCTION_H -- cgit From 9f17be8af02011f04d188ce991921f6eb0ecf792 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 25 Jan 2017 19:45:45 -0200 Subject: Several graphic tools implemented, tf start --- Project/TransferFunction.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index 2a5acbb..fa48354 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -3,12 +3,27 @@ #include "ControlElement.h" +#include +#include "wxGLString.h" + class TransferFunction : public ControlElement { public: TransferFunction(); ~TransferFunction(); + virtual void Draw(wxPoint2DDouble translation, double scale) const; + virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } + virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } + virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } + virtual void SetText(wxString numerator, wxString denominator); + +protected: + wchar_t m_supNumber[10]; + + wxGLString* m_glStringNum = NULL; + wxGLString* m_glStringDen = NULL; + int m_fontSize = 10; }; #endif // TRANSFERFUNCTION_H -- cgit From 15df77aa461ecea7344cce5e736ebee9fb943a9b Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 26 Jan 2017 17:11:37 -0200 Subject: Get superscript implemented --- Project/TransferFunction.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index fa48354..f4e09a1 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -17,6 +17,7 @@ public: virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } virtual void SetText(wxString numerator, wxString denominator); + virtual wxString GetSuperscriptNumber(int number); protected: wchar_t m_supNumber[10]; -- cgit From 10bb7105946bc0a892a9daf42ec5181ad9994fcf Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 27 Jan 2017 19:57:18 -0200 Subject: several control elements methods implemented Node position buggy --- Project/TransferFunction.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index f4e09a1..282ccb0 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -18,6 +18,8 @@ public: virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } virtual void SetText(wxString numerator, wxString denominator); virtual wxString GetSuperscriptNumber(int number); + virtual void GetTFString(wxString& numerator, wxString& denominator); + virtual void UpdateTFText(); protected: wchar_t m_supNumber[10]; @@ -25,6 +27,8 @@ protected: wxGLString* m_glStringNum = NULL; wxGLString* m_glStringDen = NULL; int m_fontSize = 10; + std::vector m_numerator; + std::vector m_denominator; }; #endif // TRANSFERFUNCTION_H -- cgit From 5e7c19ae397164dd718b2593663cee5d1be687cd Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Sat, 28 Jan 2017 14:50:12 -0200 Subject: Node bug fixes, tf form implemented --- Project/TransferFunction.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index 282ccb0..c8ca59f 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -6,6 +6,8 @@ #include #include "wxGLString.h" +class TransferFunctionForm; + class TransferFunction : public ControlElement { public: @@ -16,12 +18,19 @@ public: virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } + virtual bool ShowForm(wxWindow* parent, Element* element); + + virtual std::vector GetNumerator() const { return m_numerator; } + virtual std::vector GetDenominator() const { return m_denominator; } + virtual void SetNumerator(std::vector numerator) { m_numerator = numerator; } + virtual void SetDenominator(std::vector denominator) { m_denominator = denominator; } + virtual void UpdateTFText(); + +protected: virtual void SetText(wxString numerator, wxString denominator); virtual wxString GetSuperscriptNumber(int number); virtual void GetTFString(wxString& numerator, wxString& denominator); - virtual void UpdateTFText(); -protected: wchar_t m_supNumber[10]; wxGLString* m_glStringNum = NULL; -- cgit From a54f50d0bf86c7c4d400e8b4d30cbc6091cfd9df Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 24 Feb 2017 12:25:41 -0300 Subject: Connection line implementation start --- Project/TransferFunction.h | 1 - 1 file changed, 1 deletion(-) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index c8ca59f..d1d9529 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -17,7 +17,6 @@ public: virtual void Draw(wxPoint2DDouble translation, double scale) const; virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } - virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } virtual bool ShowForm(wxWindow* parent, Element* element); virtual std::vector GetNumerator() const { return m_numerator; } -- cgit From 4ddc7be64451db873e49169e951532ce8893e359 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 3 Mar 2017 18:50:40 -0300 Subject: More connection line methods implemented --- Project/TransferFunction.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index d1d9529..34c23fc 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -18,6 +18,7 @@ public: virtual bool Contains(wxPoint2DDouble position) const { return m_rect.Contains(position); } virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } virtual bool ShowForm(wxWindow* parent, Element* element); + virtual void Rotate(bool clockwise = true); virtual std::vector GetNumerator() const { return m_numerator; } virtual std::vector GetDenominator() const { return m_denominator; } -- cgit From f19803bc64885bcfaef15cfd7a8139c28d3dd506 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 8 Apr 2017 16:31:25 -0300 Subject: Control editor export under implementation File handling --- Project/TransferFunction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/TransferFunction.h') diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index 34c23fc..45681ce 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -11,7 +11,7 @@ class TransferFunctionForm; class TransferFunction : public ControlElement { public: - TransferFunction(); + TransferFunction(int id); ~TransferFunction(); virtual void Draw(wxPoint2DDouble translation, double scale) const; -- cgit