diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-01-18 17:16:30 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 17:16:30 -0200 |
| commit | 69131a727782090ffd7cb467f449e8f26d3d2949 (patch) | |
| tree | c5c60bad223bd8e3c97252b31ab8ed2b5e3e2a25 /Project/Workspace.h | |
| parent | 58148f1ebe5be64231965ca76ae13e4690528e55 (diff) | |
| parent | 46115e4326fc679fe6f1f2c32164b95420e689eb (diff) | |
| download | PSP.git-69131a727782090ffd7cb467f449e8f26d3d2949.tar.gz PSP.git-69131a727782090ffd7cb467f449e8f26d3d2949.tar.xz PSP.git-69131a727782090ffd7cb467f449e8f26d3d2949.zip | |
Merge pull request #25 from Thales1330/bugfix/data-100117
Bugfix data 100117
Diffstat (limited to 'Project/Workspace.h')
| -rw-r--r-- | Project/Workspace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Project/Workspace.h b/Project/Workspace.h index f138410..3b03220 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -68,7 +68,7 @@ public: ~Workspace(); wxString GetName() const { return m_name; } - std::vector<Element*> GetElementList() const { return m_elementList; } + std::vector<Element*> GetElementList() const; std::vector<Text*> GetTextList() const { return m_textList; } std::vector<Element*> GetAllElements() const; WorkspaceMode GetWorkspaceMode() const { return m_mode; } @@ -105,6 +105,7 @@ public: bool RunPowerFlow(); bool RunFault(); + bool RunSCPower(); protected: virtual void OnIdle(wxIdleEvent& event); @@ -132,7 +133,7 @@ protected: WorkspaceMode m_mode = MODE_EDIT; - std::vector<Element*> m_elementList; + std::vector<PowerElement*> m_elementList; int m_elementNumber[NUM_ELEMENTS]; std::vector<Text*> m_textList; |