Ticket #6: chart-rotate-label.diff

chart.py

@@ -17 +17 @@
 
 import copy
 import cairo
+import math
 
 from pycha.color import (defaultColorscheme, getColorscheme, hex2rgb,
                          DEFAULT_COLOR)
@@ -302 +303 @@
         cx.set_source_rgb(*hex2rgb(self.options.axis.lineColor))
         cx.set_line_width(self.options.axis.lineWidth)
 
+        cx.select_font_face(self.options.axis.labelFont,
+                    cairo.FONT_SLANT_NORMAL,
+                    cairo.FONT_WEIGHT_NORMAL)
+        cx.set_font_size(self.options.axis.labelFontSize)
+
         if not self.options.axis.y.hide:
             if self.yticks:
                 def drawYLabel(tick):
@@ -321 +327 @@
                     extents = cx.text_extents(label)
                     labelWidth = extents[2]
                     labelHeight = extents[3]
-                    cx.move_to(x - self.options.axis.tickSize - labelWidth - 5,
-                               y + labelHeight / 2.0)
-                    cx.show_text(label)
 
+                    if self.options.axis.y.rotate:
+                        radians = math.radians(self.options.axis.y.rotate)
+                        cx.move_to(
+                                x   - self.options.axis.tickSize
+                                    - (labelWidth * math.cos(radians))
+                                    - 4,
+                                y   + (labelWidth * math.sin(radians))
+                                    + labelHeight / (2.0/math.cos(radians))
+                                )
+                        cx.rotate(-radians)
+                        cx.show_text(label)
+                        cx.rotate(radians)
+                    else:
+                        cx.move_to(
+                                x - self.options.axis.tickSize - labelWidth - 5,
+                                y + labelHeight / 2.0)
+                        cx.show_text(label)
                     return label
+
                 for tick in self.yticks:
                     drawYLabel(tick)
 
+            if self.options.axis.y.label:
+                tickExtents = [cx.text_extents(unicode(tick[1]))[2:4]
+                        for tick in self.yticks]
+                tickWidth = 0.0
+                if tickExtents:
+                    tickWidth = self.options.axis.tickSize + 4.0
+                    tickExtents.sort()
+                    max_width, height = tickExtents[-1]
+                    if self.options.axis.y.rotate:
+                        radians = math.radians(self.options.axis.y.rotate)
+                        max_width = (
+                                (max_width * math.cos(radians))
+                                + (height * math.sin(radians)) )
+                    tickWidth += max_width
+
+                cx.new_path()
+                label = unicode(self.options.axis.y.label)
+                labelWidth, labelHeight = cx.text_extents(label)[2:4]
+                x = self.area.x - tickWidth - 4.0
+                y = self.area.y + .5 * self.area.h + labelWidth / 2
+                cx.move_to(x, y)
+                cx.select_font_face(self.options.axis.labelFont,
+                            cairo.FONT_SLANT_NORMAL,
+                            cairo.FONT_WEIGHT_BOLD)
+                radians = math.radians(90)
+                cx.rotate(-radians)
+                cx.show_text(label)
+                cx.rotate(radians)
+                cx.select_font_face(self.options.axis.labelFont,
+                            cairo.FONT_SLANT_NORMAL,
+                            cairo.FONT_WEIGHT_NORMAL)
+
             cx.new_path()
             cx.move_to(self.area.x, self.area.y)
             cx.line_to(self.area.x, self.area.y + self.area.h)
@@ -349 +402 @@
                     cx.line_to(x, y + self.options.axis.tickSize)
                     cx.close_path()
                     cx.stroke()
+                    cx.fill()
 
+                    cx.new_path()
                     label = unicode(tick[1])
                     extents = cx.text_extents(label)
                     labelWidth = extents[2]
                     labelHeight = extents[3]
-                    cx.move_to(x - labelWidth / 2.0,
-                               y + self.options.axis.tickSize + 10)
-                    cx.show_text(label)
+                    if self.options.axis.x.rotate:
+                        radians = math.radians(self.options.axis.x.rotate)
+                        cx.move_to(
+                                x   - (labelHeight * math.cos(radians)),
+                                y   + self.options.axis.tickSize
+                                    + (labelHeight * math.cos(radians))
+                                    + 2)
+                        cx.rotate(radians)
+                        cx.show_text(label)
+                        cx.rotate(-radians)
+                    else:
+                        cx.move_to(x - labelWidth / 2.0,
+                               y + self.options.axis.tickSize + labelHeight + 2)
+                        cx.show_text(label)
                     return label
+
                 for tick in self.xticks:
                     drawXLabel(tick)
 
+            if self.options.axis.x.label:
+                tickExtents = [cx.text_extents(unicode(tick[1]))[2:4]
+                        for tick in self.xticks]
+                tickHeight = 0.0
+                if tickExtents:
+                    tickHeight = self.options.axis.tickSize + 4.0
+                    tickExtents.sort()
+                    max_width, height = tickExtents[-1]
+                    if self.options.axis.x.rotate:
+                        radians = math.radians(self.options.axis.x.rotate)
+                        height = ((max_width * math.sin(radians))
+                                  + (height * math.cos(radians)) )
+                    tickHeight += height
+
+                cx.new_path()
+                label = unicode(self.options.axis.x.label)
+                cx.select_font_face(self.options.axis.labelFont,
+                            cairo.FONT_SLANT_NORMAL,
+                            cairo.FONT_WEIGHT_BOLD)
+                labelWidth, labelHeight = cx.text_extents(label)[2:4]
+                x = self.area.x + self.area.w / 2.0 - labelWidth / 2.0
+                y = self.area.y + self.area.h + tickHeight + labelHeight + 4.0
+                cx.move_to(x, y)
+                cx.show_text(label)
+                cx.select_font_face(self.options.axis.labelFont,
+                            cairo.FONT_SLANT_NORMAL,
+                            cairo.FONT_WEIGHT_NORMAL)
+
             cx.new_path()
             cx.move_to(self.area.x, self.area.y + self.area.h)
             cx.line_to(self.area.x + self.area.w, self.area.y + self.area.h)
@@ -456 +551 @@
             tickCount=10,
             tickPrecision=1,
             range=None,
+            rotate=None,
+            label=None,
         ),
         y=Option(
             hide=False,
@@ -463 +560 @@
             tickCount=10,
             tickPrecision=1,
             range=None,
+            rotate=None,
+            label=None,
         ),
     ),
     background=Option(