Changeset 75

Timestamp:

12/20/07 06:21:14 (4 years ago)

Author:

lgs

Message:

Simplify the Scatter Plot by inheriting from LineChart?

Location:

trunk

Files:

• examples/linechart.png (modified) (previous)
• src/line.py (modified) (1 diff)
• src/scatter.py (modified) (1 diff)

trunk/src/line.py

@@ -34 +34 @@
                 x = (xval - self.minxval) * self.xscale
                 y = 1.0 - (yval - self.minyval) * self.yscale
-                point = Point(x, clamp(0.0, 1.0, y), xval, yval, name)
+                point = Point(x, y, xval, yval, name)
                 
-                if 0.0 <= point.x <= 1.0:
+                if 0.0 <= point.x <= 1.0 and 0.0 <= point.y <= 1.0:
                     self.points.append(point)
     

trunk/src/scatter.py

@@ -18 +18 @@
 from pycha.chart import Chart
 from pycha.color import hex2rgb, clamp
-from pycha.line import Point
+from pycha.line import Point, LineChart
 
-class ScatterplotChart(Chart):
-    
-    def __init__(self, surface=None, options={}):
-        super(ScatterplotChart, self).__init__(surface, options)
-        self.points = []
-        
-    def _updateChart(self):
-        """Evaluates measures for scatterplots"""
-        self.points = []
-
-        for i, (name, store) in enumerate(self.datasets):
-            for item in store:
-                xval, yval = item
-                x = (xval - self.minxval) * self.xscale
-                y = 1.0 - (yval - self.minyval) * self.yscale
-                point = Point(x, clamp(0.0, 1.0, y), xval, yval, name)
-                
-                if 0.0 <= point.x <= 1.0:
-                    self.points.append(point)
-    
+class ScatterplotChart(LineChart):
+      
     def _renderChart(self, cx):
         """Renders a scatterplot"""