Home / Browse / PyX / Mail / Archive

PyX

Email Archive: pyx-checkins (read-only)

[PyX-checkins] SF.net SVN: pyx: [2735] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2006-05-19 14:09

Revision: 2735
Author:   wobsta
Date:     2006-05-19 07:09:09 -0700 (Fri, 19 May 2006)
ViewCVS:  http://svn.sourceforge.net/pyx/?rev=2735&view=rev

Log Message:
-----------
remove the set function (which was always catched by an except due to bad coding)

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py
Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2006-05-19 14:08:14 UTC (rev 2734)
+++ trunk/pyx/pyx/graph/style.py	2006-05-19 14:09:09 UTC (rev 2735)
@@ -824,7 +824,6 @@
 
     def initdrawpoints(self, privatedata, sharedata, graph):
         privatedata.rectcanvas = graph.insert(canvas.canvas())
-        privatedata.lastcolorvalue = None
 
     def drawpoint(self, privatedata, sharedata, graph, point):
         xvmin = sharedata.vrange[0][0]
@@ -848,14 +847,7 @@
             p.append(graph.vgeodesic_el(xvmax, yvmax, xvmin, yvmax))
             p.append(graph.vgeodesic_el(xvmin, yvmax, xvmin, yvmin))
             p.append(path.closepath())
-            colorvalue = point["color"]
-            try:
-                if colorvalue != privatedata.lastcolorvalue:
-                    privatedata.rectcanvas.set([self.palette.getcolor(colorvalue)])
-            except:
-                pass
-            else:
-                privatedata.rectcanvas.fill(p)
+            privatedata.rectcanvas.fill(p, [self.palette.getcolor(point["color"])])
 
     def key_pt(self, privatedata, sharedata, graph, x_pt, y_pt, width_pt, height_pt):
         raise RuntimeError("Style currently doesn't provide a graph key")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[PyX-checkins] SF.net SVN: pyx: [2735] trunk/pyx/pyx/graph/style.py	<wobsta@us...>

[PyX-checkins] SF.net SVN: pyx: [2741] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2006-05-20 05:21

Revision: 2741
Author:   wobsta
Date:     2006-05-19 22:20:41 -0700 (Fri, 19 May 2006)
ViewCVS:  http://svn.sourceforge.net/pyx/?rev=2741&view=rev

Log Message:
-----------
I'm sorry, I've just seen that I missed to checkin the new pyx/graph/style.py ...

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py
Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2006-05-20 04:54:52 UTC (rev 2740)
+++ trunk/pyx/pyx/graph/style.py	2006-05-20 05:20:41 UTC (rev 2741)
@@ -1371,6 +1371,10 @@
         sharedata.stackedbardraw = 1
         privatedata.stackedbar = sharedata.stackedbar
 
+    def drawpointfill(self, privatedata, p):
+        if p:
+            privatedata.rectcanvas.fill(p, privatedata.barattrs)
+
     def drawpoint(self, privatedata, sharedata, graph, point):
         xvmin = sharedata.vbarrange[0][0]
         xvmax = sharedata.vbarrange[0][1]
@@ -1403,10 +1407,35 @@
             p.append(graph.vgeodesic_el(xvmax, yvmax, xvmin, yvmax))
             p.append(graph.vgeodesic_el(xvmin, yvmax, xvmin, yvmin))
             p.append(path.closepath())
-            privatedata.rectcanvas.fill(p, privatedata.barattrs)
+            self.drawpointfill(privatedata, p)
+        else:
+            self.drawpointfill(privatedata, None)
 
     def key_pt(self, privatedata, sharedata, graph, x_pt, y_pt, width_pt, height_pt):
         selectindex = privatedata.stackedbar
         selecttotal = sharedata.stackedbar + 1
         graph.fill(path.rect_pt(x_pt + width_pt*selectindex/float(selecttotal), y_pt, width_pt/float(selecttotal), height_pt), privatedata.barattrs)
 
