Implements wx.DC.DrawXXXList methods

Author: amauryfa

etg/cffi/dc.py

@@ -1,3 +1,79 @@
 def run(module):
-    # TODO: replicate the methods from the sip/dc.py
-    pass
+    module.addPyCode('''\
+    import itertools''')
+
+    c = module.find('wxDC')
+
+    c.addPyMethod(
+        '_DrawRectangleList', '(self, coords, pens, brushes)',
+        body="""\
+           for (coord, pen, brush) in itertools.izip_longest(
+                   coords, pens, brushes):
+               if pen is not None:
+                   self.SetPen(pen)
+               if brush is not None:
+                   self.SetBrush(brush)
+               self.DrawRectangle(*coord)
+        """)
+
+    c.addPyMethod(
+        '_DrawEllipseList', '(self, coords, pens, brushes)',
+        body="""\
+           for (coord, pen, brush) in itertools.izip_longest(
+                   coords, pens, brushes):
+               if pen is not None:
+                   self.SetPen(pen)
+               if brush is not None:
+                   self.SetBrush(brush)
+               self.DrawEllipse(*coord)
+        """)
+
+    c.addPyMethod(
+        '_DrawPolygonList', '(self, coords, pens, brushes)',
+        body="""\
+           for (coord, pen, brush) in itertools.izip_longest(
+                   coords, pens, brushes):
+               if pen is not None:
+                   self.SetPen(pen)
+               if brush is not None:
+                   self.SetBrush(brush)
+               self.DrawPolygon(coord)
+        """)
+
+    c.addPyMethod(
+        '_DrawPointList', '(self, coords, pens, brushes)',
+        body="""\
+           for (coord, pen, brush) in itertools.izip_longest(
+                   coords, pens, brushes):
+               if pen is not None:
+                   self.SetPen(pen)
+               if brush is not None:
+                   self.SetBrush(brush)
+               self.DrawPoint(*coord)
+        """)
+
+    c.addPyMethod(
+        '_DrawLineList', '(self, coords, pens, brushes)',
+        body="""\
+           for (coord, pen, brush) in itertools.izip_longest(
+                   coords, pens, brushes):
+               if pen is not None:
+                   self.SetPen(pen)
+               if brush is not None:
+                   self.SetBrush(brush)
+               self.DrawLine(*coord)
+        """)
+
+    c.addPyMethod(
+        '_DrawTextList', '(self, texts, points, foregrounds, backgrounds)',
+        body="""\
+           for (text, point, fg, bg) in itertools.izip_longest(
+                   texts, points, foregrounds, backgrounds):
+               if text is not None:
+                   string = text
+               if fg is not None:
+                   self.SetTextForeground(fg)
+               if bg is not None:
+                   self.SetTextBackground(bg)
+               self.DrawText(string, point[0], point[1])
+           """)

etg/dc.py

@@ -27,7 +27,9 @@
            'wxDCFontChanger',
            ]    
 
-OTHERDEPS = [ 'src/dc_ex.cpp', ]
+OTHERDEPS = [ 'src/dc_ex.cpp', 
+              'etg/sip/dc.py',
+              'etg/cffi/dc.py',]
 
 #---------------------------------------------------------------------------
 
@@ -174,6 +176,28 @@ def run():
     c.addPyCode('DC.GetGdkDrawable = wx.deprecated(DC.GetGdkDrawable, "Use GetHandle instead.")')
 
 
+
+    
+    c.addPyMethod('DrawPointList', '(self, points, pens=None)',
+        doc="""\
+            Draw a list of points as quickly as possible.
+    
+            :param points: A sequence of 2-element sequences representing 
+                           each point to draw, (x,y).
+            :param pens:   If None, then the current pen is used.  If a single 
+                           pen then it will be used for all points.  If a list of 
+                           pens then there should be one for each point in points.
+            """,
+        body="""\
+            if pens is None:
+                pens = []
+            elif isinstance(pens, wx.Pen):
+                pens = [pens]
+            elif len(pens) != len(points):
+                raise ValueError('points and pens must have same length')
+            return self._DrawPointList(points, pens, [])
+            """)
+
     c.addPyMethod('DrawLineList', '(self, lines, pens=None)',
         doc="""\
             Draw a list of lines as quickly as possible.

etg/sip/dc.py

@@ -24,24 +24,3 @@ def run(module):
     c.addCppMethod('PyObject*', '_DrawTextList', 
         '(PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)',
         body="return wxPyDrawTextList(*self, textList, pyPoints, foregroundList, backgroundList);")
-
-    
-    c.addPyMethod('DrawPointList', '(self, points, pens=None)',
-        doc="""\
-            Draw a list of points as quickly as possible.
-    
-            :param points: A sequence of 2-element sequences representing 
-                           each point to draw, (x,y).
-            :param pens:   If None, then the current pen is used.  If a single 
-                           pen then it will be used for all points.  If a list of 
-                           pens then there should be one for each point in points.
-            """,
-        body="""\
-            if pens is None:
-                pens = []
-            elif isinstance(pens, wx.Pen):
-                pens = [pens]
-            elif len(pens) != len(points):
-                raise ValueError('points and pens must have same length')
-            return self._DrawPointList(points, pens, [])
-            """)