** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: threadraster.cpp,v 1.3 2001/03/02 21:32:34 kevin Exp $
+** $Id$
**
** 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
//
/////////////////////////////////////////////////////////////////////
-RasterizerSupervisorThread::RasterizerSupervisorThread (PhantomFileView* pProjView, int iNX, int iNY,
- int iNSample, double dViewRatio, const char* const pszLabel)
-: m_pPhantomView(pProjView), m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(pszLabel),
- SupervisorThread()
+RasterizerSupervisorThread::RasterizerSupervisorThread (PhantomFileView* pProjView, int iNX, int iNY,
+ int iNSample, double dViewRatio, wxChar const* pszLabel)
+ : SupervisorThread(), m_pPhantomView(pProjView), m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(pszLabel)
{
}
wxThread::ExitCode
RasterizerSupervisorThread::Entry()
{
- RasterizerSupervisor rasterSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
+ RasterizerSupervisor rasterSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel);
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: ");
- msg += rasterSupervisor.getFailMessage().c_str();
- msg += "\n";
+ wxString msg (_T("Error starting Rasterizer supervisor: "));
+ msg += rasterSupervisor.getFailMessage();
+ msg += _T("\n");
wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
eventLog.SetString( msg );
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
//
/////////////////////////////////////////////////////////////////////
-RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pPhantomView, int iNX, int iNY,
- int iNSample, double dViewRatio, const char* const pszLabel)
- : m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()),
- m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel),
- BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Rasterizing", iNX)
+RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pPhantomView, int iNX, int iNY,
+ int iNSample, double dViewRatio, wxChar const* pszLabel)
+ : BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), _T("Rasterizing"), iNX),
+ m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()),
+ m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(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()
BackgroundWorkerThread*
RasterizerSupervisor::createWorker (int iThread, int iStartUnit, int iNumUnits)
{
- RasterizerWorker* pThread = new RasterizerWorker (this, iThread, iStartUnit, iNumUnits);
- m_vecpChildImageFiles[iThread]->setArraySize (iNumUnits, m_iNY);
- pThread->SetParameters (m_pPhantomView, m_vecpChildImageFiles[iThread], m_iNX, m_iNY, m_iNSample, m_dViewRatio);
+ RasterizerWorker* pThread = new RasterizerWorker (this, iThread, iStartUnit, iNumUnits);
+ m_vecpChildImageFiles[iThread]->setArraySize (iNumUnits, m_iNY);
+ pThread->SetParameters (m_pPhantomView, m_vecpChildImageFiles[iThread], m_iNX, m_iNY, m_iNSample, m_dViewRatio);
- return pThread;
+ return pThread;
}
void
wxCriticalSectionLocker critsect (doneSection);
ImageFile* pImageFile = getImageFile();
+ pImageFile->labelAdd (m_strLabel.mb_str(wxConvUTF8), getTimerEnd());
- if (! wxThread::IsMain())
- wxMutexGuiEnter();
- ImageFileDocument* pImageDoc = theApp->newImageDoc();
- if (! pImageDoc) {
- sys_error (ERR_SEVERE, "Unable to create image file");
- return;
- }
- pImageDoc->setImageFile (pImageFile);
- pImageDoc->UpdateAllViews (NULL);
- if (ImageFileView* imageView = pImageDoc->getView()) {
- imageView->OnUpdate (imageView, NULL);
- imageView->getFrame()->SetFocus();
- imageView->getFrame()->Show(true);
- }
- *theApp->getLog() << m_pszLabel << "\n";
- if (! wxThread::IsMain())
- wxMutexGuiLeave();
- pImageFile->labelAdd (m_pszLabel, getTimerEnd());
- if (theApp->getAskDeleteNewDocs())
- pImageDoc->Modify (true);
+ wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
+ wxString msg (m_strLabel);
+ msg += _T("\n");
+ eventLog.SetString( msg );
+ wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
+
+ wxCommandEvent newImageEvent (wxEVT_COMMAND_MENU_SELECTED, NEW_IMAGEFILE_EVENT);
+ newImageEvent.SetClientData (pImageFile);
+ wxPostEvent (theApp->getMainFrame(), newImageEvent);
setDone();
}
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);
}
}
#ifdef DEBUG
if (theApp->getVerboseLogging()) {
wxString msg;
- msg.Printf("Worker thread: Received destroy message at work unit #%d\n", iUnit);
+ msg.Printf(_T("Worker thread: Received destroy message at work unit #%d\n"), iUnit);
wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
event.SetString( msg );
- wxPostEvent( theApp->getMainFrame(), event );
+ wxPostEvent( theApp->getMainFrame(), event );
}
#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
projects / ctsim.git / blobdiff