diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 21:45:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch) | |
| tree | e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gr-wavelet/include | |
| parent | 78431dc6941e3acc67c858277dfe4a0ed583643c (diff) | |
Tree: clang-format without the include sorting
Diffstat (limited to 'gr-wavelet/include')
| -rw-r--r-- | gr-wavelet/include/gnuradio/wavelet/api.h | 4 | ||||
| -rw-r--r-- | gr-wavelet/include/gnuradio/wavelet/squash_ff.h | 40 | ||||
| -rw-r--r-- | gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h | 37 | ||||
| -rw-r--r-- | gr-wavelet/include/gnuradio/wavelet/wvps_ff.h | 31 |
4 files changed, 53 insertions, 59 deletions
diff --git a/gr-wavelet/include/gnuradio/wavelet/api.h b/gr-wavelet/include/gnuradio/wavelet/api.h index 371ac24d54..e5f4af2ce8 100644 --- a/gr-wavelet/include/gnuradio/wavelet/api.h +++ b/gr-wavelet/include/gnuradio/wavelet/api.h @@ -25,9 +25,9 @@ #include <gnuradio/attributes.h> #ifdef gnuradio_wavelet_EXPORTS -# define WAVELET_API __GR_ATTR_EXPORT +#define WAVELET_API __GR_ATTR_EXPORT #else -# define WAVELET_API __GR_ATTR_IMPORT +#define WAVELET_API __GR_ATTR_IMPORT #endif #endif /* INCLUDED_WAVELET_API_H */ diff --git a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h index fd5dfb10c6..ea7cbea91b 100644 --- a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h @@ -20,36 +20,34 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_WAVELET_SQUASH_FF_H -#define INCLUDED_WAVELET_SQUASH_FF_H +#ifndef INCLUDED_WAVELET_SQUASH_FF_H +#define INCLUDED_WAVELET_SQUASH_FF_H #include <gnuradio/wavelet/api.h> #include <gnuradio/sync_block.h> namespace gr { - namespace wavelet { +namespace wavelet { + +/*! + * \brief Implements cheap resampling of spectrum directly from + * spectral points, using gsl interpolation + * \ingroup misc + */ +class WAVELET_API squash_ff : virtual public sync_block +{ +public: + // gr::wavelet::squash_ff::sptr + typedef boost::shared_ptr<squash_ff> sptr; /*! - * \brief Implements cheap resampling of spectrum directly from - * spectral points, using gsl interpolation - * \ingroup misc + * \param igrid + * \param ogrid */ - class WAVELET_API squash_ff : virtual public sync_block - { - public: - - // gr::wavelet::squash_ff::sptr - typedef boost::shared_ptr<squash_ff> sptr; - - /*! - * \param igrid - * \param ogrid - */ - static sptr make(const std::vector<float> &igrid, - const std::vector<float> &ogrid); - }; + static sptr make(const std::vector<float>& igrid, const std::vector<float>& ogrid); +}; - } /* namespace wavelet */ +} /* namespace wavelet */ } /* namespace gr */ #endif diff --git a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h index 3012b26711..7220613956 100644 --- a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h @@ -27,30 +27,27 @@ #include <gnuradio/sync_block.h> namespace gr { - namespace wavelet { +namespace wavelet { + +/*! + * \brief Compute wavelet transform using gsl routines. + * \ingroup wavelet_blk + */ +class WAVELET_API wavelet_ff : virtual public sync_block +{ +public: + // gr::wavelet::wavelet_ff:sptr + typedef boost::shared_ptr<wavelet_ff> sptr; /*! - * \brief Compute wavelet transform using gsl routines. - * \ingroup wavelet_blk + * \param size + * \param order + * \param forward */ - class WAVELET_API wavelet_ff : virtual public sync_block - { - public: - - // gr::wavelet::wavelet_ff:sptr - typedef boost::shared_ptr<wavelet_ff> sptr; - - /*! - * \param size - * \param order - * \param forward - */ - static sptr make(int size = 1024, - int order = 20, - bool forward = true); - }; + static sptr make(int size = 1024, int order = 20, bool forward = true); +}; - } /* namespace wavelet */ +} /* namespace wavelet */ } /* namespace gr */ #endif /* INCLUDED_WAVELET_WAVELET_FF_H */ diff --git a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h index 042201279e..68ec05fa91 100644 --- a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h @@ -29,26 +29,25 @@ class wavelet_wvps_ff; namespace gr { - namespace wavelet { +namespace wavelet { + +/*! + * \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients + * \ingroup wavelet_blk + */ +class WAVELET_API wvps_ff : virtual public sync_block +{ +public: + // gr::wavelet::wvps_ff::sptr + typedef boost::shared_ptr<wvps_ff> sptr; /*! - * \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients - * \ingroup wavelet_blk + \param ilen */ - class WAVELET_API wvps_ff : virtual public sync_block - { - public: - - // gr::wavelet::wvps_ff::sptr - typedef boost::shared_ptr<wvps_ff> sptr; - - /*! - \param ilen - */ - static sptr make(int ilen); - }; + static sptr make(int ilen); +}; - } /* namespace wavelet */ +} /* namespace wavelet */ } /* namespace gr */ #endif /* INCLUDED_WAVELET_WVPS_FF_H */ |