From 269691c7d45675382bafbdf8a56f0682f1927fd9 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sun, 1 Apr 2012 16:18:40 -0700
Subject: wavelet: converted blocks to private implementation pattern
---
gr-wavelet/include/wavelet/wavelet_squash_ff.h | 33 ++++---------------------
gr-wavelet/include/wavelet/wavelet_wavelet_ff.h | 29 ++--------------------
gr-wavelet/include/wavelet/wavelet_wvps_ff.h | 17 ++-----------
3 files changed, 9 insertions(+), 70 deletions(-)
(limited to 'gr-wavelet/include/wavelet')
diff --git a/gr-wavelet/include/wavelet/wavelet_squash_ff.h b/gr-wavelet/include/wavelet/wavelet_squash_ff.h
index 99ecf93ca8..c79f513c6d 100644
--- a/gr-wavelet/include/wavelet/wavelet_squash_ff.h
+++ b/gr-wavelet/include/wavelet/wavelet_squash_ff.h
@@ -20,49 +20,26 @@
* 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 <wavelet_api.h>
#include <gr_sync_block.h>
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_interp.h>
-#include <gsl/gsl_spline.h>
+
/*!
* \brief implements cheap resampling of spectrum directly from
* spectral points, using gsl interpolation
* \ingroup misc
*/
-
class wavelet_squash_ff;
typedef boost::shared_ptr<wavelet_squash_ff> wavelet_squash_ff_sptr;
WAVELET_API wavelet_squash_ff_sptr wavelet_make_squash_ff(const std::vector<float> &igrid,
const std::vector<float> &ogrid);
-class WAVELET_API wavelet_squash_ff : public gr_sync_block
+class WAVELET_API wavelet_squash_ff : virtual public gr_sync_block
{
- friend WAVELET_API wavelet_squash_ff_sptr wavelet_make_squash_ff(const std::vector<float> &igrid,
- const std::vector<float> &ogrid);
-
- size_t d_inum;
- size_t d_onum;
- double *d_igrid;
- double *d_iwork;
- double *d_ogrid;
-
- gsl_interp_accel *d_accel;
- gsl_spline *d_spline;
-
- wavelet_squash_ff(const std::vector<float> &igrid,
- const std::vector<float> &ogrid);
-
- public:
- ~wavelet_squash_ff();
-
- int work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
+ // No public API methods visible
};
#endif
diff --git a/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h b/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h
index 9b1f3fe0ec..ef920f1635 100644
--- a/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h
+++ b/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h
@@ -23,12 +23,8 @@
#define INCLUDED_WAVELET_WAVELET_FF_H
#include <wavelet_api.h>
-#include <iostream>
#include <gr_sync_block.h>
-#include <gsl/gsl_errno.h>
-#include <gsl/gsl_wavelet.h>
-
class wavelet_wavelet_ff;
typedef boost::shared_ptr<wavelet_wavelet_ff> wavelet_wavelet_ff_sptr;
@@ -42,30 +38,9 @@ wavelet_make_wavelet_ff(int size = 1024,
* \ingroup wavelet_blk
*/
-class WAVELET_API wavelet_wavelet_ff : public gr_sync_block
+class WAVELET_API wavelet_wavelet_ff : virtual public gr_sync_block
{
- int d_size;
- int d_order;
- bool d_forward;
- gsl_wavelet *d_wavelet;
- gsl_wavelet_workspace *d_workspace;
- double *d_temp;
-
- friend WAVELET_API wavelet_wavelet_ff_sptr
- wavelet_make_wavelet_ff(int size,
- int order,
- bool forward);
-
- wavelet_wavelet_ff(int size,
- int order,
- bool forward);
-
-public:
- ~wavelet_wavelet_ff();
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
+ // No public API methods visible
};
#endif /* INCLUDED_WAVELET_WAVELET_FF_H */
diff --git a/gr-wavelet/include/wavelet/wavelet_wvps_ff.h b/gr-wavelet/include/wavelet/wavelet_wvps_ff.h
index ec6ed0c340..061f423230 100644
--- a/gr-wavelet/include/wavelet/wavelet_wvps_ff.h
+++ b/gr-wavelet/include/wavelet/wavelet_wvps_ff.h
@@ -36,22 +36,9 @@ wavelet_make_wvps_ff(int ilen);
* \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients
* \ingroup wavelet_blk
*/
-class WAVELET_API wavelet_wvps_ff : public gr_sync_block
+class WAVELET_API wavelet_wvps_ff : virtual public gr_sync_block
{
- friend WAVELET_API wavelet_wvps_ff_sptr
- wavelet_make_wvps_ff(int ilen);
-
- int d_ilen;
- int d_olen;
-
- protected:
- wavelet_wvps_ff(int ilen);
-
- public:
- int work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
+ // No public API methods visible
};
#endif /* INCLUDED_WAVELET_WVPS_FF_H */
--
cgit v1.2.3