From 7aed88dbcf9d37a1f40c8cad115f055c4d69e7a9 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 29 Dec 2016 19:03:16 -0200 Subject: Parent/child optimization implemented And others bugfixes. --- Project/Workspace.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Project/Workspace.h') diff --git a/Project/Workspace.h b/Project/Workspace.h index 21a1a56..fe2a25f 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -91,7 +91,8 @@ public: void ValidateBusesVoltages(Element* initialBus); void ValidateElementsVoltages(); - + + void UpdateElementsID(); void UpdateTextElements(); int GetElementNumber(ElementID elementID) { return m_elementNumber[elementID]; } @@ -159,7 +160,7 @@ protected: wxPoint2DDouble m_mousePosition; - double m_zoomMin = 0.05; + double m_zoomMin = 0.01; double m_zoomMax = 3.0; }; -- cgit From 2c0b51586b3b2243ae0fdcd653139818e4b4e23e Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Mon, 2 Jan 2017 19:31:11 -0200 Subject: Fast data visualization implemented --- Project/Workspace.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Project/Workspace.h') diff --git a/Project/Workspace.h b/Project/Workspace.h index fe2a25f..e900604 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "WorkspaceBase.h" #include "Bus.h" @@ -101,6 +102,7 @@ public: bool RunPowerFlow(); protected: + virtual void OnTimer(wxTimerEvent& event); virtual void OnLeftDoubleClick(wxMouseEvent& event); virtual void OnRightClickDown(wxMouseEvent& event); virtual void OnLeftClickUp(wxMouseEvent& event); @@ -119,6 +121,7 @@ protected: wxGLContext* m_glContext; wxStatusBar* m_statusBar; Camera* m_camera; + wxTipWindow* m_tipWindow = NULL; wxString m_name; WorkspaceMode m_mode = MODE_EDIT; @@ -129,8 +132,7 @@ protected: std::vector m_textList; wxFileName m_savedPath; - -private: + wxRect2DDouble m_selectionRect; wxPoint2DDouble m_startSelRect; }; -- cgit From a1932eec23589ed67d824873b37de3e83a09cd24 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 3 Jan 2017 19:03:12 -0200 Subject: Text element optimizated, but buggy Element/parent search buggy --- Project/Workspace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Workspace.h') diff --git a/Project/Workspace.h b/Project/Workspace.h index e900604..095feac 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -78,7 +78,7 @@ public: void SetName(wxString name) { m_name = name; } void SetElementList(std::vector elementList) { m_elementList = elementList; } - void SetTextList(std::vector textList) { m_textList = textList; } + void SetTextList(std::vector textList); void SetStatusBarText(wxString text) { m_statusBar->SetStatusText(text); } void SetWorkspaceMode(WorkspaceMode mode) { m_mode = mode; } void SetSavedPath(wxFileName savedPath) { m_savedPath = savedPath; } -- cgit From b6f96ca48bc156898df79deba63d270b393fb150 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 5 Jan 2017 19:31:28 -0200 Subject: Text bugs fixed --- Project/Workspace.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Project/Workspace.h') 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 elementList) { m_elementList = elementList; } + void SetElementList(std::vector elementList); void SetTextList(std::vector 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 -- cgit