diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:11:21 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-05 16:11:21 -0400 |
| commit | f98715b851b39c0e3f11c0a5e853eec1ac7dbff6 (patch) | |
| tree | 66d650bad1fe6c5244c2fd692df5c8b93698330d | |
| parent | 36f8fe8f83bc867d7f1e00725a9f13415b863540 (diff) | |
Revert "wxgui: Fixes to solve issues using GL sinks on OS X"
This reverts commit 5f0aaf3d5397675d6f87acd7ab20526ac1fb0d4e.
Issues reported with blank displays on some non-OSX systems.
| -rw-r--r-- | gr-wxgui/src/python/const_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/fft_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/histo_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/plotter/plotter_base.py | 11 | ||||
| -rw-r--r-- | gr-wxgui/src/python/scope_window.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/waterfall_window.py | 1 |
6 files changed, 3 insertions, 13 deletions
diff --git a/gr-wxgui/src/python/const_window.py b/gr-wxgui/src/python/const_window.py index a7ff2e5f3f..2ad89b2a38 100644 --- a/gr-wxgui/src/python/const_window.py +++ b/gr-wxgui/src/python/const_window.py @@ -150,7 +150,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/src/python/fft_window.py b/gr-wxgui/src/python/fft_window.py index cf21b893a8..fac83a4a34 100644 --- a/gr-wxgui/src/python/fft_window.py +++ b/gr-wxgui/src/python/fft_window.py @@ -274,7 +274,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/src/python/histo_window.py b/gr-wxgui/src/python/histo_window.py index e87e978252..a1b520f9c1 100644 --- a/gr-wxgui/src/python/histo_window.py +++ b/gr-wxgui/src/python/histo_window.py @@ -117,7 +117,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/src/python/plotter/plotter_base.py b/gr-wxgui/src/python/plotter/plotter_base.py index 6d9463458d..b8a2ce709e 100644 --- a/gr-wxgui/src/python/plotter/plotter_base.py +++ b/gr-wxgui/src/python/plotter/plotter_base.py @@ -87,8 +87,7 @@ class plotter_base(wx.glcanvas.GLCanvas, common.mutex): @param 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 @@ -152,14 +151,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/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py index fa79a986e9..dc90a60459 100644 --- a/gr-wxgui/src/python/scope_window.py +++ b/gr-wxgui/src/python/scope_window.py @@ -492,7 +492,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/src/python/waterfall_window.py b/gr-wxgui/src/python/waterfall_window.py index a190899c3a..cd60104d7a 100644 --- a/gr-wxgui/src/python/waterfall_window.py +++ b/gr-wxgui/src/python/waterfall_window.py @@ -207,7 +207,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) |