X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fbackgroundsupr.cpp;h=d7d8c0a9a14cedfd203f2df8a39878bf66f1478a;hp=f9b328f848248bd20b362512dc05f15b388cd53e;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=c8b19dfaffba9f06d8b6c40cb1bb83a8964867f7 diff --git a/src/backgroundsupr.cpp b/src/backgroundsupr.cpp index f9b328f..d7d8c0a 100644 --- a/src/backgroundsupr.cpp +++ b/src/backgroundsupr.cpp @@ -31,7 +31,7 @@ #include "wx/wx.h" #endif -// pragma line required for Fedora 4 and wxWin 2.4.2 +// pragma line required for Fedora 4 and wxWin 2.4.2 #pragma implementation "timer.h" #include "ct.h" @@ -58,7 +58,7 @@ END_EVENT_TABLE() BackgroundSupervisor::BackgroundSupervisor (SupervisorThread* pMyThread, wxWindow* pParentFrame, BackgroundProcessingDocument* pDocument, const char* const pszProcessTitle, int iTotalUnits) - : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle), + : wxEvtHandler(), m_pMyThread(pMyThread), m_pParentFrame(pParentFrame), m_pDocument(pDocument), m_strProcessTitle(pszProcessTitle), m_iTotalUnits(iTotalUnits), m_iNumThreads(0), m_bDone(false), m_bFail(false), m_bCancelled(false), m_iRunning(0), m_pTimer(NULL), m_bWorkersDeleted(false), m_bBackgroundManagerAdded(false) { @@ -85,8 +85,8 @@ BackgroundSupervisor::deleteWorkers() if (m_bWorkersDeleted) return; - for (int i = 0; i < m_iNumThreads; i++) - if (m_vecpThreads[i]) + for (int i = 0; i < m_iNumThreads; i++) + if (m_vecpThreads[i]) m_vecpThreads[i]->Delete(); // send Destroy message to workers #ifdef USE_BKGMGR @@ -95,9 +95,9 @@ BackgroundSupervisor::deleteWorkers() wxPostEvent (theApp->getBackgroundManager(), doneEvent); #endif - while (m_iRunning > 0 || m_bBackgroundManagerAdded) + while (m_iRunning > 0 || m_bBackgroundManagerAdded) m_pMyThread->Sleep(50); - + m_bWorkersDeleted = true; } @@ -135,7 +135,7 @@ BackgroundSupervisor::start() return false; m_pTimer = new Timer; - + std::string strLabel (m_strProcessTitle); strLabel += " "; strLabel += m_pParentFrame->GetTitle(); @@ -156,7 +156,7 @@ BackgroundSupervisor::start() for (int i = 0; i < m_iNumThreads; i++) m_vecpThreads[i]->Run(); - + return true; } @@ -172,7 +172,7 @@ void BackgroundSupervisor::onWorkerUnitTick () { ++m_iUnitsDone; - + #ifdef USE_BKGMGR wxCommandEvent addTaskEvent (wxEVT_COMMAND_MENU_SELECTED, MSG_BACKGROUND_SUPERVISOR_UNIT_TICK); addTaskEvent.SetInt (m_iUnitsDone - 1); @@ -184,15 +184,15 @@ BackgroundSupervisor::onWorkerUnitTick () void BackgroundSupervisor::onWorkerDone (int iThread) { - wxCriticalSection critsectDone; - critsectDone.Enter(); + wxCriticalSection critsectDone; + critsectDone.Enter(); m_iRunning--; #ifdef DEBUG if (theApp->getVerboseLogging()) { wxString msg; - msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning); + msg.Printf("Background Supervisor: Thread finished. Remaining threads: %d\n", m_iRunning); wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); eventLog.SetString( msg ); wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event