X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=afceae446d164897f38e555558737d282ea2716f;hb=48b964d879cb0353ab421226e7a282389a1db479;hp=ebca038c6c32fbc6ad3929523fbe2adcddfe7bc4;hpb=0392f1a597f0b8b608c81ff5d4f7adfda6154f4f;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index ebca038..afceae4 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.142 2001/03/30 19:15:23 kevin Exp $
+**  $Id: views.cpp,v 1.145 2001/03/30 21:01:15 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
@@ -228,7 +228,7 @@ EVT_MENU(IFMENU_IMAGE_SUBTRACT, ImageFileView::OnSubtract)
 EVT_MENU(IFMENU_IMAGE_MULTIPLY, ImageFileView::OnMultiply)
 EVT_MENU(IFMENU_IMAGE_DIVIDE, ImageFileView::OnDivide)
 EVT_MENU(IFMENU_IMAGE_SCALESIZE, ImageFileView::OnScaleSize)
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
 #endif
 #ifdef HAVE_FFT
@@ -1007,7 +1007,7 @@ ImageFileView::CreateChildFrame(wxDocument *doc, wxView *view)
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('2'), IFMENU_FILTER_FFT);
   accelEntries[iEntry++].Set (wxACCEL_ALT,  static_cast<int>('2'), IFMENU_FILTER_IFFT);
 #endif
-#ifdef wxUSE_GLCANVAS
+#if wxUSE_GLCANVAS
   accelEntries[iEntry++].Set (wxACCEL_CTRL, static_cast<int>('3'), IFMENU_IMAGE_CONVERT3D);
 #endif
   wxAcceleratorTable accelTable (iEntry, accelEntries);
@@ -2539,7 +2539,7 @@ ProjectionFileView::OnConvertPolar (wxCommandEvent& event)
 {
   Projections& rProj = GetDocument()->getProjections();
   DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert Polar", m_iDefaultPolarNX, m_iDefaultPolarNY,
-    m_iDefaultPolarInterpolation, -1);
+    m_iDefaultPolarInterpolation, -1, IDH_DLG_POLAR);
   if (dialogPolar.ShowModal() == wxID_OK) {
     wxProgressDialog dlgProgress (wxString("Convert Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL);
     wxString strInterpolation (dialogPolar.getInterpolationName());
@@ -2581,7 +2581,7 @@ ProjectionFileView::OnConvertFFTPolar (wxCommandEvent& event)
 {
   Projections& rProj = GetDocument()->getProjections();
   DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Convert to FFT Polar", m_iDefaultPolarNX, m_iDefaultPolarNY,
-    m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad);
+    m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_FFT_POLAR);
   if (dialogPolar.ShowModal() == wxID_OK) {
     wxProgressDialog dlgProgress (wxString("Convert FFT Polar"), wxString("Conversion Progress"), 1, getFrameForChild(), wxPD_APP_MODAL);
     wxString strInterpolation (dialogPolar.getInterpolationName());
@@ -2768,7 +2768,7 @@ ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
 {
   Projections& rProj = GetDocument()->getProjections();
   DialogGetConvertPolarParameters dialogPolar (getFrameForChild(), "Fourier Reconstruction", m_iDefaultPolarNX, m_iDefaultPolarNY,
-    m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad);
+    m_iDefaultPolarInterpolation, m_iDefaultPolarZeropad, IDH_DLG_RECON_FOURIER);
   if (dialogPolar.ShowModal() == wxID_OK) {
     wxProgressDialog dlgProgress (wxString("Reconstruction Fourier"), wxString("Reconstruction Progress"), 1, getFrameForChild(), wxPD_APP_MODAL);
     wxString strInterpolation (dialogPolar.getInterpolationName());
@@ -2783,7 +2783,9 @@ ProjectionFileView::OnReconstructFourier (wxCommandEvent& event)
       *theApp->getLog() << "Error converting to polar\n";
       return;
     }
+#ifdef HAVE_FFT
     pIF->ifft(*pIF);
+#endif
     pIF->magnitude(*pIF);
     Fourier::shuffleFourierToNaturalOrder (*pIF);