X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=e7d35027f374777a8ff396ec817118cd6bf17ceb;hb=a65971e957a117618b33070897f11a4116f38e1f;hp=13774796c6d2206876a141250ae99c566dbb8ac6;hpb=cd93aebb4dec4e0ae88d53f131c2320ae92d0cab;p=ctsim.git diff --git a/src/views.cpp b/src/views.cpp index 1377479..e7d3502 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.126 2001/03/04 22:30:20 kevin Exp $ +** $Id: views.cpp,v 1.128 2001/03/07 16:34:47 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 @@ -1095,6 +1095,12 @@ ImageFileView::OnExport (wxCommandEvent& event) strExt = ".png"; strWildcard = "PNG Files (*.png)|*.png"; } +#endif +#ifdef HAVE_CTN_DICOM + else if (m_iDefaultExportFormatID == ImageFile::EXPORT_FORMAT_DICOM) { + strExt = ""; + strWildcard = "DICOM Files (*.*)|*.*"; + } #endif else { strExt = ""; @@ -1949,7 +1955,7 @@ PhantomFileView::OnProjections (wxCommandEvent& event) } } else { #if HAVE_WXTHREADS - if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { + if (theApp->getUseBackgroundTasks()) { ProjectorSupervisorThread* pProjector = new ProjectorSupervisorThread (this, m_iDefaultNDet, m_iDefaultNView, sGeometry.c_str(), m_iDefaultNSample, dRotationRadians, m_dDefaultFocalLength, m_dDefaultCenterDetectorLength, m_dDefaultViewRatio, m_dDefaultScanRatio, os.str().c_str()); @@ -2032,7 +2038,7 @@ PhantomFileView::OnRasterize (wxCommandEvent& event) << m_iDefaultRasterNSamples;; #if HAVE_WXTHREADS - if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { + if (theApp->getUseBackgroundTasks()) { RasterizerSupervisorThread* pThread = new RasterizerSupervisorThread (this, m_iDefaultRasterNX, m_iDefaultRasterNY, m_iDefaultRasterNSamples, m_dDefaultRasterViewRatio, os.str().c_str()); if (pThread->Create() != wxTHREAD_NO_ERROR) { @@ -2472,7 +2478,7 @@ ProjectionFileView::OnReconstructFBP (wxCommandEvent& event) delete pReconstructor; } else { #if HAVE_WXTHREADS - if (theApp->getUseBackgroundTasks() || theApp->getNumberCPU() > 1) { + if (theApp->getUseBackgroundTasks()) { ReconstructorSupervisorThread* pReconstructor = new ReconstructorSupervisorThread (this, m_iDefaultNX, m_iDefaultNY, optFilterName.c_str(), m_dDefaultFilterParam, optFilterMethodName.c_str(), m_iDefaultZeropad, optFilterGenerationName.c_str(),