Changeset 109 for trunk/chavier/gui.py

Timestamp:

10/27/08 16:49:58 (4 years ago)

Author:

lgs

Message:

Some refactoring and support for negative values in line and bar charts. Inspired by Nicolas patch

Files:

• trunk/chavier/gui.py (modified) (8 diffs)

trunk/chavier/gui.py

@@ -22 +22 @@
 from chavier.dialogs import (
     TextInputDialog, PointDialog, OptionDialog, RandomGeneratorDialog,
-    AboutDialog,
+    AboutDialog, warning
     )
 
@@ -29 +29 @@
         self.app = app
 
+        self.chart = None
         self.surface = None
 
@@ -123 +124 @@
                  '<ctrl>g', 'Generate random points',
                  self.generate_random_points),
+                ('dump-chart-state', gtk.STOCK_CONVERT, '_Dump chart state',
+                 '<ctrl>d', 'Dump internal chart variables',
+                 self.dump_chart_state),
                 ('help', None, '_Help', None, 'Help', None),
                 ('about', gtk.STOCK_ABOUT, None, None, 'About this program',
@@ -168 +172 @@
     <menu action="tools">
       <menuitem action="random-points"/>
+      <menuitem action="dump-chart-state"/>
     </menu>
     <menu action="help">
@@ -357 +362 @@
 
     def drawing_area_expose_event(self, widget, event, data=None):
-        if self.surface is None:
+        if self.chart is None:
             return
 
@@ -364 +369 @@
                      event.area.width, event.area.height)
         cr.clip()
-        cr.set_source_surface(self.surface, 0, 0)
+        cr.set_source_surface(self.chart.surface, 0, 0)
         cr.paint()
 
     def drawing_area_size_allocate_event(self, widget, event, data=None):
-        if self.surface is not None:
+        if self.chart is not None:
             self.refresh()
 
     def on_chart_type_change(self, action, current, data=None):
-        if self.surface is not None:
+        if self.chart is not None:
             self.refresh()
 
@@ -478 +483 @@
             chart_type = self._get_chart_type()
             alloc = self.drawing_area.get_allocation()
-            self.surface = self.app.get_chart(datasets, options, chart_type,
-                                              alloc.width, alloc.height)
+            self.chart = self.app.get_chart(datasets, options, chart_type,
+                                            alloc.width, alloc.height)
             self.drawing_area.queue_draw()
         else:
-            self.surface = None
+            self.chart = None
 
     def generate_random_points(self, action=None):
@@ -500 +505 @@
         dialog.destroy()
 
+    def dump_chart_state(self, action=None):
+        if self.chart is None:
+            return
+
+        alloc = self.drawing_area.get_allocation()
+
+        print 'CHART STATE'
+        print '-' * 70
+        print 'surface: %d x %d' % (alloc.width, alloc.height)
+        print 'area   :', self.chart.area
+        print
+        print 'minxval:', self.chart.minxval
+        print 'maxxval:', self.chart.maxxval
+        print 'xrange :', self.chart.xrange
+        print
+        print 'minyval:', self.chart.minyval
+        print 'maxyval:', self.chart.maxyval
+        print 'yrange :', self.chart.yrange
+
     def about(self, action=None):
         dialog = AboutDialog(self.main_window)