From 2bfb6cffd86cb771918dde12e10704384d534714 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 27 Jul 2016 16:16:29 -0300 Subject: Projeto base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nenhum código implementado ainda. --- Project/MainFrame.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Project/MainFrame.h (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h new file mode 100644 index 0000000..8e2faf3 --- /dev/null +++ b/Project/MainFrame.h @@ -0,0 +1,14 @@ +#ifndef MAINFRAME_H +#define MAINFRAME_H +#include "wxcrafter.h" + +class MainFrame : public MainFrameBaseClass +{ +public: + MainFrame(wxWindow* parent); + virtual ~MainFrame(); + + void OnExit(wxCommandEvent& event); + void OnAbout(wxCommandEvent& event); +}; +#endif // MAINFRAME_H -- cgit From d1b893e6757270b0f246a7657d7b6701dcea3b87 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 27 Jul 2016 23:41:41 -0300 Subject: Main frame under construction Ribbon bar icons done, all controllers set, does nothing --- Project/MainFrame.h | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 8e2faf3..c0bb93c 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -1,14 +1,52 @@ #ifndef MAINFRAME_H #define MAINFRAME_H -#include "wxcrafter.h" -class MainFrame : public MainFrameBaseClass +#include "MainFrameBase.h" +#include "ArtMetro.h" + +class MainFrame : public MainFrameBase { -public: + public: MainFrame(wxWindow* parent); - virtual ~MainFrame(); + ~MainFrame(); + + protected: + virtual void OnAboutClick(wxRibbonButtonBarEvent& event); + virtual void OnAddElementDropdown(wxRibbonButtonBarEvent& event); + virtual void OnChartsClick(wxRibbonButtonBarEvent& event); + virtual void OnCloseClick(wxRibbonButtonBarEvent& event); + virtual void OnCopyClick(wxRibbonButtonBarEvent& event); + virtual void OnDataReportClick(wxRibbonButtonBarEvent& event); + virtual void OnDeleteClick(wxRibbonButtonBarEvent& event); + virtual void OnDisableSolutionClick(wxRibbonButtonBarEvent& event); + virtual void OnDragClick(wxRibbonButtonBarEvent& event); + virtual void OnEnableSolutionClick(wxRibbonButtonBarEvent& event); + virtual void OnExitClick(wxRibbonButtonBarEvent& event); + virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); + virtual void OnFaultClick(wxRibbonButtonBarEvent& event); + virtual void OnFitClick(wxRibbonButtonBarEvent& event); + virtual void OnMoveClick(wxRibbonButtonBarEvent& event); + virtual void OnOpenClick(wxRibbonButtonBarEvent& event); + virtual void OnPSPGuideClick(wxRibbonButtonBarEvent& event); + virtual void OnPasteClick(wxRibbonButtonBarEvent& event); + virtual void OnPowerFlowClick(wxRibbonButtonBarEvent& event); + virtual void OnProjectSettingsClick(wxRibbonButtonBarEvent& event); + virtual void OnRedoClick(wxRibbonButtonBarEvent& event); + virtual void OnResetVoltagesClick(wxRibbonButtonBarEvent& event); + virtual void OnRunStabilityClick(wxRibbonButtonBarEvent& event); + virtual void OnSCPowerClick(wxRibbonButtonBarEvent& event); + virtual void OnSaveAsClick(wxRibbonButtonBarEvent& event); + virtual void OnSaveClick(wxRibbonButtonBarEvent& event); + virtual void OnSnapshotClick(wxRibbonButtonBarEvent& event); + virtual void OnStabilitySettingsClick(wxRibbonButtonBarEvent& event); + virtual void OnUndoClick(wxRibbonButtonBarEvent& event); + virtual void OnNewClick(wxRibbonButtonBarEvent& event); - void OnExit(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); + private: + wxRibbonMetroArtProvider* m_artMetro; + + void Init(); + void EnableCurrentProjectRibbon(bool enable = true); }; -#endif // MAINFRAME_H + +#endif // MAINFRAME_H -- cgit From 3a246308dcd76f70a1b6c3e6b08f0d597b255dba Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 30 Jul 2016 00:29:03 -0300 Subject: Adding the basics graphics elements The base is done, bus under contruction --- Project/MainFrame.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h index c0bb93c..2b54414 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -1,13 +1,30 @@ #ifndef MAINFRAME_H #define MAINFRAME_H +#include +#include + #include "MainFrameBase.h" #include "ArtMetro.h" +#include "Workspace.h" + +enum +{ + ID_ADDMENU_BUS = 20000, + ID_ADDMENU_LINE, + ID_ADDMENU_TRANSFORMER, + ID_ADDMENU_GENERATOR, + ID_ADDMENU_LOAD, + ID_ADDMENU_CAPACITOR, + ID_ADDMENU_INDUCTOR, + ID_ADDMENU_INDMOTOR, + ID_ADDMENU_SYNCCOMP +}; class MainFrame : public MainFrameBase { public: - MainFrame(wxWindow* parent); + MainFrame(wxWindow* parent, wxLocale* locale); ~MainFrame(); protected: @@ -21,7 +38,7 @@ class MainFrame : public MainFrameBase virtual void OnDisableSolutionClick(wxRibbonButtonBarEvent& event); virtual void OnDragClick(wxRibbonButtonBarEvent& event); virtual void OnEnableSolutionClick(wxRibbonButtonBarEvent& event); - virtual void OnExitClick(wxRibbonButtonBarEvent& event); + virtual void OnExitClick(wxRibbonButtonBarEvent& event) { this->Close(); }; virtual void OnExpImpClick(wxRibbonButtonBarEvent& event); virtual void OnFaultClick(wxRibbonButtonBarEvent& event); virtual void OnFitClick(wxRibbonButtonBarEvent& event); @@ -43,10 +60,18 @@ class MainFrame : public MainFrameBase virtual void OnNewClick(wxRibbonButtonBarEvent& event); private: + std::vector m_workspaceList; + int m_projectNumber = 1; + wxRibbonMetroArtProvider* m_artMetro; + wxMenu* m_addElementsMenu; + wxLocale* m_locale; void Init(); - void EnableCurrentProjectRibbon(bool enable = true); + void EnableCurrentProjectRibbon(bool enable = true); + void CreateAddElementsMenu(); + + void OnAddElementsClick(wxCommandEvent& event); }; #endif // MAINFRAME_H -- cgit From 5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Mon, 1 Aug 2016 18:05:11 -0300 Subject: Attempt to implement Event Handler in Workspace fail --- Project/MainFrame.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 2b54414..8459926 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -28,6 +28,8 @@ class MainFrame : public MainFrameBase ~MainFrame(); protected: + virtual void NotebookPageClosed(wxAuiNotebookEvent& event); + virtual void NotebookPageClosing(wxAuiNotebookEvent& event); virtual void OnAboutClick(wxRibbonButtonBarEvent& event); virtual void OnAddElementDropdown(wxRibbonButtonBarEvent& event); virtual void OnChartsClick(wxRibbonButtonBarEvent& event); -- cgit From 0ac91e091e52cae5745b14d62f77f905e559cf92 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 2 Aug 2016 01:01:20 -0300 Subject: Cycle dependence fixed. Next step: remove mouse handler --- Project/MainFrame.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 8459926..22c49ab 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -5,8 +5,10 @@ #include #include "MainFrameBase.h" -#include "ArtMetro.h" -#include "Workspace.h" + +class MainFrameBase; +class wxRibbonMetroArtProvider; +class Workspace; enum { -- cgit From 46c9d3fe586fb5c8ac75384b62a79971f96a5b88 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 3 Aug 2016 17:43:25 -0300 Subject: Bus implemented, selection not working Selection to move fail --- Project/MainFrame.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Project/MainFrame.h') diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 22c49ab..241551f 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -26,6 +26,7 @@ enum class MainFrame : public MainFrameBase { public: + MainFrame(); MainFrame(wxWindow* parent, wxLocale* locale); ~MainFrame(); @@ -65,7 +66,7 @@ class MainFrame : public MainFrameBase private: std::vector m_workspaceList; - int m_projectNumber = 1; + int m_projectNumber = 1; wxRibbonMetroArtProvider* m_artMetro; wxMenu* m_addElementsMenu; -- cgit