** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.125 2001/03/02 21:11:50 kevin Exp $
+** $Id: views.cpp,v 1.129 2001/03/07 22:30:16 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
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
m_pFileMenu->AppendSeparator();
- m_pFileMenu->Append(MAINMENU_IMPORT, "&Import\tCtrl-I...");
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
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 = "";
rPlotFile.addColumn (1, pYReal);
rPlotFile.addColumn (2, pYImag);
rPlotFile.addColumn (3, pYMag);
- for (int iL = 0; iL < rIF.nLabels(); iL++)
+ for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str();
*theApp->getLog() << os.str().c_str() << "\n";
rPlotFile.addColumn (1, pYReal);
rPlotFile.addColumn (2, pYImag);
rPlotFile.addColumn (3, pYMag);
- for (int iL = 0; iL < rIF.nLabels(); iL++)
+ for (unsigned int iL = 0; iL < rIF.nLabels(); iL++)
rPlotFile.addDescription (rIF.labelGet(iL).getLabelString().c_str());
os << " FFT Plot of " << GetDocument()->GetFirstView()->GetFrame()->GetTitle().c_str();
*theApp->getLog() << os.str().c_str() << "\n";
}
} 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());
<< 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) {
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
m_pFileMenu->AppendSeparator();
- m_pFileMenu->Append(MAINMENU_IMPORT, "&Import\tCtrl-I...");
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
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(),
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
m_pFileMenu->AppendSeparator();
- m_pFileMenu->Append(MAINMENU_IMPORT, "&Import\tCtrl-I...");
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
m_pFileMenu->AppendSeparator();
- m_pFileMenu->Append(MAINMENU_IMPORT, "&Import\tCtrl-I...");
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Pre&view");
m_pFileMenu->AppendSeparator();
- m_pFileMenu->Append(MAINMENU_IMPORT, "&Import\tCtrl-I...");
+ m_pFileMenu->Append(MAINMENU_IMPORT, "&Import...\tCtrl-M");
#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");