X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadproj.h;h=805718e49602a1336733bcaa37d8c41a4b13c51d;hp=49212f4a92693ab70b3acf1373c455edb76ccb1f;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=edd35e8663bc7abd7b8a02b5cc5ec169a5edc0ac diff --git a/src/threadproj.h b/src/threadproj.h index 49212f4..805718e 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.6 2001/03/04 04:27:55 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 @@ -48,6 +48,7 @@ private: PhantomFileView* m_pPhantomView; const int m_iNDet; const int m_iNView; + const int m_iOffsetView; const std::string m_strGeometry; const int m_iNSample; const double m_dRotation; @@ -58,7 +59,7 @@ private: const std::string m_strLabel; public: - ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, + ProjectorSupervisorThread(PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView, const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength, double dViewRatio, double dScanRatio, const char* const pszLabel); @@ -76,9 +77,10 @@ private: PhantomFileView* m_pPhantomView; PhantomFileDocument* m_pPhantomDoc; Scanner* m_pScanner; - + const int m_iNDet; const int m_iNView; + const int m_iOffsetView; const char* const m_pszGeometry; const int m_iNSample; const double m_dRotation; @@ -90,7 +92,7 @@ private: public: - ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView, + ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pProjView, int iNDet, int iNView, int iOffsetView, const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength, double dViewRatio, double dScanRatio, const char* const pszLabel); @@ -114,6 +116,7 @@ private: Scanner* m_pScanner; int m_iNDet; int m_iNView; + int m_iOffsetView; const char* m_pszGeometry; int m_iNSample; double m_dRotation; @@ -124,12 +127,12 @@ private: public: - ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) + ProjectorWorker (ProjectorSupervisor* pSupervisor, int iThread, int iStartView, int iNumViews) : BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews) {} - - void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner, - int iNDet, int iView, + + void SetParameters (PhantomFileView* pPhantomFile, Projections* pProjections, Scanner* pScanner, + int iNDet, int iView, int iOffsetView, const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength, double dViewRatio, double dScanRatio); @@ -141,4 +144,4 @@ public: #endif // HAVE_WXTHREADS #endif // _THREADPROJ_H_ - +