X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=e7d35027f374777a8ff396ec817118cd6bf17ceb;hb=4cdd078f0f198a00e8037e6edec0eb30a6861bae;hp=5a802c459aecb011e94b9c8fb33a1043f16c8ce9;hpb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 5a802c4..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.125 2001/03/02 21:11:50 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
@@ -841,7 +841,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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...");
@@ -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) {
@@ -2119,7 +2125,7 @@ PhantomFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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...");
@@ -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(), 
@@ -2572,7 +2578,7 @@ ProjectionFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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...");
@@ -2904,7 +2910,7 @@ PlotFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   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...");
@@ -3159,7 +3165,7 @@ TextFileView::CreateChildFrame (wxDocument *doc, wxView *view)
   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...");