X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Ffilter.h;h=48d13a0c03dd2a945e0aafd511f96fadb6ca8a7f;hp=2dd5ed5f074d7dee0fb9572cd84125747c9cf325;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=d3fa225aa232e132cc198672c4fc148f96a1ab8c diff --git a/include/filter.h b/include/filter.h index 2dd5ed5..48d13a0 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.25 2001/02/11 04:56:37 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 @@ -53,11 +53,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; @@ -105,15 +107,15 @@ class SignalFilter { static const int getFilterCount() {return s_iFilterCount;} static const int getReconstructFilterCount() { return s_iReconstructFilterCount; } - static const char** getFilterNameArray() {return s_aszFilterName;} - static const char** getFilterTitleArray() {return s_aszFilterTitle;} + 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); @@ -141,12 +143,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 int s_iReconstructFilterCount; - static const char* s_aszDomainName[]; - static const char* s_aszDomainTitle[]; + static const char* const s_aszDomainName[]; + static const char* const s_aszDomainTitle[]; static const int s_iDomainCount; static int N_INTEGRAL;