+
+class changebar(bar):
+
+    def selectstyle(self, privatedata, sharedata, graph, selectindex, selecttotal):
+        if selecttotal != 1:
+            raise RuntimeError("Changebar can't change its appearance. Thus you can't use it to plot several bars side by side on a subaxis.")
+
+    def initdrawpoints(self, privatedata, sharedata, graph):
+        bar.initdrawpoints(self, privatedata, sharedata, graph)
+        privatedata.bars = []
+
+    def drawpointfill(self, privatedata, p):
+        privatedata.bars.append(p)
+
+    def donedrawpoints(self, privatedata, sharedata, graph):
+        selecttotal = len(privatedata.bars)
+        for selectindex, p in enumerate(privatedata.bars):
+            if p:
+                barattrs = attr.selectattrs(self.defaultbarattrs + self.barattrs, selectindex, selecttotal)
+                privatedata.rectcanvas.fill(p, barattrs)
+
+    def key_pt(self, privatedata, sharedata, graph, x_pt, y_pt, width_pt, height_pt):
+        raise RuntimeError("Style currently doesn't provide a graph key")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[PyX-checkins] SF.net SVN: pyx: [2832] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2006-06-26 05:55

Revision: 2832
Author:   wobsta
Date:     2006-06-25 22:55:06 -0700 (Sun, 25 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pyx/?rev=2832&view=rev

Log Message:
-----------
fix palette to gradient renaming

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py
Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2006-06-26 05:52:26 UTC (rev 2831)
+++ trunk/pyx/pyx/graph/style.py	2006-06-26 05:55:06 UTC (rev 2832)
@@ -1464,10 +1464,10 @@
 
     needsdata = ["vpos", "vposmissing", "vposavailable", "vposvalid"]
 
-    def __init__(self, colorname="color", palette=color.palette.Rainbow,
+    def __init__(self, colorname="color", gradient=color.gradient.Rainbow,
                        mincolor=None, maxcolor=None, index1=0, index2=1, epsilon=1e-10):
         self.colorname = colorname
-        self.palette = palette
+        self.gradient = gradient
         self.mincolor = mincolor
         self.maxcolor = maxcolor
         self.index1 = index1
@@ -1562,7 +1562,7 @@
                             pass
                         else:
                             color = (color - privatedata.mincolor) / float(privatedata.maxcolor - privatedata.mincolor)
-                            graph.fill(path.circle_pt(x_pt, y_pt, 1), [self.palette.getcolor(color)])
+                            graph.fill(path.circle_pt(x_pt, y_pt, 1), [self.gradient.getcolor(color)])
 
     def key_pt(self, privatedata, sharedata, graph, x_pt, y_pt, width_pt, height_pt):
         raise NotImplementedError


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[PyX-checkins] SF.net SVN: pyx: [2833] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2006-06-26 06:13

Revision: 2833
Author:   wobsta
Date:     2006-06-25 23:13:21 -0700 (Sun, 25 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pyx/?rev=2833&view=rev

Log Message:
-----------
do not indicate color on invalid points

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py
Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2006-06-26 05:55:06 UTC (rev 2832)
+++ trunk/pyx/pyx/graph/style.py	2006-06-26 06:13:21 UTC (rev 2833)
@@ -1552,17 +1552,19 @@
                 self.initpointstopath(privatedata)
                 for value2 in values2:
                     try:
-                        x_pt, y_pt = graph.vpos_pt(*data2[value2][2])
+                        vposavailable, vposvalid, vpos = data2[value2]
                     except KeyError:
                         pass
                     else:
-                        try:
-                            color = privatedata.colors[value1][value2]
-                        except KeyError:
-                            pass
-                        else:
-                            color = (color - privatedata.mincolor) / float(privatedata.maxcolor - privatedata.mincolor)
-                            graph.fill(path.circle_pt(x_pt, y_pt, 1), [self.gradient.getcolor(color)])
+                        if vposvalid:
+                            x_pt, y_pt = graph.vpos_pt(*vpos)
+                            try:
+                                color = privatedata.colors[value1][value2]
+                            except KeyError:
+                                pass
+                            else:
+                                color = (color - privatedata.mincolor) / float(privatedata.maxcolor - privatedata.mincolor)
+                                graph.fill(path.circle_pt(x_pt, y_pt, 1), [self.gradient.getcolor(color)])
 
     def key_pt(self, privatedata, sharedata, graph, x_pt, y_pt, width_pt, height_pt):
         raise NotImplementedError


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[PyX-checkins] SF.net SVN: pyx: [2880] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2007-07-23 15:38

Revision: 2880
          http://svn.sourceforge.net/pyx/?rev=2880&view=rev
Author:   wobsta
Date:     2007-07-23 08:38:30 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
correct poscolumnnames access

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py

Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2007-07-23 15:36:38 UTC (rev 2879)
+++ trunk/pyx/pyx/graph/style.py	2007-07-23 15:38:30 UTC (rev 2880)
@@ -1018,7 +1018,7 @@
                 min = data[0] - self.autohistogrampointpos * delta
                 max = data[-1] + (1-self.autohistogrampointpos) * delta
                 graph.axes[columnname].adjustaxis([min, max])
-        elif self.fromvalue is not None and columnname != sharedata.poscolumnnames[privatedata.rangeaxisindex]:
+        elif self.fromvalue is not None and columnname == sharedata.poscolumnnames[1-privatedata.rangeaxisindex]:
             graph.axes[columnname].adjustaxis([self.fromvalue])
 
     def selectstyle(self, privatedata, sharedata, graph, selectindex, selecttotal):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[PyX-checkins] SF.net SVN: pyx: [2894] trunk/pyx/pyx/graph/style.py

From: <wobsta@us...> - 2007-10-03 21:02

Revision: 2894
          http://pyx.svn.sourceforge.net/pyx/?rev=2894&view=rev
Author:   wobsta
Date:     2007-10-03 14:02:15 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
remove non-used kwargs

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py

Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2007-10-03 20:54:26 UTC (rev 2893)
+++ trunk/pyx/pyx/graph/style.py	2007-10-03 21:02:15 UTC (rev 2894)
@@ -1657,7 +1657,7 @@
 
     def __init__(self, colorname="color", gradient=color.gradient.Grey, mincolor=None, maxcolor=None,
                        gridlines1=0.05, gridlines2=0.05, gridcolor=None,
-                       backcolor=color.gray.black, **kwargs):
+                       backcolor=color.gray.black):
         self.colorname = colorname
         self.gradient = gradient
         self.mincolor = mincolor


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[PyX-checkins] SF.net SVN: pyx: [2940] trunk/pyx/pyx/graph/style.py

From: <joergl@us...> - 2007-10-24 11:54

Revision: 2940
          http://pyx.svn.sourceforge.net/pyx/?rev=2940&view=rev
Author:   joergl
Date:     2007-10-24 04:54:47 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
replaced test for truth value, which doesn't work with numpy arrays. However the previous if seems to be too less strict

Modified Paths:
--------------
    trunk/pyx/pyx/graph/style.py

Modified: trunk/pyx/pyx/graph/style.py
===================================================================
--- trunk/pyx/pyx/graph/style.py	2007-10-24 10:44:20 UTC (rev 2939)
+++ trunk/pyx/pyx/graph/style.py	2007-10-24 11:54:47 UTC (rev 2940)
@@ -1015,7 +1015,7 @@
         if privatedata.autohistogram and columnname == sharedata.poscolumnnames[privatedata.rangeaxisindex]:
             if len(data) == 1:
                 raise ValueError("several data points needed for automatic histogram width calculation")
-            if data:
+            if len(data) > 1:
                 delta = data[1] - data[0]
                 min = data[0] - self.autohistogrampointpos * delta
                 max = data[-1] + (1-self.autohistogrampointpos) * delta


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.