summaryrefslogtreecommitdiffstats
path: root/Project/Workspace.h
diff options
context:
space:
mode:
authorThales1330 <thaleslima.ufu@gmail.com>2017-01-05 19:31:28 -0200
committerThales1330 <thaleslima.ufu@gmail.com>2017-01-05 19:31:28 -0200
commitb6f96ca48bc156898df79deba63d270b393fb150 (patch)
tree9c6e2fa2a45d6c6c4c14d8711b2b89066bfb37d7 /Project/Workspace.h
parenta1932eec23589ed67d824873b37de3e83a09cd24 (diff)
downloadPSP.git-b6f96ca48bc156898df79deba63d270b393fb150.tar.gz
PSP.git-b6f96ca48bc156898df79deba63d270b393fb150.tar.xz
PSP.git-b6f96ca48bc156898df79deba63d270b393fb150.zip
Text bugs fixed
Diffstat (limited to 'Project/Workspace.h')
-rw-r--r--Project/Workspace.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/Project/Workspace.h b/Project/Workspace.h
index 095feac..4ac469c 100644
--- a/Project/Workspace.h
+++ b/Project/Workspace.h
@@ -77,11 +77,12 @@ public:
wxFileName GetSavedPath() const { return m_savedPath; }
void SetName(wxString name) { m_name = name; }
- void SetElementList(std::vector<Element*> elementList) { m_elementList = elementList; }
+ void SetElementList(std::vector<Element*> elementList);
void SetTextList(std::vector<Text*> textList);
void SetStatusBarText(wxString text) { m_statusBar->SetStatusText(text); }
void SetWorkspaceMode(WorkspaceMode mode) { m_mode = mode; }
void SetSavedPath(wxFileName savedPath) { m_savedPath = savedPath; }
+ void SetJustOpened(bool justOpened) { m_justOpened = justOpened; }
void Redraw() { m_glCanvas->Refresh(); }
void RotateSelectedElements(bool clockwise = true);
@@ -102,6 +103,7 @@ public:
bool RunPowerFlow();
protected:
+ virtual void OnIdle(wxIdleEvent& event);
virtual void OnTimer(wxTimerEvent& event);
virtual void OnLeftDoubleClick(wxMouseEvent& event);
virtual void OnRightClickDown(wxMouseEvent& event);
@@ -118,9 +120,9 @@ protected:
void SetViewport();
void UpdateStatusBar();
- wxGLContext* m_glContext;
- wxStatusBar* m_statusBar;
- Camera* m_camera;
+ wxGLContext* m_glContext = NULL;
+ wxStatusBar* m_statusBar = NULL;
+ Camera* m_camera = NULL;
wxTipWindow* m_tipWindow = NULL;
wxString m_name;
@@ -135,6 +137,8 @@ protected:
wxRect2DDouble m_selectionRect;
wxPoint2DDouble m_startSelRect;
+
+ bool m_justOpened = false;
};
class Camera