X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fviews.cpp;h=2624d6a33444ed0259cb91a0bafa9f0611b61e94;hb=564c2f25b9026a53b2653b0b008b044e32a13050;hp=631f481f78cda69482ea5bf6fa66551721812252;hpb=99e0682c24409926fb1afd867db88a4803c734e7;p=ctsim.git

diff --git a/src/views.cpp b/src/views.cpp
index 631f481..2624d6a 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.141 2001/03/28 16:44:41 kevin Exp $
+**  $Id: views.cpp,v 1.144 2001/03/30 19:25:00 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)
-#if wxUSE_GLCANVAS
+#ifdef wxUSE_GLCANVAS
 EVT_MENU(IFMENU_IMAGE_CONVERT3D, ImageFileView::OnConvert3d)
 #endif
 #ifdef HAVE_FFT
@@ -1195,8 +1195,8 @@ ImageFileView::OnEditPaste (wxCommandEvent& event)
       double dScale3 = 3 * 255;
       unsigned char* pixels = image.GetData();
       ImageFileArray v = rIF.getArray();
-      for (int ix = 0; ix < rIF.nx(); ix++) {
-        for (int iy = 0; iy < rIF.ny(); iy++) {
+      for (unsigned int ix = 0; ix < rIF.nx(); ix++) {
+        for (unsigned int iy = 0; iy < rIF.ny(); iy++) {
           unsigned int iBase = 3 * (iy * nx + ix);
           if (ix == 0 && iy == 0 && (pixels[iBase] == pixels[iBase+1] && pixels[iBase+1] == pixels[iBase+2]))
             bMonochrome = true;
@@ -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);