r7061: initial property settings

[ctsim.git] / src / threadraster.cpp

diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 3b90791c4b2275bfd6c4910b103fdb5f97c540c6..d3a67a913590ffe04c96d3d47fa46aab5b9ed432 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.8 2001/03/04 22:30:20 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
@@ -57,41 +57,37 @@
 /////////////////////////////////////////////////////////////////////
 
 RasterizerSupervisorThread::RasterizerSupervisorThread (PhantomFileView* pProjView, int iNX, int iNY, 
-   int iNSample, double dViewRatio, const char* const pszLabel)
-:   SupervisorThread(), m_pPhantomView(pProjView), m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_strLabel(pszLabel)
+                                                        int iNSample, double dViewRatio, const char* 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* pRasterSupervisor = new RasterizerSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
-
-  pRasterSupervisor->start();
-
-  while (! pRasterSupervisor->workersDone() && ! pRasterSupervisor->fail() && ! pRasterSupervisor->cancelled()) {
+  RasterizerSupervisor rasterSupervisor (this, m_pPhantomView, m_iNX, m_iNY, m_iNSample, m_dViewRatio, m_strLabel.c_str());
+  
+  rasterSupervisor.start();
+  
+  while (! rasterSupervisor.workersDone() && ! rasterSupervisor.fail() && ! rasterSupervisor.cancelled()) {
     Sleep(100);
   }
-
-  if (pRasterSupervisor->fail())
+  
+  if (rasterSupervisor.fail())
   {
     wxString msg ("Error starting Rasterizer supervisor: ");
-    msg += pRasterSupervisor->getFailMessage().c_str();
+    msg += rasterSupervisor.getFailMessage().c_str();
     msg += "\n";
     wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
     eventLog.SetString( msg );
     wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event
   }
-
-  if (! pRasterSupervisor->cancelled())
-    pRasterSupervisor->onDone();
-  pRasterSupervisor->deleteWorkers();
-  while (! pRasterSupervisor->workersDeleted()) {
-    Sleep(50);
-  }
-  delete pRasterSupervisor;
-
-  return reinterpret_cast<wxThread::ExitCode>(0);
+  
+  if (! rasterSupervisor.cancelled())
+    rasterSupervisor.onDone();
+  rasterSupervisor.deleteWorkers();
+  
+  return static_cast<wxThread::ExitCode>(0);
 }
 
 void
@@ -107,10 +103,10 @@ RasterizerSupervisorThread::OnExit()
 /////////////////////////////////////////////////////////////////////
 
 RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFileView* pPhantomView, int iNX, int iNY, 
-   int iNSample, double dViewRatio, const char* const pszLabel)
-    : BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Rasterizing", iNX),
-      m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()), 
-      m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel)
+                                            int iNSample, double dViewRatio, const char* const pszLabel)
+                                            : BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Rasterizing", iNX),
+                                            m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()), 
+                                            m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel)
 {
   m_vecpChildImageFiles.reserve (getNumWorkers());
   for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
@@ -127,11 +123,11 @@ 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);
-
-   return pThread;
+  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;
 }
 
 void
@@ -139,16 +135,16 @@ RasterizerSupervisor::onDone()
 {
   wxCriticalSection doneSection;
   wxCriticalSectionLocker critsect (doneSection);
-
+  
   ImageFile* pImageFile = getImageFile();
   pImageFile->labelAdd (m_pszLabel, getTimerEnd());
-
+  
   wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT );
   wxString msg (m_pszLabel);
   msg += "\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);
@@ -161,9 +157,9 @@ ImageFile*
 RasterizerSupervisor::getImageFile()
 {
   ImageFile* pImageFile = new ImageFile (m_iNX, m_iNY);
-
+  
   size_t iColSize = sizeof(ImageFileValue) * m_iNY;
-
+  
   ImageFileArray globalArray = pImageFile->getArray();
   int iGlobalCol = 0;
   for (int iw = 0; iw < getNumWorkers(); iw++) {
@@ -212,16 +208,15 @@ RasterizerWorker::Entry ()
       break;
     }
     rPhantom.convertToImagefile (*m_pImageFile, m_iNX, m_dViewRatio, m_iNSample, Trace::TRACE_NONE, iUnit + m_iStartUnit, 1, iUnit);
-
-       m_pSupervisor->onWorkerUnitTick();
+    m_pSupervisor->onWorkerUnitTick();
   }
-
+  
   m_pSupervisor->onWorkerDone (m_iThread);
-
+  
   while (! TestDestroy())
     Sleep(100);
-
-  return reinterpret_cast<wxThread::ExitCode>(0);
+  
+  return static_cast<wxThread::ExitCode>(0);
 }
 
 void