Changeset 109 for trunk/src/scatter.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/src/scatter.py (modified) (3 diffs)

trunk/src/scatter.py

@@ -16 +16 @@
 # along with PyCha.  If not, see <http://www.gnu.org/licenses/>.
 
-from pycha.chart import Chart
-from pycha.color import hex2rgb, clamp
-from pycha.line import Point, LineChart
+from pycha.line import LineChart
 
 class ScatterplotChart(LineChart):
@@ -24 +22 @@
     def _renderChart(self, cx):
         """Renders a scatterplot"""
-        def drawSymbol(point, size=2):
-            ox = point.x * self.area.w + self.area.x
-            oy = point.y * self.area.h + self.area.y
-            cx.move_to(ox-size, oy  )
-            cx.line_to(ox+size, oy  )
-            cx.move_to(ox     , oy-size)
-            cx.line_to(ox     , oy+size)
+        def drawSymbol(point, size=2):
+            ox = point.x * self.area.w + self.area.x
+            oy = point.y * self.area.h + self.area.y
+            cx.move_to(ox-size, oy  )
+            cx.line_to(ox+size, oy  )
+            cx.move_to(ox     , oy-size)
+            cx.line_to(ox     , oy+size)
 
         def preparePath(storeName, size=2):
@@ -42 +40 @@
 
         cx.set_line_width(self.options.stroke.width)
-        # TODO: self.options.stroke.shadow
-        for key in self._getDatasetsKeys():
-            cx.set_source_rgb(*self.options.colorScheme[key])
-            preparePath(key)
-            cx.stroke()
+        # TODO: self.options.stroke.shadow
+        for key in self._getDatasetsKeys():
+            cx.set_source_rgb(*self.options.colorScheme[key])
+            preparePath(key)
+            cx.stroke()
 
         cx.restore()
 
     def _renderLines(self, cx):
-        """We don't need lines in the background"""
-        pass
+        # We don't need lines in the background
+        pass