X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Ffilter.h;h=5974e9488cd0894bf1ab60b44daae02e8ed630e2;hb=82a12d49ecd2c09c301e6513b549c358f715e764;hp=0a610d6843370cb28443c5b582188715da046c24;hpb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;p=ctsim.git

diff --git a/include/filter.h b/include/filter.h
index 0a610d6..5974e94 100644
--- a/include/filter.h
+++ b/include/filter.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: filter.h,v 1.24 2001/01/28 19:10:18 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
@@ -33,8 +33,7 @@
 #include "config.h"
 #endif
 #ifdef HAVE_FFTW
-#include <fftw.h>
-#include <rfftw.h>
+#include <fftw3.h>
 #endif
 
 
@@ -53,11 +52,13 @@ class SignalFilter {
     static const int FILTER_ABS_BANDLIMIT; 	// filter times |x|
     static const int FILTER_ABS_SINC;
     static const int FILTER_ABS_G_HAMMING;
+    static const int FILTER_ABS_HANNING;
     static const int FILTER_ABS_COSINE;
     static const int FILTER_SHEPP;
     static const int FILTER_BANDLIMIT;
     static const int FILTER_SINC;
     static const int FILTER_G_HAMMING;
+    static const int FILTER_HANNING;
     static const int FILTER_COSINE;
     static const int FILTER_TRIANGLE;
 
@@ -103,15 +104,17 @@ class SignalFilter {
     static void setNumIntegral(int nIntegral) {N_INTEGRAL = nIntegral;}
 
   static const int getFilterCount() {return s_iFilterCount;}
-  static const char** getFilterNameArray() {return s_aszFilterName;}
-  static const char** getFilterTitleArray() {return s_aszFilterTitle;}
+  static const int getReconstructFilterCount() { return s_iReconstructFilterCount; }
+
+  static const char* const* getFilterNameArray() {return s_aszFilterName;}
+  static const char* const* getFilterTitleArray() {return s_aszFilterTitle;}
   static int convertFilterNameToID (const char* const filterName);
   static const char* convertFilterIDToName (const int idFilter);
   static const char* convertFilterIDToTitle (const int idFilter);
 
   static const int getDomainCount() {return s_iDomainCount;}
-  static const char** getDomainNameArray() {return s_aszDomainName;}
-  static const char** getDomainTitleArray() {return s_aszDomainTitle;}
+  static const char* const* getDomainNameArray() {return s_aszDomainName;}
+  static const char* const* getDomainTitleArray() {return s_aszDomainTitle;}
   static int convertDomainNameToID (const char* const domainName);
   static const char* convertDomainIDToName (const int idDomain);
   static const char* convertDomainIDToTitle (const int idDomain);
@@ -139,11 +142,12 @@ class SignalFilter {
     bool m_fail;
     std::string m_failMessage;
 
-    static const char* s_aszFilterName[];
-    static const char* s_aszFilterTitle[];
+    static const char* const s_aszFilterName[];
+    static const char* const s_aszFilterTitle[];
     static const int s_iFilterCount;
-    static const char* s_aszDomainName[];
-    static const char* s_aszDomainTitle[];
+    static const int s_iReconstructFilterCount;
+    static const char* const s_aszDomainName[];
+    static const char* const s_aszDomainTitle[];
     static const int s_iDomainCount;
     static int N_INTEGRAL;