X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fthreadproj.h;h=49212f4a92693ab70b3acf1373c455edb76ccb1f;hb=3ea498d51ce4597e9649cd21f155b51175ea0bea;hp=6bb16f5e3d6ba605d649ad0d153ffcbff436adbd;hpb=cb0608392968d4509c0fbcf9b029ac5e5923e171;p=ctsim.git

diff --git a/src/threadproj.h b/src/threadproj.h
index 6bb16f5..49212f4 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.2 2001/02/25 15:27:28 kevin Exp $
+**  $Id: threadproj.h,v 1.6 2001/03/04 04:27:55 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
@@ -28,6 +28,8 @@
 #ifndef _THREADPROJ_H
 #define _THREADPROJ_H
 
+#ifdef HAVE_WXTHREADS
+
 #include <vector>
 #include <wx/thread.h>
 #include <wx/progdlg.h>
@@ -50,14 +52,15 @@ private:
   const int m_iNSample;
   const double m_dRotation;
   const double m_dFocalLength;
+  const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
   const std::string m_strLabel;
 
 public:
   ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, 
-   const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio, 
-   double dScanRatio, const char* const pszLabel);
+   const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
+   double dViewRatio, double dScanRatio, const char* const pszLabel);
 
   virtual wxThread::ExitCode Entry();
 
@@ -70,8 +73,8 @@ class ProjectorSupervisor : public BackgroundSupervisor {
 private:
 
   std::vector<Projections*> m_vecpChildProjections;
-  PhantomFileDocument* m_pPhantomDoc;
   PhantomFileView* m_pPhantomView;
+  PhantomFileDocument* m_pPhantomDoc;
   Scanner* m_pScanner;
   
   const int m_iNDet;
@@ -80,15 +83,16 @@ private:
   const int m_iNSample;
   const double m_dRotation;
   const double m_dFocalLength;
+  const double m_dCenterDetectorLength;
   const double m_dViewRatio;
   const double m_dScanRatio;
   const char* const m_pszLabel;
 
 
 public:
-   ProjectorSupervisor (PhantomFileView* pProjView, int iNDet, int iNView, 
-   const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio, 
-   double dScanRatio, const char* const pszLabel);
+   ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView, 
+   const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
+   double dViewRatio, double dScanRatio, const char* const pszLabel);
 
    virtual BackgroundWorkerThread* createWorker (int iThread, int iStartUnit, int iNumUnits);
 
@@ -114,6 +118,7 @@ private:
   int m_iNSample;
   double m_dRotation;
   double m_dFocalLength;
+  double m_dCenterDetectorLength;
   double m_dViewRatio;
   double m_dScanRatio;
 
@@ -125,8 +130,8 @@ public:
   
   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);
+   const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
+   double dViewRatio, double dScanRatio);
 
   virtual wxThread::ExitCode Entry();      // thread execution starts here
 
@@ -134,5 +139,6 @@ public:
 };
 
 
-#endif
+#endif // HAVE_WXTHREADS
+#endif // _THREADPROJ_H_