Changeset 103 for trunk

Timestamp:

09/27/08 03:49:56 (4 years ago)

Author:

lgs

Message:

First version that actually draws charts

Location:

trunk/chavier

Files:

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

trunk/chavier/app.py

@@ +1 @@
+import cairo
+
 from pycha.chart import DEFAULT_OPTIONS
+from pycha.bar import VerticalBarChart
 
 from chavier.gui import GUI
@@ -13 +16 @@
         return DEFAULT_OPTIONS
 
+    def get_chart(self, datasets, options, width, height):
+        surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
+        chart = VerticalBarChart(surface, DEFAULT_OPTIONS)
+        chart.addDataset(datasets)
+        chart.render()
+        return surface
+
 if __name__ == '__main__':
     app = App()

trunk/chavier/gui.py

@@ -6 +6 @@
     def __init__(self, app):
         self.app = app
+
+        self.surface = None
 
         self.main_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
@@ -35 +37 @@
         block1 = self._create_sidebar_block(u'Data sets',
                                             self._datasets_notebook_creator)
-        hbuttons = self._create_datasets_buttons()
-        block1.pack_start(hbuttons, False, False)
-        hbuttons.show()
+        self._create_dataset("Dataset 1")
+        block1.set_size_request(-1, 200)
 
         vpaned.add1(block1)
@@ -47 +48 @@
         block2.show()
 
-        drawing_area = gtk.DrawingArea()
-        hpaned.add2(drawing_area)
-        drawing_area.show()
+        self.drawing_area = gtk.DrawingArea()
+        self.drawing_area.connect('expose_event',
+                                  self.drawing_area_expose_event)
+        self.drawing_area.connect('size_allocate',
+                                  self.drawing_area_size_allocate_event)
+        hpaned.add2(self.drawing_area)
+        self.drawing_area.show()
 
         self.main_window.show()
