r617: *** empty log message ***

[ctsim.git] / src / threadraster.cpp

diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 837a22fb844a452a4426b1e058a1504893a51995..b45875dbe71e1afb0c38ca3ebc4f9df5be316bb8 100644 (file)
--- a/src/threadraster.cpp
+++ b/src/threadraster.cpp
@@ -9,7 +9,7 @@
 **  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.12 2001/03/07 21:18:50 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
@@ -68,10 +68,11 @@ RasterizerSupervisorThread::Entry()
   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: ");
@@ -82,12 +83,11 @@ RasterizerSupervisorThread::Entry()
     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
@@ -109,12 +109,9 @@ RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFi
       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()
@@ -167,7 +164,7 @@ RasterizerSupervisor::getImageFile()
   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);
     }
   }
@@ -210,18 +207,17 @@ RasterizerWorker::Entry ()
 #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