replaced semaphore with primitive lock, adjusted drawing bounds

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9482 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-wxgui/src/python/plotter/plotter_base.py b/gr-wxgui/src/python/plotter/plotter_base.py
index a695fce0acb66925a63b2abd6d7cbf99e538d44a..bc42eed1e60816e1dcbe2f0c2e5f10f016f87934 100644 (file)
--- 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 88e2b4dc1ee7bb38c79c9f6f2808cbc66c4927e8..42c17da8692fc133ccc7513f1fa9af94c5ca4a6c 100644 (file)
--- 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