Cleanup Public header files and bindings

CMakeLists.txt

@@ -95,7 +95,7 @@ if(NOT CMAKE_MODULES_DIR)
   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
-set(GR_INCLUDE_DIR      include/bokehgui)
+set(GR_INCLUDE_DIR      include/gnuradio/bokehgui)
 set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/bokehgui)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME})
@@ -173,7 +173,7 @@ add_custom_target(uninstall
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/bokehgui)
+add_subdirectory(include/gnuradio/bokehgui)
 add_subdirectory(lib)
 add_subdirectory(apps)
 add_subdirectory(docs)

include/bokehgui/CMakeLists.txt → include/gnuradio/bokehgui/CMakeLists.txt

@@ -33,4 +33,5 @@ install(FILES
     freq_sink_c_proc.h
     waterfall_sink_f_proc.h
     waterfall_sink_c_proc.h
-    DESTINATION include/bokehgui)
+    # hist_sink_proc.h 
+    DESTINATION include/gnuradio/bokehgui)

include/bokehgui/base_sink.h → include/gnuradio/bokehgui/base_sink.h

@@ -23,9 +23,9 @@
 #define INCLUDED_BOKEHGUI_BASE_SINK_PROC_H
 
 #include <queue>
-#include <bokehgui/api.h>
+#include <gnuradio/bokehgui/api.h>
 #include <gnuradio/sync_block.h>
