Changeset 104

Timestamp:

09/27/08 04:20:45 (4 years ago)

Author:

lgs

Message:

Chart type switcher

Location:

trunk/chavier

Files:

• app.py (modified) (2 diffs)
• gui.py (modified) (8 diffs)

trunk/chavier/app.py

@@ -2 +2 @@
 
 from pycha.chart import DEFAULT_OPTIONS
-from pycha.bar import VerticalBarChart
+import pycha.bar
+import pycha.line
+import pycha.pie
+import pycha.scatter
 
 from chavier.gui import GUI
 
 class App(object):
+
+    CHART_TYPES = (
+        pycha.bar.VerticalBarChart,
+        pycha.bar.HorizontalBarChart,
+        pycha.line.LineChart,
+        pycha.pie.PieChart,
+        pycha.scatter.ScatterplotChart,
+        )
+
+    (VERTICAL_BAR_TYPE,
+     HORIZONTAL_BAR_TYPE,
+     LINE_TYPE,
+     PIE_TYPE,
+     SCATTER_TYPE) = range(len(CHART_TYPES))
+
     def __init__(self):
         self.gui = GUI(self)
@@ -16 +34 @@
         return DEFAULT_OPTIONS
 
-    def get_chart(self, datasets, options, width, height):
+    def get_chart(self, datasets, options, chart_type, width, height):
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-        chart = VerticalBarChart(surface, DEFAULT_OPTIONS)
+        chart_factory = self.CHART_TYPES[chart_type]
+        chart = chart_factory(surface, DEFAULT_OPTIONS)
         chart.addDataset(datasets)
         chart.render()

trunk/chavier/gui.py

@@ -59 +59 @@
 
     def _create_ui_manager(self):
-        uimanager = gtk.UIManager()
-        accel_group = uimanager.get_accel_group()
+        self.uimanager = gtk.UIManager()
+        accel_group = self.uimanager.get_accel_group()
         self.main_window.add_accel_group(accel_group)
 
@@ -92 +92 @@
                  'Update the chart', self.refresh),
                 ])
-        uimanager.insert_action_group(action_group, -1)
+        action_group.add_radio_actions([
+                ('verticalbar', None, '_Vertical bars', None,
+                 'Use vertical bars chart', self.app.VERTICAL_BAR_TYPE),
+                ('horizontalbar', None, '_Horizontal bars', None,
+                 'Use horizontal bars chart', self.app.HORIZONTAL_BAR_TYPE),
+                ('line', None, '_Line', None,
+                 'Use lines chart', self.app.LINE_TYPE),
+                ('pie', None, '_Pie', None,
+                 'Use pie chart', self.app.PIE_TYPE),
+                ('scatter', None, '_Scatter', None,
+                 'Use scatter chart', self.app.SCATTER_TYPE),
+                ], self.app.VERTICAL_BAR_TYPE, self.on_chart_type_change)
+        self.uimanager.insert_action_group(action_group, -1)
 
         ui = """<ui>
@@ -110 +122 @@
     <menu action="view">
       <menuitem action="refresh"/>
+      <separator />
+      <menuitem action="verticalbar"/>
+      <menuitem action="horizontalbar"/>
+      <menuitem action="line"/>
+      <menuitem action="pie"/>
+      <menuitem action="scatter"/>
     </menu>
   </menubar>
@@ -125 +143 @@
 </ui>
 """
-        uimanager.add_ui_from_string(ui)
-        uimanager.ensure_update()
-        menubar = uimanager.get_widget('/MenuBar')
-        toolbar = uimanager.get_widget('/ToolBar')
+        self.uimanager.add_ui_from_string(ui)
+        self.uimanager.ensure_update()
+        menubar = self.uimanager.get_widget('/MenuBar')
+        toolbar = self.uimanager.get_widget('/ToolBar')
 
         return menubar, toolbar
@@ -223 +241 @@
             model = treeview.get_model()
             points = [(x, y) for x, y in model]
-            datasets.append((name, points))
+            if len(points) > 0:
+                datasets.append((name, points))
         return datasets
+
+    def _get_chart_type(self):
+        action_group = self.uimanager.get_action_groups()[0]
+        action = action_group.get_action('verticalbar')
+        return action.get_current_value()
 
     def run(self):
@@ -247 +271 @@
 
     def drawing_area_size_allocate_event(self, widget, event, data=None):
+        if self.surface is not None:
+            self.refresh()
+
+    def on_chart_type_change(self, action, current, data=None):
         if self.surface is not None:
             self.refresh()
@@ -261 +289 @@
             name = dialog.get_name()
             self._create_dataset(name)
+            self.datasets_notebook.set_current_page(n_pages)
         dialog.destroy()
 
@@ -334 +363 @@
     def refresh(self, action=None):
         datasets = self._get_datasets()
-#        options = self._get_options()
-
-        alloc = self.drawing_area.get_allocation()
-        self.surface = self.app.get_chart(datasets, None,
-                                          alloc.width, alloc.height)
-        self.drawing_area.queue_draw()
+        if datasets:
+#            options = self._get_options()
+
+            chart_type = self._get_chart_type()
+            alloc = self.drawing_area.get_allocation()
+            self.surface = self.app.get_chart(datasets, None, chart_type,
+                                              alloc.width, alloc.height)
+            self.drawing_area.queue_draw()
+        else:
+            self.surface = None