diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-08 22:02:09 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-08 22:02:09 -0300 |
| commit | 9e1f6849c929506a17fa12185c5c0185d5287177 (patch) | |
| tree | 2706096d34de7f715ff55abb9c3e527351e58b2d /Project/DataReportBase.cpp | |
| parent | 93c3c0af32d08bbc22b43a03d81fad37fd8feb19 (diff) | |
| download | PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.tar.gz PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.tar.xz PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.zip | |
More grid data implemented
Some fault bugfixes
Diffstat (limited to 'Project/DataReportBase.cpp')
| -rw-r--r-- | Project/DataReportBase.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Project/DataReportBase.cpp b/Project/DataReportBase.cpp index 92d511f..0e14d38 100644 --- a/Project/DataReportBase.cpp +++ b/Project/DataReportBase.cpp @@ -64,13 +64,13 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString& boxSizerLvl1_1->Add(boxSizerLvl2_1, 1, wxEXPAND, WXC_FROM_DIP(5)); - m_notebookPowerFlowData = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT); - m_notebookPowerFlowData->SetName(wxT("m_notebookPowerFlowData")); + m_notebookDataReport = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxBK_DEFAULT); + m_notebookDataReport->SetName(wxT("m_notebookDataReport")); - boxSizerLvl2_1->Add(m_notebookPowerFlowData, 1, wxEXPAND, WXC_FROM_DIP(5)); + boxSizerLvl2_1->Add(m_notebookDataReport, 1, wxEXPAND, WXC_FROM_DIP(5)); - m_panelPowerFlowData = new wxPanel(m_notebookPowerFlowData, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookPowerFlowData, wxSize(-1,-1)), wxTAB_TRAVERSAL); - m_notebookPowerFlowData->AddPage(m_panelPowerFlowData, _("Power flow data"), false); + m_panelPowerFlowData = new wxPanel(m_notebookDataReport, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookDataReport, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_notebookDataReport->AddPage(m_panelPowerFlowData, _("Power flow data"), false); wxBoxSizer* boxSizerLvl3_1 = new wxBoxSizer(wxVERTICAL); m_panelPowerFlowData->SetSizer(boxSizerLvl3_1); @@ -131,8 +131,8 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString& boxSizerLvl4_3->Add(m_gridPFBranches, 1, wxEXPAND, WXC_FROM_DIP(5)); - m_panelFaultData = new wxPanel(m_notebookPowerFlowData, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookPowerFlowData, wxSize(-1,-1)), wxTAB_TRAVERSAL); - m_notebookPowerFlowData->AddPage(m_panelFaultData, _("Fault data"), false); + m_panelFaultData = new wxPanel(m_notebookDataReport, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebookDataReport, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_notebookDataReport->AddPage(m_panelFaultData, _("Fault data"), false); wxBoxSizer* boxSizerLvl3_2 = new wxBoxSizer(wxVERTICAL); m_panelFaultData->SetSizer(boxSizerLvl3_2); @@ -212,10 +212,10 @@ DataReportBase::DataReportBase(wxWindow* parent, wxWindowID id, const wxString& #if wxVERSION_NUMBER >= 2900 - if(!wxPersistenceManager::Get().Find(m_notebookPowerFlowData)){ - wxPersistenceManager::Get().RegisterAndRestore(m_notebookPowerFlowData); + if(!wxPersistenceManager::Get().Find(m_notebookDataReport)){ + wxPersistenceManager::Get().RegisterAndRestore(m_notebookDataReport); } else { - wxPersistenceManager::Get().Restore(m_notebookPowerFlowData); + wxPersistenceManager::Get().Restore(m_notebookDataReport); } #endif |