From 64ed394cdc4b3347768c2e1996518f02982b2ef5 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 26 Mar 2018 15:54:26 -0300 Subject: Import file GUI implemented --- Project/MainFrame.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'Project/MainFrame.cpp') diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 41fe59b..a4fdbbc 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -34,6 +34,7 @@ #include "ChartView.h" #include "DataReport.h" #include "AboutForm.h" +#include "ImportForm.h" MainFrame::MainFrame() : MainFrameBase(NULL) {} MainFrame::MainFrame(wxWindow* parent, wxLocale* locale, PropertiesData* initProperties, wxString openPath) @@ -238,7 +239,7 @@ void MainFrame::OnEnableSolutionClick(wxRibbonButtonBarEvent& event) m_ribbonButtonBarContinuous->ToggleButton(ID_RIBBON_DISABLESOL, false); } -void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} +//void MainFrame::OnExpImpClick(wxRibbonButtonBarEvent& event) {} void MainFrame::OnFaultClick(wxRibbonButtonBarEvent& event) { if(Workspace* workspace = dynamic_cast(m_auiNotebook->GetCurrentPage())) { @@ -476,6 +477,24 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event) } } } + +void MainFrame::OnImportClick(wxRibbonButtonBarEvent& event) +{ + // Create a new workspace to import + Workspace* impWorkspace = new Workspace(this, _("Imported project"), this->GetStatusBar(), m_sharedGLContext); + ImportForm importForm(this, impWorkspace); + if(importForm.ShowModal() == wxID_OK) { + // Import file(s) + if(!m_sharedGLContext) m_sharedGLContext = impWorkspace->GetOpenGLContext(); + m_workspaceList.push_back(impWorkspace); + m_auiNotebook->AddPage(impWorkspace, impWorkspace->GetName(), true); + m_auiNotebook->Layout(); + impWorkspace->Redraw(); + impWorkspace->SetJustOpened(true); + m_projectNumber++; + } +} + void MainFrame::NotebookPageClosed(wxAuiNotebookEvent& event) { if(m_auiNotebook->GetPageCount() == 0) EnableCurrentProjectRibbon(false); -- cgit