diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:36:32 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:36:32 -0400 |
| commit | 27e426e7a0f3ce93cb7ac3b2daa72ca719636d8c (patch) | |
| tree | a602b8fbeafd3a9b59e1cd97bbe09df8ac09745f | |
| parent | 694e322bab9bfaa1b9613eebeee5c69fdae8bd7b (diff) | |
| parent | f98715b851b39c0e3f11c0a5e853eec1ac7dbff6 (diff) | |
Merge branch 'maint'
Conflicts:
gr-audio/lib/alsa/audio_alsa_sink.cc
gr-audio/lib/alsa/audio_alsa_source.cc
| -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 |
6 files changed, 3 insertions, 13 deletions
diff --git a/gr-wxgui/python/wxgui/const_window.py b/gr-wxgui/python/wxgui/const_window.py index 2c499b54bd..1295aff1fa 100644 --- a/gr-wxgui/python/wxgui/const_window.py +++ b/gr-wxgui/python/wxgui/const_window.py @@ -152,7 +152,6 @@ 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 80ecf526b2..ada926c418 100644 --- a/gr-wxgui/python/wxgui/fft_window.py +++ b/gr-wxgui/python/wxgui/fft_window.py @@ -276,7 +276,6 @@ 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 f830dc83bd..3e38fdcb64 100644 --- a/gr-wxgui/python/wxgui/histo_window.py +++ b/gr-wxgui/python/wxgui/histo_window.py @@ -119,7 +119,6 @@ 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 6f2f0e7bad..78e21f3c1d 100644 --- a/gr-wxgui/python/wxgui/plotter/plotter_base.py +++ b/gr-wxgui/python/wxgui/plotter/plotter_base.py @@ -91,8 +91,7 @@ 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, wx.ID_ANY, 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 + wx.glcanvas.GLCanvas.__init__(self, parent, attribList=attribList); self.use_persistence=False self.persist_alpha=2.0/15 self.clear_accum=True @@ -158,14 +157,10 @@ 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 = None - if event.GetEventObject(): # Only create DC if paint triggered by WM message (for OS X) - dc = wx.PaintDC(self) + dc = wx.PaintDC(self) self.lock() - self.SetCurrent(self._gl_ctx) # Real the explicit GL context + self.SetCurrent() # 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 5d367d9c45..357998bf95 100644 --- a/gr-wxgui/python/wxgui/scope_window.py +++ b/gr-wxgui/python/wxgui/scope_window.py @@ -495,7 +495,6 @@ 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 9f91d17eb4..7d401223c2 100644 --- a/gr-wxgui/python/wxgui/waterfall_window.py +++ b/gr-wxgui/python/wxgui/waterfall_window.py @@ -209,7 +209,6 @@ 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) |