X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprocsignal.h;h=7a3cb62fde6725b8221e01895e0a0da01d182129;hp=94548a8bd2e3fb7ba467da35365af47541e24c9f;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977

diff --git a/include/procsignal.h b/include/procsignal.h
index 94548a8..7a3cb62 100644
--- a/include/procsignal.h
+++ b/include/procsignal.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: procsignal.h,v 1.5 2000/09/02 05:10:39 kevin Exp $
+**  $Id: procsignal.h,v 1.8 2000/12/16 06:12: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
@@ -39,7 +39,6 @@
 
 #include <complex>
 
-
 class SignalFilter;
 class SGP;
 
@@ -66,7 +65,7 @@ class ProcessSignal {
     void filterSignal (const float input[], double output[]) const;
 
     bool fail(void) const 	{return m_fail;}
-    const string& failMessage(void) const {return m_failMessage;}
+    const std::string& failMessage(void) const {return m_failMessage;}
 
     void setTraceLevel (int traceLevel) {m_traceLevel = traceLevel; }
 
@@ -95,9 +94,9 @@ class ProcessSignal {
 
     // transforms using direct trigometric calculation
     static void finiteFourierTransform (const double input[], double output[], const int n, const int direction);
-    static void finiteFourierTransform (const double input[], complex<double> output[], const int n, const int direction);
-    static void finiteFourierTransform (const complex<double> input[], complex<double> output[], const int n, const int direction);
-    static void finiteFourierTransform (const complex<double> input[], double output[], const int n, const int direction);
+    static void finiteFourierTransform (const double input[], std::complex<double> output[], const int n, const int direction);
+    static void finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], const int n, const int direction);
+    static void finiteFourierTransform (const std::complex<double> input[], double output[], const int n, const int direction);
 
 
     static void shuffleNaturalToFourierOrder (double* pdVector, const int n);
@@ -105,8 +104,8 @@ class ProcessSignal {
     static void shuffleFourierToNaturalOrder (double* pdVector, const int n);
 
  private:
-    string m_nameFilterMethod;
-    string m_nameFilterGeneration;
+	 std::string m_nameFilterMethod;
+	 std::string m_nameFilterGeneration;
     int m_idFilterMethod;
     int m_idFilterGeneration;
     int m_nSignalPoints;
@@ -134,7 +133,7 @@ class ProcessSignal {
     double m_dFocalLength;
 
     bool m_fail;
-    string m_failMessage;
+    std::string m_failMessage;
 
     static const char* s_aszFilterMethodName[];
     static const char* s_aszFilterMethodTitle[];
@@ -154,9 +153,9 @@ class ProcessSignal {
 
     // transforms that use precalculated trig tables, therefore don't 
     // require number of data points (n) as an argument
-    void finiteFourierTransform (const double input[], complex<double> output[], const int direction) const;
-    void finiteFourierTransform (const complex<double> input[], complex<double> output[], const int direction) const;
-    void finiteFourierTransform (const complex<double> input[], double output[], const int direction) const;
+    void finiteFourierTransform (const double input[], std::complex<double> output[], const int direction) const;
+    void finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], const int direction) const;
+    void finiteFourierTransform (const std::complex<double> input[], double output[], const int direction) const;
 
     double convolve (const double func[], const double filter[], const double dx, const int n, const int np) const;
     double convolve (const double f[], const double dx, const int n, const int np) const;