diff --git a/kiva/quartz/ABCGI.pyx b/kiva/quartz/ABCGI.pyx index 91d715d78..4e8b1e3c3 100644 --- a/kiva/quartz/ABCGI.pyx +++ b/kiva/quartz/ABCGI.pyx @@ -1062,7 +1062,7 @@ cdef class CGContext: apoints = (numpy.asarray(points, dtype=numpy.float32)) - if apoints.nd != 2 or apoints.dimensions[1] != 2: + if apoints.ndim != 2 or apoints.shape[1] != 2: msg = "must pass array of 2-D points" raise ValueError(msg) diff --git a/kiva/tests/drawing_tester.py b/kiva/tests/drawing_tester.py index db6bcf92b..506b3d3b4 100644 --- a/kiva/tests/drawing_tester.py +++ b/kiva/tests/drawing_tester.py @@ -19,9 +19,9 @@ DECORATIVE, DEFAULT, ITALIC, MODERN, NORMAL, ROMAN, SCRIPT, TELETYPE, Font ) from kiva.constants import ( - WEIGHT_THIN, WEIGHT_EXTRALIGHT, WEIGHT_LIGHT, WEIGHT_NORMAL, WEIGHT_MEDIUM, - WEIGHT_SEMIBOLD, WEIGHT_BOLD, WEIGHT_EXTRABOLD, WEIGHT_HEAVY, - WEIGHT_EXTRAHEAVY + FILL_STROKE, WEIGHT_THIN, WEIGHT_EXTRALIGHT, WEIGHT_LIGHT, WEIGHT_NORMAL, + WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD, WEIGHT_EXTRABOLD, + WEIGHT_HEAVY, WEIGHT_EXTRAHEAVY ) @@ -188,6 +188,23 @@ def test_star_clip(self): self.gc.arc(150, 150, 100, 0.0, 2 * numpy.pi) self.gc.fill_path() + def test_draw_path_at_points(self): + if not hasattr(self.gc, 'draw_path_at_points'): + self.skipTest("GC doesn't have 'draw_marker_at_points' method.") + + path = self.gc.get_empty_path() + path.move_to(-5, -5) + path.line_to(-5, 5) + path.line_to(5, 5) + path.line_to(5, -5) + path.close_path() + + points = numpy.array([[0, 0], [10, 10], [20, 20], [30, 30]]) + + with self.draw_and_check(): + self.gc.draw_path_at_points(points, path, FILL_STROKE) + self.gc.fill_path() + # Required methods #################################################### @contextlib.contextmanager