** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: threadraster.cpp,v 1.6 2001/03/04 04:27:55 kevin Exp $
+** $Id: threadraster.cpp,v 1.13 2001/03/09 02:40:17 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
RasterizerSupervisor rasterSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
rasterSupervisor.start();
- while (! rasterSupervisor.isDone() && ! rasterSupervisor.fail()) {
+
+ while (! rasterSupervisor.workersDone() && ! rasterSupervisor.fail() && ! rasterSupervisor.cancelled()) {
Sleep(100);
- Yield();
}
+
if (rasterSupervisor.fail())
{
wxString msg ("Error starting Rasterizer supervisor: ");
wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
}
- while (! rasterSupervisor.workersDeleted()) {
- Sleep(50);
- rasterSupervisor.ProcessPendingEvents();
- }
+ if (! rasterSupervisor.cancelled())
+ rasterSupervisor.onDone();
+ rasterSupervisor.deleteWorkers();
- return reinterpret_cast<wxThread::ExitCode>(0);
+ return static_cast<wxThread::ExitCode>(0);
}
void
m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel)
{
m_vecpChildImageFiles.reserve (getNumWorkers());
- for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) {
+ for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
m_vecpChildImageFiles[iThread] = new ImageFile;
}
-
-
-
}
RasterizerSupervisor::~RasterizerSupervisor()
int iGlobalCol = 0;
for (int iw = 0; iw < getNumWorkers(); iw++) {
ImageFileArray childArray = m_vecpChildImageFiles[iw]->getArray();
- for (int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
+ for (unsigned int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
memcpy (globalArray[iGlobalCol++], childArray[iCol], iColSize);
}
}
#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);
- return reinterpret_cast<wxThread::ExitCode>(0);
+ return static_cast<wxThread::ExitCode>(0);
}
void