diff options
| author | jblum | 2008-09-02 07:24:19 +0000 |
|---|---|---|
| committer | jblum | 2008-09-02 07:24:19 +0000 |
| commit | ec6d18c95d58707ad89f14e094bf592047048227 (patch) | |
| tree | effb37acefbd51b3bbf08fc46a89a9ae2d8e01c3 /gr-wxgui/src/python | |
| parent | 0aa33cf5c22e3721c6809ef0db54cfbe9ebe4db7 (diff) | |
| download | gnuradio-ec6d18c95d58707ad89f14e094bf592047048227.tar.gz gnuradio-ec6d18c95d58707ad89f14e094bf592047048227.tar.bz2 gnuradio-ec6d18c95d58707ad89f14e094bf592047048227.zip | |
replaced semaphore with primitive lock, adjusted drawing bounds
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9482 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui/src/python')
| -rw-r--r-- | gr-wxgui/src/python/plotter/plotter_base.py | 19 | ||||
| -rw-r--r-- | gr-wxgui/src/python/plotter/waterfall_plotter.py | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/gr-wxgui/src/python/plotter/plotter_base.py b/gr-wxgui/src/python/plotter/plotter_base.py index a695fce0a..bc42eed1e 100644 --- a/gr-wxgui/src/python/plotter/plotter_base.py +++ b/gr-wxgui/src/python/plotter/plotter_base.py @@ -54,7 +54,7 @@ class _plotter_base(wx.glcanvas.GLCanvas): Bind the paint and size events. @param parent the parent widgit """ - self._semaphore = threading.Semaphore(1) + self._global_lock = threading.Lock() attribList = (wx.glcanvas.WX_GL_DOUBLEBUFFER, wx.glcanvas.WX_GL_RGBA) wx.glcanvas.GLCanvas.__init__(self, parent, attribList=attribList) self.changed(False) @@ -64,8 +64,8 @@ class _plotter_base(wx.glcanvas.GLCanvas): self.Bind(wx.EVT_PAINT, self._on_paint) self.Bind(wx.EVT_SIZE, self._on_size) - def lock(self): self._semaphore.acquire(True) - def unlock(self): self._semaphore.release() + def lock(self): self._global_lock.acquire() + def unlock(self): self._global_lock.release() def _on_size(self, event): """! @@ -244,12 +244,13 @@ class grid_plotter_base(_plotter_base): # Draw Border ################################################## glColor3f(*GRID_LINE_COLOR_SPEC) - glBegin(GL_LINE_LOOP) - glVertex3f(self.padding_left, self.padding_top, 0) - glVertex3f(self.width - self.padding_right, self.padding_top, 0) - glVertex3f(self.width - self.padding_right, self.height - self.padding_bottom, 0) - glVertex3f(self.padding_left, self.height - self.padding_bottom, 0) - glEnd() + self._draw_rect( + self.padding_left, + self.padding_top, + self.width - self.padding_right - self.padding_left, + self.height - self.padding_top - self.padding_bottom, + fill=False, + ) ################################################## # Draw Grid X ################################################## diff --git a/gr-wxgui/src/python/plotter/waterfall_plotter.py b/gr-wxgui/src/python/plotter/waterfall_plotter.py index 88e2b4dc1..42c17da86 100644 --- a/gr-wxgui/src/python/plotter/waterfall_plotter.py +++ b/gr-wxgui/src/python/plotter/waterfall_plotter.py @@ -152,10 +152,10 @@ class waterfall_plotter(grid_plotter_base): glEnable(GL_TEXTURE_2D) glPushMatrix() #matrix scaling - glTranslatef(self.padding_left+1, self.padding_top, 0) + glTranslatef(self.padding_left, self.padding_top, 0) glScalef( - float(self.width-self.padding_left-self.padding_right-1), - float(self.height-self.padding_top-self.padding_bottom-1), + float(self.width-self.padding_left-self.padding_right), + float(self.height-self.padding_top-self.padding_bottom), 1.0, ) #draw texture with wrapping |