X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadproj.h;h=6e6db11cffbb2780b462a80266f69049cc3769fd;hp=02afffde2225af8e4e4486d33bd350ce6f5ac156;hb=a97f1819c4f24321ba8d54a16f6534ee94404d26;hpb=df521cfe14a9e0b47bdcd98d1f67d03acf242162

diff --git a/src/threadproj.h b/src/threadproj.h
index 02afffd..6e6db11 100644
--- a/src/threadproj.h
+++ b/src/threadproj.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadproj.h,v 1.1 2001/02/25 10:52:55 kevin Exp $
+**  $Id: threadproj.h,v 1.3 2001/02/25 19:24:01 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
@@ -72,7 +72,8 @@ private:
   std::vector<Projections*> m_vecpChildProjections;
   PhantomFileDocument* m_pPhantomDoc;
   PhantomFileView* m_pPhantomView;
-    
+  Scanner* m_pScanner;
+  
   const int m_iNDet;
   const int m_iNView;
   const char* const m_pszGeometry;
@@ -85,7 +86,7 @@ private:
 
 
 public:
-   ProjectorSupervisor (PhantomFileView* pProjView, int iNDet, int iNView, 
+   ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView, 
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio, 
    double dScanRatio, const char* const pszLabel);
 
@@ -106,6 +107,7 @@ class ProjectorWorker : public BackgroundWorkerThread {
 private:
   PhantomFileView* m_pPhantomView;
   Projections* m_pProjections;
+  Scanner* m_pScanner;
   int m_iNDet;
   int m_iNView;
   const char* m_pszGeometry;
@@ -121,7 +123,8 @@ public:
     : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
   {}
   
-  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, int iNDet, int iView, 
+  void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner, 
+   int iNDet, int iView, 
    const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio,
    double dScanRatio);