From 2bfb6cffd86cb771918dde12e10704384d534714 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 27 Jul 2016 16:16:29 -0300 Subject: Projeto base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nenhum código implementado ainda. --- Project/MainFrame.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Project/MainFrame.cpp (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp new file mode 100644 index 0000000..6d98c38 --- /dev/null +++ b/Project/MainFrame.cpp @@ -0,0 +1,27 @@ +#include "MainFrame.h" +#include + +MainFrame::MainFrame(wxWindow* parent) + : MainFrameBaseClass(parent) +{ +} + +MainFrame::~MainFrame() +{ +} + +void MainFrame::OnExit(wxCommandEvent& event) +{ + wxUnusedVar(event); + Close(); +} + +void MainFrame::OnAbout(wxCommandEvent& event) +{ + wxUnusedVar(event); + wxAboutDialogInfo info; + info.SetCopyright(_("My MainFrame")); + info.SetLicence(_("GPL v2 or later")); + info.SetDescription(_("Short description goes here")); + ::wxAboutBox(info); +} -- cgit From d1b893e6757270b0f246a7657d7b6701dcea3b87 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 27 Jul 2016 23:41:41 -0300 Subject: Main frame under construction Ribbon bar icons done, all controllers set, does nothing --- Project/MainFrame.cpp | 84 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 17 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 6d98c38..e687972 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -1,27 +1,77 @@ #include "MainFrame.h" -#include - -MainFrame::MainFrame(wxWindow* parent) - : MainFrameBaseClass(parent) -{ -} +MainFrame::MainFrame(wxWindow* parent) : MainFrameBase(parent) { Init(); } MainFrame::~MainFrame() { + if(!m_artMetro) delete m_artMetro; } - -void MainFrame::OnExit(wxCommandEvent& event) +void MainFrame::Init() { - wxUnusedVar(event); - Close(); + this->SetSize(800, 600); + // carregar configs locais + + EnableCurrentProjectRibbon(false); + + m_artMetro = new wxRibbonMetroArtProvider(); + m_ribbonBar->SetArtProvider(m_artMetro); + m_ribbonBar->Layout(); } -void MainFrame::OnAbout(wxCommandEvent& event) +void MainFrame::EnableCurrentProjectRibbon(bool enable) { - wxUnusedVar(event); - wxAboutDialogInfo info; - info.SetCopyright(_("My MainFrame")); - info.SetLicence(_("GPL v2 or later")); - info.SetDescription(_("Short description goes here")); - ::wxAboutBox(info); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ADDELEMENT, enable); + m_ribbonButtonBarStabData->EnableButton(ID_RIBBON_CHARTS, enable); + m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_CLOSE, enable); + m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_COPY, enable); + m_ribbonButtonBarReports->EnableButton(ID_RIBBON_DATAREPORT, enable); + m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_DELETE, enable); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_DISABLESOL, enable); + m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_DRAG, enable); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ENABLESOL, enable); + m_ribbonButtonBarCalculations->EnableButton(ID_RIBBON_FAULT, enable); + m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_FIT, enable); + m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_MOVE, enable); + m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_PASTE, enable); + m_ribbonButtonBarCalculations->EnableButton(ID_RIBBON_POWERFLOW, enable); + m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_REDO, enable); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_RESETVOLT, enable); + m_ribbonButtonBarStability->EnableButton(ID_RIBBON_RUNSTAB, enable); + m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_SAVE, enable); + m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_SAVEAS, enable); + m_ribbonButtonBarCalculations->EnableButton(ID_RIBBON_SCPOWER, enable); + m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_SETTINGS, enable); + m_ribbonButtonBarReports->EnableButton(ID_RIBBON_SNAPSHOT, enable); + m_ribbonButtonBarStability->EnableButton(ID_RIBBON_STABSETTINGS, enable); + m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_UNDO, enable); } + +void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) { EnableCurrentProjectRibbon(); } +void MainFrame::OnAboutClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnAddElementDropdown(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnChartsClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnCloseClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnCopyClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnDataReportClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnDeleteClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnDisableSolutionClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnDragClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnEnableSolutionClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnExitClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnFaultClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnFitClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnMoveClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnOpenClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnPSPGuideClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnPasteClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnPowerFlowClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnProjectSettingsClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnRedoClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnResetVoltagesClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnRunStabilityClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnSCPowerClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnSaveAsClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnSaveClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnSnapshotClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnStabilitySettingsClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnUndoClick(wxRibbonButtonBarEvent& event) {} -- cgit From 3a246308dcd76f70a1b6c3e6b08f0d597b255dba Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 30 Jul 2016 00:29:03 -0300 Subject: Adding the basics graphics elements The base is done, bus under contruction --- Project/MainFrame.cpp | 130 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 118 insertions(+), 12 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index e687972..ddd2247 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -1,33 +1,46 @@ #include "MainFrame.h" -MainFrame::MainFrame(wxWindow* parent) : MainFrameBase(parent) { Init(); } +MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) +{ + m_locale = locale; + + Init(); +} MainFrame::~MainFrame() { if(!m_artMetro) delete m_artMetro; + if(!m_addElementsMenu) { + m_addElementsMenu->Disconnect(wxEVT_COMMAND_MENU_SELECTED, + wxCommandEventHandler(MainFrame::OnAddElementsClick), NULL, this); + delete m_addElementsMenu; + } } void MainFrame::Init() { - this->SetSize(800, 600); - // carregar configs locais + this->SetSize(800, 600); + + CreateAddElementsMenu(); EnableCurrentProjectRibbon(false); m_artMetro = new wxRibbonMetroArtProvider(); m_ribbonBar->SetArtProvider(m_artMetro); - m_ribbonBar->Layout(); + m_ribbonBar->Realize(); + + this->Layout(); } void MainFrame::EnableCurrentProjectRibbon(bool enable) { m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ADDELEMENT, enable); m_ribbonButtonBarStabData->EnableButton(ID_RIBBON_CHARTS, enable); - m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_CLOSE, enable); + m_ribbonButtonBarCProject->EnableButton(ID_RIBBON_CLOSE, enable); m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_COPY, enable); m_ribbonButtonBarReports->EnableButton(ID_RIBBON_DATAREPORT, enable); m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_DELETE, enable); - m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_DISABLESOL, enable); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_DISABLESOL, enable); m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_DRAG, enable); - m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ENABLESOL, enable); + m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ENABLESOL, enable); m_ribbonButtonBarCalculations->EnableButton(ID_RIBBON_FAULT, enable); m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_FIT, enable); m_ribbonButtonBarHandling->EnableButton(ID_RIBBON_MOVE, enable); @@ -45,18 +58,78 @@ void MainFrame::EnableCurrentProjectRibbon(bool enable) m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_UNDO, enable); } -void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) { EnableCurrentProjectRibbon(); } +void MainFrame::CreateAddElementsMenu() +{ + m_addElementsMenu = new wxMenu(); + + wxMenuItem* busElement = + new wxMenuItem(m_addElementsMenu, ID_ADDMENU_BUS, _("&Bus\tB"), _("Adds a bus at the circuit")); + // busElement->SetBitmap(wxArtProvider::GetBitmap(wxART_WARNING)); + wxMenuItem* lineElement = + new wxMenuItem(m_addElementsMenu, ID_ADDMENU_LINE, _("&Line\tL"), _("Adds a power line at the circuit")); + wxMenuItem* transformerElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_TRANSFORMER, _("&Transformer\tT"), + _("Adds a transformer at the circuit")); + wxMenuItem* generatorElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_GENERATOR, _("&Generator\tG"), + _("Adds a generator at the circuit")); + wxMenuItem* indMotorElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_INDMOTOR, _("&Induction motor\tI"), + _("Adds an induction motor at the circuit")); + wxMenuItem* syncCompElement = + new wxMenuItem(m_addElementsMenu, ID_ADDMENU_SYNCCOMP, _("&Synchronous compensator \tK"), + _("Adds an induction motor at the circuit")); + wxMenuItem* loadElement = + new wxMenuItem(m_addElementsMenu, ID_ADDMENU_LOAD, _("&Load\tShift-L"), _("Adds a load at the circuit")); + wxMenuItem* capacitorElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_CAPACITOR, _("&Capacitor\tShift-C"), + _("Adds a shunt capacitor at the circuit")); + wxMenuItem* inductorElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_INDUCTOR, _("&Inductor\tShift-I"), + _("Adds a shunt inductor at the circuit")); + + m_addElementsMenu->Append(busElement); + m_addElementsMenu->Append(lineElement); + m_addElementsMenu->Append(transformerElement); + m_addElementsMenu->Append(generatorElement); + m_addElementsMenu->Append(indMotorElement); + m_addElementsMenu->Append(syncCompElement); + m_addElementsMenu->Append(loadElement); + m_addElementsMenu->Append(capacitorElement); + m_addElementsMenu->Append(inductorElement); + + m_addElementsMenu->Connect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAddElementsClick), NULL, + this); +} + +void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) +{ + EnableCurrentProjectRibbon(); + + Workspace* newWorkspace = new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); + m_workspaceList.push_back(newWorkspace); + + m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName()); + newWorkspace->Layout(); + newWorkspace->Redraw(); + m_projectNumber++; +} + void MainFrame::OnAboutClick(wxRibbonButtonBarEvent& event) {} -void MainFrame::OnAddElementDropdown(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnAddElementDropdown(wxRibbonButtonBarEvent& event) { event.PopupMenu(m_addElementsMenu); } void MainFrame::OnChartsClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnCloseClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnCopyClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnDataReportClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnDeleteClick(wxRibbonButtonBarEvent& event) {} -void MainFrame::OnDisableSolutionClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnDisableSolutionClick(wxRibbonButtonBarEvent& event) +{ + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_ENABLESOL, false); +} + void MainFrame::OnDragClick(wxRibbonButtonBarEvent& event) {} -void MainFrame::OnEnableSolutionClick(wxRibbonButtonBarEvent& event) {} -void MainFrame::OnExitClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnEnableSolutionClick(wxRibbonButtonBarEvent& event) +{ + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_ENABLESOL, true); + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, false); +} + void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnFaultClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnFitClick(wxRibbonButtonBarEvent& event) {} @@ -75,3 +148,36 @@ void MainFrame::OnSaveClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnSnapshotClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnStabilitySettingsClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnUndoClick(wxRibbonButtonBarEvent& event) {} +void MainFrame::OnAddElementsClick(wxCommandEvent& event) +{ + switch(event.GetId()) + { + case ID_ADDMENU_BUS: + // inserir barra + break; + case ID_ADDMENU_LINE: + // inserir linha + break; + case ID_ADDMENU_TRANSFORMER: + // inserir transformador + break; + case ID_ADDMENU_GENERATOR: + // inserir gerador + break; + case ID_ADDMENU_LOAD: + // inserir larga + break; + case ID_ADDMENU_CAPACITOR: + // inserir capacitor + break; + case ID_ADDMENU_INDUCTOR: + // inserir indutor + break; + case ID_ADDMENU_INDMOTOR: + // inserir motor + break; + case ID_ADDMENU_SYNCCOMP: + // inserir compensador sincrono + break; + } +} -- cgit From 5e0be3d0a505781c31b3d23450fd92d4cc7b7ce7 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Mon, 1 Aug 2016 18:05:11 -0300 Subject: Attempt to implement Event Handler in Workspace fail --- Project/MainFrame.cpp | 105 +++++++++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 40 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index ddd2247..7099b76 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -3,8 +3,8 @@ MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) { m_locale = locale; - - Init(); + + Init(); } MainFrame::~MainFrame() { @@ -17,8 +17,8 @@ MainFrame::~MainFrame() } void MainFrame::Init() { - this->SetSize(800, 600); - + this->SetSize(800, 600); + CreateAddElementsMenu(); EnableCurrentProjectRibbon(false); @@ -99,15 +99,19 @@ void MainFrame::CreateAddElementsMenu() void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) { - EnableCurrentProjectRibbon(); - - Workspace* newWorkspace = new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); - m_workspaceList.push_back(newWorkspace); - - m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName()); - newWorkspace->Layout(); - newWorkspace->Redraw(); - m_projectNumber++; + EnableCurrentProjectRibbon(); + + Workspace* newWorkspace = + new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber, m_projectNumber)); + m_workspaceList.push_back(newWorkspace); + + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); + m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_ENABLESOL, false); + + m_auiNotebook->AddPage(newWorkspace, newWorkspace->GetName(), true); + newWorkspace->Layout(); + newWorkspace->Redraw(); + m_projectNumber++; } void MainFrame::OnAboutClick(wxRibbonButtonBarEvent& event) {} @@ -152,32 +156,53 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) { switch(event.GetId()) { - case ID_ADDMENU_BUS: - // inserir barra - break; - case ID_ADDMENU_LINE: - // inserir linha - break; - case ID_ADDMENU_TRANSFORMER: - // inserir transformador - break; - case ID_ADDMENU_GENERATOR: - // inserir gerador - break; - case ID_ADDMENU_LOAD: - // inserir larga - break; - case ID_ADDMENU_CAPACITOR: - // inserir capacitor - break; - case ID_ADDMENU_INDUCTOR: - // inserir indutor - break; - case ID_ADDMENU_INDMOTOR: - // inserir motor - break; - case ID_ADDMENU_SYNCCOMP: - // inserir compensador sincrono - break; + case ID_ADDMENU_BUS: + // inserir barra + break; + case ID_ADDMENU_LINE: + // inserir linha + break; + case ID_ADDMENU_TRANSFORMER: + // inserir transformador + break; + case ID_ADDMENU_GENERATOR: + // inserir gerador + break; + case ID_ADDMENU_LOAD: + // inserir larga + break; + case ID_ADDMENU_CAPACITOR: + // inserir capacitor + break; + case ID_ADDMENU_INDUCTOR: + // inserir indutor + break; + case ID_ADDMENU_INDMOTOR: + // inserir motor + break; + case ID_ADDMENU_SYNCCOMP: + // inserir compensador sincrono + break; + } +} +void MainFrame::NotebookPageClosed(wxAuiNotebookEvent& event) +{ + if(m_auiNotebook->GetPageCount() == 0) EnableCurrentProjectRibbon(false); + //Memory leak? +} +void MainFrame::NotebookPageClosing(wxAuiNotebookEvent& event) +{ + std::vector::iterator it = m_workspaceList.begin(); + while(it != m_workspaceList.end()) { + Workspace* workspace = *it; + + if(event.GetSelection() == m_auiNotebook->GetPageIndex(workspace)) { + //delete workspace; //Memory leak? + m_workspaceList.erase(it); + wxMessageBox(wxString::Format("%d", m_workspaceList.size())); + break; + } + it++; } + event.Skip(); } -- cgit From 0ac91e091e52cae5745b14d62f77f905e559cf92 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 2 Aug 2016 01:01:20 -0300 Subject: Cycle dependence fixed. Next step: remove mouse handler --- Project/MainFrame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 7099b76..d2314e9 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -1,4 +1,6 @@ #include "MainFrame.h" +#include "ArtMetro.h" +#include "Workspace.h" MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) { @@ -102,7 +104,7 @@ void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) EnableCurrentProjectRibbon(); Workspace* newWorkspace = - new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber, m_projectNumber)); + new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); m_workspaceList.push_back(newWorkspace); m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); -- cgit From 78aac544e1e77f5405260797cee4b94d7a0dfe32 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 2 Aug 2016 17:34:42 -0300 Subject: Bus controllers under implementation Events handler removed --- Project/MainFrame.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index d2314e9..9769a1f 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -104,7 +104,7 @@ void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) EnableCurrentProjectRibbon(); Workspace* newWorkspace = - new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); + new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber), this->GetStatusBar()); m_workspaceList.push_back(newWorkspace); m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); @@ -201,7 +201,6 @@ void MainFrame::NotebookPageClosing(wxAuiNotebookEvent& event) if(event.GetSelection() == m_auiNotebook->GetPageIndex(workspace)) { //delete workspace; //Memory leak? m_workspaceList.erase(it); - wxMessageBox(wxString::Format("%d", m_workspaceList.size())); break; } it++; -- cgit From 46c9d3fe586fb5c8ac75384b62a79971f96a5b88 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 3 Aug 2016 17:43:25 -0300 Subject: Bus implemented, selection not working Selection to move fail --- Project/MainFrame.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 9769a1f..aa9164e 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -2,6 +2,10 @@ #include "ArtMetro.h" #include "Workspace.h" +MainFrame::MainFrame() : MainFrameBase(NULL) +{ +} + MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) { m_locale = locale; -- cgit From 0a85e05fa7aa0e2b950c2c3bcec5d45f25b1c0e2 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 9 Aug 2016 17:45:09 -0300 Subject: Line under implementation --- Project/MainFrame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index aa9164e..c9ab732 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -14,8 +14,8 @@ MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) } MainFrame::~MainFrame() { - if(!m_artMetro) delete m_artMetro; - if(!m_addElementsMenu) { + //if(m_artMetro) delete m_artMetro; + if(m_addElementsMenu) { m_addElementsMenu->Disconnect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAddElementsClick), NULL, this); delete m_addElementsMenu; -- cgit From 05525745c0b0d189484da3c45f95356d7558e2cf Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 18 Aug 2016 19:10:04 -0300 Subject: Line improvements, context menu implemented Line still under construction, contex menu base implemented --- Project/MainFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index c9ab732..1ba9887 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -175,7 +175,7 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) // inserir gerador break; case ID_ADDMENU_LOAD: - // inserir larga + // inserir carga break; case ID_ADDMENU_CAPACITOR: // inserir capacitor -- cgit