Skip to content

Commit 0dd03c2

Browse files
committed
Renamed InvertedYTkCanvas to InvertedYCanvas and added a comment.
1 parent 1e57cfe commit 0dd03c2

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

src/aturtle/canvas.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111

12-
class InvertedYTkCanvas:
12+
class InvertedYCanvas:
1313

1414
"""
1515
Behaves like a tkinter.Canvas widget, where Y coordinates are negated such
@@ -30,6 +30,9 @@ def __init__(self, master, background):
3030

3131
def _inverted_y(self, coords):
3232

33+
# `coords` is an iterable of (x0, y0, x1, y0, ..., xn, yn) numbers,
34+
# where the ones in odd offsets/indices are Y values that are negated.
35+
3336
return [
3437
-value if offset % 2 else value
3538
for offset, value in enumerate(coords)

src/aturtle/window.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Window:
2121

2222
def __init__(self, width=320, height=320, x=None, y=None,
2323
fill_color='white', title='A-Turtle',
24-
canvas_factory=canvas.InvertedYTkCanvas):
24+
canvas_factory=canvas.InvertedYCanvas):
2525
"""
2626
Initialize a Window with the given `width` and `height`, filled in
2727
`fill_color`, with the given `title`.

tests/test_canvas.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def tearDown(self):
4242

4343
def test_create_creates_tkinter_Canvas(self):
4444

45-
_c = canvas.InvertedYTkCanvas(self.master, 'background')
45+
_c = canvas.InvertedYCanvas(self.master, 'background')
4646

4747
tkinter_canvas_call_args = self.tkinter.canvas_init_calls
4848

@@ -51,7 +51,7 @@ def test_create_creates_tkinter_Canvas(self):
5151

5252
def test_create_creates_tkinter_Canvas_with_given_master(self):
5353

54-
_c = canvas.InvertedYTkCanvas(self.master, 'background')
54+
_c = canvas.InvertedYCanvas(self.master, 'background')
5555

5656
tkinter_canvas_call_args = self.tkinter.canvas_init_calls
5757

@@ -62,7 +62,7 @@ def test_create_creates_tkinter_Canvas_with_given_master(self):
6262

6363
def test_create_creates_tkinter_Canvas_with_given_background(self):
6464

65-
_c = canvas.InvertedYTkCanvas(self.master, 'background')
65+
_c = canvas.InvertedYCanvas(self.master, 'background')
6666

6767
tkinter_canvas_call_args = self.tkinter.canvas_init_calls
6868

@@ -72,7 +72,7 @@ def test_create_creates_tkinter_Canvas_with_given_background(self):
7272

7373
def test_create_creates_tkinter_Canvas_with_zero_highlightthickness(self):
7474

75-
_c = canvas.InvertedYTkCanvas(self.master, 'background')
75+
_c = canvas.InvertedYCanvas(self.master, 'background')
7676

7777
tkinter_canvas_call_args = self.tkinter.canvas_init_calls
7878

@@ -82,7 +82,7 @@ def test_create_creates_tkinter_Canvas_with_zero_highlightthickness(self):
8282

8383
def test_create_polygon_returns_integer_item_id(self):
8484

85-
c = canvas.InvertedYTkCanvas(self.master, None)
85+
c = canvas.InvertedYCanvas(self.master, None)
8686

8787
item_id = c.create_polygon([], fill='fill', outline='outline', width=42)
8888

@@ -91,7 +91,7 @@ def test_create_polygon_returns_integer_item_id(self):
9191

9292
def test_create_polygon_inverts_y_coordinates(self):
9393

94-
c = canvas.InvertedYTkCanvas(self.master, None)
94+
c = canvas.InvertedYCanvas(self.master, None)
9595

9696
coords = [0, 0, 1, 1, 2, -2]
9797
_item_id = c.create_polygon(coords, fill='fill', outline='outline', width=42)
@@ -103,7 +103,7 @@ def test_create_polygon_inverts_y_coordinates(self):
103103

104104
def test_create_polygon_passes_args_to_Canvas_create_polygon(self):
105105

106-
c = canvas.InvertedYTkCanvas(self.master, None)
106+
c = canvas.InvertedYCanvas(self.master, None)
107107

108108
_item_id = c.create_polygon([], fill='fill', outline='outline', width=42)
109109

@@ -113,7 +113,7 @@ def test_create_polygon_passes_args_to_Canvas_create_polygon(self):
113113

