** This is part of the CTSim program
** Copyright (C) 1983-2001 Kevin Rosenberg
**
-** $Id: threadproj.cpp,v 1.2 2001/02/25 15:27:28 kevin Exp $
+** $Id: threadproj.cpp,v 1.5 2001/02/27 03:59:30 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
wxThread::ExitCode
ProjectorSupervisorThread::Entry()
{
- ProjectorSupervisor projSupervisor (m_pPhantomView, m_iNDet, m_iNView,
+ ProjectorSupervisor projSupervisor (this, m_pPhantomView, m_iNDet, m_iNView,
m_strGeometry.c_str(), m_iNSample, m_dRotation, m_dFocalLength, m_dViewRatio, m_dScanRatio, m_strLabel.c_str());
projSupervisor.start();
while (! projSupervisor.isDone() && ! projSupervisor.fail()) {
- Sleep(50);
+ Sleep(100);
Yield();
}
if (projSupervisor.fail())
//
/////////////////////////////////////////////////////////////////////
-ProjectorSupervisor::ProjectorSupervisor (PhantomFileView* pPhantomView, int iNDet, int iNView,
+ProjectorSupervisor::ProjectorSupervisor (SupervisorThread* pThread, PhantomFileView* pPhantomView, int iNDet, int iNView,
const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dViewRatio,
double dScanRatio, const char* const pszLabel)
: m_pPhantomView(pPhantomView), m_pPhantomDoc(pPhantomView->GetDocument()),
m_iNDet(iNDet), m_iNView(iNView),
m_pszGeometry(pszGeometry), m_iNSample(iNSample), m_dRotation(dRotation), m_dFocalLength(dFocalLength),
m_dViewRatio(dViewRatio), m_dScanRatio(dScanRatio), m_pszLabel(pszLabel),
- BackgroundSupervisor (pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Projecting", iNView)
+ BackgroundSupervisor (pThread, pPhantomView->GetFrame(), pPhantomView->GetDocument(), "Projecting", iNView)
{
m_pScanner = new Scanner (m_pPhantomDoc->getPhantom(), m_pszGeometry, m_iNDet,
m_iNView, m_iNSample, m_dRotation, m_dFocalLength, m_dViewRatio, m_dScanRatio);
for (int iw = 0; iw < getNumWorkers(); iw++) {
for (int iView = 0; iView < m_vecpChildProjections[iw]->nView(); iView++) {
DetectorArray& childDetArray = m_vecpChildProjections[iw]->getDetectorArray(iView);
- DetectorArray& globalDetArray = pProjections->getDetectorArray(iGlobalView);
+ DetectorArray& globalDetArray = pProjections->getDetectorArray(iGlobalView++);
globalDetArray.setViewAngle (childDetArray.viewAngle());
DetectorValue* childDetval = childDetArray.detValues();
DetectorValue* globalDetval = globalDetArray.detValues();
memcpy (globalDetval, childDetval, detArraySize);
- iGlobalView++;
}
}
#endif
break;
}
- m_pScanner->collectProjections (*m_pProjections, rPhantom, iUnit + m_iStartUnit, 1, true, Trace::TRACE_NONE);
+ m_pScanner->collectProjections (*m_pProjections, rPhantom, iUnit + m_iStartUnit, 1, iUnit, Trace::TRACE_NONE);
wxPostEvent (m_pSupervisor, eventProgress);
}
}