projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r583: no message
[ctsim.git]
/
src
/
threadproj.h
diff --git
a/src/threadproj.h
b/src/threadproj.h
index 02afffde2225af8e4e4486d33bd350ce6f5ac156..6bb16f5e3d6ba605d649ad0d153ffcbff436adbd 100644
(file)
--- 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
**
** 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.
2 2001/02/25 15:27:28
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
**
** 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;
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;
const int m_iNDet;
const int m_iNView;
const char* const m_pszGeometry;
@@
-106,6
+107,7
@@
class ProjectorWorker : public BackgroundWorkerThread {
private:
PhantomFileView* m_pPhantomView;
Projections* m_pProjections;
private:
PhantomFileView* m_pPhantomView;
Projections* m_pProjections;
+ Scanner* m_pScanner;
int m_iNDet;
int m_iNView;
const char* m_pszGeometry;
int m_iNDet;
int m_iNView;
const char* m_pszGeometry;
@@
-121,7
+123,8
@@
public:
: BackgroundWorkerThread (pSupervisor, iThread, iStartView, iNumViews)
{}
: 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);
const char* const pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio,
double dScanRatio);