114114
def test_create_image_returns_integer_item_id(self):
115115

116-
c = canvas.InvertedYTkCanvas(self.master, None)
116+
c = canvas.InvertedYCanvas(self.master, None)
117117

118118
item_id = c.create_image(0, 0, image=None, anchor=None)
119119

@@ -122,7 +122,7 @@ def test_create_image_returns_integer_item_id(self):
122122

123123
def test_create_image_inverts_y_coordinate(self):
124124

125-
c = canvas.InvertedYTkCanvas(self.master, None)
125+
c = canvas.InvertedYCanvas(self.master, None)
126126

127127
_item_id = c.create_image(42, 24, image=None, anchor=None)
128128

@@ -133,7 +133,7 @@ def test_create_image_inverts_y_coordinate(self):
133133

134134
def test_create_image_passes_args_to_Canvas_create_image(self):
135135

136-
c = canvas.InvertedYTkCanvas(self.master, None)
136+
c = canvas.InvertedYCanvas(self.master, None)
137137

138138
_item_id = c.create_image(42, 24, image='image', anchor='anchor')
139139

@@ -144,7 +144,7 @@ def test_create_image_passes_args_to_Canvas_create_image(self):
144144

145145
def test_create_line_returns_integer_item_id(self):
146146

147-
c = canvas.InvertedYTkCanvas(self.master, None)
147+
c = canvas.InvertedYCanvas(self.master, None)
148148

149149
item_id = c.create_line([], fill='fill', width=42, capstyle='capstyle')
150150

@@ -153,7 +153,7 @@ def test_create_line_returns_integer_item_id(self):
153153

154154
def test_create_line_inverts_y_coordinates(self):
155155

156-
c = canvas.InvertedYTkCanvas(self.master, None)
156+
c = canvas.InvertedYCanvas(self.master, None)
157157

158158
coords = [0, 0, 1, 1, 2, -2]
159159
_item_id = c.create_line(coords, fill='fill', width=42, capstyle='capstyle')
@@ -165,7 +165,7 @@ def test_create_line_inverts_y_coordinates(self):
165165

166166
def test_create_line_passes_args_to_Canvas_create_line(self):
167167

168-
c = canvas.InvertedYTkCanvas(self.master, None)
168+
c = canvas.InvertedYCanvas(self.master, None)
169169

170170
_item_id = c.create_line([], fill='fill', width=42, capstyle='capstyle')
171171

@@ -176,7 +176,7 @@ def test_create_line_passes_args_to_Canvas_create_line(self):
176176

177177
def test_move_calls_canvas_move_with_same_item_id(self):
178178

179-
c = canvas.InvertedYTkCanvas(self.master, None)
179+
c = canvas.InvertedYCanvas(self.master, None)
180180

181181
c.move(42, 0, 0)
182182

@@ -185,7 +185,7 @@ def test_move_calls_canvas_move_with_same_item_id(self):
185185

186186
def test_move_calls_canvas_move_with_inverted_y(self):
187187

188-
c = canvas.InvertedYTkCanvas(self.master, None)
188+
c = canvas.InvertedYCanvas(self.master, None)
189189

190190
c.move(None, 42, 24)
191191

@@ -194,7 +194,7 @@ def test_move_calls_canvas_move_with_inverted_y(self):
194194

195195
def test_coords_calls_canvas_coords_with_same_item_id(self):
196196

197-
c = canvas.InvertedYTkCanvas(self.master, None)
197+
c = canvas.InvertedYCanvas(self.master, None)
198198

199199
c.coords(42, [])
200200

@@ -203,7 +203,7 @@ def test_coords_calls_canvas_coords_with_same_item_id(self):
203203

204204
def test_coords_calls_canvas_coords_with_inverted_y_coords(self):
205205

206-
c = canvas.InvertedYTkCanvas(self.master, None)
206+
c = canvas.InvertedYCanvas(self.master, None)
207207

208208
c.coords(None, [1, 2, 3, 4, 5, 6])
209209

@@ -214,7 +214,7 @@ def test_coords_calls_canvas_coords_with_inverted_y_coords(self):
214214

215215
def test_attribute_access_returns_tkinter_Canvas_attribute(self):
216216

217-
c = canvas.InvertedYTkCanvas(self.master, None)
217+
c = canvas.InvertedYCanvas(self.master, None)
218218

219219
names = (
220220
'pack',

0 commit comments

Comments
 (0)