From ddb262a4d6bed48ac68eeed99032e10c49c02996 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 18 Jan 2017 19:45:49 -0200 Subject: Control editor implementation start --- Project/ControlEditor.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Project/ControlEditor.h (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h new file mode 100644 index 0000000..b917db5 --- /dev/null +++ b/Project/ControlEditor.h @@ -0,0 +1,11 @@ +#ifndef CONTROLEDITOR_H +#define CONTROLEDITOR_H +#include "ControlEditorBase.h" + +class ControlEditor : public ControlEditorBase +{ +public: + ControlEditor(wxWindow* parent); + virtual ~ControlEditor(); +}; +#endif // CONTROLEDITOR_H -- cgit From 864842440bb7fd9f8495314b8bfa2e2c8a0d47f4 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 19 Jan 2017 19:18:16 -0200 Subject: Cunston control element button implementation --- Project/ControlEditor.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index b917db5..fd35452 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -1,11 +1,35 @@ #ifndef CONTROLEDITOR_H #define CONTROLEDITOR_H + #include "ControlEditorBase.h" +#include +#include +#include +#include + +class ControlElementButton : public wxWindow +{ +public: + ControlElementButton(wxWindow* parent, wxString label, wxImage image); + ~ControlElementButton(); + +protected: + void OnPaint(wxPaintEvent& event); + + wxString m_label; + wxImage m_image; +}; class ControlEditor : public ControlEditorBase { public: ControlEditor(wxWindow* parent); virtual ~ControlEditor(); + +protected: + void BuildControlElementPanel(); + virtual void LeftClickDown(wxMouseEvent& event); + + wxButton* m_tfButton; }; #endif // CONTROLEDITOR_H -- cgit From 6f7aebd00330c40007b41aa6e48847695924fe29 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 20 Jan 2017 13:34:14 -0200 Subject: ControlButton fixed --- Project/ControlEditor.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index fd35452..95edc07 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -3,8 +3,8 @@ #include "ControlEditorBase.h" #include -#include #include +#include #include class ControlElementButton : public wxWindow @@ -14,10 +14,25 @@ public: ~ControlElementButton(); protected: - void OnPaint(wxPaintEvent& event); - + virtual void OnPaint(wxPaintEvent& event); + virtual void OnMouseEnter(wxMouseEvent& event); + virtual void OnMouseLeave(wxMouseEvent& event); + virtual void OnLeftClickDown(wxMouseEvent& event); + virtual void OnLeftClickUp(wxMouseEvent& event); + wxString m_label; + wxFont m_font; + wxPoint m_labelPosition; + wxImage m_image; + wxSize m_imageSize; + wxPoint m_imagePosition; + + int m_borderSize = 2; + bool m_mouseAbove = false; + bool m_selected = false; + + wxSize m_buttonSize; }; class ControlEditor : public ControlEditorBase -- cgit From 9d29dde68863f207eba2d84746cd38094810932d Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 20 Jan 2017 18:19:59 -0200 Subject: Button click event trigger implemented --- Project/ControlEditor.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 95edc07..723831a 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -7,10 +7,23 @@ #include #include +enum ControlElementButtonID +{ + ID_IO = 0, + ID_TF, + ID_SUM, + ID_CONST, + ID_LIMITER, + ID_GAIN, + ID_MULT, + ID_SAT, + ID_RATELIM +}; + class ControlElementButton : public wxWindow { public: - ControlElementButton(wxWindow* parent, wxString label, wxImage image); + ControlElementButton(wxWindow* parent, wxString label, wxImage image, wxWindowID id = wxID_ANY); ~ControlElementButton(); protected: @@ -40,6 +53,8 @@ class ControlEditor : public ControlEditorBase public: ControlEditor(wxWindow* parent); virtual ~ControlEditor(); + + virtual void AddElement(ControlElementButtonID id); protected: void BuildControlElementPanel(); -- cgit 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/ControlEditor.h | 59 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 18 deletions(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 723831a..e121690 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -6,19 +6,14 @@ #include #include #include +#include +#include -enum ControlElementButtonID -{ - ID_IO = 0, - ID_TF, - ID_SUM, - ID_CONST, - ID_LIMITER, - ID_GAIN, - ID_MULT, - ID_SAT, - ID_RATELIM -}; +class Camera; +class ControlElement; +class TransferFunction; + +enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_SAT, ID_RATELIM }; class ControlElementButton : public wxWindow { @@ -36,30 +31,58 @@ protected: wxString m_label; wxFont m_font; wxPoint m_labelPosition; - + wxImage m_image; wxSize m_imageSize; wxPoint m_imagePosition; - + int m_borderSize = 2; bool m_mouseAbove = false; bool m_selected = false; - + wxSize m_buttonSize; }; class ControlEditor : public ControlEditorBase { public: + enum ControlEditorMode { + MODE_EDIT = 0, + MODE_MOVE_ELEMENT, + MODE_DRAG, + MODE_DRAG_INSERT, + MODE_INSERT, + MODE_SELECTION_RECT, + MODE_PASTE, + MODE_DRAG_PASTE + }; ControlEditor(wxWindow* parent); virtual ~ControlEditor(); - + virtual void AddElement(ControlElementButtonID id); + virtual void Redraw() { m_glCanvas->Refresh(); } protected: - void BuildControlElementPanel(); + virtual void OnDoubleClick(wxMouseEvent& event); + virtual void OnLeftClickDown(wxMouseEvent& event); + virtual void OnLeftClickUp(wxMouseEvent& event); + virtual void OnMiddleDown(wxMouseEvent& event); + virtual void OnMiddleUp(wxMouseEvent& event); + virtual void OnMouseMotion(wxMouseEvent& event); + virtual void OnPaint(wxPaintEvent& event); virtual void LeftClickDown(wxMouseEvent& event); - wxButton* m_tfButton; + void BuildControlElementPanel(); + void SetViewport(); + + wxGLContext* m_glContext = NULL; + Camera* m_camera = NULL; + + ControlEditorMode m_mode = MODE_EDIT; + + wxRect2DDouble m_selectionRect; + wxPoint2DDouble m_startSelRect; + + std::vector m_elementList; }; #endif // CONTROLEDITOR_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/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index e121690..0652e1d 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -63,6 +63,7 @@ public: virtual void Redraw() { m_glCanvas->Refresh(); } protected: + virtual void OnScroll(wxMouseEvent& event); virtual void OnDoubleClick(wxMouseEvent& event); virtual void OnLeftClickDown(wxMouseEvent& event); virtual void OnLeftClickUp(wxMouseEvent& event); -- 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/ControlEditor.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 0652e1d..92e1966 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -63,6 +63,7 @@ public: virtual void Redraw() { m_glCanvas->Refresh(); } protected: + virtual void OnIdle(wxIdleEvent& event); virtual void OnScroll(wxMouseEvent& event); virtual void OnDoubleClick(wxMouseEvent& event); virtual void OnLeftClickDown(wxMouseEvent& event); @@ -85,5 +86,7 @@ protected: wxPoint2DDouble m_startSelRect; std::vector m_elementList; + + bool m_firstDraw = true; }; #endif // CONTROLEDITOR_H -- 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/ControlEditor.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 92e1966..d4e99b7 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -12,6 +12,7 @@ class Camera; class ControlElement; class TransferFunction; +class ConnectionLine; enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_SAT, ID_RATELIM }; @@ -49,9 +50,11 @@ public: enum ControlEditorMode { MODE_EDIT = 0, MODE_MOVE_ELEMENT, + MODE_MOVE_LINE, MODE_DRAG, MODE_DRAG_INSERT, MODE_INSERT, + MODE_INSERT_LINE, MODE_SELECTION_RECT, MODE_PASTE, MODE_DRAG_PASTE @@ -61,8 +64,10 @@ public: virtual void AddElement(ControlElementButtonID id); virtual void Redraw() { m_glCanvas->Refresh(); } + virtual void RotateSelectedElements(bool clockwise); protected: + virtual void OnKeyDown(wxKeyEvent& event); virtual void OnIdle(wxIdleEvent& event); virtual void OnScroll(wxMouseEvent& event); virtual void OnDoubleClick(wxMouseEvent& event); @@ -86,6 +91,7 @@ protected: wxPoint2DDouble m_startSelRect; std::vector m_elementList; + std::vector m_connectionList; bool m_firstDraw = true; }; -- cgit From d11da00a993f1eeae6a1be50839ac72740e4e27b Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Sat, 4 Mar 2017 17:14:52 -0300 Subject: Delete element implemented --- Project/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index d4e99b7..73c2c62 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -65,6 +65,7 @@ public: virtual void AddElement(ControlElementButtonID id); virtual void Redraw() { m_glCanvas->Refresh(); } virtual void RotateSelectedElements(bool clockwise); + virtual void DeleteSelectedElements(); protected: virtual void OnKeyDown(wxKeyEvent& event); -- cgit From b3be8e8ef6338bce2106d9c161bf3c7f7f7f9244 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Mon, 6 Mar 2017 18:59:37 -0300 Subject: Connection line fully implemented Bug on delete a chid line and update points --- Project/ControlEditor.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 73c2c62..8d499fc 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -10,6 +10,7 @@ #include class Camera; +class Element; class ControlElement; class TransferFunction; class ConnectionLine; @@ -83,6 +84,8 @@ protected: void BuildControlElementPanel(); void SetViewport(); + std::vector::iterator DeleteLineFromList(std::vector::iterator& it); + wxGLContext* m_glContext = NULL; Camera* m_camera = NULL; @@ -90,10 +93,10 @@ protected: wxRect2DDouble m_selectionRect; wxPoint2DDouble m_startSelRect; - + std::vector m_elementList; std::vector m_connectionList; - + bool m_firstDraw = true; }; #endif // CONTROLEDITOR_H -- cgit From 009849e49967af659354a94a16c51cab5eb8b5a4 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 7 Mar 2017 19:19:57 -0300 Subject: Sum implementation start --- Project/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 8d499fc..fd74d55 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -14,6 +14,7 @@ class Element; class ControlElement; class TransferFunction; class ConnectionLine; +class Sum; enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_SAT, ID_RATELIM }; -- cgit From 21ebf63bb59357000f9bb44acde176d4ff169c01 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 9 Mar 2017 15:09:43 -0300 Subject: Sum implemented --- Project/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index fd74d55..c9f47f8 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -68,6 +68,7 @@ public: virtual void Redraw() { m_glCanvas->Refresh(); } virtual void RotateSelectedElements(bool clockwise); virtual void DeleteSelectedElements(); + virtual void CheckConnections(); protected: virtual void OnKeyDown(wxKeyEvent& event); -- cgit From 045037ce8f2b106acbe5425245746a2dbed65c26 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 30 Mar 2017 11:10:06 -0300 Subject: Exponencial under implementation --- Project/ControlEditor.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index c9f47f8..4713f1d 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -15,6 +15,9 @@ class ControlElement; class TransferFunction; class ConnectionLine; class Sum; +class Multiplier; +class Limiter; +class RateLimiter; enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_SAT, ID_RATELIM }; -- cgit From a684d5c9c9dd131060b5a36d7c7844ae197fcfd1 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 31 Mar 2017 18:16:05 -0300 Subject: Exponencial implemented --- Project/ControlEditor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 4713f1d..da3d567 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -18,8 +18,9 @@ class Sum; class Multiplier; class Limiter; class RateLimiter; +class Exponential; -enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_SAT, ID_RATELIM }; +enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM }; class ControlElementButton : public wxWindow { -- cgit From afb0e6e08d3911b7387799f5c465fd59ca26a484 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 1 Apr 2017 17:43:54 -0300 Subject: Constant implemented Missing: gain and io --- Project/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index da3d567..4a7397c 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -19,6 +19,7 @@ class Multiplier; class Limiter; class RateLimiter; class Exponential; +class Constant; enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM }; -- cgit From 38b3e2decff95f5e29ffb6025ee899d108d22f04 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 4 Apr 2017 18:10:12 -0300 Subject: Gain implemented Implement io: https://ideone.com/0HDBVd --- Project/ControlEditor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 4a7397c..998fb2d 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -20,6 +20,7 @@ class Limiter; class RateLimiter; class Exponential; class Constant; +class Gain; enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID_GAIN, ID_MULT, ID_EXP, ID_RATELIM }; -- cgit From ed36957d2d06ce9484e39be699bc41b521bdb090 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 6 Apr 2017 17:12:09 -0300 Subject: Io form under implementation --- Project/ControlEditor.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 998fb2d..982aeca 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -9,6 +9,8 @@ #include #include +#include "IOControl.h" + class Camera; class Element; class ControlElement; @@ -26,11 +28,11 @@ enum ControlElementButtonID { ID_IO = 0, ID_TF, ID_SUM, ID_CONST, ID_LIMITER, ID class ControlElementButton : public wxWindow { -public: + public: ControlElementButton(wxWindow* parent, wxString label, wxImage image, wxWindowID id = wxID_ANY); ~ControlElementButton(); -protected: + protected: virtual void OnPaint(wxPaintEvent& event); virtual void OnMouseEnter(wxMouseEvent& event); virtual void OnMouseLeave(wxMouseEvent& event); @@ -54,7 +56,7 @@ protected: class ControlEditor : public ControlEditorBase { -public: + public: enum ControlEditorMode { MODE_EDIT = 0, MODE_MOVE_ELEMENT, @@ -67,7 +69,10 @@ public: MODE_PASTE, MODE_DRAG_PASTE }; - ControlEditor(wxWindow* parent); + + ControlEditor(wxWindow* parent, + int ioflags = IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_VELOCITY | IOControl::OUT_FIELD_VOLTAGE | + IOControl::OUT_MEC_POWER); virtual ~ControlEditor(); virtual void AddElement(ControlElementButtonID id); @@ -76,7 +81,7 @@ public: virtual void DeleteSelectedElements(); virtual void CheckConnections(); -protected: + protected: virtual void OnKeyDown(wxKeyEvent& event); virtual void OnIdle(wxIdleEvent& event); virtual void OnScroll(wxMouseEvent& event); @@ -106,5 +111,6 @@ protected: std::vector m_connectionList; bool m_firstDraw = true; + int m_ioFlags; }; -#endif // CONTROLEDITOR_H +#endif // CONTROLEDITOR_H -- cgit From d13b7013afa5ba1d40ee52e77eabd43bfd1b4acd Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 7 Apr 2017 17:49:47 -0300 Subject: generic controls gui implemented --- Project/ControlEditor.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 982aeca..0b9304c 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -80,6 +80,8 @@ class ControlEditor : public ControlEditorBase virtual void RotateSelectedElements(bool clockwise); virtual void DeleteSelectedElements(); virtual void CheckConnections(); + virtual std::vector GetConnectionLineList() { return m_connectionList; } + virtual std::vector GetControlElementList() { return m_elementList; } protected: virtual void OnKeyDown(wxKeyEvent& event); -- 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/ControlEditor.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 0b9304c..40a2b0a 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -11,6 +11,7 @@ #include "IOControl.h" +class FileHanding; class Camera; class Element; class ControlElement; @@ -84,6 +85,7 @@ class ControlEditor : public ControlEditorBase virtual std::vector GetControlElementList() { return m_elementList; } protected: + virtual void OnExportClick(wxCommandEvent& event); virtual void OnKeyDown(wxKeyEvent& event); virtual void OnIdle(wxIdleEvent& event); virtual void OnScroll(wxMouseEvent& event); @@ -114,5 +116,7 @@ class ControlEditor : public ControlEditorBase bool m_firstDraw = true; int m_ioFlags; + + int m_lastElementID = 0; }; #endif // CONTROLEDITOR_H -- cgit From 52931022eb25080e33f2362c3b0bd4361f0cdb0b Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 12 Apr 2017 18:57:10 -0300 Subject: Open control implementation --- Project/ControlEditor.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 40a2b0a..2dd4051 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -81,10 +81,13 @@ class ControlEditor : public ControlEditorBase virtual void RotateSelectedElements(bool clockwise); virtual void DeleteSelectedElements(); virtual void CheckConnections(); - virtual std::vector GetConnectionLineList() { return m_connectionList; } - virtual std::vector GetControlElementList() { return m_elementList; } + virtual std::vector GetConnectionLineList() const { return m_connectionList; } + virtual std::vector GetControlElementList() const { return m_elementList; } + virtual void SetConnectionsList(std::vector connectionList) { m_connectionList = connectionList; } + virtual void SetElementsList(std::vector elementList) { m_elementList = elementList; } protected: + virtual void OnImportClick(wxCommandEvent& event); virtual void OnExportClick(wxCommandEvent& event); virtual void OnKeyDown(wxKeyEvent& event); virtual void OnIdle(wxIdleEvent& event); -- cgit From 0ec05e0cb396a9ef153d29f605d4a0bbeb0dc7c1 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 17 Apr 2017 20:25:10 -0300 Subject: Connection line import under implementation Parent line not implemented yet --- Project/ControlEditor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/ControlEditor.h') diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 2dd4051..eb1bc4f 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -83,8 +83,8 @@ class ControlEditor : public ControlEditorBase virtual void CheckConnections(); virtual std::vector GetConnectionLineList() const { return m_connectionList; } virtual std::vector GetControlElementList() const { return m_elementList; } - virtual void SetConnectionsList(std::vector connectionList) { m_connectionList = connectionList; } virtual void SetElementsList(std::vector elementList) { m_elementList = elementList; } + virtual void SetConnectionsList(std::vector connectionList) { m_connectionList = connectionList; } protected: virtual void OnImportClick(wxCommandEvent& event); -- cgit