autoColor for extended brushes and non-orth plots

veusz/document/painthelper.py

@@ -146,7 +146,8 @@ def __init__(self, document, pagesize,
         self.widgetstack = []
 
         # current index for each plotter (if wanting automatic colors)
-        self.autoplotterindex = {}
+        self.autoplottercount = 0
+        self.autoplottermap = {}
 
     @property
     def maxdim(self):
@@ -309,3 +310,10 @@ def widgetBoundsIterator(self, widgettype=None):
                 yield state.widget, state.bounds
             # remove the widget itself from the stack and insert children
             stack = state.children + stack[1:]
+
+    def autoColorIndex(self, key):
+        """Return automatic color index for key given."""
+        if key not in self.autoplottermap:
+            self.autoplottermap[key] = self.autoplottercount
+            self.autoplottercount += 1
+        return self.autoplottermap[key]

veusz/setting/collections.py

@@ -69,7 +69,7 @@ def makeQPen(self, painter):
             color.setAlphaF((100-self.transparency) / 100.)
         width = self.get('width').convert(painter)
         style, dashpattern = setting.LineStyle._linecnvt[self.style]
-        pen = qt4.QPen( color, width, style )
+        pen = qt4.QPen(color, width, style)
 
         if dashpattern:
             pen.setDashPattern(dashpattern)
@@ -345,7 +345,7 @@ def __init__(self, name, **args):
             usertext = _('Underline') ) )
         self.add( setting.Bool(
             'hide', False,
-            descr = _('Hide the text')
+            descr = _('Hide the text'),
             usertext = _('Hide')) )
 
     def copy(self):

veusz/setting/setting.py

@@ -1378,8 +1378,12 @@ def copy(self):
         """Make a copy of the setting."""
         return self._copyHelper((), (), {})
 
-    def color(self, painter):
-        """Return QColor for color."""
+    def color(self, painter, dataindex=0):
+        """Return QColor from color.
+
+        painter is a Veusz Painter
+        dataindex is index for automatically getting colors for subdatasets.
+        """
 
         if self.val.lower() == 'auto':
             # lookup widget

veusz/utils/extbrushfilling.py

@@ -195,7 +195,7 @@ def brushExtFillPath(painter, extbrush, path, ignorehide=False,
     style = extbrush.style
     if style in _fillcnvt:
         # standard fill: use Qt styles for painting
-        color = painter.docColor(extbrush.color)
+        color = extbrush.get('color').color(painter)
         if extbrush.transparency >= 0:
             color.setAlphaF((100-extbrush.transparency) / 100.)
         brush = qt4.QBrush(color, _fillcnvt[style])
@@ -213,13 +213,13 @@ def brushExtFillPath(painter, extbrush, path, ignorehide=False,
 
         if not extbrush.backhide:
             # background brush
-            color = painter.docColor(extbrush.backcolor)
-            if extbrush.backtransparency >= 0:
+            color = extbrush.get('backcolor').color(painter)
+            if extbrush.backtransparency > 0:
                 color.setAlphaF((100-extbrush.backtransparency) / 100.)
             brush = qt4.QBrush(color)
             painter.fillPath(path, brush)
 
-        color = painter.docColor(extbrush.color)
+        color = extbrush.get('color').color(painter)
         if extbrush.transparency >= 0:
             color.setAlphaF((100-extbrush.transparency) / 100.)
         width = extbrush.get('linewidth').convert(painter)

veusz/widgets/graph.py

@@ -250,12 +250,10 @@ def draw(self, parentposn, painthelper, outerbounds = None):
         # don't duplicate drawing axes
         axesdrawn = set()
 
-        # map color indices to children
-        autoplotterindex = 0
+        # reset counter and compute automatic colors
+        painthelper.autoplottercount = 0
         for c in self.children:
-            if c.isplotter and c not in painthelper.autoplotterindex:
-                painthelper.autoplotterindex[c] = autoplotterindex
-                autoplotterindex += 1
+            c.autoColor(painter)
 
         # do normal drawing of children
         # iterate over children in reverse order

veusz/widgets/nonorthfunction.py

@@ -159,6 +159,11 @@ def pickPoint(self, x0, y0, bounds, distance='radial'):
     def pickIndex(self, oldindex, direction, bounds):
         return self._pickable().pickIndex(oldindex, direction, bounds)
 
+    def autoColor(self, painter, dataindex=0):
+        """Automatic color for plotting."""
+        return painter.docColorAuto(
+            painter.helper.autoColorIndex((self, dataindex)))
+
     def draw(self, parentposn, phelper, outerbounds=None):
         '''Plot the function on a plotter.'''
 

veusz/widgets/nonorthgraph.py

@@ -147,6 +147,11 @@ def draw(self, parentposn, phelper, outerbounds=None):
 
         painter = phelper.painter(self, bounds)
         with painter:
+            # reset counter and compute automatic colors
+            phelper.autoplottercount = 0
+            for c in self.children:
+                c.autoColor(painter)
+
             # plot graph
             datarange = self.getDataRange()
             self.drawGraph(painter, bounds, datarange, outerbounds=outerbounds)

veusz/widgets/nonorthpoint.py

@@ -188,6 +188,11 @@ def getColorbarParameters(self):
         return (c.min, c.max, c.scaling, s.MarkerFill.colorMap, 0,
                 s.MarkerFill.colorMapInvert)
 
+    def autoColor(self, painter, dataindex=0):
+        """Automatic color for plotting."""
+        return painter.docColorAuto(
+            painter.helper.autoColorIndex((self, dataindex)))
+
     def draw(self, parentposn, phelper, outerbounds=None):
         '''Plot the data on a plotter.'''
 

veusz/widgets/plotters.py

@@ -63,13 +63,10 @@ def addSettings(klass, s):
                             descr = _('Name of Y-axis to use'),
                             usertext=_('Y axis')) )
 
-    def autoColor(self, painter):
+    def autoColor(self, painter, dataindex=0):
         """Automatic color for plotting."""
-        helper = painter.helper
-        if self in helper.autoplotterindex:
-            return painter.docColorAuto(helper.autoplotterindex[self])
-        else:
-            return 'foreground'
+        return painter.docColorAuto(
+            painter.helper.autoColorIndex((self, dataindex)))
 
     def getAxesNames(self):
         """Returns names of axes used."""

veusz/widgets/widget.py

@@ -418,7 +418,7 @@ def updateControlItem(self, controlitem, pos):
 
         pass
 
-    def autoColor(self, painter):
+    def autoColor(self, painter, dataindex=0):
         """Return automatic color for plotting."""
         return 'foreground'