Ticket #1592: two-axis-xocolor.patch

src/sugar/graphics/xocolor.py

@@ -1 +1 @@
 # Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2008-2009 Sugar Labs
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -207 +208 @@
 ['#BCCDFF', '#AC32FF'], \
 ]
 
+strokes = list(set([i[0] for i in colors]))
+fills = list(set([i[1] for i in colors]))
+
 
 def _parse_string(color_string):
     if color_string == 'white':
@@ -261 +265 @@
         return '%s,%s' % (self.stroke, self.fill)
 
 
+class _PartColor(object):
+
+    def __init__(self, color_range, color):
+        self._range = color_range
+        if color in self._range:
+            self._index = self._range.index(color)
+        else:
+            self._index = random.randint(0, len(self._range) - 1)
+        self.value = self._range[self._index]
+
+    def get_next(self):
+        return self._range[self._get_next_index(+1)]
+
+    def get_prev(self):
+        return self._range[self._get_next_index(-1)]
+
+    def next(self, delta):
+        self._index = self._get_next_index(delta)
+        self.value = self._range[self._index]
+
+    def _get_next_index(self, delta):
+        if self._index + delta < 0:
+            return len(self._range) - 1
+        elif self._index + delta >= len(self._range):
+            return 0
+        else:
+            return self._index + delta
+
+
+class StrokeColor(_PartColor):
+
+    def __init__(self, color=None):
+        _PartColor.__init__(self, strokes, color)
+
+
+class FillColor(_PartColor):
+
+    def __init__(self, color=None):
+        _PartColor.__init__(self, fills, color)
+
+
 if __name__ == "__main__":
     import sys
     import re