Fixing up color bugs. wireservice#26

leather/shapes/category.py

@@ -19,7 +19,7 @@ def legend_dimension(self):
 
     def legend_labels(self, series, palette):
         """
-        Generate a dictionary of labels mappeds to colors for the legend.
+        Generate a list of tuples with labels mappeds to colors for the legend.
         """
         label_colors = []
         legend_dimension = self._legend_dimension
@@ -50,7 +50,12 @@ def legend_to_svg(self, series, palette):
         """
         Render the legend entries for these shapes.
         """
-        label_colors = self.legend_labels(series, palette)
+        if self._fill_color is not None:
+            colors = self._fill_color
+        else:
+            colors = list(palette)
+
+        label_colors = self.legend_labels(series, colors)
         item_groups = []
 
         if hasattr(self, '_stroke_color'):

leather/shapes/grouped_bars.py

@@ -27,7 +27,7 @@ def validate_series(self, series):
         """
         Verify this shape can be used to render a given series.
         """
-        if isinstance(series, CategorySeries):
+        if not isinstance(series, CategorySeries):
             raise ValueError('GroupedBars can only be used to render CategorySeries.')
 
     def to_svg(self, width, height, x_scale, y_scale, series, palette):