diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-04 20:05:30 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 20:05:30 -0300 |
| commit | 926af7f34aaf5aebdbac0cbc550ed75647874258 (patch) | |
| tree | 4df26f8c631aeeeed6e5c9e8aab87c4c663bd30f /Project/MainFrame.h | |
| parent | 17d1dd82ec065eff08546ef1fd2a188ce77471b2 (diff) | |
| parent | 6f3421c4150e49af026432a2a2be0171d741ad03 (diff) | |
| download | PSP.git-926af7f34aaf5aebdbac0cbc550ed75647874258.tar.gz PSP.git-926af7f34aaf5aebdbac0cbc550ed75647874258.tar.xz PSP.git-926af7f34aaf5aebdbac0cbc550ed75647874258.zip | |
Merge pull request #33 from Thales1330/wip/electromechanical-calc
Wip electromechanical calc
Diffstat (limited to 'Project/MainFrame.h')
| -rw-r--r-- | Project/MainFrame.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Project/MainFrame.h b/Project/MainFrame.h index c20e691..f9d9523 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -11,9 +11,12 @@ class MainFrameBase; class wxRibbonMetroArtProvider; class Workspace; class FileHanding; +class GeneralPropertiesForm; +class SimulationsSettingsForm; +class PropertiesData; +class ChartView; -enum -{ +enum { ID_ADDMENU_BUS = 20000, ID_ADDMENU_LINE, ID_ADDMENU_TRANSFORMER, @@ -29,10 +32,12 @@ class MainFrame : public MainFrameBase { public: MainFrame(); - MainFrame(wxWindow* parent, wxLocale* locale); + MainFrame(wxWindow* parent, wxLocale* locale, PropertiesData* initProperties); ~MainFrame(); protected: + virtual void OnGeneralSettingsClick(wxRibbonButtonBarEvent& event); + virtual void OnSimulationSettingsClick(wxRibbonButtonBarEvent& event); virtual void OnRotClockClick(wxRibbonButtonBarEvent& event); virtual void OnRotCounterClockClick(wxRibbonButtonBarEvent& event); virtual void NotebookPageClosed(wxAuiNotebookEvent& event); @@ -56,7 +61,6 @@ class MainFrame : public MainFrameBase 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); @@ -64,17 +68,17 @@ class MainFrame : public MainFrameBase 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); - private: + protected: std::vector<Workspace*> m_workspaceList; int m_projectNumber = 1; wxRibbonMetroArtProvider* m_artMetro = NULL; wxMenu* m_addElementsMenu = NULL; wxLocale* m_locale = NULL; + PropertiesData* m_generalProperties = NULL; void Init(); void EnableCurrentProjectRibbon(bool enable = true); |