Changeset 107

Timestamp:

09/30/08 01:10:35 (4 years ago)

Author:

lgs

Message:

Add type information for the options so we can edit them

Location:

trunk/chavier

Files:

• app.py (modified) (1 diff)
• gui.py (modified) (7 diffs)

trunk/chavier/app.py

@@ -25 +25 @@
      SCATTER_TYPE) = range(len(CHART_TYPES))
 
+    OPTIONS_TYPES = dict(
+        axis=dict(
+            lineWidth=float,
+            lineColor=str,
+            tickSize=float,
+            labelColor=str,
+            labelFont=str,
+            labelFontSize=int,
+            labelWidth=float,
+            x=dict(
+                hide=bool,
+                ticks=list,
+                tickCount=int,
+                tickPrecision=int,
+                range=list,
+                rotate=float,
+                label=unicode,
+                ),
+            y=dict(
+                hide=bool,
+                ticks=list,
+                tickCount=int,
+                tickPrecision=int,
+                range=list,
+                rotate=float,
+                label=unicode,
+                ),
+            ),
+        background=dict(
+            hide=bool,
+            baseColor=str,
+            chartColor=str,
+            lineColor=str,
+            lineWidth=float,
+            ),
+        legend=dict(
+            opacity=float,
+            borderColor=str,
+            hide=bool,
+            position=dict(
+                top=int,
+                left=int,
+                bottom=int,
+                right=int,
+                )
+            ),
+        padding=dict(
+            left=int,
+            right=int,
+            top=int,
+            bottom=int,
+            ),
+        stroke=dict(
+            color=str,
+            hide=bool,
+            shadow=bool,
+            width=int,
+            ),
+        fillOpacity=float,
+        shouldFill=bool,
+        barWidthFillFraction=float,
+        xOriginIsZero=bool,
+        yOriginIsZero=bool,
+        pieRadius=float,
+        colorScheme=str,
+        title=unicode,
+        titleFont=str,
+        titleFontSize=int,
+        )
+
     def __init__(self):
         self.gui = GUI(self)

trunk/chavier/gui.py

@@ -89 +89 @@
                  'Edit the current point of the current dataset',
                  self.edit_point),
+                ('edit_option', gtk.STOCK_EDIT, 'Edit op_tion', None,
+                 'Edit the current option',
+                 self.edit_option),
 
                 ('view', None, '_View', None, 'View', None),
@@ -121 +124 @@
       <menuitem action="remove_point"/>
       <menuitem action="edit_point"/>
+      <separator />
+      <menuitem action="edit_option"/>
     </menu>
     <menu action="view">
@@ -190 +195 @@
 
     def _options_treeview_creator(self):
-        self.options_store = gtk.TreeStore(str, str)
+        self.options_store = gtk.TreeStore(str, str, object)
         options = self.app.get_default_options()
-        self._fill_options_store(options, None)
-
-        treeview = gtk.TreeView(self.options_store)
+        self._fill_options_store(options, None, self.app.OPTIONS_TYPES)
+
+        self.options_treeview = gtk.TreeView(self.options_store)
 
         column1 = gtk.TreeViewColumn('Name', gtk.CellRendererText(), text=0)
-        treeview.append_column(column1)
+        self.options_treeview.append_column(column1)
 
         column2 = gtk.TreeViewColumn('Value', gtk.CellRendererText(), text=1)
-        treeview.append_column(column2)
-
-        treeview.expand_all()
+        self.options_treeview.append_column(column2)
+
+        self.options_treeview.expand_all()
 
         scrolled_window = gtk.ScrolledWindow()
         scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-        scrolled_window.add(treeview)
-        treeview.show()
+        scrolled_window.add(self.options_treeview)
+        self.options_treeview.show()
 
         return scrolled_window
 
-    def _fill_options_store(self, options, parent_node):
+    def _fill_options_store(self, options, parent_node, types):
         for name, value in options.items():
+            value_type = types[name]
             if isinstance(value, dict):
-                current_parent = self.options_store.append(parent_node, (name, None))
-                self._fill_options_store(value, current_parent)
+                current_parent = self.options_store.append(parent_node, (name, None, None))
+                self._fill_options_store(value, current_parent, value_type)
 
             else:
+                print value_type
                 if value is not None:
                     value = str(value)
-                self.options_store.append(parent_node, (name, value))
+                self.options_store.append(parent_node, (name, value, value_type))
 
     def _get_current_dataset_tab(self):
@@ -252 +259 @@
         return action.get_current_value()
 
+    def _get_options(self, iter):
+        options = {}
+        first_child = self.options_store.iter_children(iter)
+        if first_child is not None:
+            name = self.options_store.get_value(iter, 0)
+            options[name] = self._get_options(first_child)
+
+        iter = self.options_store.iter_next(iter)
+        while iter is not None:
+            name = self.options_store.get_value(iter, 0)
+            options[name] = self._get_options(iter)
+            iter = self.options_store.iter_next(iter)
+
+        return options
+
     # Event and signal handlers
     def delete_event(self, widget, event, data=None):
@@ -362 +384 @@
         dialog.destroy()
 
+    def edit_option(self, action):
+        selection = self.options_treeview.get_selection()
+        model, selected = selection.get_selected()
+        if selected is None:
+            warning(self.main_window, "You must select the option to edit")
+            return
+
+        name, value, value_type = model.get(selected, 0, 1, 2)
+        parents = []
+        parent = model.iter_parent(selected)
+        while parent is not None:
+            parents.append(model.get_value(parent, 0))
+            parent = model.iter_parent(parent)
+        parents.reverse()
+        parents.append(name)
+        label = u'.'.join(parents)
+
+        dialog = OptionDialog(self.main_window, label, value, value_type)
+        response = dialog.run()
+        if response == gtk.RESPONSE_ACCEPT:
+            new_value = dialog.get_value()
+            model.set_value(selected, 1, new_value)
+            self.refresh()
+        dialog.destroy()
+
     def refresh(self, action=None):
         datasets = self._get_datasets()
         if datasets:
-#            options = self._get_options()
+            root = self.options_store.get_iter_first()
+            options = self._get_options(root)
 
             chart_type = self._get_chart_type()
@@ -415 +463 @@
         buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                    gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
-        super(PointDialog, self).__init__(u'Enter a name for the dataset',
+        super(PointDialog, self).__init__(u'Enter the point values',
                                           toplevel_window, flags, buttons)
 
@@ -443 +491 @@
         return (float(self.entries[u'x'].get_text()),
                 float(self.entries[u'y'].get_text()))
+
+
+class OptionDialog(gtk.Dialog):
+    def __init__(self, toplevel_window, label, value, value_type):
+        flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
+        buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                   gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
+        super(OptionDialog, self).__init__(u'Enter the option value',
+                                           toplevel_window, flags, buttons)
+
+
+        hbox = gtk.HBox(spacing=6)
+        hbox.set_border_width(12)
+
+        label = gtk.Label(label)
+        hbox.pack_start(label, False, False)
+
+        self.entry = gtk.Entry()
+        self.entry.set_text(value)
+        self.entry.set_activates_default(True)
+        hbox.pack_start(self.entry, True, True)
+
+        self.vbox.pack_start(hbox, False, False)
+
+        self.vbox.show_all()
+
+        self.set_default_response(gtk.RESPONSE_ACCEPT)
+
+    def get_value(self):
+        return self.entry.get_text()