X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundmgr.cpp;h=7c6ef63fdd87343ebde024af4129c1c655435bc5;hp=340d7d4c73b13163f0af1b257e49f08680f1cd52;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=c8b19dfaffba9f06d8b6c40cb1bb83a8964867f7 diff --git a/src/backgroundmgr.cpp b/src/backgroundmgr.cpp index 340d7d4..7c6ef63 100644 --- a/src/backgroundmgr.cpp +++ b/src/backgroundmgr.cpp @@ -89,7 +89,7 @@ void BackgroundManager::OnUnitTick (wxCommandEvent& event) { int iUnits = event.GetInt(); - + BackgroundSupervisor* pSupervisor = reinterpret_cast(event.GetClientData()); if (pSupervisor == NULL) { sys_error (ERR_SEVERE, "Received NULL task [BackgroundManager::OnUnitTick]"); @@ -98,8 +98,8 @@ BackgroundManager::OnUnitTick (wxCommandEvent& event) BackgroundManagerTask* pTask = lookupTask (pSupervisor); if (pTask == NULL) { - sys_error (ERR_SEVERE, "Error looking up task [BackgroundManager::OnUnitTick]"); - return; + sys_error (ERR_SEVERE, "Error looking up task [BackgroundManager::OnUnitTick]"); + return; } pTask->gauge()->SetValue (iUnits); } @@ -118,7 +118,7 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) wxCriticalSectionLocker locker (m_criticalSection); int iNumTasks = m_vecpTasks.size(); - std::vector vecPositionUsed (iNumTasks); //vector of used table positions + std::vector vecPositionUsed (iNumTasks); //vector of used table positions for (int iP = 0; iP < iNumTasks; iP++) vecPositionUsed[iP] = false; @@ -134,7 +134,7 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) iFirstUnusedPos = i; break; } - + wxPoint posGauge (m_sizeBorder.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y); wxPoint posLabel (m_sizeBorder.x + m_sizeGauge.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y); wxPoint posButton (m_sizeBorder.x + m_sizeGauge.x + m_sizeLabel.x, m_sizeBorder.y + iFirstUnusedPos * m_sizeCell.y); @@ -142,7 +142,7 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) wxStaticText* pLabel = new wxStaticText (m_pCanvas, -1, pszTaskName, posLabel, m_sizeLabel); wxButton* pButton = new wxButton (m_pCanvas, s_iNextButtonID, _T("Cancel"), posButton, m_sizeButton, wxBU_LEFT); - BackgroundManagerTask* pTask = new BackgroundManagerTask (pSupervisor, pszTaskName, + BackgroundManagerTask* pTask = new BackgroundManagerTask (pSupervisor, pszTaskName, iFirstUnusedPos, pGauge, pLabel, pButton, s_iNextButtonID); m_vecpTasks.push_back (pTask); @@ -152,7 +152,7 @@ BackgroundManager::OnAddTask (wxCommandEvent& event) resizeWindow(); if (m_iNumTasks == 1) { m_pCanvas->SetFocus(); - Show(true); + Show(true); } } @@ -170,18 +170,18 @@ BackgroundManager::OnRemoveTask (wxCommandEvent& event) bool bFound = false; for (TaskContainer::iterator iTask = m_vecpTasks.begin(); iTask != m_vecpTasks.end(); iTask++) { if ((*iTask)->supervisor() == pSupervisor) { - delete (*iTask)->gauge(); - delete (*iTask)->label(); - delete (*iTask)->button(); + delete (*iTask)->gauge(); + delete (*iTask)->label(); + delete (*iTask)->button(); delete *iTask; m_vecpTasks.erase (iTask); m_iNumTasks--; - bFound = true; + bFound = true; break; } } if (! bFound) { - sys_error (ERR_SEVERE, "Unable to find supervisor [BackgroundManager::OnRemoveTask]"); + sys_error (ERR_SEVERE, "Unable to find supervisor [BackgroundManager::OnRemoveTask]"); return; } pSupervisor->ackRemoveBackgroundManager();