From 864842440bb7fd9f8495314b8bfa2e2c8a0d47f4 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 19 Jan 2017 19:18:16 -0200 Subject: Cunston control element button implementation --- Project/Workspace.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 7f9cce4..fa15722 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -745,18 +745,8 @@ void Workspace::OnKeyDown(wxKeyEvent& event) } // Tests - Ctrl + Shift + L if(event.ControlDown() && event.ShiftDown()) { - int numChild = 0; - int numParent = 0; - for(auto it = m_elementList.begin(), itEnd = m_elementList.end(); it != itEnd; ++it) { - Element* element = *it; - if(element->Contains(m_camera->GetMousePosition())) { - for(int i = 0; i < (int)element->GetParentList().size(); i++) { - if(element->GetParentList()[i]) numParent++; - } - numChild = element->GetChildList().size(); - } - } - wxMessageBox(wxString::Format("%d parents\n%d childs", numParent, numChild)); + ControlEditor* ce = new ControlEditor(this); + ce->Show(); } } break; case 'T': // Insert a transformer. -- cgit From 9d29dde68863f207eba2d84746cd38094810932d Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 20 Jan 2017 18:19:59 -0200 Subject: Button click event trigger implemented --- Project/Workspace.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index fa15722..1ed8d93 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -355,8 +355,7 @@ void Workspace::OnRightClickDown(wxMouseEvent& event) if(element->GetContextMenu(menu)) { m_timer->Stop(); menu.SetClientData(element); - menu.Connect( - wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(Workspace::OnPopupClick), NULL, this); + menu.Bind(wxEVT_COMMAND_MENU_SELECTED, &Workspace::OnPopupClick, this); PopupMenu(&menu); redraw = true; -- cgit From bdb0625280d827ba7333b6fc9d6c6534e0720100 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 24 Jan 2017 18:25:17 -0200 Subject: Control editor implementation start --- Project/Workspace.cpp | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 1ed8d93..c53bd60 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -1,5 +1,5 @@ #include "Workspace.h" - +#include "Camera.h" #include "Element.h" //#include "Bus.h" #include "Line.h" @@ -17,44 +17,6 @@ #include "PowerFlow.h" #include "Fault.h" -// Camera -Camera::Camera() -{ - m_translation = wxPoint2DDouble(0, 0); - m_scale = 1.0; -} - -Camera::~Camera() {} -wxPoint2DDouble Camera::ScreenToWorld(wxPoint2DDouble screenCoords) const -{ - return wxPoint2DDouble( - screenCoords.m_x / m_scale - m_translation.m_x, screenCoords.m_y / m_scale - m_translation.m_y); -} - -void Camera::SetTranslation(wxPoint2DDouble screenPoint) -{ - m_translation = screenPoint / m_scale - m_translationStartPt; -} - -void Camera::SetScale(wxPoint2DDouble screenPoint, double delta) -{ - m_translation -= screenPoint * (1.0 - m_scale) / m_scale; - - m_scale += delta; - - // Limits: 5% - 300% - if(m_scale < m_zoomMin) m_scale = m_zoomMin; - if(m_scale > m_zoomMax) m_scale = m_zoomMax; - - m_translation += screenPoint * (1.0 - m_scale) / m_scale; -} - -wxPoint2DDouble Camera::GetMousePosition(bool worldCoords) const -{ - if(worldCoords) return ScreenToWorld(m_mousePosition); - return m_mousePosition; -} - // Workspace Workspace::Workspace() : WorkspaceBase(NULL) -- cgit From 9f17be8af02011f04d188ce991921f6eb0ecf792 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 25 Jan 2017 19:45:45 -0200 Subject: Several graphic tools implemented, tf start --- Project/Workspace.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index c53bd60..893f69c 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -584,16 +584,6 @@ void Workspace::OnMiddleDown(wxMouseEvent& event) m_mode = MODE_DRAG; } break; } - /*if(m_mode != MODE_INSERT && m_mode != MODE_INSERT_TEXT && m_mode == MODE_PASTE && m_mode != MODE_DRAG_INSERT && - m_mode != MODE_DRAG_INSERT_TEXT && m_mode != MODE_DRAG_PASTE) { - m_mode = MODE_DRAG; - } else if(m_mode == MODE_INSERT_TEXT) { - m_mode = MODE_DRAG_INSERT_TEXT; - }else if(m_mode == MODE_PASTE) { - m_mode = MODE_DRAG_PASTE; - } else { - m_mode = MODE_DRAG_INSERT; - }*/ m_camera->StartTranslation(m_camera->ScreenToWorld(event.GetPosition())); UpdateStatusBar(); } -- cgit From 4ddc7be64451db873e49169e951532ce8893e359 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 3 Mar 2017 18:50:40 -0300 Subject: More connection line methods implemented --- Project/Workspace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index 893f69c..f7bdf5f 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -655,7 +655,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event) m_statusBar->SetStatusText(_("Insert Text: Click to insert, ESC to cancel.")); Redraw(); } - } + } break; case 'F': { if(event.GetModifiers() == wxMOD_SHIFT) { Fit(); -- cgit From d13b7013afa5ba1d40ee52e77eabd43bfd1b4acd Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 7 Apr 2017 17:49:47 -0300 Subject: generic controls gui implemented --- Project/Workspace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Workspace.cpp') diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index f7bdf5f..5575764 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -696,7 +696,7 @@ void Workspace::OnKeyDown(wxKeyEvent& event) } // Tests - Ctrl + Shift + L if(event.ControlDown() && event.ShiftDown()) { - ControlEditor* ce = new ControlEditor(this); + ControlEditor* ce = new ControlEditor(this, IOControl::IN_TERMINAL_VOLTAGE | IOControl::OUT_FIELD_VOLTAGE); ce->Show(); } } break; -- cgit