-#include <bokehgui/trigger_mode.h>
+#include <gnuradio/bokehgui/trigger_mode.h>
 #include <volk/volk.h>
 
 namespace gr {

include/bokehgui/freq_sink_c_proc.h → include/gnuradio/bokehgui/freq_sink_c_proc.h

@@ -1,121 +1,121 @@
-/* -*- c++ -*- */
-/* Copyright 2017 Free Software Foundation, Inc.
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H
-#define INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H
-
-#include <gnuradio/fft/window.h>
-#include <bokehgui/base_sink.h>
-
-namespace gr {
-  namespace bokehgui {
-
-    /*!
-     * \brief A buffer store-sink to store multiple signals in frequency-domain.
-     * \ingroup bokehgui
-     *
-     * \details
-     * This block is part of Bokeh based frequency sink for complex values.
-     *
-     * This is a buffer store that takes set of a complex point streams
-     * and stores the PSD. The corresponding Python class retrieve the
-     * buffer data and plot the signals using Bokeh library.
-     *
-     * A queue of 2D array is maintained. Each 2D array is of size
-     * \p nconnection \p x \p d_size. For each call to get the data from
-     * Python, first element of queue is sent.
-     *
-     * The sink supports storing complex data or messages. The message port
-     * is named "in". When using message port, \p nconnections should be
-     * set to 0. An option for "Float Message" is provided in GRC to use
-     * message mode.
-     *
-     * This sink can plot messages that contain either uniform vectors
-     * of float 32 values (pmt::is_f32vector) or PDUs where the data
-     * is a uniform vector of float 32 values.
-     *
-     */
-    class BOKEHGUI_API freq_sink_c_proc : virtual public base_sink<gr_complex>
-    {
-     public:
-      typedef std::shared_ptr<freq_sink_c_proc> sptr;
-
-       /*!
-        * \brief Build a complex frequency sink
-        *
-        * \param fftsize size of the FFT to compute and display. If using
-        *        the PDU message port to plot samples, the length of
-        *        each PDU must be a multiple of the FFT size.
-        * \param wintype type of window to apply (see gr::fft::window::win_type)
-        * \param fc center frequency of signal (use for x-axis labels)
-        * \param bw bandwidth of signal (used to set x-axis labels)
-        * \param name title for the plot
-        * \param nconnections number of signals to be connected to the
-        *        sink. The PDU message port is always available for a
-        *        connection, and this value must be set to 0 if only
-        *        the PDU message port is being used.
-        */
-      static sptr make(int fftsize, int wintype, double fc, double bw, const std::string &name, int nconnections);
-
-      virtual void reset() = 0;
-      virtual float * get_plot_data() = 0;
-      virtual int get_buff_size() = 0;
-      virtual int get_buff_cols() = 0;
-
-      virtual double get_center_freq() = 0;
-      virtual double get_bandwidth() = 0;
-      virtual int get_wintype() = 0;
-      virtual bool set_fft_window(fft::window::win_type newwintype) = 0;
-      virtual void buildwindow() = 0;
-      virtual void set_frequency_range(double, double) = 0;
-      virtual void handle_set_freq(pmt::pmt_t) = 0;
-
-      /*!
-       * Set up a trigger for the sink to know when to start
-       * plotting. Useful to isolate events and avoid noise.
-       *
-       * The trigger modes are Free, Auto, Normal, and Tag (see
-       * gr::bokehgui::trigger_mode). The first three are like a normal
-       * trigger function. Free means free running with no trigger,
-       * auto will trigger if the trigger event is seen, but will
-       * still plot otherwise, and normal will hold until the trigger
-       * event is observed. The Tag trigger mode allows us to trigger
-       * off a specific stream tag. The tag trigger is based only on
-       * the name of the tag, so when a tag of the given name is seen,
-       * the trigger is activated.
-       *
-       * In auto and normal mode, we look to see if the magnitude of
-       * the any FFT point is over the set level.
-       *
-       * \param mode The trigger_mode: free, auto, normal, or tag.
-       * \param level The magnitude of the trigger even for auto or normal modes.
-       * \param channel Which input channel to use for the trigger events.
-       * \param tag_key The name (as a string) of the tag to trigger off
-       *                of if using the tag mode.
-       */
-      virtual void set_trigger_mode(trigger_mode mode,
-                            float level,
-                            int channel,
-                            const std::string &tag_key) = 0;
-    };
-  } // namespace bokehgui
-} // namespace gr
-
-#endif /* INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H */
+/* -*- c++ -*- */
+/* Copyright 2017 Free Software Foundation, Inc.
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H
+#define INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H
+
+#include <gnuradio/fft/window.h>
+#include <gnuradio/bokehgui/base_sink.h>
+
+namespace gr {
+  namespace bokehgui {
+
+    /*!
+     * \brief A buffer store-sink to store multiple signals in frequency-domain.
+     * \ingroup bokehgui
+     *
+     * \details
+     * This block is part of Bokeh based frequency sink for complex values.
+     *
+     * This is a buffer store that takes set of a complex point streams
+     * and stores the PSD. The corresponding Python class retrieve the
+     * buffer data and plot the signals using Bokeh library.
+     *
+     * A queue of 2D array is maintained. Each 2D array is of size
+     * \p nconnection \p x \p d_size. For each call to get the data from
+     * Python, first element of queue is sent.
+     *
+     * The sink supports storing complex data or messages. The message port
+     * is named "in". When using message port, \p nconnections should be
+     * set to 0. An option for "Float Message" is provided in GRC to use
+     * message mode.
+     *
+     * This sink can plot messages that contain either uniform vectors
+     * of float 32 values (pmt::is_f32vector) or PDUs where the data
+     * is a uniform vector of float 32 values.
+     *
+     */
+    class BOKEHGUI_API freq_sink_c_proc : virtual public base_sink<gr_complex>
+    {
+     public:
+      typedef std::shared_ptr<freq_sink_c_proc> sptr;
+
+       /*!
+        * \brief Build a complex frequency sink
+        *
+        * \param fftsize size of the FFT to compute and display. If using
+        *        the PDU message port to plot samples, the length of
+        *        each PDU must be a multiple of the FFT size.
+        * \param wintype type of window to apply (see gr::fft::window::win_type)
+        * \param fc center frequency of signal (use for x-axis labels)
+        * \param bw bandwidth of signal (used to set x-axis labels)
+        * \param name title for the plot
+        * \param nconnections number of signals to be connected to the
+        *        sink. The PDU message port is always available for a
+        *        connection, and this value must be set to 0 if only
+        *        the PDU message port is being used.
+        */
+      static sptr make(int fftsize, int wintype, double fc, double bw, const std::string &name, int nconnections);
+
+      virtual void reset() = 0;
+      virtual float * get_plot_data() = 0;
+      virtual int get_buff_size() = 0;
+      virtual int get_buff_cols() = 0;
+
+      virtual double get_center_freq() = 0;
+      virtual double get_bandwidth() = 0;
+      virtual int get_wintype() = 0;
+      virtual bool set_fft_window(fft::window::win_type newwintype) = 0;
+      virtual void buildwindow() = 0;
+      virtual void set_frequency_range(double, double) = 0;
+      virtual void handle_set_freq(pmt::pmt_t) = 0;
+
+      /*!
+       * Set up a trigger for the sink to know when to start
+       * plotting. Useful to isolate events and avoid noise.
+       *
+       * The trigger modes are Free, Auto, Normal, and Tag (see
+       * gr::bokehgui::trigger_mode). The first three are like a normal
+       * trigger function. Free means free running with no trigger,
+       * auto will trigger if the trigger event is seen, but will
+       * still plot otherwise, and normal will hold until the trigger
+       * event is observed. The Tag trigger mode allows us to trigger
+       * off a specific stream tag. The tag trigger is based only on
+       * the name of the tag, so when a tag of the given name is seen,
+       * the trigger is activated.
+       *
+       * In auto and normal mode, we look to see if the magnitude of
+       * the any FFT point is over the set level.
+       *
+       * \param mode The trigger_mode: free, auto, normal, or tag.
+       * \param level The magnitude of the trigger even for auto or normal modes.
+       * \param channel Which input channel to use for the trigger events.
+       * \param tag_key The name (as a string) of the tag to trigger off
+       *                of if using the tag mode.
+       */
+      virtual void set_trigger_mode(trigger_mode mode,
+                            float level,
+                            int channel,
+                            const std::string &tag_key) = 0;
+    };
+  } // namespace bokehgui
+} // namespace gr
+
+#endif /* INCLUDED_BOKEHGUI_FREQ_SINK_C_PROC_H */