** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: views.cpp,v 1.171 2003/03/15 10:27:30 kevin Exp $
+** $Id$
**
** 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
int ny = rIF.ny();
if (v != NULL && yCursor < ny) {
- fftw_complex* pcIn = new fftw_complex [nx];
+ fftw_complex* pcIn = static_cast<fftw_complex*>(fftw_malloc (sizeof(fftw_complex) * nx));
int i;
for (i = 0; i < nx; i++) {
- pcIn[i].re = v[i][yCursor];
+ pcIn[i][0] = v[i][yCursor];
if (rIF.isComplex())
- pcIn[i].im = vImag[i][yCursor];
+ pcIn[i][1] = vImag[i][yCursor];
else
- pcIn[i].im = 0;
+ pcIn[i][1] = 0;
}
- fftw_plan plan = fftw_create_plan (nx, FFTW_FORWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM);
- fftw_one (plan, pcIn, NULL);
+ fftw_plan plan = fftw_plan_dft_1d (nx, pcIn, pcIn, FFTW_FORWARD, FFTW_ESTIMATE);
+ fftw_execute (plan);
fftw_destroy_plan (plan);
double* pX = new double [nx];
double* pYMag = new double [nx];
for (i = 0; i < nx; i++) {
pX[i] = i;
- pYReal[i] = pcIn[i].re / nx;
- pYImag[i] = pcIn[i].im / nx;
- pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
+ pYReal[i] = pcIn[i][0] / nx;
+ pYImag[i] = pcIn[i][1] / nx;
+ pYMag[i] = ::sqrt (pcIn[i][0] * pcIn[i][0] + pcIn[i][1] * pcIn[i][1]);
}
Fourier::shuffleFourierToNaturalOrder (pYReal, nx);
Fourier::shuffleFourierToNaturalOrder (pYImag, nx);
delete pYReal;
delete pYImag;
delete pYMag;
- delete [] pcIn;
+ fftw_free(pcIn);
if (theApp->getAskDeleteNewDocs())
pPlotDoc->Modify (true);
pdTemp[i] = v[xCursor][i];
Fourier::shuffleNaturalToFourierOrder (pdTemp, ny);
for (i = 0; i < ny; i++)
- pcIn[i].re = pdTemp[i];
+ pcIn[i][0] = pdTemp[i];
for (i = 0; i < ny; i++) {
if (rIF.isComplex())
}
Fourier::shuffleNaturalToFourierOrder (pdTemp, ny);
for (i = 0; i < ny; i++)
- pcIn[i].im = pdTemp[i];
+ pcIn[i][1] = pdTemp[i];
- fftw_plan plan = fftw_create_plan (ny, FFTW_BACKWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM);
- fftw_one (plan, pcIn, NULL);
+ fftw_plan plan = fftw_plan_dft_1d (ny, pcIn, pcIn, FFTW_BACKWARD, FFTW_ESTIMATE);
+ fftw_execute (plan);
fftw_destroy_plan (plan);
double* pX = new double [ny];
double* pYMag = new double [ny];
for (i = 0; i < ny; i++) {
pX[i] = i;
- pYReal[i] = pcIn[i].re / ny;
- pYImag[i] = pcIn[i].im / ny;
- pYMag[i] = ::sqrt (pcIn[i].re * pcIn[i].re + pcIn[i].im * pcIn[i].im);
+ pYReal[i] = pcIn[i][0] / ny;
+ pYImag[i] = pcIn[i][1] / ny;
+ pYMag[i] = ::sqrt (pcIn[i][0] * pcIn[i][0] + pcIn[i][1] * pcIn[i][1]);
}
PlotFileDocument* pPlotDoc = theApp->newPlotDoc();
wxString strInterpolation (dialogPolar.getInterpolationName());
m_iDefaultPolarNX = dialogPolar.getXSize();
m_iDefaultPolarNY = dialogPolar.getYSize();
- ImageFileDocument* pPolarDoc = theApp->newImageDoc();
ImageFile* pIF = new ImageFile (m_iDefaultPolarNX, m_iDefaultPolarNY);
m_iDefaultPolarInterpolation = Projections::convertInterpNameToID (strInterpolation.c_str());
return;
}
- pPolarDoc = theApp->newImageDoc ();
+ ImageFileDocument* pPolarDoc = theApp->newImageDoc();
if (! pPolarDoc) {
sys_error (ERR_SEVERE, "Unable to create image file");
return;