** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: threadraster.cpp,v 1.7 2001/03/04 04:30:45 kevin Exp $
+** $Id: threadraster.cpp,v 1.8 2001/03/04 22:30:20 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
wxThread::ExitCode
RasterizerSupervisorThread::Entry()
{
- RasterizerSupervisor rasterSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
+ RasterizerSupervisor* pRasterSupervisor = new RasterizerSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
- rasterSupervisor.start();
- while (! rasterSupervisor.isDone() && ! rasterSupervisor.fail()) {
+ pRasterSupervisor->start();
+
+ while (! pRasterSupervisor->workersDone() && ! pRasterSupervisor->fail() && ! pRasterSupervisor->cancelled()) {
Sleep(100);
- Yield();
}
- if (rasterSupervisor.fail())
+
+ if (pRasterSupervisor->fail())
{
wxString msg ("Error starting Rasterizer supervisor: ");
- msg += rasterSupervisor.getFailMessage().c_str();
+ msg += pRasterSupervisor->getFailMessage().c_str();
msg += "\n";
wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
eventLog.SetString( msg );
wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
}
- while (! rasterSupervisor.workersDeleted()) {
+ if (! pRasterSupervisor->cancelled())
+ pRasterSupervisor->onDone();
+ pRasterSupervisor->deleteWorkers();
+ while (! pRasterSupervisor->workersDeleted()) {
Sleep(50);
- rasterSupervisor.ProcessPendingEvents();
}
+ delete pRasterSupervisor;
return reinterpret_cast<wxThread::ExitCode>(0);
}
for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
m_vecpChildImageFiles[iThread] = new ImageFile;
}
-
-
-
}
RasterizerSupervisor::~RasterizerSupervisor()
#endif
break;
}
- rPhantom.convertToImagefile (*m_pImageFile, m_iNX, m_dViewRatio, m_iNSample, Trace::TRACE_NONE,
- iUnit + m_iStartUnit, 1, iUnit);
- wxPostEvent (m_pSupervisor, eventProgress);
+ rPhantom.convertToImagefile (*m_pImageFile, m_iNX, m_dViewRatio, m_iNSample, Trace::TRACE_NONE, iUnit + m_iStartUnit, 1, iUnit);
+
+ m_pSupervisor->onWorkerUnitTick();
}
- wxCommandEvent eventDone (wxEVT_COMMAND_MENU_SELECTED, BackgroundSupervisor::MSG_WORKER_THREAD_DONE);
- eventDone.SetInt (m_iThread); // Send back thread# that has finished
- wxPostEvent (m_pSupervisor, eventDone);
+
+ m_pSupervisor->onWorkerDone (m_iThread);
while (! TestDestroy())
Sleep(100);