X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fthreadproj.cpp;h=dfdf2be26e43ceee7ed28b8464e937cb1e0d6a58;hp=db6070c1484a8a5b12bd92ddc9fb228556aca137;hb=a97f1819c4f24321ba8d54a16f6534ee94404d26;hpb=4d5f56994972346351a48730315a7d85924103ba diff --git a/src/threadproj.cpp b/src/threadproj.cpp index db6070c..dfdf2be 100644 --- a/src/threadproj.cpp +++ b/src/threadproj.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2001 Kevin Rosenberg ** -** $Id: threadproj.cpp,v 1.3 2001/02/25 16:21:36 kevin Exp $ +** $Id: threadproj.cpp,v 1.4 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 @@ -64,12 +64,12 @@ ProjectorSupervisorThread::ProjectorSupervisorThread (PhantomFileView* pProjView 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()) @@ -102,14 +102,14 @@ ProjectorSupervisorThread::OnExit() // ///////////////////////////////////////////////////////////////////// -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);