diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
| commit | a00231d5fc7411c8bb3f0ffdf72f2ccabd2477b6 (patch) | |
| tree | de07a61632c7e9f1f6df9da0df89623f810ae9b4 | |
| parent | 11fd3f467ab8a8c7e548dfed092d102945770f99 (diff) | |
| parent | 48e5bff6fe99b5d4654fcb03a6f8da8a206eb7d7 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/tpb_thread_body.cc | 3 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_keep_m_in_n.xml | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/wavfile.cc | 6 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/const_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/fft_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/histo_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/plotter/plotter_base.py | 11 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/scope_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/python/wxgui/waterfall_window.py | 1 |
10 files changed, 26 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 161017bc09..5862273a36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,9 +311,13 @@ SET(cmake_configs ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake ) +if(NOT CMAKE_MODULES_DIR) + set(CMAKE_MODULES_DIR lib/cmake/gnuradio) +endif(NOT CMAKE_MODULES_DIR) + install( - FILES ${cmake_configs} - DESTINATION lib/cmake/gnuradio + FILES ${cmake_configs} + DESTINATION ${CMAKE_MODULES_DIR} COMPONENT "runtime_devel" ) diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index c49594c931..f9e543b0e5 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -119,6 +119,9 @@ namespace gr { guard.lock(); } } + if (d->done()) { + return; + } } } break; diff --git a/gr-blocks/grc/blocks_keep_m_in_n.xml b/gr-blocks/grc/blocks_keep_m_in_n.xml index 9e861749bb..824955c412 100644 --- a/gr-blocks/grc/blocks_keep_m_in_n.xml +++ b/gr-blocks/grc/blocks_keep_m_in_n.xml @@ -62,7 +62,7 @@ </param> <check>$n > 0</check> <check>$m > 0</check> - <check>$m < $n</check> + <check>$m <= $n</check> <sink> <name>in</name> <type>$type</type> diff --git a/gr-blocks/lib/wavfile.cc b/gr-blocks/lib/wavfile.cc index e741cbab4e..1a5b3ff35f 100644 --- a/gr-blocks/lib/wavfile.cc +++ b/gr-blocks/lib/wavfile.cc @@ -38,14 +38,14 @@ namespace gr { // Define host to/from worknet (little endian) short and long #ifdef BOOST_BIG_ENDIAN - static inline uint16_t __wav_bs16(uint16_t x) + static inline uint16_t __gri_wav_bs16(uint16_t x) { return (x>>8) | (x<<8); } - static inline uint32_t __wav_bs32(uint32_t x) + static inline uint32_t __gri_wav_bs32(uint32_t x) { - return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); + return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); } #define htowl(x) __gri_wav_bs32(x) diff --git a/gr-wxgui/python/wxgui/const_window.py b/gr-wxgui/python/wxgui/const_window.py index 1295aff1fa..2c499b54bd 100644 --- a/gr-wxgui/python/wxgui/const_window.py +++ b/gr-wxgui/python/wxgui/const_window.py @@ -152,6 +152,7 @@ class const_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.channel_plotter(self) self.plotter.SetSize(wx.Size(*size)) + self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.set_x_label('Inphase') self.plotter.set_y_label('Quadrature') diff --git a/gr-wxgui/python/wxgui/fft_window.py b/gr-wxgui/python/wxgui/fft_window.py index ada926c418..80ecf526b2 100644 --- a/gr-wxgui/python/wxgui/fft_window.py +++ b/gr-wxgui/python/wxgui/fft_window.py @@ -276,6 +276,7 @@ class fft_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.channel_plotter(self) self.plotter.SetSize(wx.Size(*size)) + self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.enable_legend(True) self.plotter.enable_point_label(True) diff --git a/gr-wxgui/python/wxgui/histo_window.py b/gr-wxgui/python/wxgui/histo_window.py index 3e38fdcb64..f830dc83bd 100644 --- a/gr-wxgui/python/wxgui/histo_window.py +++ b/gr-wxgui/python/wxgui/histo_window.py @@ -119,6 +119,7 @@ class histo_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.bar_plotter(self) self.plotter.SetSize(wx.Size(*size)) + self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.enable_point_label(True) self.plotter.enable_grid_lines(False) diff --git a/gr-wxgui/python/wxgui/plotter/plotter_base.py b/gr-wxgui/python/wxgui/plotter/plotter_base.py index 78e21f3c1d..ca904908ec 100644 --- a/gr-wxgui/python/wxgui/plotter/plotter_base.py +++ b/gr-wxgui/python/wxgui/plotter/plotter_base.py @@ -91,7 +91,8 @@ class plotter_base(wx.glcanvas.GLCanvas, common.mutex): parent: the parent widgit """ attribList = (wx.glcanvas.WX_GL_DOUBLEBUFFER, wx.glcanvas.WX_GL_RGBA) - wx.glcanvas.GLCanvas.__init__(self, parent, attribList=attribList); + wx.glcanvas.GLCanvas.__init__(self, parent, wx.ID_ANY, attribList=attribList); # Specifically use the CTOR which does NOT create an implicit GL context + self._gl_ctx = wx.glcanvas.GLContext(self) # Create the explicit GL context self.use_persistence=False self.persist_alpha=2.0/15 self.clear_accum=True @@ -157,10 +158,14 @@ class plotter_base(wx.glcanvas.GLCanvas, common.mutex): Resize the view port if the width or height changed. Redraw the screen, calling the draw functions. """ + if not self.IsShownOnScreen(): # Cannot realise a GL context on OS X if window is not yet shown + return # create device context (needed on Windows, noop on X) - dc = wx.PaintDC(self) + dc = None + if event.GetEventObject(): # Only create DC if paint triggered by WM message (for OS X) + dc = wx.PaintDC(self) self.lock() - self.SetCurrent() + self.SetCurrent(self._gl_ctx) # Real the explicit GL context # check if gl was initialized if not self._gl_init_flag: diff --git a/gr-wxgui/python/wxgui/scope_window.py b/gr-wxgui/python/wxgui/scope_window.py index 357998bf95..5d367d9c45 100644 --- a/gr-wxgui/python/wxgui/scope_window.py +++ b/gr-wxgui/python/wxgui/scope_window.py @@ -495,6 +495,7 @@ class scope_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.channel_plotter(self) self.plotter.SetSize(wx.Size(*size)) + self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.enable_legend(True) self.plotter.enable_point_label(True) diff --git a/gr-wxgui/python/wxgui/waterfall_window.py b/gr-wxgui/python/wxgui/waterfall_window.py index 7d401223c2..9f91d17eb4 100644 --- a/gr-wxgui/python/wxgui/waterfall_window.py +++ b/gr-wxgui/python/wxgui/waterfall_window.py @@ -209,6 +209,7 @@ class waterfall_window(wx.Panel, pubsub.pubsub): wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) self.plotter = plotter.waterfall_plotter(self) self.plotter.SetSize(wx.Size(*size)) + self.plotter.SetSizeHints(*size) self.plotter.set_title(title) self.plotter.enable_point_label(True) self.plotter.enable_grid_lines(False) |