@@ -61 +66 @@
         action_group.add_actions([
                 ('file', None, '_File', None, 'File', None),
-                ('quit', gtk.STOCK_QUIT, '_Quit', None, 'Quit the program',
+                ('quit', gtk.STOCK_QUIT, None, None, 'Quit the program',
                  self.quit),
+
+                ('edit', None, '_Edit', None, 'Edit', None),
+                ('add_dataset', gtk.STOCK_ADD, '_Add dataset',
+                 '<ctrl><alt>plus', 'Add another dataset', self.add_dataset),
+                ('remove_dataset', gtk.STOCK_REMOVE, '_Remove dataset',
+                 '<ctrl><alt>minus', 'Remove the current dataset',
+                 self.remove_dataset),
+                ('edit_dataset', gtk.STOCK_EDIT, '_Edit dataset name',
+                 '<ctrl><alt>e', 'Edit the name of the current dataset',
+                 self.edit_dataset),
+                ('add_point', gtk.STOCK_ADD, 'Add _point', '<ctrl>plus',
+                 'Add another point to the current dataset', self.add_point),
+                ('remove_point', gtk.STOCK_REMOVE, 'Remove p_oint',
+                 '<ctrl>minus',
+                 'Remove the current point of the current dataset',
+                 self.remove_point),
+                ('edit_point', gtk.STOCK_EDIT, 'Edit po_int', '<ctrl>e',
+                 'Edit the current point of the current dataset',
+                 self.edit_point),
+
                 ('view', None, '_View', None, 'View', None),
-                ('refresh', gtk.STOCK_REFRESH, '_Refresh', None, 'Update the chart',
-                 self.refresh),
+                ('refresh', gtk.STOCK_REFRESH, None, '<ctrl>r',
+                 'Update the chart', self.refresh),
                 ])
         uimanager.insert_action_group(action_group, -1)
@@ -73 +98 @@
     <menu action="file">
       <menuitem action="quit"/>
+    </menu>
+    <menu action="edit">
+      <menuitem action="add_dataset"/>
+      <menuitem action="remove_dataset"/>
+      <menuitem action="edit_dataset"/>
+      <separator />
+      <menuitem action="add_point"/>
+      <menuitem action="remove_point"/>
+      <menuitem action="edit_point"/>
     </menu>
     <menu action="view">
@@ -79 +113 @@
   </menubar>
   <toolbar name="ToolBar">
+    <toolitem action="quit"/>
+    <separator />
+    <toolitem action="add_dataset"/>
+    <toolitem action="remove_dataset"/>
+    <separator />
+    <toolitem action="add_point"/>
+    <toolitem action="remove_point"/>
+    <separator />
     <toolitem action="refresh"/>
   </toolbar>
@@ -110 +152 @@
         return self.datasets_notebook
 
-    def _create_datasets_buttons(self):
-        hbuttons = gtk.HButtonBox()
-        hbuttons.set_layout(gtk.BUTTONBOX_END)
-
-        add_button = gtk.Button(stock=gtk.STOCK_ADD)
-        add_button.connect('clicked', self.add_dataset)
-        hbuttons.pack_start(add_button, False, False)
-        add_button.show()
-
-        remove_button = gtk.Button(stock=gtk.STOCK_REMOVE)
-        hbuttons.pack_start(remove_button, False, False)
-        remove_button.show()
-        remove_button.set_sensitive(False)
-
-        return hbuttons
-
     def _dataset_treeview_creator(self):
         store = gtk.ListStore(float, float)
@@ -176 +202 @@
                 self.options_store.append(parent_node, (name, value))
 
+    def _get_current_dataset_tab(self):
+        current_tab = self.datasets_notebook.get_current_page()
+        if current_tab != -1:
+            return self.datasets_notebook.get_nth_page(current_tab)
+
+    def _create_dataset(self, name):
+        scrolled_window = self._dataset_treeview_creator()
+        scrolled_window.show()
+        label = gtk.Label(name)
+        self.datasets_notebook.append_page(scrolled_window, label)
+
+    def _get_datasets(self):
+        datasets = []
+        n_pages = self.datasets_notebook.get_n_pages()
+        for i in range(n_pages):
+            tab = self.datasets_notebook.get_nth_page(i)
+            label = self.datasets_notebook.get_tab_label(tab)
+            name = label.get_label()
+            treeview = tab.get_children()[0]
+            model = treeview.get_model()
+            points = [(x, y) for x, y in model]
+            datasets.append((name, points))
+        return datasets
+
     def run(self):
         gtk.main()
@@ -185 +235 @@
         gtk.main_quit()
 
+    def drawing_area_expose_event(self, widget, event, data=None):
+        if self.surface is None:
+            return
+
+        cr = widget.window.cairo_create()
+        cr.rectangle(event.area.x, event.area.y,
+                     event.area.width, event.area.height)
+        cr.clip()
+        cr.set_source_surface(self.surface, 0, 0)
+        cr.paint()
+
+    def drawing_area_size_allocate_event(self, widget, event, data=None):
+        if self.surface is not None:
+            self.refresh()
+
     def quit(self, action):
         self.main_window.destroy()
 
-    def add_dataset(self, button, data=None):
+    def add_dataset(self, action):
         n_pages = self.datasets_notebook.get_n_pages()
         suggested_name = u'Dataset %d' % (n_pages + 1)
@@ -195 +260 @@
         if response == gtk.RESPONSE_ACCEPT:
             name = dialog.get_name()
-            scrolled_window = self._dataset_treeview_creator()
-            scrolled_window.show()
-            label = gtk.Label(name)
-            self.datasets_notebook.append_page(scrolled_window, label)
+            self._create_dataset(name)
         dialog.destroy()
 
-    def refresh(self, action):
-        pass
+    def remove_dataset(self, action):
+        current_tab = self.datasets_notebook.get_current_page()
+        assert current_tab != -1
+
+        self.datasets_notebook.remove_page(current_tab)
+
+    def edit_dataset(self, action):
+        tab = self._get_current_dataset_tab()
+        assert tab is not None
+
+        label = self.datasets_notebook.get_tab_label(tab)
+        name = label.get_label()
+        dialog = TextInputDialog(self.main_window, name)
+        response = dialog.run()
+        if response == gtk.RESPONSE_ACCEPT:
+            name = dialog.get_name()
+            label.set_label(name)
+        dialog.destroy()
+
+    def add_point(self, action):
+        tab = self._get_current_dataset_tab()
+        assert tab is not None
+
+        treeview = tab.get_children()[0]
+        model = treeview.get_model()
+
+        dialog = PointDialog(self.main_window, len(model) * 1.0, 0.0)
+        response = dialog.run()
+        if response == gtk.RESPONSE_ACCEPT:
+            x, y = dialog.get_point()
+            model.append((x, y))
+            self.refresh()
+        dialog.destroy()
+
+    def remove_point(self, action):
+        tab = self._get_current_dataset_tab()
+        assert tab is not None
+
+        treeview = tab.get_children()[0]
+        selection = treeview.get_selection()
+        model, selected = selection.get_selected()
+        if selected is None:
+            warning(self.main_window, "You must select the point to remove")
+            return
+
+        model.remove(selected)
+        self.refresh()
+
+    def edit_point(self, action):
+        tab = self._get_current_dataset_tab()
+        assert tab is not None
+
+        treeview = tab.get_children()[0]
+        selection = treeview.get_selection()
+        model, selected = selection.get_selected()
+        if selected is None:
+            warning(self.main_window, "You must select the point to edit")
+            return
+
+        x, y = model.get(selected, 0, 1)
+
+        dialog = PointDialog(self.main_window, x, y)
+        response = dialog.run()
+        if response == gtk.RESPONSE_ACCEPT:
+            x, y = dialog.get_point()
+            model.set(selected, 0, x, 1, y)
+            self.refresh()
+        dialog.destroy()
+
+    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()
+
+
 
 class TextInputDialog(gtk.Dialog):
@@ -233 +372 @@
     def get_name(self):
         return self.entry.get_text()
+
+
+class PointDialog(gtk.Dialog):
+    def __init__(self, toplevel_window, initial_x, initial_y):
+        flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
+        buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                   gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
+        super(PointDialog, self).__init__(u'Enter a name for the dataset',
+                                          toplevel_window, flags, buttons)
+
+        initials = {u'x': str(initial_x), u'y': str(initial_y)}
+        self.entries = {}
+        for coordinate in (u'x', u'y'):
+            hbox = gtk.HBox(spacing=6)
+            hbox.set_border_width(12)
+
+            label = gtk.Label(coordinate)
+            hbox.pack_start(label, False, False)
+
+            entry = gtk.Entry()
+            entry.set_activates_default(True)
+            entry.set_text(initials[coordinate])
+            hbox.pack_start(entry, True, True)
+
+            self.entries[coordinate] = entry
+
+            self.vbox.pack_start(hbox, False, False)
+
+        self.vbox.show_all()
+
+        self.set_default_response(gtk.RESPONSE_ACCEPT)
+
+    def get_point(self):
+        return (float(self.entries[u'x'].get_text()),
+                float(self.entries[u'y'].get_text()))
+
+
+def warning(window, msg):
+    dialog = gtk.MessageDialog(window,
+                               gtk.DIALOG_MODAL|gtk.DIALOG_DESTROY_WITH_PARENT,
+                               gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, msg)
+    dialog.run()
+    dialog.destroy()