X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fviews.cpp;h=5a802c459aecb011e94b9c8fb33a1043f16c8ce9;hp=b78442190c44e0f06aeade515d24e9dd9fd30369;hb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;hpb=eb33bec27b609785c97a8cece532f2348989d308 diff --git a/src/views.cpp b/src/views.cpp index b784421..5a802c4 100644 --- a/src/views.cpp +++ b/src/views.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: views.cpp,v 1.124 2001/03/02 20:20:09 kevin Exp $ +** $Id: views.cpp,v 1.125 2001/03/02 21:11:50 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 @@ -1948,6 +1948,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) } } } else { +#if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet, m_iDefaultNView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, @@ -1960,7 +1961,9 @@ PhantomFileView::OnProjections (wxCommandEvent& event) pProjector->SetPriority(60); pProjector->Run(); return; - } else { + } else +#endif // HAVE_WXTHREADS + { pProj = new Projections; pProj->initFromScanner (theScanner); wxProgressDialog dlgProgress (wxString("Projection"), wxString("Projection Progress"), pProj->nView() + 1, getFrameForChild(), wxPD_CAN_ABORT ); @@ -2028,6 +2031,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) << m_iDefaultRasterNY << ", ViewRatio=" << m_dDefaultRasterViewRatio << ", nSamples=" << m_iDefaultRasterNSamples;; +#if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread (this, m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, os.str().c_str()); @@ -2037,7 +2041,9 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) } pThread->SetPriority (60); pThread->Run(); - } else { + } else +#endif + { ImageFile* pImageFile = new ImageFile (m_iDefaultRasterNX, m_iDefaultRasterNY); wxProgressDialog dlgProgress (wxString("Rasterize"), wxString("Rasterization Progress"), pImageFile->nx() + 1, getFrameForChild(), wxPD_CAN_ABORT ); @@ -2465,6 +2471,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) delete pDlgReconstruct; delete pReconstructor; } else { +#if HAVE_WXTHREADS if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { ReconstructorSupervisorThread* pReconstructor = new ReconstructorSupervisorThread (this, m_iDefaultNX, m_iDefaultNY, optFilterName.c_str(), @@ -2478,7 +2485,9 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) pReconstructor->SetPriority (60); pReconstructor->Run(); return; - } else { + } else +#endif + { pImageFile = new ImageFile (m_iDefaultNX, m_iDefaultNY); Reconstructor* pReconstructor = new Reconstructor (rProj, *pImageFile, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),