[Commit-gnuradio] r9170 - in gnuradio/branches/features/experimental-gui: . plotter

[jblum]

Author: jblum
Date: 2008-08-04 15:11:06 -0600 (Mon, 04 Aug 2008)
New Revision: 9170

Modified:
   gnuradio/branches/features/experimental-gui/const_window.py
   gnuradio/branches/features/experimental-gui/grc_constsink_test.py
   gnuradio/branches/features/experimental-gui/plotter/channel_plotter.py
Log:
const thicker dots

Modified: gnuradio/branches/features/experimental-gui/const_window.py
===================================================================
--- gnuradio/branches/features/experimental-gui/const_window.py 2008-08-04 
18:55:28 UTC (rev 9169)
+++ gnuradio/branches/features/experimental-gui/const_window.py 2008-08-04 
21:11:06 UTC (rev 9170)
@@ -40,10 +40,12 @@
 DEFAULT_CONST_SIZE = 2048
 CONST_PLOT_COLOR_SPEC = (0, 0, 1)
 MARKER_TYPES = (
-       ('Line', None),
-       ('Plus', '+'),
-       ('Dot', '.'),
+       ('Dot Small', 1.0),
+       ('Dot Medium', 2.0),
+       ('Dot Large', 3.0),
+       ('Line Link', None),
 )
+DEFAULT_MARKER_TYPE = MARKER_TYPES[1][1]
 RUNNING_KEY = 'running'
 X_DIVS_KEY = 'x_divs'
 Y_DIVS_KEY = 'y_divs'
@@ -142,7 +144,7 @@
                self._register_set_prop(self.controller, RUNNING_KEY, True)
                self._register_set_prop(self.controller, X_DIVS_KEY, 8)
                self._register_set_prop(self.controller, Y_DIVS_KEY, 8)
-               self._register_set_prop(self.controller, MARKER_KEY, '.')
+               self._register_set_prop(self.controller, MARKER_KEY, 
DEFAULT_MARKER_TYPE)
                #register events
                self.ext_controller.subscribe(msg_key, self.handle_msg)
                for key in (
@@ -176,10 +178,10 @@
                x_divs = self.controller[X_DIVS_KEY]
                y_divs = self.controller[Y_DIVS_KEY]
                #update the x axis
-               x_max = 2.0
+               x_max = 1.2
                self.plotter.set_x_grid(-x_max, x_max, 
common.get_clean_num(2.0*x_max/x_divs))
                #update the y axis
-               y_max = 2.0
+               y_max = 1.2
                self.plotter.set_y_grid(-y_max, y_max, 
common.get_clean_num(2.0*y_max/y_divs))
                #update plotter
                self.plotter.update()

Modified: gnuradio/branches/features/experimental-gui/grc_constsink_test.py
===================================================================
--- gnuradio/branches/features/experimental-gui/grc_constsink_test.py   
2008-08-04 18:55:28 UTC (rev 9169)
+++ gnuradio/branches/features/experimental-gui/grc_constsink_test.py   
2008-08-04 21:11:06 UTC (rev 9170)
@@ -77,7 +77,7 @@
                        self.GetWin(), 
                        title="Constellation Plot", 
                        sample_rate=samp_rate, 
-                       frame_rate=10,
+                       frame_rate=1,
                        #mpsk recv params
                        M=len(const),
                        theta=0,

Modified: gnuradio/branches/features/experimental-gui/plotter/channel_plotter.py
===================================================================
--- gnuradio/branches/features/experimental-gui/plotter/channel_plotter.py      
2008-08-04 18:55:28 UTC (rev 9169)
+++ gnuradio/branches/features/experimental-gui/plotter/channel_plotter.py      
2008-08-04 21:11:06 UTC (rev 9170)
@@ -120,18 +120,9 @@
                        glTranslatef(x_trans, -self.y_min, 0)
                        #draw the points/lines
                        glColor3f(*color_spec)
-                       if marker == '+': #TODO slow, slow, slow
-                               points_4 = numpy.array(zip(points, points, 
points, points))
-                               points_4 = points_4 + .01*numpy.array([
-                                               (self.x_max-self.x_min, 0),
-                                               (self.x_min-self.x_max, 0),
-                                               (0, self.y_max-self.y_min),
-                                               (0, self.y_min-self.y_max),
-                                       ]
-                               )
-                               points = points_4.reshape(len(points)*4, 2)
+                       if marker: glPointSize(marker)
                        glVertexPointer(2, GL_FLOAT, 0, points)
-                       glDrawArrays({None: GL_LINE_STRIP, '.': GL_POINTS, '+': 
GL_LINES}[marker], 0, len(points))
+                       glDrawArrays(marker is None and GL_LINE_STRIP or 
GL_POINTS, 0, len(points))
                        glPopMatrix()
 
        def _draw_legend(self):